837 files changed, 47612 insertions, 47115 deletions

diff --git a/ChangeLog b/ChangeLog
index acfcec27300..bc4aff9608d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
+Changes for 6.0.0rc1
+
+New features:
+
+Bug fixes:
+
+--------------------------------------------------------------------------------
 Changes for 6.0.0beta2
 
 New features:
+..F....... [ZBXNEXT-7033] anchored modal dialogues to avoid their repositioning during interactions (ashubin, jfreibergs)
+..F....... [ZBXNEXT-669] added maintenance status icon to Latest Data page (acikuns)
 A.F.I...S. [ZBXNEXT-6999] implemented SLA, SLA reports and SLA report widget (ashubin, averza, jfreibergs, vso)
 ...G...... [ZBXNEXT-6875] added native support for the system.hw.chassis and system.hw.devices keys in Zabbix agent 2 (esneiders)
 .D.....PST [ZBXNEXT-2485] moved odbc poller into separate poller type (dgoloscapov, vso)
@@ -13,6 +22,11 @@ A......... [ZBXNEXT-6470,ZBXNEXT-6890] implemented complete audit logging of mai
 ...G...PS. [ZBXNEXT-4922] added support for pcre2 (yurii)
 
 Bug fixes:
+..F....... [ZBX-20382] updated jquery version (ashubin)
+.....J.... [ZBX-20383] updated logback-core, logback-classic and slf4j-api jars to the latest stable versions (vso)
+..F.I..... [ZBX-20384] fixed possibility to view setup pages by non-superadmin if config already file exists (averza)
+..F....... [ZBX-20388] fixed XSS vulnerability in multiselect (agriscenko)
+A......... [ZBX-19815] fixed multiple data convertion issues in import between versions 1.8/2.0 and 5.0 (Ivo)
 .......PS. [ZBX-20405] improved timeouts in JS (dgoloscapov, wiper)
 ..F....... [ZBX-19669] fixed success message not showing when no fields were changed in Administration->Authentication page (Ivo)
 ...G...... [ZBX-20269] added handling of performance counter with negative denominator value (arimdjonoks)
@@ -309,6 +323,9 @@ New features:
 ...G...... [ZBXNEXT-6875] added native support for the system.hw.chassis and system.hw.devices keys in Zabbix agent 2 (esneiders)
 
 Bug fixes:
+...G.....T [ZBX-19185] fixed free bytes calculation for temporary tablespace in Oracle by ODBC and by agent2 template (abiba)
+.........T [ZBX-20258] fixed tags processing for Zammad media type (abiba)
+A......... [ZBX-19815] fixed multiple data convertion issues in import between versions 1.8/2.0 and 5.0 (Ivo)
 .......PS. [ZBX-20405] improved timeouts in JS (dgoloscapov, wiper)
 ..F....... [ZBX-19669] fixed success message not showing when no fields were changed in Administration->Authentication page (Ivo)
 ...G...... [ZBX-20269] added handling of performance counter with negative denominator value (arimdjonoks)
@@ -1502,6 +1519,9 @@ New features:
 ...G...... [ZBXNEXT-6875] added native support for the system.hw.chassis and system.hw.devices keys in Zabbix agent 2 (esneiders)
 
 Bug fixes:
+.........T [ZBX-20258] fixed tags processing for Zammad media type (abiba)
+.........T [ZBX-20113] fixed items value map for VMware template (abiba)
+A......... [ZBX-19815] fixed multiple data convertion issues in import between versions 1.8/2.0 and 5.0 (Ivo)
 ..F....... [ZBX-19669] fixed success message not showing when no fields were changed in Administration->Authentication page (Ivo)
 ...G...... [ZBX-20269] added handling of performance counter with negative denominator value (arimdjonoks)
 ...G...... [ZBX-20143] fixed tcp timeout not working in net.dns.record (dgoloscapov)
diff --git a/ChangeLog.d/bugfix/ZBX-19815 b/ChangeLog.d/bugfix/ZBX-19815
deleted file mode 100644
index c888b60484e..00000000000
--- a/ChangeLog.d/bugfix/ZBX-19815
+++ /dev/null
@@ -1 +0,0 @@
-A......... [ZBX-19815] fixed multiple data convertion issues in import between versions 1.8/2.0 and 5.0 (Ivo)
diff --git a/ChangeLog.d/feature/ZBXNEXT-6861 b/ChangeLog.d/feature/ZBXNEXT-6861
new file mode 100644
index 00000000000..f253b3da661
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-6861
@@ -0,0 +1 @@
+.........T [ZBXNEXT-6861] updated Zabbix proxy templates according to the latest guidelines (abakaldin)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7078 b/ChangeLog.d/feature/ZBXNEXT-7078
new file mode 100644
index 00000000000..f89b099cc05
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-7078
@@ -0,0 +1 @@
+.........T [ZBXNEXT-7078] added pfsense template (vkhaliev)
diff --git a/bin/win32/dev/zabbix_sender.h b/bin/win32/dev/zabbix_sender.h
index a60acab6131..16efc2f3959 100644
--- a/bin/win32/dev/zabbix_sender.h
+++ b/bin/win32/dev/zabbix_sender.h
@@ -50,8 +50,6 @@ zabbix_sender_info_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_send_values                                        *
- *                                                                            *
  * Purpose: send values to Zabbix server/proxy                                *
  *                                                                            *
  * Parameters: address   - [IN] zabbix server/proxy address                   *
@@ -74,8 +72,6 @@ ZBX_API int	zabbix_sender_send_values(const char *address, unsigned short port,
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_parse_result                                       *
- *                                                                            *
  * Purpose: parses the result returned from zabbix_sender_send_values()       *
  *          function                                                          *
  *                                                                            *
@@ -97,8 +93,6 @@ ZBX_API int	zabbix_sender_parse_result(const char *result, int *response, zabbix
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_free_result                                        *
- *                                                                            *
  * Purpose: free data allocated by zabbix_sender_send_values() function       *
  *                                                                            *
  * Parameters: ptr   - [IN] pointer to the data to free                       *
diff --git a/bin/win64/dev/zabbix_sender.h b/bin/win64/dev/zabbix_sender.h
index a60acab6131..16efc2f3959 100644
--- a/bin/win64/dev/zabbix_sender.h
+++ b/bin/win64/dev/zabbix_sender.h
@@ -50,8 +50,6 @@ zabbix_sender_info_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_send_values                                        *
- *                                                                            *
  * Purpose: send values to Zabbix server/proxy                                *
  *                                                                            *
  * Parameters: address   - [IN] zabbix server/proxy address                   *
@@ -74,8 +72,6 @@ ZBX_API int	zabbix_sender_send_values(const char *address, unsigned short port,
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_parse_result                                       *
- *                                                                            *
  * Purpose: parses the result returned from zabbix_sender_send_values()       *
  *          function                                                          *
  *                                                                            *
@@ -97,8 +93,6 @@ ZBX_API int	zabbix_sender_parse_result(const char *result, int *response, zabbix
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_free_result                                        *
- *                                                                            *
  * Purpose: free data allocated by zabbix_sender_send_values() function       *
  *                                                                            *
  * Parameters: ptr   - [IN] pointer to the data to free                       *
diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
index 51df87eca80..87b37fdd270 100644
--- a/conf/zabbix_server.conf
+++ b/conf/zabbix_server.conf
@@ -237,7 +237,7 @@ DBUser=zabbix
 
 ### Option: StartHistoryPollers
 #	Number of pre-forked instances of history pollers.
-#	Only required for calculated, aggregated and internal checks.
+#	Only required for calculated and internal checks.
 #	A database connection is required for each history poller instance.
 #
 # Mandatory: no
diff --git a/configure.ac b/configure.ac
index 1eec2aeb788..69862ef593b 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.0beta2])
+AC_INIT([Zabbix],[6.0.0rc1])
 AC_CONFIG_SRCDIR(src/zabbix_server/server.c)
 AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99])
 
diff --git a/create/src/data.tmpl b/create/src/data.tmpl
index 7f6bdb4faf8..e731776d680 100644
--- a/create/src/data.tmpl
+++ b/create/src/data.tmpl
@@ -76,7 +76,7 @@ ROW   |15         |4   |Redmine                 |                |           |
 ROW   |16         |4   |Telegram                |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var Telegram = {&eol;    token: null,&eol;    to: null,&eol;    message: null,&eol;    proxy: null,&eol;    parse_mode: null,&eol;&eol;    escapeMarkup: function (str, mode) {&eol;        switch (mode) {&eol;            case 'markdown':&eol;                return str.replace(/([_*\[`])/g, '\\$&');&eol;&eol;            case 'markdownv2':&eol;                return str.replace(/([_*\[\]()~`>#+\-=&pipe;{}.!])/g, '\\$&');&eol;&eol;            default:&eol;                return str;&eol;        }&eol;    },&eol;&eol;    sendMessage: function () {&eol;        var params = {&eol;            chat_id: Telegram.to,&eol;            text: Telegram.message,&eol;            disable_web_page_preview: true,&eol;            disable_notification: false&eol;        },&eol;        data,&eol;        response,&eol;        request = new HttpRequest(),&eol;        url = 'https://api.telegram.org/bot' + Telegram.token + '/sendMessage';&eol;&eol;        if (Telegram.parse_mode !== null) {&eol;            params['parse_mode'] = Telegram.parse_mode;&eol;        }&eol;&eol;        if (Telegram.proxy) {&eol;            request.setProxy(Telegram.proxy);&eol;        }&eol;&eol;        request.addHeader('Content-Type: application/json');&eol;        data = JSON.stringify(params);&eol;&eol;        // Remove replace() function if you want to see the exposed token in the log file.&eol;        Zabbix.log(4, '[Telegram Webhook] URL: ' + url.replace(Telegram.token, '<TOKEN>'));&eol;        Zabbix.log(4, '[Telegram Webhook] params: ' + data);&eol;        response = request.post(url, data);&eol;        Zabbix.log(4, '[Telegram Webhook] HTTP code: ' + request.getStatus());&eol;&eol;        try {&eol;            response = JSON.parse(response);&eol;        }&eol;        catch (error) {&eol;            response = null;&eol;        }&eol;&eol;        if (request.getStatus() !== 200 &pipe;&pipe; typeof response.ok !== 'boolean' &pipe;&pipe; response.ok !== true) {&eol;            if (typeof response.description === 'string') {&eol;                throw response.description;&eol;            }&eol;            else {&eol;                throw 'Unknown error. Check debug log for more information.';&eol;            }&eol;        }&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value);&eol;&eol;    if (typeof params.Token === 'undefined') {&eol;        throw 'Incorrect value is given for parameter "Token": parameter is missing';&eol;    }&eol;&eol;    Telegram.token = params.Token;&eol;&eol;    if (params.HTTPProxy) {&eol;        Telegram.proxy = params.HTTPProxy;&eol;    } &eol;&eol;    params.ParseMode = params.ParseMode.toLowerCase();&eol;    &eol;    if (['markdown', 'html', 'markdownv2'].indexOf(params.ParseMode) !== -1) {&eol;        Telegram.parse_mode = params.ParseMode;&eol;    }&eol;&eol;    Telegram.to = params.To;&eol;    Telegram.message = params.Subject + '\n' + params.Message;&eol;&eol;    if (['markdown', 'markdownv2'].indexOf(params.ParseMode) !== -1) {&eol;        Telegram.message = Telegram.escapeMarkup(Telegram.message, params.ParseMode);&eol;    }&eol;&eol;    Telegram.sendMessage();&eol;&eol;    return 'OK';&eol;}&eol;catch (error) {&eol;    Zabbix.log(4, '[Telegram Webhook] notification failed: ' + error);&eol;    throw 'Sending failed: ' + error + '.';&eol;}|10s    |0           |0              |                                      |                                                            |https://git.zabbix.com/projects/ZBX/repos/zabbix/browse/templates/media/telegram&eol;&eol;1. Register bot: send "/newbot" to @BotFather and follow instructions&eol;2. Copy and paste the obtained token into the "Token" field above&eol;3. If you want to send personal notifications, you need to get chat id of the user you want to send messages to:&eol;    3.1. Send "/getid" to "@myidbot" in Telegram messenger&eol;    3.2. Copy returned chat id and save it in the "Telegram Webhook" media for the user&eol;    3.3. Ask the user to send "/start" to your bot (Telegram bot won't send anything to the user without it)&eol;4. If you want to send group notifications, you need to get group id of the group you want to send messages to:&eol;    4.1. Add "@myidbot" to your group&eol;    4.2. Send "/getgroupid@myidbot" in your group&eol;    4.3. Copy returned group id save it in the "Telegram Webhook" media for the user you created for  group notifications&eol;    4.4. Send "/start@your_bot_name_here" in your group (Telegram bot won't send anything to the group without it)|
 ROW   |17         |4   |Zendesk                 |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var Zendesk = {&eol;    params: {},&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;&eol;        Zendesk.params = params;&eol;        if (typeof Zendesk.params.url === 'string') {&eol;            if (!Zendesk.params.url.endsWith('/')) {&eol;                Zendesk.params.url += '/';&eol;            }&eol;            Zendesk.params.url += 'api/v2/';&eol;        }&eol;    },&eol;&eol;    addCustomFields: function (data, fields) {&eol;        if (typeof fields === 'object' && Object.keys(fields).length) {&eol;            var schema = Zendesk.getSchema(),&eol;                arr = [],&eol;                i,&eol;                n;&eol;&eol;            if (schema) {&eol;                Object.keys(fields)&eol;                    .forEach(function(field) {&eol;                        for (i = 0, n = schema.ticket_fields.length; i < n; i++) {&eol;                            if (schema.ticket_fields[i].id == field&eol;                                && ['text', 'integer', 'date'].indexOf(schema.ticket_fields[i].type) !== -1){&eol;&eol;                                switch (schema.ticket_fields[i].type) {&eol;                                    case 'integer':&eol;                                        fields[field] = parseInt(fields[field]);&eol;                                        break;&eol;                                    case 'date':&eol;                                        if (fields[field].match(/^\d{4}[.-]\d{2}[.-]\d{2}$/) !== null) {&eol;                                            fields[field] = fields[field].replace(/\./g, '-');&eol;                                        }&eol;                                        else {&eol;                                            fields[field] = '';&eol;                                        }&eol;                                        break;&eol;                                }&eol;&eol;                                arr.push({id: field, value: fields[field]});&eol;                                break;&eol;                            }&eol;                        }&eol;                    });&eol;&eol;                if (arr.length) {&eol;                    data.ticket['custom_fields'] = arr;&eol;                }&eol;            }&eol;            else {&eol;                Zabbix.log(4, '[Zendesk Webhook] Failed to retrieve field schema.');&eol;            }&eol;        }&eol;&eol;        return data;&eol;    },&eol;&eol;    request: function (method, query, data) {&eol;        ['url', 'token', 'type'].forEach(function (field) {&eol;            if (typeof Zendesk.params !== 'object' &pipe;&pipe; typeof Zendesk.params[field] === 'undefined') {&eol;                throw 'Required Zendesk param is not set: ' + field + '\n' + Zendesk.params[field];&eol;            }&eol;        });&eol;&eol;        var response,&eol;            url = Zendesk.params.url + query,&eol;            request = new HttpRequest();&eol;&eol;        if (typeof Zendesk.HTTPProxy === 'string' && Zendesk.HTTPProxy.trim() !== '') {&eol;            request.setProxy(Zendesk.HTTPProxy);&eol;        }&eol;&eol;        request.addHeader('Content-Type: application/json');&eol;        request.addHeader('Authorization: Basic ' + btoa(Zendesk.params.token));&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        Zabbix.log(4, '[Zendesk Webhook] Sending request: ' + url + ((typeof data === 'string') ? (' ' + data) : ''));&eol;&eol;        switch (method) {&eol;            case 'get':&eol;                response = request.get(url, data);&eol;                break;&eol;&eol;            case 'post':&eol;                response = request.post(url, data);&eol;                break;&eol;&eol;            case 'put':&eol;                response = request.put(url, data);&eol;                break;&eol;&eol;            default:&eol;                throw 'Unsupported HTTP request method: ' + method;&eol;        }&eol;&eol;        Zabbix.log(4, '[Zendesk Webhook] Received response with status code ' + request.getStatus() + '. ' + response);&eol;&eol;        if (response !== null) {&eol;            try {&eol;                response = JSON.parse(response);&eol;            }&eol;            catch (error) {&eol;                Zabbix.log(4, '[Zendesk Webhook] Failed to parse response received from Zendesk.');&eol;            }&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 !== null && typeof response.error !== 'undefined'&eol;                && Object.keys(response.error).length > 0) {&eol;                message += ': ' + JSON.stringify(response.error);&eol;            }&eol;            else if (response !== null && typeof response.description !== 'undefined'&eol;                && Object.keys(response.description).length > 0) {&eol;                message += ': ' + JSON.stringify(response.description);&eol;            }&eol;            else {&eol;                message += '. ' + response;&eol;            }&eol;            throw message + '. Check debug log for more information.';&eol;        }&eol;&eol;        return {&eol;            status: request.getStatus(),&eol;            response: response&eol;        };&eol;    },&eol;&eol;    getSchema: function() {&eol;        var result = Zendesk.request('get', 'ticket_fields.json');&eol;&eol;        return result.response;&eol;    },&eol;&eol;    createIssue: function(data, fields) {&eol;        var result = Zendesk.request('post', 'tickets.json', Zendesk.addCustomFields(data, fields));&eol;&eol;        if (typeof result.response !== 'object' &pipe;&pipe; typeof result.response.ticket.id === 'undefined'&eol;            &pipe;&pipe; result.status != 201) {&eol;            throw 'Cannot create Zendesk issue. Check debug log for more information.';&eol;        }&eol;&eol;        return result.response.ticket.id;&eol;    },&eol;&eol;    updateIssue: function(data, fields) {&eol;        Zendesk.request('put', 'tickets/' + Zendesk.params.issue_key + '.json', Zendesk.addCustomFields(data, fields));&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        fields = {},&eol;        zendesk = {},&eol;        update = {},&eol;        data = {},&eol;        result = {tags: {}},&eol;        required_params = [&eol;            'alert_subject',&eol;            'alert_message',&eol;            'event_id',&eol;            'event_source',&eol;            'event_value',&eol;            '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: 'resolved', color: '#009900'},&eol;            {name: 'default', color: '#000000'}&eol;        ],&eol;        priority;&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('zendesk_')) {&eol;                zendesk[key.substring(8)] = params[key];&eol;            }&eol;            else if (key.startsWith('customfield_')) {&eol;                fields[key.substring(12)] = params[key];&eol;            }&eol;            else if (key.startsWith('event_update_')) {&eol;                update[key.substring(13)] = params[key];&eol;            }&eol;            else if (required_params.indexOf(key) !== -1 && params[key].trim() === '') {&eol;                throw 'Parameter ' + key + ' cannot be empty.';&eol;            }&eol;        });&eol;&eol;    // Possible values: question, incident, problems, task&eol;    if (['question', 'incident', 'problem', 'task'].indexOf(params.zendesk_type) === -1) {&eol;        throw 'Incorrect "zendesk_type" parameter given: ' + params.zendesk_type +&eol;            '\nMust be one of question, incident, problem, task.';&eol;    }&eol;&eol;    // Possible values: 0 - Trigger, 1 - Discovery, 2 - Autoregistration, 3 - Internal.&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;    // Possible values: 1 for problem, 0 for recovering&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;    // Possible values: 0 - Webhook was called because of problem/recovery event, 1 - Update operation.&eol;    if (params.event_source === '0' && params.event_update_status !== '0' && params.event_update_status !== '1') {&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_value === '0') {&eol;        throw 'Recovery operations are supported only for trigger-based actions.';&eol;    }&eol;&eol;    // Zendesk_issue_key must be a positive integer if an update action is being performed.&eol;    if (params.event_source === '0' && ((params.event_value === '1' && params.event_update_status === '1')&eol;        &pipe;&pipe; (params.event_value === '0' && (params.event_update_status === '0' &pipe;&pipe; params.event_update_status === '1')))&eol;        && (isNaN(parseInt(params.zendesk_issue_key)) &pipe;&pipe; parseInt(params.zendesk_issue_key) < 1 )) {&eol;        throw 'Incorrect "zendesk_issue_key" parameter given: ' + params.zendesk_issue_key +&eol;            '\nMust be positive integer.';&eol;    }&eol;&eol;    if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol;        params.event_nseverity = '7';&eol;    }&eol;&eol;    if (params.event_value === '0') {&eol;        params.event_nseverity = '6';&eol;    }&eol;&eol;    priority = params['severity_' + severities[params.event_nseverity].name] &pipe;&pipe; severities[7].name;&eol;&eol;    Zendesk.setParams(zendesk);&eol;    Zendesk.HTTPProxy = params.HTTPProxy;&eol;&eol;    // Create issue for non trigger-based events.&eol;    if (params.event_source !== '0' && params.event_value !== '0') {&eol;        data = {&eol;            ticket: {&eol;                external_id: params.event_id,&eol;                type: Zendesk.params.type,&eol;                status: 'new',&eol;                subject: params.alert_subject,&eol;                comment: {&eol;                    body: params.alert_message,&eol;                    public: 'false'&eol;                },&eol;                priority: priority,&eol;                tags: params.event_tags&eol;            }&eol;        };&eol;&eol;        Zendesk.createIssue(data, fields);&eol;    }&eol;    // Create issue for trigger-based events.&eol;    else if (params.event_value === '1' && update.status === '0') {&eol;        data = {&eol;            ticket: {&eol;                external_id: params.event_id,&eol;                type: Zendesk.params.type,&eol;                status: 'new',&eol;                subject: params.alert_subject,&eol;                comment: {&eol;                    body: params.zbxurl + (params.zbxurl.endsWith('/') ? '' : '/') + 'tr_events.php?triggerid=' +&eol;                        params.trigger_id + '&eventid=' + params.event_id + '\n' + params.alert_message,&eol;                    public: 'false'&eol;                },&eol;                priority: priority,&eol;                tags: params.event_tags&eol;            }&eol;        };&eol;        var key = Zendesk.createIssue(data, fields);&eol;&eol;        result.tags.__zbx_zdk_issuekey = key;&eol;        result.tags.__zbx_zdk_issuelink = params.zendesk_url +&eol;            (params.zendesk_url.endsWith('/') ? '' : '/') + 'agent/tickets/' + key;&eol;    }&eol;    // Update created issue for trigger-based event.&eol;    else {&eol;        data = {&eol;            ticket: {&eol;                type: Zendesk.params.type,&eol;                subject: params.alert_subject,&eol;                comment: {&eol;                    body: params.alert_message,&eol;                    public: 'false'&eol;                }&eol;            }&eol;        };&eol;&eol;        Zendesk.updateIssue(data, fields);&eol;    }&eol;&eol;    return JSON.stringify(result);&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[Zendesk Webhook] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__zbx_zdk_issuelink}      |Zendesk: {EVENT.TAGS.__zbx_zdk_issuekey}                    |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 ROW   |18         |4   |ServiceNow              |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var ServiceNow = {&eol;    params: {},&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;&eol;        ServiceNow.params = params;&eol;        if (typeof ServiceNow.params.url === 'string') {&eol;            if (!ServiceNow.params.url.endsWith('/')) {&eol;                ServiceNow.params.url += '/';&eol;            }&eol;&eol;            ServiceNow.params.url += 'api/now/table/incident';&eol;        }&eol;    },&eol;&eol;    setProxy: function (HTTPProxy) {&eol;        ServiceNow.HTTPProxy = HTTPProxy;&eol;    },&eol;&eol;    setFields: function (data, fields) {&eol;        if (typeof fields === 'object' && Object.keys(fields).length) {&eol;            Object.keys(fields)&eol;                .forEach(function(field) {&eol;                    data[field] = (fields[field].match(/^\d{4}\.\d{2}\.\d{2}$/) !== null)&eol;                        ? fields[field].replace(/\./g, '-')&eol;                        : fields[field];&eol;                });&eol;        }&eol;    },&eol;&eol;    request: function (method, data) {&eol;        ['url', 'user', 'password'].forEach(function (field) {&eol;            if (typeof ServiceNow.params !== 'object' &pipe;&pipe; typeof ServiceNow.params[field] === 'undefined'&eol;                &pipe;&pipe; ServiceNow.params[field] === '' ) {&eol;                throw 'Required ServiceNow param is not set: "' + field + '".';&eol;            }&eol;        });&eol;&eol;        var response,&eol;            url = ServiceNow.params.url,&eol;            request = new HttpRequest();&eol;&eol;        request.addHeader('Content-Type: application/json');&eol;        request.addHeader('Authorization: Basic ' + btoa(ServiceNow.params.user + ':' + ServiceNow.params.password));&eol;&eol;        if (typeof ServiceNow.HTTPProxy !== 'undefined' && ServiceNow.HTTPProxy !== '') {&eol;            request.setProxy(ServiceNow.HTTPProxy);&eol;        }&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        Zabbix.log(4, '[ ServiceNow Webhook ] Sending request: ' + url + ((typeof data === 'string')&eol;            ? ('\n' + data)&eol;            : ''));&eol;&eol;        switch (method) {&eol;            case 'get':&eol;                response = request.get(url, data);&eol;                break;&eol;&eol;            case 'post':&eol;                response = request.post(url, data);&eol;                break;&eol;&eol;            case 'put':&eol;                response = request.put(url, data);&eol;                break;&eol;&eol;            default:&eol;                throw 'Unsupported HTTP request method: ' + method;&eol;        }&eol;&eol;        Zabbix.log(4, '[ ServiceNow 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, '[ ServiceNow Webhook ] Failed to parse response received from ServiceNow');&eol;                response = null;&eol;            }&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 !== null && typeof response.error.message !== 'undefined'&eol;                && Object.keys(response.error).length > 0) {&eol;                message += ': ' + JSON.stringify(response.error.message);&eol;            }&eol;&eol;            throw message + ' Check debug log for more information.';&eol;        }&eol;        else if (typeof response.result !== 'object' &pipe;&pipe; typeof response.result.sys_id === 'undefined') {&eol;            throw 'Cannot create ServiceNow incident. Check debug log for more information.';&eol;        }&eol;&eol;        return response.result;&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        fields = {},&eol;        servicenow = {},&eol;        data = {},&eol;        result = {tags: {}},&eol;        required_params = [&eol;            'alert_subject', 'alert_message', 'event_source', 'event_value',&eol;            'event_update_status', 'event_recovery_value', 'event_nseverity'&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: 'resolved', color: '#009900'},&eol;            {name: 'default', color: '#000000'}&eol;        ],&eol;        method = 'post',&eol;        process_tags = true;&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('servicenow_')) {&eol;                servicenow[key.substring(11)] = params[key];&eol;            }&eol;            else if (key.startsWith('u_')) {&eol;                fields[key] = 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;    if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol;        params.event_nseverity = '7';&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;    data.short_description = params.alert_subject;&eol;    data.description = params.alert_message;&eol;    data.comments = params.alert_message;&eol;&eol;    if (typeof params['urgency_for_' + severities[params.event_nseverity].name] !== 'undefined') {&eol;        data.urgency = params['urgency_for_' + severities[params.event_nseverity].name];&eol;    }&eol;&eol;    ServiceNow.setParams(servicenow);&eol;    ServiceNow.setProxy(params.HTTPProxy);&eol;    ServiceNow.setFields(data, fields);&eol;&eol;    if (params.event_source === '0' && (params.event_value === '0' &pipe;&pipe; params.event_update_status === '1')) {&eol;        process_tags = false;&eol;        method = 'put';&eol;        delete data.description;&eol;        delete data.urgency;&eol;        ServiceNow.params.url += '/' + params.servicenow_sys_id;&eol;    }&eol;&eol;    var response = ServiceNow.request(method, data);&eol;&eol;    if (process_tags) {&eol;        result.tags.__zbx_servicenow_sys_id = response.sys_id;&eol;        result.tags.__zbx_servicenow_link = params.servicenow_url +&eol;            (params.servicenow_url.endsWith('/') ? '' : '/') + 'incident.do?sys_id=' + response.sys_id;&eol;        result.tags.__zbx_servicenow_number = response.number;&eol;    }&eol;&eol;    return JSON.stringify(result);&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[ ServiceNow Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__zbx_servicenow_link}    |ServiceNow: {EVENT.TAGS.__zbx_servicenow_number}            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-ROW   |19         |4   |Zammad                  |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var Zammad = {&eol;    params: {},&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;&eol;        Zammad.params = params;&eol;        if (typeof Zammad.params.url === 'string') {&eol;            if (!Zammad.params.url.endsWith('/')) {&eol;                Zammad.params.url += '/';&eol;            }&eol;        }&eol;    },&eol;&eol;    request: function (method, query, data) {&eol;        ['url', 'access_token'].forEach(function (field) {&eol;            if (typeof Zammad.params !== 'object' &pipe;&pipe; typeof Zammad.params[field] === 'undefined'&eol;                &pipe;&pipe; Zammad.params[field] === '' ) {&eol;                throw 'Required param is not set: "' + field + '".';&eol;            }&eol;        });&eol;&eol;        var response,&eol;            url = Zammad.params.url + query,&eol;            request = new HttpRequest();&eol;&eol;        if (typeof Zammad.HTTPProxy === 'string' && Zammad.HTTPProxy.trim() !== '') {&eol;            request.setProxy(Zammad.HTTPProxy);&eol;        }&eol;&eol;        request.addHeader('Content-Type: application/json');&eol;        request.addHeader('Authorization: Token token=' + Zammad.params.access_token);&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        Zabbix.log(4, '[ Zammad Webhook ] Sending request: ' +&eol;            url + ((typeof data === 'string') ? (' ' + data) : ''));&eol;&eol;        switch (method) {&eol;            case 'get':&eol;                response = request.get(url, data);&eol;                break;&eol;&eol;            case 'post':&eol;                response = request.post(url, data);&eol;                break;&eol;&eol;            case 'put':&eol;                response = request.put(url, data);&eol;                break;&eol;&eol;            default:&eol;                throw 'Unsupported HTTP request method: ' + method;&eol;        }&eol;&eol;        Zabbix.log(4, '[ Zammad Webhook ] Received response with status code ' + request.getStatus() + ': ' + response);&eol;&eol;        if (response !== null) {&eol;            try {&eol;                response = JSON.parse(response);&eol;            }&eol;            catch (error) {&eol;                Zabbix.log(4, '[ Zammad Webhook ] Failed to parse response received from Zammad');&eol;                response = null;&eol;            }&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 !== null && typeof response.errors !== 'undefined'&eol;                && Object.keys(response.errors).length > 0) {&eol;                message += ': ' + JSON.stringify(response.errors);&eol;            }&eol;            else if (response !== null && typeof response.errorMessages !== 'undefined'&eol;                && Object.keys(response.errorMessages).length > 0) {&eol;                message += ': ' + JSON.stringify(response.errorMessages);&eol;            }&eol;&eol;            throw message + ' Check debug log for more information.';&eol;        }&eol;&eol;        return {&eol;            status: request.getStatus(),&eol;            response: response&eol;        };&eol;    },&eol;&eol;    setTicketTags: function(tags, ticket_id) {&eol;        try {&eol;            var tags_json = JSON.parse(tags),&eol;                result;&eol;&eol;            for (var i in tags_json) {&eol;                result = Zammad.request('get',&eol;                    '/api/v1/tags/add?object=Ticket&o_id=' + ticket_id +&eol;                    '&item=' + tags_json[i].tag);&eol;&eol;                if (typeof result.response !== 'object'&eol;                    &pipe;&pipe; result.status != 200) {&eol;                    Zabbix.log(4, '[ Zammad Webhook ] Cannot add ticket tag:' + tags_json[i].tag);&eol;                }&eol;            }&eol;        }&eol;        catch (error) {&eol;            Zabbix.log(4, '[ Zammad Webhook ] Failed to add ticket tags:' + error);&eol;        }&eol;&eol;        return;&eol;    },&eol;&eol;    createTicket: function(subject, message, priority) {&eol;        var data = {&eol;                title: subject,&eol;                group: 'Users',&eol;                article: {&eol;                    subject: subject,&eol;                    body: message,&eol;                    type: 'note',&eol;                    internal: false&eol;                },&eol;                customer: Zammad.params.customer&eol;            },&eol;            result;&eol;&eol;        if (priority) {&eol;            data.priority_id = priority;&eol;        }&eol;&eol;        result = Zammad.request('post', 'api/v1/tickets', data);&eol;&eol;        if (typeof result.response !== 'object'&eol;            &pipe;&pipe; typeof result.response.id === 'undefined'&eol;            &pipe;&pipe; result.status != 201) {&eol;            throw 'Cannot create Zammad ticket. Check debug log for more information.';&eol;        }&eol;&eol;        return result.response.id;&eol;    },&eol;&eol;    updateTicket: function(subject, message) {&eol;        var data = {&eol;            ticket_id: Zammad.params.ticket_id,&eol;            subject: subject,&eol;            body: message &pipe;&pipe; '',&eol;            type: 'note',&eol;            internal: false&eol;        };&eol;&eol;        result = Zammad.request('post', 'api/v1/ticket_articles', data);&eol;&eol;        if (typeof result.response !== 'object'&eol;            &pipe;&pipe; typeof result.response.id === 'undefined'&eol;            &pipe;&pipe; result.status != 201) {&eol;            throw 'Cannot update Zammad ticket. Check debug log for more information.';&eol;        }&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        params_zammad = {},&eol;        params_update = {},&eol;        result = {tags: {}},&eol;        required_params = [&eol;            'alert_subject', 'customer',&eol;            'event_source', 'event_value',&eol;            '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: 'resolved', color: '#009900'},&eol;            {name: null, color: '#000000'}&eol;        ],&eol;        priority;&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('zammad_')) {&eol;                params_zammad[key.substring(7)] = params[key].trim();&eol;            }&eol;            else if (key.startsWith('event_update_')) {&eol;                params_update[key.substring(13)] = params[key];&eol;            }&eol;            else if (required_params.indexOf(key) !== -1 && params[key].trim() === '') {&eol;                throw 'Parameter "' + key + '" cannot 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_source === '0' && params.event_update_status !== '0' && params.event_update_status !== '1') {&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_value === '0') {&eol;        throw 'Recovery operations are supported only for trigger-based actions.';&eol;    }&eol;&eol;    if (params.event_source === '0'&eol;        && ((params.event_value === '1' && params.event_update_status === '1')&eol;            &pipe;&pipe; (params.event_value === '0'&eol;                && (params.event_update_status === '0' &pipe;&pipe; params.event_update_status === '1')))&eol;        && (isNaN(parseInt(params.zammad_ticket_id)) &pipe;&pipe; parseInt(params.zammad_ticket_id) < 1 )) {&eol;        throw 'Incorrect "zammad_ticket_id" parameter given: ' + params.zammad_ticket_id +&eol;            '\nMust be positive integer.';&eol;    }&eol;&eol;    if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol;        params.event_nseverity = '7';&eol;    }&eol;&eol;    if (params.event_value === '0') {&eol;        params.event_nseverity = '6';&eol;    }&eol;&eol;    priority = params['severity_' + severities[params.event_nseverity].name];&eol;    priority = priority && priority.trim() &pipe;&pipe; severities[7].name;&eol;&eol;    Zammad.setParams(params_zammad);&eol;    Zammad.HTTPProxy = params.HTTPProxy;&eol;&eol;    // Create ticket for non trigger-based events.&eol;    if (params.event_source !== '0'&eol;        && params.event_value !== '0') {&eol;        Zammad.createTicket(params.alert_subject, params.alert_message, priority, params.event_tags);&eol;    }&eol;    // Create ticket for trigger-based events.&eol;    else if (params.event_value === '1' && params_update.status === '0') {&eol;        var ticket_id = Zammad.createTicket(params.alert_subject,&eol;            params.alert_subject + '\n' + params.alert_message + '\n' +&eol;            params.zabbix_url + (params.zabbix_url.endsWith('/') ? '' : '/') +&eol;            'tr_events.php?triggerid=' + params.trigger_id + '&eventid=' + params.event_id + '\n',&eol;            priority);&eol;&eol;        result.tags.__zbx_zammad_ticket_id = ticket_id;&eol;        result.tags.__zbx_zammad_ticketlink = params.zammad_url +&eol;            (params.zammad_url.endsWith('/') ? '' : '/') + '#ticket/zoom/' + ticket_id;&eol;&eol;        if (Zammad.params.enable_tags.toLowerCase() === 'true') {&eol;            Zammad.setTicketTags(params.event_tags, ticket_id);&eol;        }&eol;    }&eol;    // Update created ticket for trigger-based event.&eol;    else {&eol;        Zammad.updateTicket(params.alert_subject, params.alert_message);&eol;    }&eol;&eol;    return JSON.stringify(result);&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[ Zammad Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__zbx_zammad_ticketlink}  |Zammad: ticket #{EVENT.TAGS.__zbx_zammad_ticket_id}         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+ROW   |19         |4   |Zammad                  |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var Zammad = {&eol;    params: {},&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;&eol;        Zammad.params = params;&eol;        if (typeof Zammad.params.url === 'string') {&eol;            if (!Zammad.params.url.endsWith('/')) {&eol;                Zammad.params.url += '/';&eol;            }&eol;        }&eol;    },&eol;&eol;    request: function (method, query, data) {&eol;        ['url', 'access_token'].forEach(function (field) {&eol;            if (typeof Zammad.params !== 'object' &pipe;&pipe; typeof Zammad.params[field] === 'undefined'&eol;                &pipe;&pipe; Zammad.params[field] === '' ) {&eol;                throw 'Required param is not set: "' + field + '".';&eol;            }&eol;        });&eol;&eol;        var response,&eol;            url = Zammad.params.url + query,&eol;            request = new HttpRequest();&eol;&eol;        if (typeof Zammad.HTTPProxy === 'string' && Zammad.HTTPProxy.trim() !== '') {&eol;            request.setProxy(Zammad.HTTPProxy);&eol;        }&eol;&eol;        request.addHeader('Content-Type: application/json');&eol;        request.addHeader('Authorization: Token token=' + Zammad.params.access_token);&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        Zabbix.log(4, '[ Zammad Webhook ] Sending request: ' +&eol;            url + ((typeof data === 'string') ? (' ' + data) : ''));&eol;&eol;        switch (method) {&eol;            case 'get':&eol;                response = request.get(url, data);&eol;                break;&eol;&eol;            case 'post':&eol;                response = request.post(url, data);&eol;                break;&eol;&eol;            case 'put':&eol;                response = request.put(url, data);&eol;                break;&eol;&eol;            default:&eol;                throw 'Unsupported HTTP request method: ' + method;&eol;        }&eol;&eol;        Zabbix.log(4, '[ Zammad Webhook ] Received response with status code ' + request.getStatus() + ': ' + response);&eol;&eol;        if (response !== null) {&eol;            try {&eol;                response = JSON.parse(response);&eol;            }&eol;            catch (error) {&eol;                Zabbix.log(4, '[ Zammad Webhook ] Failed to parse response received from Zammad');&eol;                response = null;&eol;            }&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 !== null && typeof response.errors !== 'undefined'&eol;                && Object.keys(response.errors).length > 0) {&eol;                message += ': ' + JSON.stringify(response.errors);&eol;            }&eol;            else if (response !== null && typeof response.errorMessages !== 'undefined'&eol;                && Object.keys(response.errorMessages).length > 0) {&eol;                message += ': ' + JSON.stringify(response.errorMessages);&eol;            }&eol;&eol;            throw message + ' Check debug log for more information.';&eol;        }&eol;&eol;        return {&eol;            status: request.getStatus(),&eol;            response: response&eol;        };&eol;    },&eol;&eol;    setTicketTags: function (tags, ticket_id) {&eol;        var data = {&eol;            item: '',&eol;            object: 'Ticket',&eol;            o_id: ticket_id&eol;        };&eol;&eol;        try {&eol;            var tags_json = JSON.parse(tags),&eol;                result;&eol;&eol;            for (var i in tags_json) {&eol;&eol;                if (tags_json[i].value) {&eol;                    data.item = tags_json[i].tag + ": " + tags_json[i].value;&eol;                } else {&eol;                    data.item = tags_json[i].tag;&eol;                }&eol;                result = Zammad.request('post', 'api/v1/tags/add', data);&eol;&eol;                if (typeof result.response !== 'object' &pipe;&pipe; result.status != 200) {&eol;                    Zabbix.log(4, '[ Zammad Webhook ] Cannot add ticket tag:' + tags_json[i].tag);&eol;                }&eol;            }&eol;        }&eol;        catch (error) {&eol;            Zabbix.log(4, '[ Zammad Webhook ] Failed to add ticket tags:' + error);&eol;        }&eol;&eol;        return;&eol;    },&eol;&eol;    createTicket: function(subject, message, priority) {&eol;        var data = {&eol;                title: subject,&eol;                group: 'Users',&eol;                article: {&eol;                    subject: subject,&eol;                    body: message,&eol;                    type: 'note',&eol;                    internal: false&eol;                },&eol;                customer: Zammad.params.customer&eol;            },&eol;            result;&eol;&eol;        if (priority) {&eol;            data.priority_id = priority;&eol;        }&eol;&eol;        result = Zammad.request('post', 'api/v1/tickets', data);&eol;&eol;        if (typeof result.response !== 'object'&eol;            &pipe;&pipe; typeof result.response.id === 'undefined'&eol;            &pipe;&pipe; result.status != 201) {&eol;            throw 'Cannot create Zammad ticket. Check debug log for more information.';&eol;        }&eol;&eol;        return result.response.id;&eol;    },&eol;&eol;    updateTicket: function(subject, message) {&eol;        var data = {&eol;            ticket_id: Zammad.params.ticket_id,&eol;            subject: subject,&eol;            body: message &pipe;&pipe; '',&eol;            type: 'note',&eol;            internal: false&eol;        };&eol;&eol;        result = Zammad.request('post', 'api/v1/ticket_articles', data);&eol;&eol;        if (typeof result.response !== 'object'&eol;            &pipe;&pipe; typeof result.response.id === 'undefined'&eol;            &pipe;&pipe; result.status != 201) {&eol;            throw 'Cannot update Zammad ticket. Check debug log for more information.';&eol;        }&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        params_zammad = {},&eol;        params_update = {},&eol;        result = {tags: {}},&eol;        required_params = [&eol;            'alert_subject', 'customer',&eol;            'event_source', 'event_value',&eol;            '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: 'resolved', color: '#009900'},&eol;            {name: null, color: '#000000'}&eol;        ],&eol;        priority;&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('zammad_')) {&eol;                params_zammad[key.substring(7)] = params[key].trim();&eol;            }&eol;            else if (key.startsWith('event_update_')) {&eol;                params_update[key.substring(13)] = params[key];&eol;            }&eol;            else if (required_params.indexOf(key) !== -1 && params[key].trim() === '') {&eol;                throw 'Parameter "' + key + '" cannot 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_source === '0' && params.event_update_status !== '0' && params.event_update_status !== '1') {&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_value === '0') {&eol;        throw 'Recovery operations are supported only for trigger-based actions.';&eol;    }&eol;&eol;    if (params.event_source === '0'&eol;        && ((params.event_value === '1' && params.event_update_status === '1')&eol;            &pipe;&pipe; (params.event_value === '0'&eol;                && (params.event_update_status === '0' &pipe;&pipe; params.event_update_status === '1')))&eol;        && (isNaN(parseInt(params.zammad_ticket_id)) &pipe;&pipe; parseInt(params.zammad_ticket_id) < 1 )) {&eol;        throw 'Incorrect "zammad_ticket_id" parameter given: ' + params.zammad_ticket_id +&eol;            '\nMust be positive integer.';&eol;    }&eol;&eol;    if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol;        params.event_nseverity = '7';&eol;    }&eol;&eol;    if (params.event_value === '0') {&eol;        params.event_nseverity = '6';&eol;    }&eol;&eol;    priority = params['severity_' + severities[params.event_nseverity].name];&eol;    priority = priority && priority.trim() &pipe;&pipe; severities[7].name;&eol;&eol;    Zammad.setParams(params_zammad);&eol;    Zammad.HTTPProxy = params.HTTPProxy;&eol;&eol;    // Create ticket for non trigger-based events.&eol;    if (params.event_source !== '0'&eol;        && params.event_value !== '0') {&eol;        Zammad.createTicket(params.alert_subject, params.alert_message, priority, params.event_tags);&eol;    }&eol;    // Create ticket for trigger-based events.&eol;    else if (params.event_value === '1' && params_update.status === '0') {&eol;        var ticket_id = Zammad.createTicket(params.alert_subject,&eol;            params.alert_subject + '\n' + params.alert_message + '\n' +&eol;            params.zabbix_url + (params.zabbix_url.endsWith('/') ? '' : '/') +&eol;            'tr_events.php?triggerid=' + params.trigger_id + '&eventid=' + params.event_id + '\n',&eol;            priority);&eol;&eol;        result.tags.__zbx_zammad_ticket_id = ticket_id;&eol;        result.tags.__zbx_zammad_ticketlink = params.zammad_url +&eol;            (params.zammad_url.endsWith('/') ? '' : '/') + '#ticket/zoom/' + ticket_id;&eol;&eol;        if (Zammad.params.enable_tags.toLowerCase() === 'true') {&eol;            Zammad.setTicketTags(params.event_tags, ticket_id);&eol;        }&eol;    }&eol;    // Update created ticket for trigger-based event.&eol;    else {&eol;        Zammad.updateTicket(params.alert_subject, params.alert_message);&eol;    }&eol;&eol;    return JSON.stringify(result);&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[ Zammad Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__zbx_zammad_ticketlink}  |Zammad: ticket #{EVENT.TAGS.__zbx_zammad_ticket_id}         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 ROW   |20         |4   |Jira ServiceDesk        |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var Jira = {&eol;    params: {},&eol;    schema: {},&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;&eol;        Jira.params = params;&eol;        if (typeof Jira.params.url === 'string') {&eol;            if (!Jira.params.url.endsWith('/')) {&eol;                Jira.params.url += '/';&eol;            }&eol;&eol;            Jira.params.url += 'rest/servicedeskapi/';&eol;        }&eol;    },&eol;&eol;    setProxy: function (HTTPProxy) {&eol;        Jira.HTTPProxy = HTTPProxy;&eol;    },&eol;&eol;    setTags: function(event_tags_json) {&eol;        if (!Jira.schema) {&eol;            Zabbix.log(4, '[ Jira Service Desk Webhook ] Cannot add labels because failed to retrieve field schema.');&eol;&eol;            return;&eol;        }&eol;&eol;        var block = Jira.schema.requestTypeFields.filter(function(object) {&eol;            return object.fieldId == 'labels';&eol;        });&eol;&eol;        if (block[0] && typeof event_tags_json !== 'undefined' && event_tags_json !== ''&eol;            && event_tags_json !== '{EVENT.TAGSJSON}') {&eol;            try {&eol;                var tags = JSON.parse(event_tags_json),&eol;                    label;&eol;&eol;                Jira.labels = [];&eol;&eol;                tags.forEach(function (tag) {&eol;                    if (typeof tag.tag !== 'undefined' && typeof tag.value !== 'undefined' ) {&eol;                        label = (tag.tag + (tag.value ? (':' + tag.value) : '')).replace(/\s/g, '_');&eol;                        if (label.length < 255) {&eol;                            Jira.labels.push(label);&eol;                        }&eol;                    }&eol;                });&eol;            }&eol;            catch (error) {&eol;                // Code is not missing here.&eol;            }&eol;        }&eol;    },&eol;&eol;    addCustomFields: function (data, fields) {&eol;        if (typeof fields === 'object' && Object.keys(fields).length) {&eol;            if (Jira.schema) {&eol;                Object.keys(fields)&eol;                    .forEach(function(field) {&eol;                        data.requestFieldValues[field] = fields[field];&eol;&eol;                        var block = Jira.schema.requestTypeFields.filter(function(object) {&eol;                            return object.fieldId == field;&eol;                        });&eol;&eol;                        if (typeof block[0] === 'object' && typeof block[0].jiraSchema === 'object'&eol;                            && (block[0].jiraSchema.type === 'number' &pipe;&pipe; block[0].jiraSchema.type === 'datetime')) {&eol;                            switch (block[0].jiraSchema.type) {&eol;                                case 'number':&eol;                                    data.requestFieldValues[field] = parseInt(fields[field]);&eol;                                    break;&eol;&eol;                                case 'datetime':&eol;                                    if (fields[field].match(/\d+[.-]\d+[.-]\d+T\d+:\d+:\d+/) !== null) {&eol;                                        data.requestFieldValues[field] = fields[field].replace(/\./g, '-');&eol;                                    }&eol;                                    else {&eol;                                        delete data.requestFieldValues[field];&eol;                                    }&eol;                                    break;&eol;                            }&eol;                        }&eol;                    });&eol;            }&eol;            else {&eol;                Zabbix.log(4, '[ Jira Service Desk Webhook ] Cannot add custom fields' +&eol;                    'because failed to retrieve field schema.');&eol;            }&eol;        }&eol;&eol;        return data;&eol;    },&eol;&eol;    request: function (method, query, data) {&eol;        ['url', 'user', 'password', 'servicedesk_id', 'request_type_id'].forEach(function (field) {&eol;            if (typeof Jira.params !== 'object' &pipe;&pipe; typeof Jira.params[field] === 'undefined'&eol;                &pipe;&pipe; Jira.params[field] === '' ) {&eol;                throw 'Required Jira param is not set: "' + field + '".';&eol;            }&eol;        });&eol;&eol;        var response,&eol;            url = Jira.params.url + query,&eol;            request = new HttpRequest();&eol;&eol;        request.addHeader('Content-Type: application/json');&eol;        request.addHeader('Authorization: Basic ' + btoa(Jira.params.user + ':' + Jira.params.password));&eol;        request.addHeader('X-ExperimentalApi: opt-in');&eol;&eol;        if (typeof Jira.HTTPProxy !== 'undefined' && Jira.HTTPProxy !== '') {&eol;            request.setProxy(Jira.HTTPProxy);&eol;        }&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        Zabbix.log(4, '[ Jira Service Desk Webhook ] Sending request: ' + url +&eol;            ((typeof data === 'string') ? ('\n' + data) : ''));&eol;&eol;        switch (method) {&eol;            case 'get':&eol;                response = request.get(url, data);&eol;                break;&eol;&eol;            case 'post':&eol;                response = request.post(url, data);&eol;                break;&eol;&eol;            case 'put':&eol;                response = request.put(url, data);&eol;                break;&eol;&eol;            default:&eol;                throw 'Unsupported HTTP request method: ' + method;&eol;        }&eol;&eol;        Zabbix.log(4, '[ Jira Service Desk 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, '[ Jira Service Desk Webhook ] Failed to parse response received from Jira');&eol;                response = null;&eol;            }&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 !== null && typeof response.errors !== 'undefined'&eol;                && Object.keys(response.errors).length > 0) {&eol;                message += ': ' + JSON.stringify(response.errors);&eol;            }&eol;            else if (response !== null && typeof response.errorMessage !== 'undefined'&eol;                && Object.keys(response.errorMessage).length > 0) {&eol;                message += ': ' + JSON.stringify(response.errorMessage);&eol;            }&eol;&eol;            throw message + ' Check debug log for more information.';&eol;        }&eol;&eol;        return {&eol;            status: request.getStatus(),&eol;            response: response&eol;        };&eol;    },&eol;&eol;    getSchema: function() {&eol;        var result = Jira.request('get', 'servicedesk/' + Jira.params.servicedesk_id + '/requesttype/' +&eol;            Jira.params.request_type_id + '/field');&eol;&eol;        if (typeof Jira.schema !== 'object' && typeof Jira.schema.requestTypeFields !== 'object') {&eol;            Jira.schema = null;&eol;        }&eol;        else {&eol;            Jira.schema = result.response;&eol;        }&eol;    },&eol;&eol;    createRequest: function(summary, description, fields) {&eol;        var data = {&eol;            serviceDeskId: Jira.params.servicedesk_id,&eol;            requestTypeId: Jira.params.request_type_id,&eol;            requestFieldValues: {&eol;                summary: summary,&eol;                description: description&eol;            }&eol;        };&eol;&eol;        if (Jira.labels && Jira.labels.length > 0) {&eol;            data.requestFieldValues.labels = Jira.labels;&eol;        }&eol;        var result = Jira.request('post', 'request', Jira.addCustomFields(data, fields));&eol;&eol;        if (typeof result.response !== 'object' &pipe;&pipe; typeof result.response.issueKey === 'undefined') {&eol;            throw 'Cannot create Jira request. Check debug log for more information.';&eol;        }&eol;&eol;        return result.response.issueKey;&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        fields = {},&eol;        jira = {},&eol;        comment = {public: true},&eol;        result = {tags: {}},&eol;        required_params = [&eol;            'alert_subject', 'alert_message', 'event_source', 'event_value',&eol;            'event_update_status', 'event_recovery_value'&eol;        ];&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('jira_')) {&eol;                jira[key.substring(5)] = params[key];&eol;            }&eol;            else if (key.startsWith('customfield_')) {&eol;                fields[key] = params[key];&eol;            }&eol;            else if (required_params.indexOf(key) !== -1 && params[key] === '') {&eol;                throw 'Parameter "' + key + '" cannot 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;    Jira.setParams(jira);&eol;    Jira.setProxy(params.HTTPProxy);&eol;    Jira.getSchema();&eol;    Jira.setTags(params.event_tags_json);&eol;&eol;    // Create request for non trigger-based events.&eol;    if (params.event_source !== '0' && params.event_recovery_value !== '0') {&eol;        Jira.createRequest(params.alert_subject, params.alert_message);&eol;    }&eol;    // Create request for trigger-based events.&eol;    else if (params.event_value === '1' && params.event_update_status === '0'&eol;        && jira.request_key === '{EVENT.TAGS.__zbx_jira_requestkey}') {&eol;        var key = Jira.createRequest(params.alert_subject, params.alert_message, fields);&eol;&eol;        result.tags.__zbx_jira_requestkey = key;&eol;        result.tags.__zbx_jira_requestlink = params.jira_url +&eol;            (params.jira_url.endsWith('/') ? '' : '/') + 'browse/' + key;&eol;    }&eol;    // Comment created request for trigger-based event.&eol;    else {&eol;        if (jira.request_key === '{EVENT.TAGS.__zbx_jira_requestkey}' &pipe;&pipe; jira.request_key.trim() === '') {&eol;            throw 'Incorrect Request key given: ' + jira.request_key;&eol;        }&eol;        comment.body = params.alert_message;&eol;        Jira.request('post', 'request/' + Jira.params.request_key + '/comment', comment);&eol;    }&eol;&eol;    return JSON.stringify(result);&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[ Jira Service Desk Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__zbx_jira_requestlink}   |Jira ServiceDesk: {EVENT.TAGS.__zbx_jira_requestkey}        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 ROW   |21         |4   |OTRS                    |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var OTRS = {&eol;    params: {},&eol;    entrypoint: 'nph-genericinterface.pl/Webservice/ZabbixTicketConnector/Ticket',&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;&eol;        OTRS.params = params;&eol;        if (typeof OTRS.params.url === 'string') {&eol;            if (!OTRS.params.url.endsWith('/')) {&eol;                OTRS.params.url += '/';&eol;            }&eol;        }&eol;    },&eol;&eol;    addDynamicFields: function (data, fields) {&eol;        if (typeof fields === 'object' && Object.keys(fields).length) {&eol;            data.DynamicField = [];&eol;&eol;            Object.keys(fields)&eol;                .forEach(function(field) {&eol;                    if (field !== undefined) {&eol;                        if (fields[field].match(/^\d{4}[.-]\d{2}[.-]\d{2}$/)) {&eol;                            fields[field] = fields[field].replace(/\./g, '-');&eol;                        }&eol;&eol;                        data.DynamicField.push({Name: field, Value: fields[field]});&eol;                    }&eol;                });&eol;        }&eol;&eol;        return data;&eol;    },&eol;&eol;    request: function (method, query, data) {&eol;        ['url', 'auth_user', 'auth_password', 'queue',&eol;            'customer', 'ticket_state', 'default_priority_id', 'time_unit'].forEach(function (field) {&eol;            if (typeof OTRS.params !== 'object' &pipe;&pipe; typeof OTRS.params[field] === 'undefined'&eol;                &pipe;&pipe; OTRS.params[field] === '' ) {&eol;                throw 'Required param is not set: "' + field + '".';&eol;            }&eol;        });&eol;&eol;        var response,&eol;            request = new HttpRequest(),&eol;            url = OTRS.params.url + query +&eol;                '?UserLogin=' + encodeURIComponent(OTRS.params.auth_user) +&eol;                '&Password=' + encodeURIComponent(OTRS.params.auth_password);&eol;&eol;        if (typeof OTRS.HTTPProxy !== 'undefined' && OTRS.HTTPProxy.trim() !== '') {&eol;            request.setProxy(OTRS.HTTPProxy);&eol;        }&eol;&eol;        request.addHeader('Content-Type: application/json');&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        Zabbix.log(4, '[ OTRS Webhook ] Sending request: ' +&eol;            url + ((typeof data === 'string') ? (' ' + data) : ''));&eol;&eol;        switch (method) {&eol;            case 'get':&eol;                response = request.get(url, data);&eol;                break;&eol;&eol;            case 'post':&eol;                response = request.post(url, data);&eol;                break;&eol;&eol;            case 'put':&eol;                response = request.put(url, data);&eol;                break;&eol;&eol;            default:&eol;                throw 'Unsupported HTTP request method: ' + method;&eol;        }&eol;&eol;        Zabbix.log(4, '[ OTRS Webhook ] Received response with status code ' + request.getStatus() + ': ' + response);&eol;&eol;        if (request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300) {&eol;            var message = 'Request failed with status code ' + request.getStatus();&eol;&eol;            message += ': ' + response;&eol;            throw message + ' Check debug log for more information.';&eol;        }&eol;&eol;        if (response !== null) {&eol;            try {&eol;                response = JSON.parse(response);&eol;            }&eol;            catch (error) {&eol;                Zabbix.log(4, '[ OTRS Webhook ] Failed to parse response received from OTRS');&eol;                response = null;&eol;            }&eol;        }&eol;&eol;        if (typeof response.Error !== 'undefined'&eol;            && Object.keys(response.Error).length > 0) {&eol;            message = 'Request failed: ' + JSON.stringify(response.Error);&eol;        }&eol;&eol;&eol;        return {&eol;            status: request.getStatus(),&eol;            response: response&eol;        };&eol;    },&eol;&eol;    createTicket: function(subject, message, priority, fields) {&eol;        var result,&eol;            data = {&eol;                Ticket: {&eol;                    Title: subject,&eol;                    Queue: OTRS.params.queue,&eol;                    State: OTRS.params.ticket_state,&eol;                    PriorityID: priority &pipe;&pipe; OTRS.params.default_priority_id,&eol;                    CustomerUser: OTRS.params.customer&eol;                },&eol;                Article: {&eol;                    Subject: subject,&eol;                    Body: message,&eol;                    TimeUnit: OTRS.params.time_unit,&eol;                    ContentType: 'text/plain; charset=utf8'&eol;                }&eol;            };&eol;&eol;        result = OTRS.request('post', OTRS.entrypoint, OTRS.addDynamicFields(data, fields));&eol;&eol;        if (typeof result.response !== 'object'&eol;            &pipe;&pipe; typeof result.response.TicketID === 'undefined'&eol;            &pipe;&pipe; result.status != 200) {&eol;            throw 'Cannot create OTRS ticket. Check debug log for more information.';&eol;        }&eol;&eol;        return result.response.TicketID;&eol;    },&eol;&eol;    updateTicket: function(subject, message) {&eol;        var result,&eol;            data = {&eol;                Article: {&eol;                    Subject: subject,&eol;                    Body: message &pipe;&pipe; '',&eol;                    TimeUnit: OTRS.params.time_unit,&eol;                    ContentType: 'text/plain; charset=utf8'&eol;                }&eol;            };&eol;&eol;        result = OTRS.request('put', OTRS.entrypoint + '/' + encodeURIComponent(OTRS.params.ticket_id), data);&eol;&eol;        if (typeof result.response !== 'object'&eol;            &pipe;&pipe; typeof result.response.TicketID === 'undefined'&eol;            &pipe;&pipe; result.status != 200) {&eol;            throw 'Cannot update OTRS ticket. Check debug log for more information.';&eol;        }&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        params_otrs = {},&eol;        params_fields = {},&eol;        params_update = {},&eol;        result = {tags: {}},&eol;        required_params = [&eol;            'alert_subject', 'event_source',&eol;            '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: 'resolved', color: '#009900'},&eol;            {name: null, color: '#000000'}&eol;        ],&eol;        priority;&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('otrs_')) {&eol;                params_otrs[key.substring(5)] = params[key];&eol;            }&eol;            else if (key.startsWith('dynamicfield_')) {&eol;                params_fields[key.substring(13)] = params[key];&eol;            }&eol;            else if (key.startsWith('event_update_')) {&eol;                params_update[key.substring(13)] = params[key];&eol;            }&eol;            else if (required_params.indexOf(key) !== -1 && params[key].trim() === '') {&eol;                throw 'Parameter "' + key + '" cannot 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_source === '0' && params.event_update_status !== '0' && params.event_update_status !== '1') {&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_value === '0') {&eol;        throw 'Recovery operations are supported only for trigger-based actions.';&eol;    }&eol;&eol;    if (params.event_source === '0'&eol;        && ((params.event_value === '1' && params.event_update_status === '1')&eol;            &pipe;&pipe; (params.event_value === '0'&eol;                && (params.event_update_status === '0' &pipe;&pipe; params.event_update_status === '1')))&eol;        && (isNaN(parseInt(params.otrs_ticket_id)) &pipe;&pipe; parseInt(params.otrs_ticket_id) < 1 )) {&eol;        throw 'Incorrect "otrs_ticket_id" parameter given: ' + params.otrs_ticket_id +&eol;            '\nMust be positive integer.';&eol;    }&eol;&eol;    if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol;        params.event_nseverity = '7';&eol;    }&eol;&eol;    if (params.event_value === '0') {&eol;        params.event_nseverity = '6';&eol;    }&eol;&eol;    priority = params['severity_' + severities[params.event_nseverity].name];&eol;    priority = priority && priority.trim() &pipe;&pipe; severities[7].name;&eol;&eol;    OTRS.setParams(params_otrs);&eol;    OTRS.HTTPProxy = params.HTTPProxy;&eol;&eol;    // Create ticket for non trigger-based events.&eol;    if (params.event_source !== '0'&eol;        && params.event_value !== '0') {&eol;        OTRS.createTicket(params.alert_subject, params.alert_message, priority);&eol;    }&eol;    // Create ticket for trigger-based events.&eol;    else if (params.event_value === '1' && params_update.status === '0') {&eol;        var ticket_id = OTRS.createTicket(params.alert_subject,&eol;            params.alert_subject + '\n' + params.alert_message + '\n' +&eol;            params.zabbix_url + (params.zabbix_url.endsWith('/') ? '' : '/') +&eol;            'tr_events.php?triggerid=' + params.trigger_id + '&eventid=' + params.event_id + '\n',&eol;            priority,&eol;            params_fields);&eol;&eol;        result.tags.__zbx_otrs_ticket_id = ticket_id;&eol;        result.tags.__zbx_otrs_ticketlink = params.otrs_url +&eol;            (params.otrs_url.endsWith('/') ? '' : '/') + 'index.pl?Action=AgentTicketZoom;TicketID=' + ticket_id;&eol;    }&eol;    // Update created ticket for trigger-based event.&eol;    else {&eol;        OTRS.updateTicket(params.alert_subject, params.alert_message);&eol;    }&eol;&eol;    return JSON.stringify(result);&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[ OTRS Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__zbx_otrs_ticketlink}    |OTRS: ticket #{EVENT.TAGS.__zbx_otrs_ticket_id}             |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 ROW   |22         |4   |iLert                   |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |try {&eol;    var result = { tags: {} },&eol;        params = JSON.parse(value),&eol;        req = new HttpRequest(),&eol;        resp = '';&eol;&eol;    if (typeof params.HTTPProxy === 'string' && params.HTTPProxy.trim() !== '') {&eol;        req.setProxy(params.HTTPProxy);&eol;    }&eol;    var alertSourceKey = params['.ILERT.ALERT.SOURCE.KEY'];&eol;    if (!alertSourceKey &pipe;&pipe; (typeof alertSourceKey === 'string' && alertSourceKey.trim() === '')) {&eol;        throw 'incorrect value for variable "ILERT.ALERT.SOURCE.KEY". The value must be a non-empty string.';&eol;    }&eol;    delete params['.ILERT.ALERT.SOURCE.KEY'];&eol;    &eol;    var ilertApiBaseURL = "https://api.ilert.com";&eol;    var reqURL = encodeURI(ilertApiBaseURL + "/api/v1/events/zabbix-mt/" + alertSourceKey)&eol;&eol;    var incidentKey = "zabbix-" + params['EVENT.ID'];&eol;    var incidentViewURL = ilertApiBaseURL + "/api/v1/incidents/resolve-ik/" + alertSourceKey + "/" + incidentKey;&eol;&eol;    req.addHeader('Accept: application/json');&eol;    req.addHeader('Content-Type: application/json');&eol;&eol;    Zabbix.log(4, '[iLert Webhook] Sending request:' + JSON.stringify(params));&eol;    resp = req.post(reqURL, JSON.stringify(params));&eol;    Zabbix.log(4, '[iLert Webhook] Receiving response:' + resp);&eol;&eol;    try {&eol;        resp = JSON.parse(resp);&eol;    }&eol;    catch (error) {&eol;        throw 'incorrect response. iLert returned a non-JSON object.';&eol;    }&eol;&eol;    if (req.getStatus() == 200) {&eol;        result.tags.__ilert_incident_url = incidentViewURL;&eol;        return JSON.stringify(result);&eol;    }&eol;&eol;    if (req.getStatus() == 400 && typeof resp === 'object' && typeof resp.code === 'string') {&eol;        if (resp.code === 'NO_OPEN_INCIDENT_WITH_KEY') {&eol;          return JSON.stringify(result);&eol;        }&eol;        if (resp.code === 'INCIDENT_ALREADY_ACCEPTED') {&eol;          result.tags.__ilert_incident_url = incidentViewURL;&eol;          return JSON.stringify(result);&eol;        }&eol;    }&eol;&eol;    if (typeof resp === 'object' && typeof resp.message === 'string') {&eol;        throw resp.message;&eol;    }&eol;    else {&eol;        throw 'Unknown error.';&eol;    }&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[iLert Webhook] Notification failed : ' + error);&eol;    throw 'iLert notification failed : ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__ilert_incident_url}     |iLert incident                                              |Please refer to https://docs.ilert.com/integrations/zabbix/native &eol;  &eol;Set global macro {$ZABBIX.URL} with your Zabbix server URL.&eol;Add a dedicated user with the media type "iLert". You can also rewrite the incident summary via ".ILERT.INCIDENT.SUMMARY" parameter or leave it empty to use the standard pattern.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
@@ -708,7 +708,7 @@ ROW   |54                 |18         |0          |2       |[{EVENT.STATUS}] {EV
 ROW   |55                 |18         |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   |56                 |18         |2          |0       |Autoregistration: {HOST.HOST}                                    |Host name: {HOST.HOST}&eol;Host IP: {HOST.IP}&eol;Agent port: {HOST.PORT}                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 ROW   |57                 |19         |0          |0       |Problem: {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   |58                 |19         |0          |1       |Resolved: {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   |58                 |19         |0          |1       |Resolved: {EVENT.RECOVERY.NAME}                                  |Problem has been resolved in {EVENT.DURATION} at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}&eol;Problem name: {EVENT.RECOVERY.NAME}&eol;Host: {HOST.NAME}&eol;Severity: {EVENT.SEVERITY}&eol;Original problem ID: {EVENT.ID}&eol;{TRIGGER.URL}                                                                                                                                                                                                                                                                |
 ROW   |59                 |19         |0          |2       |Updated problem: {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   |60                 |19         |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   |61                 |19         |2          |0       |Autoregistration: {HOST.HOST}                                    |Host name: {HOST.HOST}&eol;Host IP: {HOST.IP}&eol;Agent port: {HOST.PORT}                                                                                                                                                                                                                                                                                                                                                                                                                                         |
diff --git a/create/src/templates.tmpl b/create/src/templates.tmpl
index c2c1cb936f8..e4013c59bf5 100644
--- a/create/src/templates.tmpl
+++ b/create/src/templates.tmpl
@@ -329,12 +329,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   |97               |10333 |                                     |12     |NULL      |
-ROW   |98               |10334 |                                     |12     |NULL      |
-ROW   |99               |10367 |                                     |12     |NULL      |
-ROW   |100              |10368 |                                     |12     |NULL      |
-ROW   |101              |10388 |                                     |13     |NULL      |
-ROW   |102              |10389 |                                     |13     |NULL      |
+ROW   |103              |10333 |                                     |12     |NULL      |
+ROW   |104              |10334 |                                     |12     |NULL      |
+ROW   |105              |10367 |                                     |12     |NULL      |
+ROW   |106              |10368 |                                     |12     |NULL      |
+ROW   |107              |10388 |                                     |13     |NULL      |
+ROW   |108              |10389 |                                     |13     |NULL      |
 
 TABLE |interface
 FIELDS|interfaceid|hostid|main|type|useip|ip       |dns |port |
@@ -2027,7 +2027,7 @@ ROW   |31129 |11  |
 ROW   |31130 |11  |                                                                                                                                                                                                                                                                                                                                                   |10327 |MSSQL Mirroring '{#DBNAME}': Get the mirror state                                                       |db.odbc.get["{#DBNAME}_mirroring_state","{$MSSQL.DSN}"]                                                                                                                                     |1m                          |0h     |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |SELECT ISNULL(m.mirroring_role,0) as mirroring_role,&eol;ISNULL(m.mirroring_role_sequence,0) as mirroring_role_sequence,&eol;ISNULL(m.mirroring_state,7) as mirroring_state,&eol;ISNULL(m.mirroring_witness_state,3) as mirroring_witness_state,&eol;ISNULL(m.mirroring_safety_level,3) as mirroring_safety_level,&eol;db_name(m.database_id) as dbname &eol;FROM sys.database_mirroring as m&eol;WHERE m.mirroring_state_desc IS NOT NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                |0       |{$MSSQL.USER}            |{$MSSQL.PASSWORD}        |         |          |2    |NULL       |Getting mirrors state                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |082fb332849e4633a169f1a6dbe3a8c5|
 ROW   |31132 |11  |                                                                                                                                                                                                                                                                                                                                                   |10327 |MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': Get the replica state                               |db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]                                                                                                                   |1m                          |0h     |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |SELECT ars.connected_state as connected_state,&eol;ars.is_local as is_local,&eol;arcs.join_state as join_state,&eol;ISNULL(ars.operational_state,6) as operational_state,&eol;ISNULL(ars.recovery_health,2) as recovery_health,&eol;ars.role as role,&eol;ars.synchronization_health as synchronization_health,&eol;ag.name as group_name, &eol;arcs.replica_server_name as replica_name&eol;FROM sys.dm_hadr_availability_replica_cluster_states as arcs &eol;JOIN sys.availability_groups ag ON ag.group_id = arcs.group_id&eol;JOIN sys.dm_hadr_availability_replica_states ars ON ars.replica_id = arcs.replica_id&eol;WHERE ag.name = '{#GROUP_NAME}' AND arcs.replica_server_name = '{#REPLICA_NAME}'                                                                                                                                                                                                                                                                                                                                                     |                |0       |{$MSSQL.USER}            |{$MSSQL.PASSWORD}        |         |          |2    |NULL       |Getting the database replica states.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |287c420d8d5346d7a21de580ce1836eb|
 ROW   |31180 |11  |                                                                                                                                                                                                                                                                                                                                                   |10328 |Oracle: Get archive log info                                                                            |db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]                                                                             |5m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |SELECT&eol;d.dest_name, DECODE (d.status, 'VALID',3, 'DEFERRED', 2, 'ERROR', 1, 0) AS status,&eol;d.log_sequence,&eol;d.error&eol;FROM v$archive_dest d , v$database db&eol;WHERE d.status != 'INACTIVE' AND db.log_mode = 'ARCHIVELOG';                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |                |0       |{$ORACLE.USER}           |{$ORACLE.PASSWORD}       |         |          |0    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |1a6e01f90dca47459975632c14ce5a39|
-ROW   |31181 |11  |                                                                                                                                                                                                                                                                                                                                                   |10328 |Oracle: Get tablespaces stats                                                                           |db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]                                                                           |1m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |SELECT&eol;  df.tablespace_name AS TABLESPACE, &eol;  df.type AS TYPE, &eol;  NVL(SUM(df.BYTES), 0) AS FILE_BYTES, &eol;  NVL(SUM(df.MAX_BYTES), 0) AS MAX_BYTES, &eol;  NVL(SUM(f.FREE), 0) AS FREE_BYTES,&eol;  SUM(df.BYTES)-SUM(f.FREE) AS USED_BYTES,&eol;  ROUND(DECODE(SUM(df.MAX_BYTES), 0, 0, (SUM(df.BYTES) / SUM(df.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX, &eol;  ROUND(DECODE(SUM(df.BYTES), 0, 0,(SUM(df.BYTES)-SUM(f.FREE))/ SUM(df.BYTES)* 100), 2) AS USED_FILE_PCT,&eol;  DECODE(df.STATUS, 'ONLINE', 1, 'OFFLINE', 2, 'READ ONLY', 3, 0) AS STATUS&eol;FROM ( SELECT&eol;   ddf.file_id,&eol;   dt.contents AS TYPE,&eol;   dt.STATUS ,&eol;   ddf.file_name,&eol;   ddf.tablespace_name,&eol;   TRUNC(ddf.bytes) AS bytes,&eol;   TRUNC(GREATEST(ddf.bytes, ddf.maxbytes)) AS max_bytes&eol;   FROM&eol;    dba_data_files ddf,&eol;    dba_tablespaces dt&eol;  WHERE&eol;   ddf.tablespace_name = dt.tablespace_name ) df,&eol;   ( SELECT TRUNC(SUM(bytes)) AS FREE, file_id FROM dba_free_space GROUP BY file_id ) f&eol;   WHERE df.file_id = f.file_id (+)&eol;   GROUP BY df.tablespace_name, df.TYPE, df.status&eol;UNION ALL&eol;SELECT&eol;  Y.name AS TABLESPACE, &eol;  Y.type AS TYPE, &eol;  NVL(SUM(Y.BYTES), 0) AS FILE_BYTES, &eol;  NVL(SUM(Y.MAX_BYTES), 0) AS MAX_BYTES, &eol;  NVL(MAX(NVL(Y.FREE_BYTES, 0)), 0) AS FREE,&eol;  SUM(Y.BYTES)-SUM(Y.FREE_BYTES) AS USED_BYTES,&eol;  ROUND(DECODE(SUM(Y.MAX_BYTES), 0, 0, (SUM(Y.BYTES) / SUM(Y.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX, &eol;  ROUND(DECODE(SUM(Y.BYTES), 0, 0,(SUM(Y.BYTES)-SUM(Y.FREE_BYTES))/ SUM(Y.BYTES)* 100), 2) AS USED_FILE_PCT,&eol;  DECODE(Y.TBS_STATUS, 'ONLINE', 1, 'OFFLINE', 2, 'READ ONLY', 3, 0) AS STATUS &eol;   FROM ( SELECT&eol;     dtf.tablespace_name AS name,&eol;     dt.contents AS TYPE,&eol;     dt.STATUS AS tbs_status,&eol;     dtf.status AS status,&eol;     dtf.bytes AS bytes,&eol;     (SELECT&eol;       ((f.total_blocks - s.tot_used_blocks)* vp.value)&eol;       FROM ( SELECT tablespace_name, SUM(used_blocks) tot_used_blocks FROM gv$sort_segment&eol;          WHERE tablespace_name != 'DUMMY'&eol;          GROUP BY tablespace_name) s,&eol;     ( SELECT tablespace_name, SUM(blocks) total_blocks FROM dba_temp_files&eol;       WHERE tablespace_name != 'DUMMY'&eol;       GROUP BY tablespace_name) f,&eol;     ( SELECT value FROM v$parameter WHERE name = 'db_block_size') vp&eol;   WHERE&eol;     f.tablespace_name = s.tablespace_name&eol;     AND f.tablespace_name = dtf.tablespace_name ) AS free_bytes,&eol;     CASE WHEN dtf.maxbytes = 0 THEN dtf.bytes&eol;     ELSE dtf.maxbytes END AS max_bytes&eol;   FROM&eol;    sys.dba_temp_files dtf,&eol;    sys.dba_tablespaces dt&eol;   WHERE&eol;   dtf.tablespace_name = dt.tablespace_name ) Y&eol;   GROUP BY Y.name, Y.TYPE, Y.tbs_status;|                |0       |{$ORACLE.USER}           |{$ORACLE.PASSWORD}       |         |          |0    |NULL       |Get tablespaces stats.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |972be2e777e44c539d0ddd7918b79e88|
+ROW   |31181 |11  |                                                                                                                                                                                                                                                                                                                                                   |10328 |Oracle: Get tablespaces stats                                                                           |db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]                                                                           |1m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |SELECT&eol;  df.tablespace_name AS TABLESPACE, &eol;  df.type AS TYPE, &eol;  NVL(SUM(df.BYTES), 0) AS FILE_BYTES, &eol;  NVL(SUM(df.MAX_BYTES), 0) AS MAX_BYTES, &eol;  NVL(SUM(f.FREE), 0) AS FREE_BYTES,&eol;  SUM(df.BYTES)-SUM(f.FREE) AS USED_BYTES,&eol;  ROUND(DECODE(SUM(df.MAX_BYTES), 0, 0, (SUM(df.BYTES) / SUM(df.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX, &eol;  ROUND(DECODE(SUM(df.BYTES), 0, 0,(SUM(df.BYTES)-SUM(f.FREE))/ SUM(df.BYTES)* 100), 2) AS USED_FILE_PCT,&eol;  DECODE(df.STATUS, 'ONLINE', 1, 'OFFLINE', 2, 'READ ONLY', 3, 0) AS STATUS&eol;FROM ( SELECT&eol;   ddf.file_id,&eol;   dt.contents AS TYPE,&eol;   dt.STATUS ,&eol;   ddf.file_name,&eol;   ddf.tablespace_name,&eol;   TRUNC(ddf.bytes) AS bytes,&eol;   TRUNC(GREATEST(ddf.bytes, ddf.maxbytes)) AS max_bytes&eol;   FROM&eol;    dba_data_files ddf,&eol;    dba_tablespaces dt&eol;  WHERE&eol;   ddf.tablespace_name = dt.tablespace_name ) df,&eol;   ( SELECT TRUNC(SUM(bytes)) AS FREE, file_id FROM dba_free_space GROUP BY file_id ) f&eol;   WHERE df.file_id = f.file_id (+)&eol;   GROUP BY df.tablespace_name, df.TYPE, df.status&eol;UNION ALL&eol;SELECT&eol;  Y.name AS TABLESPACE, &eol;  Y.type AS TYPE, &eol;  NVL(SUM(Y.BYTES), 0) AS FILE_BYTES, &eol;  NVL(SUM(Y.MAX_BYTES), 0) AS MAX_BYTES, &eol;  NVL(MAX(NVL(Y.FREE_BYTES, 0)), 0) AS FREE,&eol;  SUM(Y.BYTES)-MAX(Y.FREE_BYTES) AS USED_BYTES,&eol;  ROUND(DECODE(SUM(Y.MAX_BYTES), 0, 0, (SUM(Y.BYTES) / SUM(Y.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX, &eol;  ROUND(DECODE(SUM(Y.BYTES), 0, 0,(SUM(Y.BYTES)-MAX(Y.FREE_BYTES))/ SUM(Y.BYTES)* 100), 2) AS USED_FILE_PCT,&eol;  DECODE(Y.TBS_STATUS, 'ONLINE', 1, 'OFFLINE', 2, 'READ ONLY', 3, 0) AS STATUS &eol;   FROM ( SELECT&eol;     dtf.tablespace_name AS name,&eol;     dt.contents AS TYPE,&eol;     dt.STATUS AS tbs_status,&eol;     dtf.status AS status,&eol;     dtf.bytes AS bytes,&eol;     (SELECT&eol;       ((f.total_blocks - s.tot_used_blocks)* vp.value)&eol;       FROM ( SELECT tablespace_name, SUM(used_blocks) tot_used_blocks FROM gv$sort_segment&eol;          WHERE tablespace_name != 'DUMMY'&eol;          GROUP BY tablespace_name) s,&eol;     ( SELECT tablespace_name, SUM(blocks) total_blocks FROM dba_temp_files&eol;       WHERE tablespace_name != 'DUMMY'&eol;       GROUP BY tablespace_name) f,&eol;     ( SELECT value FROM v$parameter WHERE name = 'db_block_size') vp&eol;   WHERE&eol;     f.tablespace_name = s.tablespace_name&eol;     AND f.tablespace_name = dtf.tablespace_name ) AS free_bytes,&eol;     CASE WHEN dtf.maxbytes = 0 THEN dtf.bytes&eol;     ELSE dtf.maxbytes END AS max_bytes&eol;   FROM&eol;    sys.dba_temp_files dtf,&eol;    sys.dba_tablespaces dt&eol;   WHERE&eol;   dtf.tablespace_name = dt.tablespace_name ) Y&eol;   GROUP BY Y.name, Y.TYPE, Y.tbs_status;|                |0       |{$ORACLE.USER}           |{$ORACLE.PASSWORD}       |         |          |0    |NULL       |Get tablespaces stats.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |972be2e777e44c539d0ddd7918b79e88|
 ROW   |31182 |11  |                                                                                                                                                                                                                                                                                                                                                   |10328 |Oracle: Get ASM stats                                                                                   |db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]                                                                                    |1m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |SELECT&eol;name AS dg_name,&eol;ROUND(total_mb / DECODE(TYPE, 'NORMAL', 2, 'HIGH', 3, 'EXTERN', 1)*1024*1024) AS size_byte,&eol;ROUND(usable_file_mb*1024*1024 ) AS free_size_byte,&eol;ROUND(100-(usable_file_mb /(total_mb / DECODE(TYPE, 'NORMAL', 2, 'HIGH', 3, 'EXTERN', 1)))* 100, 2) AS used_percent&eol;FROM v$asm_diskgroup ;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |                |0       |{$ORACLE.USER}           |{$ORACLE.PASSWORD}       |         |          |0    |NULL       |Get ASM disk groups stats.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |63fad55a2ced487aa30017b33bf1692e|
 ROW   |31183 |0   |                                                                                                                                                                                                                                                                                                                                                   |10328 |Oracle: Service's TCP port state                                                                        |net.tcp.service[tcp,{HOST.CONN},{$ORACLE.PORT}]                                                                                                                                             |30s                         |7d     |365d  |0     |3         |             |                  |                 |                   |NULL      |33        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |0    |NULL       |Test the availability of Oracle on TCP port.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |7ee99dfbd8dd4048bc2867aaa2fc335e|
 ROW   |31184 |0   |                                                                                                                                                                                                                                                                                                                                                   |10328 |Oracle: Number of LISTENER processes                                                                    |proc.num[,,,"tnslsnr LISTENER"]                                                                                                                                                             |30s                         |7d     |365d  |0     |3         |             |                  |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |0    |NULL       |Number of LISTENER processes running                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |bf89a6ced768432a9cc3c27e1e3159d0|
@@ -7288,6 +7288,8 @@ ROW   |39741 |20  |1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}
 ROW   |39742 |19  |                                                                                                                                                                                                                                                                                                                                                   |10503 |Velocloud: System properties                                                                            |velocloud.system.properties                                                                                                                                                                 |6h                          |7d     |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |0    |NULL       |System properties of VMware SD-WAN.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0             |30d     |0       |                                                             |NULL         |3s                            |https://{$VELOCLOUD.URL}/portal/rest/systemProperty/getSystemProperties                                             |                                                                                                                                                                                                                                                                                            |{ "normalize": true }|200                    |1               |0        |Content-Type: application/json&eol;Authorization: Token {$VELOCLOUD.TOKEN}        |0            |1             |0            |0          |0          |0          |0       |1206789df5b44af7ba1c5416662344dd|
 ROW   |39743 |21  |                                                                                                                                                                                                                                                                                                                                                   |10503 |Velocloud: Get data                                                                                     |velocloud.get                                                                                                                                                                               |1m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |var params = JSON.parse(value);&eol;&eol;var request = new HttpRequest();&eol;&eol;request.addHeader('Content-Type: application/json');&eol;request.addHeader('Authorization: Token ' + params.token);&eol;&eol;var response,&eol;    output,&eol;    error_msg = '',&eol;    enterprises = [],&eol;    edges = [],&eol;    links = [],&eol;    gateways = [],&eol;    version = [],&eol;    apps = [],&eol;    appsLinks = [],&eol;    edgeSDWan = [],&eol;    edgeSDWanPath = [];&eol;&eol;function getHttpData(url, body) {&eol;    response = request.post(url, body);&eol;    Zabbix.log(4, '[ SD-WAN API ] [ ' + url + ' ] Received response with status code ' + request.getStatus() + ': ' + response);&eol;&eol;    if (response !== null) {&eol;        try {&eol;            response = JSON.parse(response);&eol;        }&eol;        catch (error) {&eol;            throw 'Failed to parse response received from SD-WAN API. Check debug log for more information.';&eol;        }&eol;    }&eol;&eol;    if (request.getStatus() !== 200) {&eol;        if (response.error && response.error.message) {&eol;            throw response.error.message;&eol;        } else {&eol;            throw 'Failed to receive data: invalid response status code.';&eol;        }&eol;    }&eol;&eol;    if (typeof (response) !== 'object' &pipe;&pipe; response === null) {&eol;        throw 'Cannot process response data: received data is not an object.';&eol;    }&eol;&eol;    return response;&eol;};&eol;&eol;try {&eol;&eol;    if (params.token === '{' + '$VELOCLOUD.TOKEN}') {&eol;        throw 'Please change {' + '$VELOCLOUD.TOKEN} macro with the proper value.';&eol;    }&eol;&eol;    if (params.url.indexOf('http://') === -1 && params.url.indexOf('https://') === -1) {&eol;        params.url = 'https://' + params.url;&eol;    }&eol;&eol;    if (!params.url.endsWith('/')) {&eol;        params.url += '/';&eol;    }&eol;&eol;    enterprises = getHttpData(params.url + 'portal/rest/monitoring/getAggregates', '{}').enterprises;&eol;&eol;    if (!Array.isArray(enterprises)) {&eol;        throw 'Cannot process edges: enterprises is not an array.';&eol;    }&eol;&eol;    links = getHttpData(params.url + 'portal/rest/monitoring/getAggregateEdgeLinkMetrics', '{}');&eol;    gateways = getHttpData(params.url + 'portal/rest/network/getNetworkGateways', JSON.stringify({ with: ['site'] }));&eol;    version = getHttpData(params.url + 'portal/rest/system/getVersionInfo', '{}');&eol;&eol;    for (var i in enterprises) {&eol;        responseEdges = getHttpData(params.url + 'portal/rest/enterprise/getEnterpriseEdges', JSON.stringify({ enterpriseId: enterprises[i].id, with: ['site'] }));&eol;        edges = edges.concat(responseEdges);&eol;    }&eol;&eol;    if (!Array.isArray(edges)) {&eol;        throw 'Cannot process edges SDWans: edges is not an array.';&eol;    }&eol;&eol;    for (var i in edges) {&eol;        responseEdgeSDWan = getHttpData(params.url + 'portal/rest/edge/getEdgeSDWANPeers', JSON.stringify({ enterpriseId: edges[i].enterpriseId, edgeId: edges[i].id }));&eol;&eol;        if (!Array.isArray(responseEdgeSDWan)) {&eol;            throw 'Cannot process edges SDWan Path: edges SDWans is not an array.';&eol;        }&eol;&eol;        for (var e in responseEdgeSDWan) {&eol;            data = {&eol;                'enterpriseId': edges[i].enterpriseId,&eol;                'edgeId': edges[i].id,&eol;                'peerLogicalId': responseEdgeSDWan[e].deviceLogicalId&eol;            };&eol;            responseEdgeSDWanPath = getHttpData(params.url + 'portal/rest/metrics/getEdgeSDWANPeerPathMetrics', JSON.stringify(data));&eol;            edgeSDWanPath = edgeSDWanPath.concat(responseEdgeSDWanPath);&eol;&eol;            responseEdgeSDWan[e].edgeId = edges[i].id;&eol;            responseEdgeSDWan[e].edgeName = edges[i].name;&eol;            responseEdgeSDWan[e].enterpriseId = edges[i].enterpriseId;&eol;        }&eol;&eol;        edgeSDWan = edgeSDWan.concat(responseEdgeSDWan);&eol;    }&eol;&eol;} catch (error) {&eol;    error_msg = error;&eol;};&eol;&eol;return JSON.stringify({&eol;    'enterprises': enterprises,&eol;    'edges': edges,&eol;    'links': links,&eol;    'gateways': gateways,&eol;    'edgeSDWan': edgeSDWan,&eol;    'edgeSDWanPath': edgeSDWanPath,&eol;    'info': version,&eol;    'error': error_msg.toString()&eol;});|                |0       |                         |                         |         |          |0    |NULL       |The JSON with result of Velocloud API requests.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |0             |30d     |0       |                                                             |NULL         |10s                           |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |3d96f6e755934bc8a4ee7300a165adae|
 ROW   |39804 |5   |                                                                                                                                                                                                                                                                                                                                                   |10047 |Zabbix stats cluster                                                                                    |zabbix[cluster,discovery,nodes]                                                                                                                                                             |1m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |0    |NULL       |Zabbix cluster statistics master item.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |f9d60d6dcbe14cd4aaec08aec6ca1856|
+ROW   |39822 |5   |                                                                                                                                                                                                                                                                                                                                                   |10047 |Zabbix server: Utilization of ODBC poller data collector processes, in %                                |zabbix[process,odbc poller,avg,busy]                                                                                                                                                        |1m                          |1w     |365d  |0     |0         |             |%                 |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |0    |NULL       |Average percentage of time ODBC poller processes have been busy in the last minute                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |f8d593ff5690419f8679a5b8303f3a66|
+ROW   |39826 |5   |                                                                                                                                                                                                                                                                                                                                                   |10048 |Utilization of ODBC poller data collector processes, in %                                               |zabbix[process,odbc poller,avg,busy]                                                                                                                                                        |1m                          |1w     |365d  |0     |0         |             |%                 |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |0    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |                     |200                    |1               |0        |                                                                                  |0            |1             |0            |0          |0          |0          |0       |06bdbdcfdbc04c24ad387b256e430801|
 
 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                            |
@@ -9851,6 +9853,8 @@ ROW   |39818 |18  |        |10261 |Cluster node [{#NODE.NAME}]: Last access age
 ROW   |39819 |18  |        |10261 |Cluster node [{#NODE.NAME}]: Last access time                                           |zabbix.nodes.lastaccess.time[{#NODE.ID}]                                         |0    |1w     |365d  |0     |3         |             |unixtime|       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Last access time                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |28539        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |0968e4fe51eb4c2b98a508090014aba0|
 ROW   |39820 |18  |        |10261 |Cluster node [{#NODE.NAME}]: Status                                                     |zabbix.nodes.status[{#NODE.ID}]                                                  |0    |1w     |365d  |0     |3         |             |        |       |          |NULL      |566       |      |           |0       |        |        |         |          |2    |NULL       |Node status                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |0             |30d     |0       |            |28539        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |2b629362886546cab34396352b93835a|
 ROW   |39821 |18  |        |10329 |WAL: Bytes received                                                                     |pgsql.wal.receive                                                                |0    |7d     |365d  |0     |3         |             |B       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |WAL receive in bytes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |0             |30d     |0       |            |31290        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |0e58a74b8a2d47d28f596196405b22b5|
+ROW   |39824 |18  |        |10261 |Remote Zabbix server: Utilization of ODBC poller data collector processes, in %         |process.odbc_poller.avg.busy                                                     |0    |1w     |365d  |0     |0         |             |%       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Average percentage of time ODBC poller processes have been busy in the last minute                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0             |30d     |0       |            |28539        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |8a21a0281ae24e0788edc8c9b875a421|
+ROW   |39825 |18  |        |10262 |Utilization of ODBC poller data collector processes, in %                               |process.odbc_poller.avg.busy                                                     |0    |1w     |365d  |0     |0         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |28585        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |7c0d7d097e004d0db25eab55ceb6b87c|
 
 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                            |
@@ -11925,6 +11929,7 @@ ROW   |39800 |7   |
 ROW   |39801 |7   |                                                                                                                                                                                                                    |10351 |Zabbix agent ping                                                              |agent.ping                                                                                                                                                                                  |1m   |7d     |365d  |0     |3         |             |        |       |                   |29547     |50        |                                                                                                                                                                                                           |           |0       |        |        |         |          |0    |NULL       |The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |0             |30d     |0       |            |NULL         |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |    |
 ROW   |39802 |7   |                                                                                                                                                                                                                    |10351 |Version of Zabbix agent running                                                |agent.version                                                                                                                                                                               |1h   |7d     |0     |0     |1         |             |        |       |                   |29545     |NULL      |                                                                                                                                                                                                           |           |0       |        |        |         |          |0    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |NULL         |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |    |
 ROW   |39805 |5   |                                                                                                                                                                                                                    |10084 |Zabbix stats cluster                                                           |zabbix[cluster,discovery,nodes]                                                                                                                                                             |1m   |0      |0     |0     |4         |             |        |       |                   |39804     |NULL      |                                                                                                                                                                                                           |           |0       |        |        |         |          |0    |NULL       |Zabbix cluster statistics master item.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |            |NULL         |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |    |
+ROW   |39823 |5   |                                                                                                                                                                                                                    |10084 |Zabbix server: Utilization of ODBC poller data collector processes, in %       |zabbix[process,odbc poller,avg,busy]                                                                                                                                                        |1m   |1w     |365d  |0     |0         |             |%       |       |                   |39822     |NULL      |                                                                                                                                                                                                           |           |0       |        |        |         |          |0    |NULL       |Average percentage of time ODBC poller processes have been busy in the last minute                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0             |30d     |0       |            |NULL         |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |    |
 
 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|
@@ -16346,6 +16351,10 @@ ROW   |21190    |{28238}>0 and {28238}<600
 ROW   |21191    |{28239}<>1                                                                                                                                                                                                                                         |Link [{#NAME}]:[{#IP}]: Link state is not "STABLE"                                                                                                                                                                                         |    |0     |2       |Link state is not "STABLE".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |NULL      |0   |2    |0            |                                                                                                                 |0               |               |0           |                                                                                                               |0       |          |abceaab09aea4cb482dc4b554502429b|
 ROW   |21194    |{28242}<>{28243}                                                                                                                                                                                                                                   |Cluster node [{#NODE.NAME}]: Status changed                                                                                                                                                                                                |    |0     |1       |The state of the node has changed. Confirm to close.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |NULL      |0   |2    |0            |                                                                                                                 |0               |               |1           |Current value: {ITEM.LASTVALUE1}                                                                               |0       |          |8d48978fb5724d19a950aa6eb8a3dd75|
 ROW   |21196    |{28246}<>{28247}                                                                                                                                                                                                                                   |Cluster node [{#NODE.NAME}]: Status changed                                                                                                                                                                                                |    |0     |1       |The state of the node has changed. Confirm to close.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |NULL      |0   |2    |0            |                                                                                                                 |0               |               |1           |Current value: {ITEM.LASTVALUE1}                                                                               |0       |          |5d68b55175924cb4adde600a019496c4|
+ROW   |21197    |{28253}>75                                                                                                                                                                                                                                         |Zabbix server: Utilization of ODBC poller processes over 75%                                                                                                                                                                               |    |0     |3       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |NULL      |0   |0    |1            |{28253}<65                                                                                                       |0               |               |0           |                                                                                                               |0       |          |f536b921e9444c6eb0ac805ab9302af9|
+ROW   |21199    |{28255}>75                                                                                                                                                                                                                                         |Remote Zabbix server: Utilization of ODBC poller processes over 75%                                                                                                                                                                        |    |0     |3       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |NULL      |0   |0    |1            |{28255}<65                                                                                                       |0               |               |0           |                                                                                                               |0       |          |eadd70080005430c8b11666d7e93a095|
+ROW   |21200    |{28256}>75                                                                                                                                                                                                                                         |Zabbix ODBC poller processes more than 75% busy                                                                                                                                                                                            |    |0     |3       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |NULL      |0   |0    |1            |{28256}<65                                                                                                       |0               |               |0           |                                                                                                               |0       |          |7f83ff01200c4862aa22057b079da6f8|
+ROW   |21201    |{28257}>75                                                                                                                                                                                                                                         |Zabbix ODBC poller processes more than 75% busy                                                                                                                                                                                            |    |0     |3       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |NULL      |0   |0    |1            |{28257}<65                                                                                                       |0               |               |0           |                                                                                                               |0       |          |3177430235ac4eeaa23b8c39987989cc|
 
 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|
@@ -17124,6 +17133,7 @@ ROW   |21162    |{$IFCONTROL:"{#IFNAME}"}=1 and {28184}=2 and ({28185}<>{28186})
 ROW   |21192    |{28240}=1                                                                                                                                                               |Zabbix agent is not available (or nodata for {$AGENT.NODATA_TIMEOUT})                                                                                                                |    |0     |3       |For active agents, nodata() with agent.ping is used with {$AGENT.NODATA_TIMEOUT} as time threshold.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |16197     |0   |0    |0            |                                                                                                                 |0               |               |1           |                                                                                                               |0       |          |    |
 ROW   |21193    |{28241}=1                                                                                                                                                               |Zabbix agent is not available (or nodata for {$AGENT.NODATA_TIMEOUT})                                                                                                                |    |0     |3       |For active agents, nodata() with agent.ping is used with {$AGENT.NODATA_TIMEOUT} as time threshold.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |16197     |0   |0    |0            |                                                                                                                 |0               |               |1           |                                                                                                               |0       |          |    |
 ROW   |21195    |{28244}<>{28245}                                                                                                                                                        |Cluster node [{#NODE.NAME}]: Status changed                                                                                                                                          |    |0     |1       |The state of the node has changed. Confirm to close.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |21194     |0   |2    |0            |                                                                                                                 |0               |               |1           |Current value: {ITEM.LASTVALUE1}                                                                               |0       |          |    |
+ROW   |21198    |{28254}>75                                                                                                                                                              |Zabbix server: Utilization of ODBC poller processes over 75%                                                                                                                         |    |0     |3       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |21197     |0   |0    |1            |{28254}<65                                                                                                       |0               |               |0           |                                                                                                               |0       |          |    |
 
 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|
@@ -17419,1554 +17429,1554 @@ ROW   |21155    |{28166}>{$ICMP_RESPONSE_TIME_WARN}
 TABLE |trigger_depends
 FIELDS|triggerdepid|triggerid_down|triggerid_up|
 ROW   |25229       |18761         |18762       |
-ROW   |35333       |17412         |17411       |
-ROW   |35334       |17414         |17413       |
-ROW   |35335       |17416         |17415       |
-ROW   |35336       |15944         |15947       |
-ROW   |35337       |15944         |15943       |
-ROW   |35338       |15943         |15947       |
-ROW   |35339       |16888         |15947       |
-ROW   |35340       |16888         |15943       |
-ROW   |35341       |15948         |15949       |
-ROW   |35342       |15950         |15949       |
-ROW   |35343       |17429         |17428       |
-ROW   |35344       |17431         |17430       |
-ROW   |35345       |17433         |17432       |
-ROW   |35346       |17355         |17354       |
-ROW   |35347       |17358         |17357       |
-ROW   |35348       |18960         |18962       |
-ROW   |35349       |16743         |16744       |
-ROW   |35350       |16784         |16785       |
-ROW   |35351       |16790         |16791       |
-ROW   |35352       |16892         |16900       |
-ROW   |35353       |16894         |16900       |
-ROW   |35354       |17459         |17458       |
-ROW   |35355       |17463         |17458       |
-ROW   |35356       |17471         |17480       |
-ROW   |35357       |17476         |17481       |
-ROW   |35358       |17478         |17480       |
-ROW   |35359       |17479         |17481       |
-ROW   |35360       |17483         |17482       |
-ROW   |35361       |17486         |17485       |
-ROW   |35362       |16646         |16647       |
-ROW   |35363       |18965         |16660       |
-ROW   |35364       |16809         |16810       |
-ROW   |35365       |18966         |16677       |
-ROW   |35366       |16902         |16904       |
-ROW   |35367       |16904         |16905       |
-ROW   |35368       |16909         |16906       |
-ROW   |35369       |16910         |16912       |
-ROW   |35370       |16912         |16913       |
-ROW   |35371       |16917         |16914       |
-ROW   |35372       |17962         |17963       |
-ROW   |35373       |17962         |17958       |
-ROW   |35374       |16752         |16753       |
-ROW   |35375       |15955         |15957       |
-ROW   |35376       |15955         |15954       |
-ROW   |35377       |15954         |15957       |
-ROW   |35378       |15956         |15957       |
-ROW   |35379       |15956         |15954       |
-ROW   |35380       |16678         |15957       |
-ROW   |35381       |16678         |15954       |
-ROW   |35382       |15961         |15960       |
-ROW   |35383       |15962         |15960       |
-ROW   |35384       |16679         |15960       |
-ROW   |35385       |17090         |17096       |
-ROW   |35386       |17093         |17096       |
-ROW   |35387       |17101         |17098       |
-ROW   |35388       |16257         |16255       |
-ROW   |35389       |16257         |16256       |
-ROW   |35390       |16256         |16255       |
-ROW   |35391       |16251         |16255       |
-ROW   |35392       |16251         |16256       |
-ROW   |35393       |16443         |16255       |
-ROW   |35394       |16443         |16256       |
-ROW   |35395       |16270         |16269       |
-ROW   |35396       |16448         |16269       |
-ROW   |35397       |16265         |16269       |
-ROW   |35398       |17503         |17505       |
-ROW   |35399       |17512         |17511       |
-ROW   |35400       |17513         |17505       |
-ROW   |35406       |17516         |17518       |
-ROW   |35407       |17517         |17516       |
-ROW   |35408       |17517         |17518       |
-ROW   |35409       |17517         |17519       |
-ROW   |35410       |17519         |17518       |
-ROW   |35411       |18918         |18917       |
-ROW   |35412       |17973         |17965       |
-ROW   |35413       |17974         |17966       |
-ROW   |35414       |17141         |17151       |
-ROW   |35415       |17142         |17141       |
-ROW   |35416       |17142         |17151       |
-ROW   |35417       |17143         |17151       |
-ROW   |35418       |17144         |17143       |
-ROW   |35419       |17144         |17151       |
-ROW   |35420       |17146         |17145       |
-ROW   |35421       |17147         |17151       |
-ROW   |35422       |17148         |17147       |
-ROW   |35423       |17148         |17151       |
-ROW   |35424       |17150         |17149       |
-ROW   |35425       |17152         |17168       |
-ROW   |35426       |17153         |17152       |
-ROW   |35427       |17153         |17168       |
-ROW   |35428       |17154         |17168       |
-ROW   |35429       |17155         |17154       |
-ROW   |35430       |17155         |17168       |
-ROW   |35431       |17156         |17168       |
-ROW   |35432       |17157         |17156       |
-ROW   |35433       |17157         |17168       |
-ROW   |35434       |17158         |17168       |
-ROW   |35435       |17159         |17158       |
-ROW   |35436       |17159         |17168       |
-ROW   |35437       |17160         |17168       |
-ROW   |35438       |17161         |17160       |
-ROW   |35439       |17161         |17168       |
-ROW   |35440       |17163         |17162       |
-ROW   |35441       |17164         |17168       |
-ROW   |35442       |17165         |17164       |
-ROW   |35443       |17165         |17168       |
-ROW   |35444       |17166         |17168       |
-ROW   |35445       |17167         |17166       |
-ROW   |35446       |17167         |17168       |
-ROW   |35447       |17169         |17168       |
-ROW   |35448       |17170         |17168       |
-ROW   |35449       |17170         |17169       |
-ROW   |35450       |17171         |17168       |
-ROW   |35451       |17172         |17168       |
-ROW   |35452       |17172         |17171       |
-ROW   |35453       |17540         |17541       |
-ROW   |35454       |16833         |16920       |
-ROW   |35455       |16920         |16921       |
-ROW   |35456       |18987         |18986       |
-ROW   |35457       |18989         |18988       |
-ROW   |35458       |18993         |18992       |
-ROW   |35459       |18994         |18992       |
-ROW   |35460       |19009         |19010       |
-ROW   |35461       |17978         |17977       |
-ROW   |35462       |17980         |17979       |
-ROW   |35463       |17984         |17983       |
-ROW   |35464       |17985         |17983       |
-ROW   |35465       |18000         |18001       |
-ROW   |35466       |18225         |18224       |
-ROW   |35467       |18237         |18236       |
-ROW   |35468       |16929         |16928       |
-ROW   |35469       |16940         |17084       |
-ROW   |35470       |18537         |18536       |
-ROW   |35471       |18539         |18538       |
-ROW   |35472       |18541         |18540       |
-ROW   |35473       |16719         |16721       |
-ROW   |35474       |16975         |16723       |
-ROW   |35475       |16729         |16728       |
-ROW   |35476       |16730         |16728       |
-ROW   |35477       |16756         |16758       |
-ROW   |35478       |16979         |16759       |
-ROW   |35479       |16765         |16764       |
-ROW   |35480       |16766         |16764       |
-ROW   |35481       |16734         |16736       |
-ROW   |35482       |16983         |16732       |
-ROW   |35483       |16741         |16740       |
-ROW   |35484       |16742         |16740       |
-ROW   |35485       |17192         |17191       |
-ROW   |35486       |17194         |17195       |
-ROW   |35487       |17199         |17198       |
-ROW   |35488       |17546         |17545       |
-ROW   |35489       |17547         |17548       |
-ROW   |35490       |16997         |16984       |
-ROW   |35491       |17002         |17003       |
-ROW   |35492       |17006         |17005       |
-ROW   |35493       |17011         |17010       |
-ROW   |35494       |17550         |17549       |
-ROW   |35495       |17551         |17552       |
-ROW   |35496       |17391         |17396       |
-ROW   |35497       |17395         |17396       |
-ROW   |35498       |16683         |16687       |
-ROW   |35499       |14252         |14251       |
-ROW   |35500       |14294         |14293       |
-ROW   |35501       |14312         |14311       |
-ROW   |35502       |14328         |14327       |
-ROW   |35503       |14348         |14347       |
-ROW   |35504       |14357         |14356       |
-ROW   |35505       |14390         |14389       |
-ROW   |35506       |14404         |14403       |
-ROW   |35507       |14452         |14451       |
-ROW   |35508       |14469         |14468       |
-ROW   |35509       |14487         |14486       |
-ROW   |35510       |14506         |14505       |
-ROW   |35511       |14535         |14534       |
-ROW   |35512       |14545         |14544       |
-ROW   |35513       |14583         |14582       |
-ROW   |35514       |14599         |14598       |
-ROW   |35515       |14616         |14615       |
-ROW   |35516       |14653         |14652       |
-ROW   |35517       |14674         |14673       |
-ROW   |35518       |14692         |14691       |
-ROW   |35519       |14705         |14704       |
-ROW   |35520       |14718         |14717       |
-ROW   |35521       |14907         |14906       |
-ROW   |35522       |15221         |15220       |
-ROW   |35523       |15702         |15701       |
-ROW   |35524       |15724         |15723       |
-ROW   |35525       |15756         |15755       |
-ROW   |35526       |15820         |15819       |
-ROW   |35527       |15841         |15840       |
-ROW   |35528       |15991         |15990       |
-ROW   |35529       |16018         |16017       |
-ROW   |35530       |16454         |16453       |
-ROW   |35531       |17924         |17923       |
-ROW   |35532       |18178         |18177       |
-ROW   |35533       |19670         |19669       |
-ROW   |35534       |19698         |19697       |
-ROW   |35535       |19726         |19725       |
-ROW   |35536       |19754         |19753       |
-ROW   |35537       |19782         |19781       |
-ROW   |35538       |19810         |19809       |
-ROW   |35539       |19838         |19837       |
-ROW   |35540       |19866         |19865       |
-ROW   |35541       |19894         |19893       |
-ROW   |35542       |19922         |19921       |
-ROW   |35543       |19950         |19949       |
-ROW   |35544       |19978         |19977       |
-ROW   |35545       |20006         |20005       |
-ROW   |35546       |20034         |20033       |
-ROW   |35547       |20062         |20061       |
-ROW   |35548       |20090         |20089       |
-ROW   |35549       |20118         |20117       |
-ROW   |35550       |20146         |20145       |
-ROW   |35551       |20174         |20173       |
-ROW   |35552       |20202         |20201       |
-ROW   |35553       |20230         |20229       |
-ROW   |35554       |20258         |20257       |
-ROW   |35555       |20286         |20285       |
-ROW   |35556       |20314         |20313       |
-ROW   |35557       |20342         |20341       |
-ROW   |35558       |20370         |20369       |
-ROW   |35559       |20398         |20397       |
-ROW   |35560       |20426         |20425       |
-ROW   |35561       |20454         |20453       |
-ROW   |35562       |20482         |20481       |
-ROW   |35563       |20510         |20509       |
-ROW   |35564       |20538         |20537       |
-ROW   |35565       |20566         |20565       |
-ROW   |35566       |20594         |20593       |
-ROW   |35567       |20622         |20621       |
-ROW   |35568       |20650         |20649       |
-ROW   |35569       |20678         |20677       |
-ROW   |35570       |20706         |20705       |
-ROW   |35571       |20734         |20733       |
-ROW   |35572       |20762         |20761       |
-ROW   |35573       |20790         |20789       |
-ROW   |35574       |20818         |20817       |
-ROW   |35575       |20846         |20845       |
-ROW   |35576       |20874         |20873       |
-ROW   |35577       |20902         |20901       |
-ROW   |35578       |20930         |20929       |
-ROW   |35579       |20958         |20957       |
-ROW   |35580       |20986         |20985       |
-ROW   |35581       |21014         |21013       |
-ROW   |35582       |21042         |21041       |
-ROW   |35583       |21070         |21069       |
-ROW   |35584       |21098         |21097       |
-ROW   |35585       |21126         |21125       |
-ROW   |35586       |21154         |21153       |
-ROW   |35587       |14253         |14252       |
-ROW   |35588       |14295         |14294       |
-ROW   |35589       |14313         |14312       |
-ROW   |35590       |14329         |14328       |
-ROW   |35591       |14349         |14348       |
-ROW   |35592       |14358         |14357       |
-ROW   |35593       |14391         |14390       |
-ROW   |35594       |14405         |14404       |
-ROW   |35595       |14453         |14452       |
-ROW   |35596       |14470         |14469       |
-ROW   |35597       |14488         |14487       |
-ROW   |35598       |14507         |14506       |
-ROW   |35599       |14536         |14535       |
-ROW   |35600       |14546         |14545       |
-ROW   |35601       |14584         |14583       |
-ROW   |35602       |14600         |14599       |
-ROW   |35603       |14617         |14616       |
-ROW   |35604       |14654         |14653       |
-ROW   |35605       |14675         |14674       |
-ROW   |35606       |14693         |14692       |
-ROW   |35607       |14706         |14705       |
-ROW   |35608       |14719         |14718       |
-ROW   |35609       |14908         |14907       |
-ROW   |35610       |15222         |15221       |
-ROW   |35611       |15703         |15702       |
-ROW   |35612       |15725         |15724       |
-ROW   |35613       |15757         |15756       |
-ROW   |35614       |15821         |15820       |
-ROW   |35615       |15842         |15841       |
-ROW   |35616       |15992         |15991       |
-ROW   |35617       |16019         |16018       |
-ROW   |35618       |16455         |16454       |
-ROW   |35619       |17925         |17924       |
-ROW   |35620       |18179         |18178       |
-ROW   |35621       |19671         |19670       |
-ROW   |35622       |19699         |19698       |
-ROW   |35623       |19727         |19726       |
-ROW   |35624       |19755         |19754       |
-ROW   |35625       |19783         |19782       |
-ROW   |35626       |19811         |19810       |
-ROW   |35627       |19839         |19838       |
-ROW   |35628       |19867         |19866       |
-ROW   |35629       |19895         |19894       |
-ROW   |35630       |19923         |19922       |
-ROW   |35631       |19951         |19950       |
-ROW   |35632       |19979         |19978       |
-ROW   |35633       |20007         |20006       |
-ROW   |35634       |20035         |20034       |
-ROW   |35635       |20063         |20062       |
-ROW   |35636       |20091         |20090       |
-ROW   |35637       |20119         |20118       |
-ROW   |35638       |20147         |20146       |
-ROW   |35639       |20175         |20174       |
-ROW   |35640       |20203         |20202       |
-ROW   |35641       |20231         |20230       |
-ROW   |35642       |20259         |20258       |
-ROW   |35643       |20287         |20286       |
-ROW   |35644       |20315         |20314       |
-ROW   |35645       |20343         |20342       |
-ROW   |35646       |20371         |20370       |
-ROW   |35647       |20399         |20398       |
-ROW   |35648       |20427         |20426       |
-ROW   |35649       |20455         |20454       |
-ROW   |35650       |20483         |20482       |
-ROW   |35651       |20511         |20510       |
-ROW   |35652       |20539         |20538       |
-ROW   |35653       |20567         |20566       |
-ROW   |35654       |20595         |20594       |
-ROW   |35655       |20623         |20622       |
-ROW   |35656       |20651         |20650       |
-ROW   |35657       |20679         |20678       |
-ROW   |35658       |20707         |20706       |
-ROW   |35659       |20735         |20734       |
-ROW   |35660       |20763         |20762       |
-ROW   |35661       |20791         |20790       |
-ROW   |35662       |20819         |20818       |
-ROW   |35663       |20847         |20846       |
-ROW   |35664       |20875         |20874       |
-ROW   |35665       |20903         |20902       |
-ROW   |35666       |20931         |20930       |
-ROW   |35667       |20959         |20958       |
-ROW   |35668       |20987         |20986       |
-ROW   |35669       |21015         |21014       |
-ROW   |35670       |21043         |21042       |
-ROW   |35671       |21071         |21070       |
-ROW   |35672       |21099         |21098       |
-ROW   |35673       |21127         |21126       |
-ROW   |35674       |21155         |21154       |
-ROW   |35675       |14253         |14251       |
-ROW   |35676       |14295         |14293       |
-ROW   |35677       |14313         |14311       |
-ROW   |35678       |14329         |14327       |
-ROW   |35679       |14349         |14347       |
-ROW   |35680       |14358         |14356       |
-ROW   |35681       |14391         |14389       |
-ROW   |35682       |14405         |14403       |
-ROW   |35683       |14453         |14451       |
-ROW   |35684       |14470         |14468       |
-ROW   |35685       |14488         |14486       |
-ROW   |35686       |14507         |14505       |
-ROW   |35687       |14536         |14534       |
-ROW   |35688       |14546         |14544       |
-ROW   |35689       |14584         |14582       |
-ROW   |35690       |14600         |14598       |
-ROW   |35691       |14617         |14615       |
-ROW   |35692       |14654         |14652       |
-ROW   |35693       |14675         |14673       |
-ROW   |35694       |14693         |14691       |
-ROW   |35695       |14706         |14704       |
-ROW   |35696       |14719         |14717       |
-ROW   |35697       |14908         |14906       |
-ROW   |35698       |15222         |15220       |
-ROW   |35699       |15703         |15701       |
-ROW   |35700       |15725         |15723       |
-ROW   |35701       |15757         |15755       |
-ROW   |35702       |15821         |15819       |
-ROW   |35703       |15842         |15840       |
-ROW   |35704       |15992         |15990       |
-ROW   |35705       |16019         |16017       |
-ROW   |35706       |16455         |16453       |
-ROW   |35707       |17925         |17923       |
-ROW   |35708       |18179         |18177       |
-ROW   |35709       |19671         |19669       |
-ROW   |35710       |19699         |19697       |
-ROW   |35711       |19727         |19725       |
-ROW   |35712       |19755         |19753       |
-ROW   |35713       |19783         |19781       |
-ROW   |35714       |19811         |19809       |
-ROW   |35715       |19839         |19837       |
-ROW   |35716       |19867         |19865       |
-ROW   |35717       |19895         |19893       |
-ROW   |35718       |19923         |19921       |
-ROW   |35719       |19951         |19949       |
-ROW   |35720       |19979         |19977       |
-ROW   |35721       |20007         |20005       |
-ROW   |35722       |20035         |20033       |
-ROW   |35723       |20063         |20061       |
-ROW   |35724       |20091         |20089       |
-ROW   |35725       |20119         |20117       |
-ROW   |35726       |20147         |20145       |
-ROW   |35727       |20175         |20173       |
-ROW   |35728       |20203         |20201       |
-ROW   |35729       |20231         |20229       |
-ROW   |35730       |20259         |20257       |
-ROW   |35731       |20287         |20285       |
-ROW   |35732       |20315         |20313       |
-ROW   |35733       |20343         |20341       |
-ROW   |35734       |20371         |20369       |
-ROW   |35735       |20399         |20397       |
-ROW   |35736       |20427         |20425       |
-ROW   |35737       |20455         |20453       |
-ROW   |35738       |20483         |20481       |
-ROW   |35739       |20511         |20509       |
-ROW   |35740       |20539         |20537       |
-ROW   |35741       |20567         |20565       |
-ROW   |35742       |20595         |20593       |
-ROW   |35743       |20623         |20621       |
-ROW   |35744       |20651         |20649       |
-ROW   |35745       |20679         |20677       |
-ROW   |35746       |20707         |20705       |
-ROW   |35747       |20735         |20733       |
-ROW   |35748       |20763         |20761       |
-ROW   |35749       |20791         |20789       |
-ROW   |35750       |20819         |20817       |
-ROW   |35751       |20847         |20845       |
-ROW   |35752       |20875         |20873       |
-ROW   |35753       |20903         |20901       |
-ROW   |35754       |20931         |20929       |
-ROW   |35755       |20959         |20957       |
-ROW   |35756       |20987         |20985       |
-ROW   |35757       |21015         |21013       |
-ROW   |35758       |21043         |21041       |
-ROW   |35759       |21071         |21069       |
-ROW   |35760       |21099         |21097       |
-ROW   |35761       |21127         |21125       |
-ROW   |35762       |21155         |21153       |
-ROW   |35763       |16287         |16289       |
-ROW   |35764       |16279         |16285       |
-ROW   |35765       |16290         |16348       |
-ROW   |35766       |16291         |16349       |
-ROW   |35767       |16292         |16350       |
-ROW   |35768       |16293         |16351       |
-ROW   |35769       |16294         |16352       |
-ROW   |35770       |16295         |16353       |
-ROW   |35771       |16296         |16354       |
-ROW   |35772       |16297         |16355       |
-ROW   |35773       |16298         |16356       |
-ROW   |35774       |16299         |16357       |
-ROW   |35775       |16300         |16358       |
-ROW   |35776       |16301         |16359       |
-ROW   |35777       |16302         |16360       |
-ROW   |35778       |16303         |16361       |
-ROW   |35779       |16304         |16362       |
-ROW   |35780       |16305         |16363       |
-ROW   |35781       |16306         |16364       |
-ROW   |35782       |16307         |16365       |
-ROW   |35783       |16308         |16366       |
-ROW   |35784       |16309         |16367       |
-ROW   |35785       |16311         |16369       |
-ROW   |35786       |16312         |16370       |
-ROW   |35787       |16313         |16371       |
-ROW   |35788       |16314         |16372       |
-ROW   |35789       |16315         |16373       |
-ROW   |35790       |16316         |16374       |
-ROW   |35791       |16317         |16375       |
-ROW   |35792       |16318         |16376       |
-ROW   |35793       |16457         |16458       |
-ROW   |35794       |17927         |17928       |
-ROW   |35795       |18181         |18182       |
-ROW   |35796       |19673         |19674       |
-ROW   |35797       |19701         |19702       |
-ROW   |35798       |19729         |19730       |
-ROW   |35799       |19757         |19758       |
-ROW   |35800       |19785         |19786       |
-ROW   |35801       |19813         |19814       |
-ROW   |35802       |19841         |19842       |
-ROW   |35803       |19869         |19870       |
-ROW   |35804       |19897         |19898       |
-ROW   |35805       |19925         |19926       |
-ROW   |35806       |19953         |19954       |
-ROW   |35807       |19981         |19982       |
-ROW   |35808       |20009         |20010       |
-ROW   |35809       |20037         |20038       |
-ROW   |35810       |20065         |20066       |
-ROW   |35811       |20093         |20094       |
-ROW   |35812       |20121         |20122       |
-ROW   |35813       |20149         |20150       |
-ROW   |35814       |20177         |20178       |
-ROW   |35815       |20205         |20206       |
-ROW   |35816       |20233         |20234       |
-ROW   |35817       |20261         |20262       |
-ROW   |35818       |20289         |20290       |
-ROW   |35819       |20317         |20318       |
-ROW   |35820       |20345         |20346       |
-ROW   |35821       |20373         |20374       |
-ROW   |35822       |20401         |20402       |
-ROW   |35823       |20429         |20430       |
-ROW   |35824       |20457         |20458       |
-ROW   |35825       |20485         |20486       |
-ROW   |35826       |20513         |20514       |
-ROW   |35827       |20541         |20542       |
-ROW   |35828       |20569         |20570       |
-ROW   |35829       |20597         |20598       |
-ROW   |35830       |20625         |20626       |
-ROW   |35831       |20653         |20654       |
-ROW   |35832       |20681         |20682       |
-ROW   |35833       |20709         |20710       |
-ROW   |35834       |20737         |20738       |
-ROW   |35835       |20765         |20766       |
-ROW   |35836       |20793         |20794       |
-ROW   |35837       |20821         |20822       |
-ROW   |35838       |20849         |20850       |
-ROW   |35839       |20877         |20878       |
-ROW   |35840       |20905         |20906       |
-ROW   |35841       |20933         |20934       |
-ROW   |35842       |20961         |20962       |
-ROW   |35843       |20989         |20990       |
-ROW   |35844       |21017         |21018       |
-ROW   |35845       |21045         |21046       |
-ROW   |35846       |21073         |21074       |
-ROW   |35847       |21101         |21102       |
-ROW   |35848       |21129         |21130       |
-ROW   |35849       |21157         |21158       |
-ROW   |35850       |16289         |14293       |
-ROW   |35851       |16285         |14717       |
-ROW   |35852       |16348         |14311       |
-ROW   |35853       |16349         |14327       |
-ROW   |35854       |16350         |14347       |
-ROW   |35855       |16351         |14356       |
-ROW   |35856       |16352         |14389       |
-ROW   |35857       |16353         |14403       |
-ROW   |35858       |16354         |14451       |
-ROW   |35859       |16355         |14468       |
-ROW   |35860       |16356         |14486       |
-ROW   |35861       |16357         |14505       |
-ROW   |35862       |16358         |14534       |
-ROW   |35863       |16359         |14544       |
-ROW   |35864       |16360         |14582       |
-ROW   |35865       |16361         |14598       |
-ROW   |35866       |16362         |14615       |
-ROW   |35867       |16363         |14652       |
-ROW   |35868       |16364         |14673       |
-ROW   |35869       |16365         |14691       |
-ROW   |35870       |16366         |14704       |
-ROW   |35871       |16367         |14906       |
-ROW   |35872       |16369         |15220       |
-ROW   |35873       |16370         |15701       |
-ROW   |35874       |16371         |15723       |
-ROW   |35875       |16372         |15755       |
-ROW   |35876       |16373         |15819       |
-ROW   |35877       |16374         |15840       |
-ROW   |35878       |16375         |15990       |
-ROW   |35879       |16376         |16017       |
-ROW   |35880       |16458         |16453       |
-ROW   |35881       |17928         |17923       |
-ROW   |35882       |18182         |18177       |
-ROW   |35883       |19674         |19669       |
-ROW   |35884       |19702         |19697       |
-ROW   |35885       |19730         |19725       |
-ROW   |35886       |19758         |19753       |
-ROW   |35887       |19786         |19781       |
-ROW   |35888       |19814         |19809       |
-ROW   |35889       |19842         |19837       |
-ROW   |35890       |19870         |19865       |
-ROW   |35891       |19898         |19893       |
-ROW   |35892       |19926         |19921       |
-ROW   |35893       |19954         |19949       |
-ROW   |35894       |19982         |19977       |
-ROW   |35895       |20010         |20005       |
-ROW   |35896       |20038         |20033       |
-ROW   |35897       |20066         |20061       |
-ROW   |35898       |20094         |20089       |
-ROW   |35899       |20122         |20117       |
-ROW   |35900       |20150         |20145       |
-ROW   |35901       |20178         |20173       |
-ROW   |35902       |20206         |20201       |
-ROW   |35903       |20234         |20229       |
-ROW   |35904       |20262         |20257       |
-ROW   |35905       |20290         |20285       |
-ROW   |35906       |20318         |20313       |
-ROW   |35907       |20346         |20341       |
-ROW   |35908       |20374         |20369       |
-ROW   |35909       |20402         |20397       |
-ROW   |35910       |20430         |20425       |
-ROW   |35911       |20458         |20453       |
-ROW   |35912       |20486         |20481       |
-ROW   |35913       |20514         |20509       |
-ROW   |35914       |20542         |20537       |
-ROW   |35915       |20570         |20565       |
-ROW   |35916       |20598         |20593       |
-ROW   |35917       |20626         |20621       |
-ROW   |35918       |20654         |20649       |
-ROW   |35919       |20682         |20677       |
-ROW   |35920       |20710         |20705       |
-ROW   |35921       |20738         |20733       |
-ROW   |35922       |20766         |20761       |
-ROW   |35923       |20794         |20789       |
-ROW   |35924       |20822         |20817       |
-ROW   |35925       |20850         |20845       |
-ROW   |35926       |20878         |20873       |
-ROW   |35927       |20906         |20901       |
-ROW   |35928       |20934         |20929       |
-ROW   |35929       |20962         |20957       |
-ROW   |35930       |20990         |20985       |
-ROW   |35931       |21018         |21013       |
-ROW   |35932       |21046         |21041       |
-ROW   |35933       |21074         |21069       |
-ROW   |35934       |21102         |21097       |
-ROW   |35935       |21130         |21125       |
-ROW   |35936       |21158         |21153       |
-ROW   |35937       |16631         |16630       |
-ROW   |35938       |16640         |16636       |
-ROW   |35939       |16642         |16638       |
-ROW   |35940       |16643         |16639       |
-ROW   |35941       |15695         |16863       |
-ROW   |35942       |18242         |16863       |
-ROW   |35943       |18243         |16863       |
-ROW   |35944       |15694         |16868       |
-ROW   |35945       |15696         |16864       |
-ROW   |35946       |15697         |16865       |
-ROW   |35947       |18244         |16864       |
-ROW   |35948       |18245         |16865       |
-ROW   |35949       |18246         |16868       |
-ROW   |35950       |18247         |16864       |
-ROW   |35951       |18248         |16865       |
-ROW   |35952       |18249         |16868       |
-ROW   |35953       |15671         |16841       |
-ROW   |35954       |18250         |16841       |
-ROW   |35955       |18251         |16841       |
-ROW   |35956       |15672         |16842       |
-ROW   |35957       |15673         |16843       |
-ROW   |35958       |15674         |16844       |
-ROW   |35959       |15675         |16845       |
-ROW   |35960       |15676         |16846       |
-ROW   |35961       |15677         |16847       |
-ROW   |35962       |15678         |16848       |
-ROW   |35963       |15679         |16849       |
-ROW   |35964       |15680         |16850       |
-ROW   |35965       |15681         |16851       |
-ROW   |35966       |15682         |16852       |
-ROW   |35967       |15683         |16853       |
-ROW   |35968       |15684         |16854       |
-ROW   |35969       |15685         |16855       |
-ROW   |35970       |15686         |16856       |
-ROW   |35971       |15687         |16857       |
-ROW   |35972       |15689         |16858       |
-ROW   |35973       |15691         |16860       |
-ROW   |35974       |15708         |16861       |
-ROW   |35975       |15997         |16862       |
-ROW   |35976       |19677         |19678       |
-ROW   |35977       |19705         |19706       |
-ROW   |35978       |19733         |19734       |
-ROW   |35979       |19761         |19762       |
-ROW   |35980       |19789         |19790       |
-ROW   |35981       |19817         |19818       |
-ROW   |35982       |19845         |19846       |
-ROW   |35983       |19873         |19874       |
-ROW   |35984       |19901         |19902       |
-ROW   |35985       |19929         |19930       |
-ROW   |35986       |19957         |19958       |
-ROW   |35987       |19985         |19986       |
-ROW   |35988       |20013         |20014       |
-ROW   |35989       |20041         |20042       |
-ROW   |35990       |20069         |20070       |
-ROW   |35991       |20097         |20098       |
-ROW   |35992       |20125         |20126       |
-ROW   |35993       |20153         |20154       |
-ROW   |35994       |20181         |20182       |
-ROW   |35995       |20209         |20210       |
-ROW   |35996       |20237         |20238       |
-ROW   |35997       |20265         |20266       |
-ROW   |35998       |20293         |20294       |
-ROW   |35999       |20321         |20322       |
-ROW   |36000       |20349         |20350       |
-ROW   |36001       |20377         |20378       |
-ROW   |36002       |20405         |20406       |
-ROW   |36003       |20433         |20434       |
-ROW   |36004       |20461         |20462       |
-ROW   |36005       |20489         |20490       |
-ROW   |36006       |20517         |20518       |
-ROW   |36007       |20545         |20546       |
-ROW   |36008       |20573         |20574       |
-ROW   |36009       |20601         |20602       |
-ROW   |36010       |20629         |20630       |
-ROW   |36011       |20657         |20658       |
-ROW   |36012       |20685         |20686       |
-ROW   |36013       |20713         |20714       |
-ROW   |36014       |20741         |20742       |
-ROW   |36015       |20769         |20770       |
-ROW   |36016       |20797         |20798       |
-ROW   |36017       |20825         |20826       |
-ROW   |36018       |20853         |20854       |
-ROW   |36019       |20881         |20882       |
-ROW   |36020       |20909         |20910       |
-ROW   |36021       |20937         |20938       |
-ROW   |36022       |20965         |20966       |
-ROW   |36023       |20993         |20994       |
-ROW   |36024       |21021         |21022       |
-ROW   |36025       |21049         |21050       |
-ROW   |36026       |21077         |21078       |
-ROW   |36027       |21105         |21106       |
-ROW   |36028       |21133         |21134       |
-ROW   |36029       |21161         |21162       |
-ROW   |36030       |18252         |16842       |
-ROW   |36031       |18253         |16843       |
-ROW   |36032       |18254         |16844       |
-ROW   |36033       |18255         |16845       |
-ROW   |36034       |18256         |16846       |
-ROW   |36035       |18257         |16847       |
-ROW   |36036       |18258         |16848       |
-ROW   |36037       |18259         |16849       |
-ROW   |36038       |18260         |16850       |
-ROW   |36039       |18261         |16851       |
-ROW   |36040       |18262         |16852       |
-ROW   |36041       |18263         |16853       |
-ROW   |36042       |18264         |16854       |
-ROW   |36043       |18265         |16855       |
-ROW   |36044       |18266         |16856       |
-ROW   |36045       |18267         |16857       |
-ROW   |36046       |18268         |16858       |
-ROW   |36047       |18270         |16860       |
-ROW   |36048       |18271         |16861       |
-ROW   |36049       |18272         |16862       |
-ROW   |36050       |19676         |19678       |
-ROW   |36051       |19704         |19706       |
-ROW   |36052       |19732         |19734       |
-ROW   |36053       |19760         |19762       |
-ROW   |36054       |19788         |19790       |
-ROW   |36055       |19816         |19818       |
-ROW   |36056       |19844         |19846       |
-ROW   |36057       |19872         |19874       |
-ROW   |36058       |19900         |19902       |
-ROW   |36059       |19928         |19930       |
-ROW   |36060       |19956         |19958       |
-ROW   |36061       |19984         |19986       |
-ROW   |36062       |20012         |20014       |
-ROW   |36063       |20040         |20042       |
-ROW   |36064       |20068         |20070       |
-ROW   |36065       |20096         |20098       |
-ROW   |36066       |20124         |20126       |
-ROW   |36067       |20152         |20154       |
-ROW   |36068       |20180         |20182       |
-ROW   |36069       |20208         |20210       |
-ROW   |36070       |20236         |20238       |
-ROW   |36071       |20264         |20266       |
-ROW   |36072       |20292         |20294       |
-ROW   |36073       |20320         |20322       |
-ROW   |36074       |20348         |20350       |
-ROW   |36075       |20376         |20378       |
-ROW   |36076       |20404         |20406       |
-ROW   |36077       |20432         |20434       |
-ROW   |36078       |20460         |20462       |
-ROW   |36079       |20488         |20490       |
-ROW   |36080       |20516         |20518       |
-ROW   |36081       |20544         |20546       |
-ROW   |36082       |20572         |20574       |
-ROW   |36083       |20600         |20602       |
-ROW   |36084       |20628         |20630       |
-ROW   |36085       |20656         |20658       |
-ROW   |36086       |20684         |20686       |
-ROW   |36087       |20712         |20714       |
-ROW   |36088       |20740         |20742       |
-ROW   |36089       |20768         |20770       |
-ROW   |36090       |20796         |20798       |
-ROW   |36091       |20824         |20826       |
-ROW   |36092       |20852         |20854       |
-ROW   |36093       |20880         |20882       |
-ROW   |36094       |20908         |20910       |
-ROW   |36095       |20936         |20938       |
-ROW   |36096       |20964         |20966       |
-ROW   |36097       |20992         |20994       |
-ROW   |36098       |21020         |21022       |
-ROW   |36099       |21048         |21050       |
-ROW   |36100       |21076         |21078       |
-ROW   |36101       |21104         |21106       |
-ROW   |36102       |21132         |21134       |
-ROW   |36103       |21160         |21162       |
-ROW   |36104       |18273         |16842       |
-ROW   |36105       |18274         |16843       |
-ROW   |36106       |18275         |16844       |
-ROW   |36107       |18276         |16845       |
-ROW   |36108       |18277         |16846       |
-ROW   |36109       |18278         |16847       |
-ROW   |36110       |18279         |16848       |
-ROW   |36111       |18280         |16849       |
-ROW   |36112       |18281         |16850       |
-ROW   |36113       |18282         |16851       |
-ROW   |36114       |18283         |16852       |
-ROW   |36115       |18284         |16853       |
-ROW   |36116       |18285         |16854       |
-ROW   |36117       |18286         |16855       |
-ROW   |36118       |18287         |16856       |
-ROW   |36119       |18288         |16857       |
-ROW   |36120       |18289         |16858       |
-ROW   |36121       |18291         |16860       |
-ROW   |36122       |18292         |16861       |
-ROW   |36123       |18293         |16862       |
-ROW   |36124       |19675         |19678       |
-ROW   |36125       |19703         |19706       |
-ROW   |36126       |19731         |19734       |
-ROW   |36127       |19759         |19762       |
-ROW   |36128       |19787         |19790       |
-ROW   |36129       |19815         |19818       |
-ROW   |36130       |19843         |19846       |
-ROW   |36131       |19871         |19874       |
-ROW   |36132       |19899         |19902       |
-ROW   |36133       |19927         |19930       |
-ROW   |36134       |19955         |19958       |
-ROW   |36135       |19983         |19986       |
-ROW   |36136       |20011         |20014       |
-ROW   |36137       |20039         |20042       |
-ROW   |36138       |20067         |20070       |
-ROW   |36139       |20095         |20098       |
-ROW   |36140       |20123         |20126       |
-ROW   |36141       |20151         |20154       |
-ROW   |36142       |20179         |20182       |
-ROW   |36143       |20207         |20210       |
-ROW   |36144       |20235         |20238       |
-ROW   |36145       |20263         |20266       |
-ROW   |36146       |20291         |20294       |
-ROW   |36147       |20319         |20322       |
-ROW   |36148       |20347         |20350       |
-ROW   |36149       |20375         |20378       |
-ROW   |36150       |20403         |20406       |
-ROW   |36151       |20431         |20434       |
-ROW   |36152       |20459         |20462       |
-ROW   |36153       |20487         |20490       |
-ROW   |36154       |20515         |20518       |
-ROW   |36155       |20543         |20546       |
-ROW   |36156       |20571         |20574       |
-ROW   |36157       |20599         |20602       |
-ROW   |36158       |20627         |20630       |
-ROW   |36159       |20655         |20658       |
-ROW   |36160       |20683         |20686       |
-ROW   |36161       |20711         |20714       |
-ROW   |36162       |20739         |20742       |
-ROW   |36163       |20767         |20770       |
-ROW   |36164       |20795         |20798       |
-ROW   |36165       |20823         |20826       |
-ROW   |36166       |20851         |20854       |
-ROW   |36167       |20879         |20882       |
-ROW   |36168       |20907         |20910       |
-ROW   |36169       |20935         |20938       |
-ROW   |36170       |20963         |20966       |
-ROW   |36171       |20991         |20994       |
-ROW   |36172       |21019         |21022       |
-ROW   |36173       |21047         |21050       |
-ROW   |36174       |21075         |21078       |
-ROW   |36175       |21103         |21106       |
-ROW   |36176       |21131         |21134       |
-ROW   |36177       |21159         |21162       |
-ROW   |36178       |15698         |16866       |
-ROW   |36179       |18294         |16866       |
-ROW   |36180       |18295         |16866       |
-ROW   |36181       |16028         |16867       |
-ROW   |36182       |18296         |16867       |
-ROW   |36183       |18297         |16867       |
-ROW   |36184       |18100         |18099       |
-ROW   |36185       |18106         |18105       |
-ROW   |36186       |14318         |14319       |
-ROW   |36187       |17554         |15717       |
-ROW   |36188       |17555         |15717       |
-ROW   |36189       |17555         |17554       |
-ROW   |36190       |17556         |15717       |
-ROW   |36191       |17557         |15717       |
-ROW   |36192       |17557         |17556       |
-ROW   |36193       |17559         |17558       |
-ROW   |36194       |17561         |17560       |
-ROW   |36195       |17563         |17562       |
-ROW   |36196       |17565         |17564       |
-ROW   |36197       |15721         |15720       |
-ROW   |36198       |15394         |15393       |
-ROW   |36199       |15392         |15391       |
-ROW   |36200       |17322         |14339       |
-ROW   |36201       |15382         |15381       |
-ROW   |36202       |15380         |15379       |
-ROW   |36203       |16504         |16505       |
-ROW   |36204       |14372         |14373       |
-ROW   |36205       |15386         |15385       |
-ROW   |36206       |15384         |15383       |
-ROW   |36207       |14380         |14381       |
-ROW   |36208       |18299         |18298       |
-ROW   |36209       |18300         |18299       |
-ROW   |36210       |18300         |18298       |
-ROW   |36211       |18303         |18302       |
-ROW   |36212       |18309         |18308       |
-ROW   |36213       |18311         |18316       |
-ROW   |36214       |18312         |18316       |
-ROW   |36215       |18313         |18316       |
-ROW   |36216       |18314         |18316       |
-ROW   |36217       |18315         |18316       |
-ROW   |36218       |18319         |18318       |
-ROW   |36219       |18321         |18320       |
-ROW   |36220       |18323         |18322       |
-ROW   |36221       |18326         |18325       |
-ROW   |36222       |18327         |18326       |
-ROW   |36223       |18327         |18325       |
-ROW   |36224       |18330         |18329       |
-ROW   |36225       |18336         |18335       |
-ROW   |36226       |18338         |18343       |
-ROW   |36227       |18339         |18343       |
-ROW   |36228       |18340         |18343       |
-ROW   |36229       |18341         |18343       |
-ROW   |36230       |18342         |18343       |
-ROW   |36231       |18346         |18345       |
-ROW   |36232       |18348         |18347       |
-ROW   |36233       |18350         |18349       |
-ROW   |36234       |18353         |18352       |
-ROW   |36235       |18354         |18353       |
-ROW   |36236       |18354         |18352       |
-ROW   |36237       |18357         |18356       |
-ROW   |36238       |18363         |18362       |
-ROW   |36239       |18365         |18370       |
-ROW   |36240       |18366         |18370       |
-ROW   |36241       |18367         |18370       |
-ROW   |36242       |18368         |18370       |
-ROW   |36243       |18369         |18370       |
-ROW   |36244       |18373         |18372       |
-ROW   |36245       |18375         |18374       |
-ROW   |36246       |18377         |18376       |
-ROW   |36247       |18380         |18379       |
-ROW   |36248       |18381         |18380       |
-ROW   |36249       |18381         |18379       |
-ROW   |36250       |18384         |18383       |
-ROW   |36251       |18390         |18389       |
-ROW   |36252       |18392         |18397       |
-ROW   |36253       |18393         |18397       |
-ROW   |36254       |18394         |18397       |
-ROW   |36255       |18395         |18397       |
-ROW   |36256       |18396         |18397       |
-ROW   |36257       |18400         |18399       |
-ROW   |36258       |18402         |18401       |
-ROW   |36259       |18404         |18403       |
-ROW   |36260       |18407         |18406       |
-ROW   |36261       |18408         |18407       |
-ROW   |36262       |18408         |18406       |
-ROW   |36263       |18411         |18410       |
-ROW   |36264       |18417         |18416       |
-ROW   |36265       |18419         |18424       |
-ROW   |36266       |18420         |18424       |
-ROW   |36267       |18421         |18424       |
-ROW   |36268       |18422         |18424       |
-ROW   |36269       |18423         |18424       |
-ROW   |36270       |18427         |18426       |
-ROW   |36271       |18429         |18428       |
-ROW   |36272       |18431         |18430       |
-ROW   |36273       |15347         |15346       |
-ROW   |36274       |15345         |15344       |
-ROW   |36275       |17567         |17566       |
-ROW   |36276       |15363         |15360       |
-ROW   |36277       |15364         |15361       |
-ROW   |36278       |15365         |15362       |
-ROW   |36279       |15357         |15354       |
-ROW   |36280       |15358         |15355       |
-ROW   |36281       |15359         |15356       |
-ROW   |36282       |17571         |17568       |
-ROW   |36283       |17572         |17569       |
-ROW   |36284       |17573         |17570       |
-ROW   |36285       |15334         |15333       |
-ROW   |36286       |15332         |15331       |
-ROW   |36287       |14460         |14461       |
-ROW   |36288       |14476         |14477       |
-ROW   |36289       |14495         |14496       |
-ROW   |36290       |14511         |17574       |
-ROW   |36291       |19666         |19665       |
-ROW   |36292       |19667         |19668       |
-ROW   |36293       |14551         |14552       |
-ROW   |36294       |15374         |15373       |
-ROW   |36295       |15376         |15375       |
-ROW   |36296       |14914         |14915       |
-ROW   |36297       |14589         |14590       |
-ROW   |36298       |15338         |15337       |
-ROW   |36299       |17333         |17332       |
-ROW   |36300       |14624         |14625       |
-ROW   |36301       |18434         |18433       |
-ROW   |36302       |18435         |18434       |
-ROW   |36303       |18435         |18433       |
-ROW   |36304       |18438         |18439       |
-ROW   |36305       |18439         |18433       |
-ROW   |36306       |18441         |18444       |
-ROW   |36307       |18442         |18444       |
-ROW   |36308       |18443         |18444       |
-ROW   |36309       |18446         |18447       |
-ROW   |36310       |18450         |18449       |
-ROW   |36311       |19685         |19684       |
-ROW   |36312       |19688         |19687       |
-ROW   |36313       |19696         |19695       |
-ROW   |36314       |19713         |19712       |
-ROW   |36315       |19716         |19715       |
-ROW   |36316       |19724         |19723       |
-ROW   |36317       |19741         |19740       |
-ROW   |36318       |19744         |19743       |
-ROW   |36319       |19752         |19751       |
-ROW   |36320       |19769         |19768       |
-ROW   |36321       |19772         |19771       |
-ROW   |36322       |19780         |19779       |
-ROW   |36323       |19797         |19796       |
-ROW   |36324       |19800         |19799       |
-ROW   |36325       |19808         |19807       |
-ROW   |36326       |19825         |19824       |
-ROW   |36327       |19828         |19827       |
-ROW   |36328       |19836         |19835       |
-ROW   |36329       |19853         |19852       |
-ROW   |36330       |19856         |19855       |
-ROW   |36331       |19864         |19863       |
-ROW   |36332       |19881         |19880       |
-ROW   |36333       |19884         |19883       |
-ROW   |36334       |19892         |19891       |
-ROW   |36335       |19909         |19908       |
-ROW   |36336       |19912         |19911       |
-ROW   |36337       |19920         |19919       |
-ROW   |36338       |19937         |19936       |
-ROW   |36339       |19940         |19939       |
-ROW   |36340       |19948         |19947       |
-ROW   |36341       |19965         |19964       |
-ROW   |36342       |19968         |19967       |
-ROW   |36343       |19976         |19975       |
-ROW   |36344       |19993         |19992       |
-ROW   |36345       |19996         |19995       |
-ROW   |36346       |20004         |20003       |
-ROW   |36347       |20021         |20020       |
-ROW   |36348       |20024         |20023       |
-ROW   |36349       |20032         |20031       |
-ROW   |36350       |20049         |20048       |
-ROW   |36351       |20052         |20051       |
-ROW   |36352       |20060         |20059       |
-ROW   |36353       |20077         |20076       |
-ROW   |36354       |20080         |20079       |
-ROW   |36355       |20088         |20087       |
-ROW   |36356       |20105         |20104       |
-ROW   |36357       |20108         |20107       |
-ROW   |36358       |20116         |20115       |
-ROW   |36359       |20133         |20132       |
-ROW   |36360       |20136         |20135       |
-ROW   |36361       |20144         |20143       |
-ROW   |36362       |20161         |20160       |
-ROW   |36363       |20164         |20163       |
-ROW   |36364       |20172         |20171       |
-ROW   |36365       |20189         |20188       |
-ROW   |36366       |20192         |20191       |
-ROW   |36367       |20200         |20199       |
-ROW   |36368       |20217         |20216       |
-ROW   |36369       |20220         |20219       |
-ROW   |36370       |20228         |20227       |
-ROW   |36371       |20245         |20244       |
-ROW   |36372       |20248         |20247       |
-ROW   |36373       |20256         |20255       |
-ROW   |36374       |20273         |20272       |
-ROW   |36375       |20276         |20275       |
-ROW   |36376       |20284         |20283       |
-ROW   |36377       |20301         |20300       |
-ROW   |36378       |20304         |20303       |
-ROW   |36379       |20312         |20311       |
-ROW   |36380       |20329         |20328       |
-ROW   |36381       |20332         |20331       |
-ROW   |36382       |20340         |20339       |
-ROW   |36383       |20357         |20356       |
-ROW   |36384       |20360         |20359       |
-ROW   |36385       |20368         |20367       |
-ROW   |36386       |20385         |20384       |
-ROW   |36387       |20388         |20387       |
-ROW   |36388       |20396         |20395       |
-ROW   |36389       |20413         |20412       |
-ROW   |36390       |20416         |20415       |
-ROW   |36391       |20424         |20423       |
-ROW   |36392       |20441         |20440       |
-ROW   |36393       |20444         |20443       |
-ROW   |36394       |20452         |20451       |
-ROW   |36395       |20469         |20468       |
-ROW   |36396       |20472         |20471       |
-ROW   |36397       |20480         |20479       |
-ROW   |36398       |20497         |20496       |
-ROW   |36399       |20500         |20499       |
-ROW   |36400       |20508         |20507       |
-ROW   |36401       |20525         |20524       |
-ROW   |36402       |20528         |20527       |
-ROW   |36403       |20536         |20535       |
-ROW   |36404       |20553         |20552       |
-ROW   |36405       |20556         |20555       |
-ROW   |36406       |20564         |20563       |
-ROW   |36407       |20581         |20580       |
-ROW   |36408       |20584         |20583       |
-ROW   |36409       |20592         |20591       |
-ROW   |36410       |20609         |20608       |
-ROW   |36411       |20612         |20611       |
-ROW   |36412       |20620         |20619       |
-ROW   |36413       |20637         |20636       |
-ROW   |36414       |20640         |20639       |
-ROW   |36415       |20648         |20647       |
-ROW   |36416       |20665         |20664       |
-ROW   |36417       |20668         |20667       |
-ROW   |36418       |20676         |20675       |
-ROW   |36419       |20693         |20692       |
-ROW   |36420       |20696         |20695       |
-ROW   |36421       |20704         |20703       |
-ROW   |36422       |20721         |20720       |
-ROW   |36423       |20724         |20723       |
-ROW   |36424       |20732         |20731       |
-ROW   |36425       |20749         |20748       |
-ROW   |36426       |20752         |20751       |
-ROW   |36427       |20760         |20759       |
-ROW   |36428       |20777         |20776       |
-ROW   |36429       |20780         |20779       |
-ROW   |36430       |20788         |20787       |
-ROW   |36431       |20805         |20804       |
-ROW   |36432       |20808         |20807       |
-ROW   |36433       |20816         |20815       |
-ROW   |36434       |20833         |20832       |
-ROW   |36435       |20836         |20835       |
-ROW   |36436       |20844         |20843       |
-ROW   |36437       |20861         |20860       |
-ROW   |36438       |20864         |20863       |
-ROW   |36439       |20872         |20871       |
-ROW   |36440       |20889         |20888       |
-ROW   |36441       |20892         |20891       |
-ROW   |36442       |20900         |20899       |
-ROW   |36443       |20917         |20916       |
-ROW   |36444       |20920         |20919       |
-ROW   |36445       |20928         |20927       |
-ROW   |36446       |20945         |20944       |
-ROW   |36447       |20948         |20947       |
-ROW   |36448       |20956         |20955       |
-ROW   |36449       |20973         |20972       |
-ROW   |36450       |20976         |20975       |
-ROW   |36451       |20984         |20983       |
-ROW   |36452       |21001         |21000       |
-ROW   |36453       |21004         |21003       |
-ROW   |36454       |21012         |21011       |
-ROW   |36455       |21029         |21028       |
-ROW   |36456       |21032         |21031       |
-ROW   |36457       |21040         |21039       |
-ROW   |36458       |21057         |21056       |
-ROW   |36459       |21060         |21059       |
-ROW   |36460       |21068         |21067       |
-ROW   |36461       |21085         |21084       |
-ROW   |36462       |21088         |21087       |
-ROW   |36463       |21096         |21095       |
-ROW   |36464       |21113         |21112       |
-ROW   |36465       |21116         |21115       |
-ROW   |36466       |21124         |21123       |
-ROW   |36467       |21141         |21140       |
-ROW   |36468       |21144         |21143       |
-ROW   |36469       |21152         |21151       |
-ROW   |36470       |21169         |21168       |
-ROW   |36471       |21172         |21171       |
-ROW   |36472       |21180         |21179       |
-ROW   |36473       |14664         |14665       |
-ROW   |36474       |17085         |17086       |
-ROW   |36475       |16547         |16546       |
-ROW   |36476       |17576         |17575       |
-ROW   |36477       |17578         |17577       |
-ROW   |36478       |17628         |17626       |
-ROW   |36479       |17629         |17627       |
-ROW   |36480       |17632         |17630       |
-ROW   |36481       |17633         |17631       |
-ROW   |36482       |17635         |17634       |
-ROW   |36483       |17637         |17636       |
-ROW   |36484       |17686         |17684       |
-ROW   |36485       |17687         |17685       |
-ROW   |36486       |17690         |17688       |
-ROW   |36487       |17691         |17689       |
-ROW   |36488       |17693         |17692       |
-ROW   |36489       |17695         |17694       |
-ROW   |36490       |17730         |17728       |
-ROW   |36491       |17731         |17729       |
-ROW   |36492       |17734         |17732       |
-ROW   |36493       |17735         |17733       |
-ROW   |36494       |17737         |17736       |
-ROW   |36495       |17754         |17752       |
-ROW   |36496       |17755         |17753       |
-ROW   |36497       |17757         |17756       |
-ROW   |36498       |17819         |17817       |
-ROW   |36499       |17820         |17818       |
-ROW   |36500       |17823         |17821       |
-ROW   |36501       |17824         |17822       |
-ROW   |36502       |17826         |17825       |
-ROW   |36503       |17860         |17858       |
-ROW   |36504       |17861         |17859       |
-ROW   |36505       |17864         |17862       |
-ROW   |36506       |17865         |17863       |
-ROW   |36507       |17899         |17897       |
-ROW   |36508       |17900         |17898       |
-ROW   |36509       |17903         |17901       |
-ROW   |36510       |17904         |17902       |
-ROW   |36511       |17906         |17905       |
-ROW   |36512       |17908         |17907       |
-ROW   |36513       |17910         |17909       |
-ROW   |36514       |16551         |16552       |
-ROW   |36515       |16031         |16563       |
-ROW   |36516       |16045         |16564       |
-ROW   |36517       |16046         |16565       |
-ROW   |36518       |16039         |16040       |
-ROW   |36519       |16061         |16063       |
-ROW   |36520       |16062         |16064       |
-ROW   |36521       |16042         |16579       |
-ROW   |36522       |16067         |16580       |
-ROW   |36523       |16068         |16581       |
-ROW   |36524       |16041         |16042       |
-ROW   |36525       |16065         |16067       |
-ROW   |36526       |16066         |16068       |
-ROW   |36527       |16041         |16579       |
-ROW   |36528       |16065         |16580       |
-ROW   |36529       |16066         |16581       |
-ROW   |36530       |18132         |18452       |
-ROW   |36531       |18135         |18453       |
-ROW   |36532       |18138         |18454       |
-ROW   |36533       |18130         |18132       |
-ROW   |36534       |18133         |18135       |
-ROW   |36535       |18136         |18138       |
-ROW   |36536       |18130         |18452       |
-ROW   |36537       |18133         |18453       |
-ROW   |36538       |18136         |18454       |
-ROW   |36539       |16070         |16069       |
-ROW   |36540       |16072         |16071       |
-ROW   |36541       |16076         |17024       |
-ROW   |36542       |18455         |17024       |
-ROW   |36543       |16079         |16077       |
-ROW   |36544       |16080         |16078       |
-ROW   |36545       |16083         |16081       |
-ROW   |36546       |16084         |16082       |
-ROW   |36547       |16091         |17026       |
-ROW   |36548       |16092         |17028       |
-ROW   |36549       |18456         |17026       |
-ROW   |36550       |18457         |17028       |
-ROW   |36551       |17244         |17243       |
-ROW   |36552       |17257         |17256       |
-ROW   |36553       |17246         |17240       |
-ROW   |36554       |17259         |17253       |
-ROW   |36555       |17249         |17247       |
-ROW   |36556       |17262         |17260       |
-ROW   |36557       |17251         |17249       |
-ROW   |36558       |17264         |17262       |
-ROW   |36559       |17251         |17247       |
-ROW   |36560       |17264         |17260       |
-ROW   |36561       |18144         |18458       |
-ROW   |36562       |18147         |18459       |
-ROW   |36563       |18142         |18144       |
-ROW   |36564       |18145         |18147       |
-ROW   |36565       |18142         |18458       |
-ROW   |36566       |18145         |18459       |
-ROW   |36567       |17268         |17267       |
-ROW   |36568       |17270         |17269       |
-ROW   |36569       |17271         |17273       |
-ROW   |36570       |18460         |17273       |
-ROW   |36571       |17276         |17275       |
-ROW   |36572       |17278         |17277       |
-ROW   |36573       |17279         |17281       |
-ROW   |36574       |18461         |17281       |
-ROW   |36575       |16141         |16142       |
-ROW   |36576       |16146         |16573       |
-ROW   |36577       |16143         |16584       |
-ROW   |36578       |18152         |18462       |
-ROW   |36579       |18150         |18152       |
-ROW   |36580       |18150         |18462       |
-ROW   |36581       |16152         |16883       |
-ROW   |36582       |16153         |16883       |
-ROW   |36583       |18463         |16883       |
-ROW   |36584       |18464         |16883       |
-ROW   |36585       |16156         |16155       |
-ROW   |36586       |16158         |16157       |
-ROW   |36587       |18157         |18156       |
-ROW   |36588       |18160         |18159       |
-ROW   |36589       |18155         |18157       |
-ROW   |36590       |18158         |18160       |
-ROW   |36591       |18155         |18156       |
-ROW   |36592       |18158         |18159       |
-ROW   |36593       |16009         |16008       |
-ROW   |36594       |16011         |16010       |
-ROW   |36595       |16014         |16013       |
-ROW   |36596       |16016         |16015       |
-ROW   |36597       |16161         |16160       |
-ROW   |36598       |16172         |16171       |
-ROW   |36599       |16162         |16161       |
-ROW   |36600       |16173         |16172       |
-ROW   |36601       |16162         |16160       |
-ROW   |36602       |16173         |16171       |
-ROW   |36603       |16166         |18162       |
-ROW   |36604       |16177         |18164       |
-ROW   |36605       |16167         |18162       |
-ROW   |36606       |16178         |18164       |
-ROW   |36607       |17035         |16160       |
-ROW   |36608       |17037         |16171       |
-ROW   |36609       |18161         |18162       |
-ROW   |36610       |18163         |18164       |
-ROW   |36611       |16183         |16182       |
-ROW   |36612       |17911         |17042       |
-ROW   |36613       |18465         |17042       |
-ROW   |36614       |18466         |17042       |
-ROW   |36615       |17043         |17912       |
-ROW   |36616       |17043         |17913       |
-ROW   |36617       |16190         |16189       |
-ROW   |36618       |17914         |17047       |
-ROW   |36619       |18467         |17047       |
-ROW   |36620       |18468         |17047       |
-ROW   |36621       |17048         |17915       |
-ROW   |36622       |17048         |17916       |
-ROW   |36623       |17285         |17287       |
-ROW   |36624       |17296         |17298       |
-ROW   |36625       |17286         |17285       |
-ROW   |36626       |17297         |17296       |
-ROW   |36627       |17286         |17287       |
-ROW   |36628       |17297         |17298       |
-ROW   |36629       |17291         |18170       |
-ROW   |36630       |17302         |18172       |
-ROW   |36631       |17292         |18170       |
-ROW   |36632       |17303         |18172       |
-ROW   |36633       |17283         |17287       |
-ROW   |36634       |17294         |17298       |
-ROW   |36635       |18169         |18170       |
-ROW   |36636       |18171         |18172       |
-ROW   |36637       |17306         |17305       |
-ROW   |36638       |17917         |17310       |
-ROW   |36639       |18469         |17310       |
-ROW   |36640       |18470         |17310       |
-ROW   |36641       |17311         |17918       |
-ROW   |36642       |17311         |17919       |
-ROW   |36643       |17314         |17313       |
-ROW   |36644       |17920         |17318       |
-ROW   |36645       |18471         |17318       |
-ROW   |36646       |18472         |17318       |
-ROW   |36647       |17319         |17921       |
-ROW   |36648       |17319         |17922       |
-ROW   |36649       |18596         |18597       |
-ROW   |36650       |18629         |18630       |
-ROW   |36651       |18662         |18663       |
-ROW   |36652       |18695         |18696       |
-ROW   |36653       |18728         |18729       |
-ROW   |36654       |18947         |18948       |
-ROW   |36655       |18794         |18795       |
-ROW   |36656       |18495         |18496       |
-ROW   |36657       |18831         |18832       |
-ROW   |36658       |18864         |18865       |
-ROW   |36659       |18897         |18898       |
-ROW   |36660       |16772         |16773       |
-ROW   |36661       |16771         |16772       |
-ROW   |36662       |16771         |16773       |
-ROW   |36663       |16769         |16770       |
-ROW   |36664       |16768         |16769       |
-ROW   |36665       |16768         |16770       |
-ROW   |36666       |19230         |19231       |
-ROW   |36667       |19233         |19232       |
-ROW   |36668       |19235         |19234       |
-ROW   |36669       |19236         |19234       |
-ROW   |36670       |19236         |19235       |
-ROW   |36671       |19238         |19237       |
-ROW   |36672       |19239         |19240       |
-ROW   |36673       |19242         |19243       |
-ROW   |36674       |19245         |19244       |
-ROW   |36675       |19247         |19246       |
-ROW   |36676       |19249         |19250       |
-ROW   |36677       |19249         |19252       |
-ROW   |36678       |19249         |19248       |
-ROW   |36679       |19249         |19254       |
-ROW   |36680       |19251         |19250       |
-ROW   |36681       |19251         |19252       |
-ROW   |36682       |19251         |19248       |
-ROW   |36683       |19251         |19254       |
-ROW   |36684       |19253         |19250       |
-ROW   |36685       |19253         |19252       |
-ROW   |36686       |19253         |19248       |
-ROW   |36687       |19253         |19254       |
-ROW   |36688       |19255         |19250       |
-ROW   |36689       |19255         |19252       |
-ROW   |36690       |19255         |19248       |
-ROW   |36691       |19255         |19254       |
-ROW   |36692       |19258         |19257       |
-ROW   |36693       |16488         |16487       |
-ROW   |36694       |16485         |16484       |
-ROW   |36695       |16486         |16484       |
-ROW   |36696       |16486         |16485       |
-ROW   |36697       |16480         |16479       |
-ROW   |36698       |16482         |16481       |
-ROW   |36699       |16475         |16474       |
-ROW   |36700       |16471         |16472       |
-ROW   |36701       |16468         |16469       |
-ROW   |36702       |16459         |16460       |
-ROW   |36703       |16462         |16463       |
-ROW   |36704       |16465         |16466       |
-ROW   |36705       |16477         |16476       |
-ROW   |36706       |19263         |19262       |
-ROW   |36707       |19266         |19265       |
-ROW   |36708       |19268         |19267       |
-ROW   |36709       |19270         |19269       |
-ROW   |36710       |19272         |19271       |
-ROW   |36711       |19276         |19275       |
-ROW   |36712       |19278         |19277       |
-ROW   |36713       |19280         |19279       |
-ROW   |36714       |19282         |19281       |
-ROW   |36715       |19288         |19287       |
-ROW   |36716       |19293         |19292       |
-ROW   |36717       |19294         |19292       |
-ROW   |36718       |19294         |19293       |
-ROW   |36719       |19295         |19296       |
-ROW   |36720       |19297         |19295       |
-ROW   |36721       |19297         |19296       |
-ROW   |36722       |19299         |19298       |
-ROW   |36723       |19301         |19302       |
-ROW   |36724       |19303         |19302       |
-ROW   |36725       |19305         |19304       |
-ROW   |36726       |19307         |19306       |
-ROW   |36727       |19308         |19306       |
-ROW   |36728       |19308         |19307       |
-ROW   |36729       |19310         |19309       |
-ROW   |36730       |19314         |19313       |
-ROW   |36731       |19317         |19316       |
-ROW   |36732       |19319         |19318       |
-ROW   |36733       |19321         |19320       |
-ROW   |36734       |19323         |19322       |
-ROW   |36735       |19327         |19326       |
-ROW   |36736       |19329         |19328       |
-ROW   |36737       |19331         |19330       |
-ROW   |36738       |19333         |19332       |
-ROW   |36739       |19339         |19338       |
-ROW   |36740       |19344         |19343       |
-ROW   |36741       |19345         |19343       |
-ROW   |36742       |19345         |19344       |
-ROW   |36743       |19346         |19347       |
-ROW   |36744       |19348         |19346       |
-ROW   |36745       |19348         |19347       |
-ROW   |36746       |19350         |19349       |
-ROW   |36747       |19352         |19353       |
-ROW   |36748       |19354         |19353       |
-ROW   |36749       |19356         |19355       |
-ROW   |36750       |19358         |19357       |
-ROW   |36751       |19359         |19357       |
-ROW   |36752       |19359         |19358       |
-ROW   |36753       |19361         |19360       |
-ROW   |36754       |19365         |19364       |
-ROW   |36755       |19368         |19367       |
-ROW   |36756       |19370         |19369       |
-ROW   |36757       |19372         |19371       |
-ROW   |36758       |19374         |19373       |
-ROW   |36759       |19378         |19377       |
-ROW   |36760       |19380         |19379       |
-ROW   |36761       |19382         |19381       |
-ROW   |36762       |19384         |19383       |
-ROW   |36763       |19390         |19389       |
-ROW   |36764       |19395         |19394       |
-ROW   |36765       |19396         |19394       |
-ROW   |36766       |19396         |19395       |
-ROW   |36767       |19397         |19398       |
-ROW   |36768       |19399         |19397       |
-ROW   |36769       |19399         |19398       |
-ROW   |36770       |19401         |19400       |
-ROW   |36771       |19403         |19404       |
-ROW   |36772       |19405         |19404       |
-ROW   |36773       |19407         |19406       |
-ROW   |36774       |19409         |19408       |
-ROW   |36775       |19410         |19408       |
-ROW   |36776       |19410         |19409       |
-ROW   |36777       |19412         |19411       |
-ROW   |36778       |19416         |19415       |
-ROW   |36779       |19419         |19418       |
-ROW   |36780       |19421         |19420       |
-ROW   |36781       |19423         |19422       |
-ROW   |36782       |19425         |19424       |
-ROW   |36783       |19429         |19428       |
-ROW   |36784       |19431         |19430       |
-ROW   |36785       |19433         |19432       |
-ROW   |36786       |19435         |19434       |
-ROW   |36787       |19441         |19440       |
-ROW   |36788       |19446         |19445       |
-ROW   |36789       |19447         |19445       |
-ROW   |36790       |19447         |19446       |
-ROW   |36791       |19448         |19449       |
-ROW   |36792       |19450         |19448       |
-ROW   |36793       |19450         |19449       |
-ROW   |36794       |19452         |19451       |
-ROW   |36795       |19454         |19455       |
-ROW   |36796       |19456         |19455       |
-ROW   |36797       |19458         |19457       |
-ROW   |36798       |19460         |19459       |
-ROW   |36799       |19461         |19459       |
-ROW   |36800       |19461         |19460       |
-ROW   |36801       |19463         |19462       |
-ROW   |36802       |15729         |15728       |
-ROW   |36803       |15730         |15728       |
-ROW   |36804       |15730         |15729       |
-ROW   |36805       |15752         |15754       |
-ROW   |36806       |15753         |15754       |
-ROW   |36807       |15753         |15752       |
-ROW   |36808       |15742         |15741       |
-ROW   |36809       |15750         |15749       |
-ROW   |36810       |15751         |15750       |
-ROW   |36811       |15751         |15749       |
-ROW   |36812       |15746         |15743       |
-ROW   |36813       |15744         |15743       |
-ROW   |36814       |15740         |15739       |
-ROW   |36815       |17946         |17945       |
-ROW   |36816       |17948         |17947       |
-ROW   |36817       |15748         |15747       |
-ROW   |36818       |19467         |19466       |
-ROW   |36819       |19471         |19470       |
-ROW   |36820       |19473         |19472       |
-ROW   |36821       |19474         |19472       |
-ROW   |36822       |19474         |19473       |
-ROW   |36823       |19476         |19475       |
-ROW   |36824       |19478         |19477       |
-ROW   |36825       |19480         |19479       |
-ROW   |36826       |19482         |19483       |
-ROW   |36827       |19484         |19483       |
-ROW   |36828       |19486         |19485       |
-ROW   |36829       |19509         |19508       |
-ROW   |36830       |19513         |19512       |
-ROW   |36831       |19517         |19516       |
-ROW   |36832       |19519         |19518       |
-ROW   |36833       |19520         |19518       |
-ROW   |36834       |19520         |19519       |
-ROW   |36835       |19522         |19521       |
-ROW   |36836       |19524         |19523       |
-ROW   |36837       |19526         |19525       |
-ROW   |36838       |19528         |19529       |
-ROW   |36839       |19530         |19529       |
-ROW   |36840       |19532         |19531       |
-ROW   |36841       |19555         |19554       |
-ROW   |36842       |19559         |19558       |
-ROW   |36843       |19563         |19562       |
-ROW   |36844       |19565         |19564       |
-ROW   |36845       |19566         |19564       |
-ROW   |36846       |19566         |19565       |
-ROW   |36847       |19568         |19567       |
-ROW   |36848       |19570         |19569       |
-ROW   |36849       |19572         |19571       |
-ROW   |36850       |19574         |19575       |
-ROW   |36851       |19576         |19575       |
-ROW   |36852       |19578         |19577       |
-ROW   |36853       |19601         |19600       |
-ROW   |36854       |19605         |19604       |
-ROW   |36855       |19609         |19608       |
-ROW   |36856       |19611         |19610       |
-ROW   |36857       |19612         |19610       |
-ROW   |36858       |19612         |19611       |
-ROW   |36859       |19614         |19613       |
-ROW   |36860       |19616         |19615       |
-ROW   |36861       |19618         |19617       |
-ROW   |36862       |19620         |19621       |
-ROW   |36863       |19622         |19621       |
-ROW   |36864       |19624         |19623       |
-ROW   |36865       |19647         |19646       |
-ROW   |36866       |16440         |16439       |
-ROW   |36867       |18003         |15790       |
-ROW   |36868       |18004         |15787       |
-ROW   |36869       |18005         |15787       |
-ROW   |36870       |18005         |18004       |
-ROW   |36871       |15786         |15785       |
-ROW   |36872       |15784         |15783       |
-ROW   |36873       |15794         |15792       |
-ROW   |36874       |15793         |15792       |
-ROW   |36875       |15782         |15781       |
-ROW   |36876       |15797         |15796       |
-ROW   |36877       |15825         |15824       |
-ROW   |36878       |15826         |15824       |
-ROW   |36879       |15826         |15825       |
-ROW   |36880       |15828         |15829       |
-ROW   |36881       |15831         |15832       |
-ROW   |36882       |15834         |15835       |
-ROW   |36883       |15845         |15846       |
-ROW   |36884       |17223         |17227       |
-ROW   |36885       |17226         |17227       |
+ROW   |36886       |17412         |17411       |
+ROW   |36887       |17414         |17413       |
+ROW   |36888       |17416         |17415       |
+ROW   |36889       |15944         |15947       |
+ROW   |36890       |15944         |15943       |
+ROW   |36891       |15943         |15947       |
+ROW   |36892       |16888         |15947       |
+ROW   |36893       |16888         |15943       |
+ROW   |36894       |15948         |15949       |
+ROW   |36895       |15950         |15949       |
+ROW   |36896       |17429         |17428       |
+ROW   |36897       |17431         |17430       |
+ROW   |36898       |17433         |17432       |
+ROW   |36899       |17355         |17354       |
+ROW   |36900       |17358         |17357       |
+ROW   |36901       |18960         |18962       |
+ROW   |36902       |16743         |16744       |
+ROW   |36903       |16784         |16785       |
+ROW   |36904       |16790         |16791       |
+ROW   |36905       |16892         |16900       |
+ROW   |36906       |16894         |16900       |
+ROW   |36907       |17459         |17458       |
+ROW   |36908       |17463         |17458       |
+ROW   |36909       |17471         |17480       |
+ROW   |36910       |17476         |17481       |
+ROW   |36911       |17478         |17480       |
+ROW   |36912       |17479         |17481       |
+ROW   |36913       |17483         |17482       |
+ROW   |36914       |17486         |17485       |
+ROW   |36915       |16646         |16647       |
+ROW   |36916       |18965         |16660       |
+ROW   |36917       |16809         |16810       |
+ROW   |36918       |18966         |16677       |
+ROW   |36919       |16902         |16904       |
+ROW   |36920       |16904         |16905       |
+ROW   |36921       |16909         |16906       |
+ROW   |36922       |16910         |16912       |
+ROW   |36923       |16912         |16913       |
+ROW   |36924       |16917         |16914       |
+ROW   |36925       |17962         |17963       |
+ROW   |36926       |17962         |17958       |
+ROW   |36927       |16752         |16753       |
+ROW   |36928       |15955         |15957       |
+ROW   |36929       |15955         |15954       |
+ROW   |36930       |15954         |15957       |
+ROW   |36931       |15956         |15957       |
+ROW   |36932       |15956         |15954       |
+ROW   |36933       |16678         |15957       |
+ROW   |36934       |16678         |15954       |
+ROW   |36935       |15961         |15960       |
+ROW   |36936       |15962         |15960       |
+ROW   |36937       |16679         |15960       |
+ROW   |36938       |17090         |17096       |
+ROW   |36939       |17093         |17096       |
+ROW   |36940       |17101         |17098       |
+ROW   |36941       |16257         |16255       |
+ROW   |36942       |16257         |16256       |
+ROW   |36943       |16256         |16255       |
+ROW   |36944       |16251         |16255       |
+ROW   |36945       |16251         |16256       |
+ROW   |36946       |16443         |16255       |
+ROW   |36947       |16443         |16256       |
+ROW   |36948       |16270         |16269       |
+ROW   |36949       |16448         |16269       |
+ROW   |36950       |16265         |16269       |
+ROW   |36951       |17503         |17505       |
+ROW   |36952       |17512         |17511       |
+ROW   |36953       |17513         |17505       |
+ROW   |36959       |17516         |17518       |
+ROW   |36960       |17517         |17516       |
+ROW   |36961       |17517         |17518       |
+ROW   |36962       |17517         |17519       |
+ROW   |36963       |17519         |17518       |
+ROW   |36964       |18918         |18917       |
+ROW   |36965       |17973         |17965       |
+ROW   |36966       |17974         |17966       |
+ROW   |36967       |17141         |17151       |
+ROW   |36968       |17142         |17141       |
+ROW   |36969       |17142         |17151       |
+ROW   |36970       |17143         |17151       |
+ROW   |36971       |17144         |17143       |
+ROW   |36972       |17144         |17151       |
+ROW   |36973       |17146         |17145       |
+ROW   |36974       |17147         |17151       |
+ROW   |36975       |17148         |17147       |
+ROW   |36976       |17148         |17151       |
+ROW   |36977       |17150         |17149       |
+ROW   |36978       |17152         |17168       |
+ROW   |36979       |17153         |17152       |
+ROW   |36980       |17153         |17168       |
+ROW   |36981       |17154         |17168       |
+ROW   |36982       |17155         |17154       |
+ROW   |36983       |17155         |17168       |
+ROW   |36984       |17156         |17168       |
+ROW   |36985       |17157         |17156       |
+ROW   |36986       |17157         |17168       |
+ROW   |36987       |17158         |17168       |
+ROW   |36988       |17159         |17158       |
+ROW   |36989       |17159         |17168       |
+ROW   |36990       |17160         |17168       |
+ROW   |36991       |17161         |17160       |
+ROW   |36992       |17161         |17168       |
+ROW   |36993       |17163         |17162       |
+ROW   |36994       |17164         |17168       |
+ROW   |36995       |17165         |17164       |
+ROW   |36996       |17165         |17168       |
+ROW   |36997       |17166         |17168       |
+ROW   |36998       |17167         |17166       |
+ROW   |36999       |17167         |17168       |
+ROW   |37000       |17169         |17168       |
+ROW   |37001       |17170         |17168       |
+ROW   |37002       |17170         |17169       |
+ROW   |37003       |17171         |17168       |
+ROW   |37004       |17172         |17168       |
+ROW   |37005       |17172         |17171       |
+ROW   |37006       |17540         |17541       |
+ROW   |37007       |16833         |16920       |
+ROW   |37008       |16920         |16921       |
+ROW   |37009       |18987         |18986       |
+ROW   |37010       |18989         |18988       |
+ROW   |37011       |18993         |18992       |
+ROW   |37012       |18994         |18992       |
+ROW   |37013       |19009         |19010       |
+ROW   |37014       |17978         |17977       |
+ROW   |37015       |17980         |17979       |
+ROW   |37016       |17984         |17983       |
+ROW   |37017       |17985         |17983       |
+ROW   |37018       |18000         |18001       |
+ROW   |37019       |18225         |18224       |
+ROW   |37020       |18237         |18236       |
+ROW   |37021       |16929         |16928       |
+ROW   |37022       |16940         |17084       |
+ROW   |37023       |18537         |18536       |
+ROW   |37024       |18539         |18538       |
+ROW   |37025       |18541         |18540       |
+ROW   |37026       |16719         |16721       |
+ROW   |37027       |16975         |16723       |
+ROW   |37028       |16729         |16728       |
+ROW   |37029       |16730         |16728       |
+ROW   |37030       |16756         |16758       |
+ROW   |37031       |16979         |16759       |
+ROW   |37032       |16765         |16764       |
+ROW   |37033       |16766         |16764       |
+ROW   |37034       |16734         |16736       |
+ROW   |37035       |16983         |16732       |
+ROW   |37036       |16741         |16740       |
+ROW   |37037       |16742         |16740       |
+ROW   |37038       |17192         |17191       |
+ROW   |37039       |17194         |17195       |
+ROW   |37040       |17199         |17198       |
+ROW   |37041       |17546         |17545       |
+ROW   |37042       |17547         |17548       |
+ROW   |37043       |16997         |16984       |
+ROW   |37044       |17002         |17003       |
+ROW   |37045       |17006         |17005       |
+ROW   |37046       |17011         |17010       |
+ROW   |37047       |17550         |17549       |
+ROW   |37048       |17551         |17552       |
+ROW   |37049       |17391         |17396       |
+ROW   |37050       |17395         |17396       |
+ROW   |37051       |16683         |16687       |
+ROW   |37052       |14252         |14251       |
+ROW   |37053       |14294         |14293       |
+ROW   |37054       |14312         |14311       |
+ROW   |37055       |14328         |14327       |
+ROW   |37056       |14348         |14347       |
+ROW   |37057       |14357         |14356       |
+ROW   |37058       |14390         |14389       |
+ROW   |37059       |14404         |14403       |
+ROW   |37060       |14452         |14451       |
+ROW   |37061       |14469         |14468       |
+ROW   |37062       |14487         |14486       |
+ROW   |37063       |14506         |14505       |
+ROW   |37064       |14535         |14534       |
+ROW   |37065       |14545         |14544       |
+ROW   |37066       |14583         |14582       |
+ROW   |37067       |14599         |14598       |
+ROW   |37068       |14616         |14615       |
+ROW   |37069       |14653         |14652       |
+ROW   |37070       |14674         |14673       |
+ROW   |37071       |14692         |14691       |
+ROW   |37072       |14705         |14704       |
+ROW   |37073       |14718         |14717       |
+ROW   |37074       |14907         |14906       |
+ROW   |37075       |15221         |15220       |
+ROW   |37076       |15702         |15701       |
+ROW   |37077       |15724         |15723       |
+ROW   |37078       |15756         |15755       |
+ROW   |37079       |15820         |15819       |
+ROW   |37080       |15841         |15840       |
+ROW   |37081       |15991         |15990       |
+ROW   |37082       |16018         |16017       |
+ROW   |37083       |16454         |16453       |
+ROW   |37084       |17924         |17923       |
+ROW   |37085       |18178         |18177       |
+ROW   |37086       |19670         |19669       |
+ROW   |37087       |19698         |19697       |
+ROW   |37088       |19726         |19725       |
+ROW   |37089       |19754         |19753       |
+ROW   |37090       |19782         |19781       |
+ROW   |37091       |19810         |19809       |
+ROW   |37092       |19838         |19837       |
+ROW   |37093       |19866         |19865       |
+ROW   |37094       |19894         |19893       |
+ROW   |37095       |19922         |19921       |
+ROW   |37096       |19950         |19949       |
+ROW   |37097       |19978         |19977       |
+ROW   |37098       |20006         |20005       |
+ROW   |37099       |20034         |20033       |
+ROW   |37100       |20062         |20061       |
+ROW   |37101       |20090         |20089       |
+ROW   |37102       |20118         |20117       |
+ROW   |37103       |20146         |20145       |
+ROW   |37104       |20174         |20173       |
+ROW   |37105       |20202         |20201       |
+ROW   |37106       |20230         |20229       |
+ROW   |37107       |20258         |20257       |
+ROW   |37108       |20286         |20285       |
+ROW   |37109       |20314         |20313       |
+ROW   |37110       |20342         |20341       |
+ROW   |37111       |20370         |20369       |
+ROW   |37112       |20398         |20397       |
+ROW   |37113       |20426         |20425       |
+ROW   |37114       |20454         |20453       |
+ROW   |37115       |20482         |20481       |
+ROW   |37116       |20510         |20509       |
+ROW   |37117       |20538         |20537       |
+ROW   |37118       |20566         |20565       |
+ROW   |37119       |20594         |20593       |
+ROW   |37120       |20622         |20621       |
+ROW   |37121       |20650         |20649       |
+ROW   |37122       |20678         |20677       |
+ROW   |37123       |20706         |20705       |
+ROW   |37124       |20734         |20733       |
+ROW   |37125       |20762         |20761       |
+ROW   |37126       |20790         |20789       |
+ROW   |37127       |20818         |20817       |
+ROW   |37128       |20846         |20845       |
+ROW   |37129       |20874         |20873       |
+ROW   |37130       |20902         |20901       |
+ROW   |37131       |20930         |20929       |
+ROW   |37132       |20958         |20957       |
+ROW   |37133       |20986         |20985       |
+ROW   |37134       |21014         |21013       |
+ROW   |37135       |21042         |21041       |
+ROW   |37136       |21070         |21069       |
+ROW   |37137       |21098         |21097       |
+ROW   |37138       |21126         |21125       |
+ROW   |37139       |21154         |21153       |
+ROW   |37140       |14253         |14252       |
+ROW   |37141       |14295         |14294       |
+ROW   |37142       |14313         |14312       |
+ROW   |37143       |14329         |14328       |
+ROW   |37144       |14349         |14348       |
+ROW   |37145       |14358         |14357       |
+ROW   |37146       |14391         |14390       |
+ROW   |37147       |14405         |14404       |
+ROW   |37148       |14453         |14452       |
+ROW   |37149       |14470         |14469       |
+ROW   |37150       |14488         |14487       |
+ROW   |37151       |14507         |14506       |
+ROW   |37152       |14536         |14535       |
+ROW   |37153       |14546         |14545       |
+ROW   |37154       |14584         |14583       |
+ROW   |37155       |14600         |14599       |
+ROW   |37156       |14617         |14616       |
+ROW   |37157       |14654         |14653       |
+ROW   |37158       |14675         |14674       |
+ROW   |37159       |14693         |14692       |
+ROW   |37160       |14706         |14705       |
+ROW   |37161       |14719         |14718       |
+ROW   |37162       |14908         |14907       |
+ROW   |37163       |15222         |15221       |
+ROW   |37164       |15703         |15702       |
+ROW   |37165       |15725         |15724       |
+ROW   |37166       |15757         |15756       |
+ROW   |37167       |15821         |15820       |
+ROW   |37168       |15842         |15841       |
+ROW   |37169       |15992         |15991       |
+ROW   |37170       |16019         |16018       |
+ROW   |37171       |16455         |16454       |
+ROW   |37172       |17925         |17924       |
+ROW   |37173       |18179         |18178       |
+ROW   |37174       |19671         |19670       |
+ROW   |37175       |19699         |19698       |
+ROW   |37176       |19727         |19726       |
+ROW   |37177       |19755         |19754       |
+ROW   |37178       |19783         |19782       |
+ROW   |37179       |19811         |19810       |
+ROW   |37180       |19839         |19838       |
+ROW   |37181       |19867         |19866       |
+ROW   |37182       |19895         |19894       |
+ROW   |37183       |19923         |19922       |
+ROW   |37184       |19951         |19950       |
+ROW   |37185       |19979         |19978       |
+ROW   |37186       |20007         |20006       |
+ROW   |37187       |20035         |20034       |
+ROW   |37188       |20063         |20062       |
+ROW   |37189       |20091         |20090       |
+ROW   |37190       |20119         |20118       |
+ROW   |37191       |20147         |20146       |
+ROW   |37192       |20175         |20174       |
+ROW   |37193       |20203         |20202       |
+ROW   |37194       |20231         |20230       |
+ROW   |37195       |20259         |20258       |
+ROW   |37196       |20287         |20286       |
+ROW   |37197       |20315         |20314       |
+ROW   |37198       |20343         |20342       |
+ROW   |37199       |20371         |20370       |
+ROW   |37200       |20399         |20398       |
+ROW   |37201       |20427         |20426       |
+ROW   |37202       |20455         |20454       |
+ROW   |37203       |20483         |20482       |
+ROW   |37204       |20511         |20510       |
+ROW   |37205       |20539         |20538       |
+ROW   |37206       |20567         |20566       |
+ROW   |37207       |20595         |20594       |
+ROW   |37208       |20623         |20622       |
+ROW   |37209       |20651         |20650       |
+ROW   |37210       |20679         |20678       |
+ROW   |37211       |20707         |20706       |
+ROW   |37212       |20735         |20734       |
+ROW   |37213       |20763         |20762       |
+ROW   |37214       |20791         |20790       |
+ROW   |37215       |20819         |20818       |
+ROW   |37216       |20847         |20846       |
+ROW   |37217       |20875         |20874       |
+ROW   |37218       |20903         |20902       |
+ROW   |37219       |20931         |20930       |
+ROW   |37220       |20959         |20958       |
+ROW   |37221       |20987         |20986       |
+ROW   |37222       |21015         |21014       |
+ROW   |37223       |21043         |21042       |
+ROW   |37224       |21071         |21070       |
+ROW   |37225       |21099         |21098       |
+ROW   |37226       |21127         |21126       |
+ROW   |37227       |21155         |21154       |
+ROW   |37228       |14253         |14251       |
+ROW   |37229       |14295         |14293       |
+ROW   |37230       |14313         |14311       |
+ROW   |37231       |14329         |14327       |
+ROW   |37232       |14349         |14347       |
+ROW   |37233       |14358         |14356       |
+ROW   |37234       |14391         |14389       |
+ROW   |37235       |14405         |14403       |
+ROW   |37236       |14453         |14451       |
+ROW   |37237       |14470         |14468       |
+ROW   |37238       |14488         |14486       |
+ROW   |37239       |14507         |14505       |
+ROW   |37240       |14536         |14534       |
+ROW   |37241       |14546         |14544       |
+ROW   |37242       |14584         |14582       |
+ROW   |37243       |14600         |14598       |
+ROW   |37244       |14617         |14615       |
+ROW   |37245       |14654         |14652       |
+ROW   |37246       |14675         |14673       |
+ROW   |37247       |14693         |14691       |
+ROW   |37248       |14706         |14704       |
+ROW   |37249       |14719         |14717       |
+ROW   |37250       |14908         |14906       |
+ROW   |37251       |15222         |15220       |
+ROW   |37252       |15703         |15701       |
+ROW   |37253       |15725         |15723       |
+ROW   |37254       |15757         |15755       |
+ROW   |37255       |15821         |15819       |
+ROW   |37256       |15842         |15840       |
+ROW   |37257       |15992         |15990       |
+ROW   |37258       |16019         |16017       |
+ROW   |37259       |16455         |16453       |
+ROW   |37260       |17925         |17923       |
+ROW   |37261       |18179         |18177       |
+ROW   |37262       |19671         |19669       |
+ROW   |37263       |19699         |19697       |
+ROW   |37264       |19727         |19725       |
+ROW   |37265       |19755         |19753       |
+ROW   |37266       |19783         |19781       |
+ROW   |37267       |19811         |19809       |
+ROW   |37268       |19839         |19837       |
+ROW   |37269       |19867         |19865       |
+ROW   |37270       |19895         |19893       |
+ROW   |37271       |19923         |19921       |
+ROW   |37272       |19951         |19949       |
+ROW   |37273       |19979         |19977       |
+ROW   |37274       |20007         |20005       |
+ROW   |37275       |20035         |20033       |
+ROW   |37276       |20063         |20061       |
+ROW   |37277       |20091         |20089       |
+ROW   |37278       |20119         |20117       |
+ROW   |37279       |20147         |20145       |
+ROW   |37280       |20175         |20173       |
+ROW   |37281       |20203         |20201       |
+ROW   |37282       |20231         |20229       |
+ROW   |37283       |20259         |20257       |
+ROW   |37284       |20287         |20285       |
+ROW   |37285       |20315         |20313       |
+ROW   |37286       |20343         |20341       |
+ROW   |37287       |20371         |20369       |
+ROW   |37288       |20399         |20397       |
+ROW   |37289       |20427         |20425       |
+ROW   |37290       |20455         |20453       |
+ROW   |37291       |20483         |20481       |
+ROW   |37292       |20511         |20509       |
+ROW   |37293       |20539         |20537       |
+ROW   |37294       |20567         |20565       |
+ROW   |37295       |20595         |20593       |
+ROW   |37296       |20623         |20621       |
+ROW   |37297       |20651         |20649       |
+ROW   |37298       |20679         |20677       |
+ROW   |37299       |20707         |20705       |
+ROW   |37300       |20735         |20733       |
+ROW   |37301       |20763         |20761       |
+ROW   |37302       |20791         |20789       |
+ROW   |37303       |20819         |20817       |
+ROW   |37304       |20847         |20845       |
+ROW   |37305       |20875         |20873       |
+ROW   |37306       |20903         |20901       |
+ROW   |37307       |20931         |20929       |
+ROW   |37308       |20959         |20957       |
+ROW   |37309       |20987         |20985       |
+ROW   |37310       |21015         |21013       |
+ROW   |37311       |21043         |21041       |
+ROW   |37312       |21071         |21069       |
+ROW   |37313       |21099         |21097       |
+ROW   |37314       |21127         |21125       |
+ROW   |37315       |21155         |21153       |
+ROW   |37316       |16287         |16289       |
+ROW   |37317       |16279         |16285       |
+ROW   |37318       |16290         |16348       |
+ROW   |37319       |16291         |16349       |
+ROW   |37320       |16292         |16350       |
+ROW   |37321       |16293         |16351       |
+ROW   |37322       |16294         |16352       |
+ROW   |37323       |16295         |16353       |
+ROW   |37324       |16296         |16354       |
+ROW   |37325       |16297         |16355       |
+ROW   |37326       |16298         |16356       |
+ROW   |37327       |16299         |16357       |
+ROW   |37328       |16300         |16358       |
+ROW   |37329       |16301         |16359       |
+ROW   |37330       |16302         |16360       |
+ROW   |37331       |16303         |16361       |
+ROW   |37332       |16304         |16362       |
+ROW   |37333       |16305         |16363       |
+ROW   |37334       |16306         |16364       |
+ROW   |37335       |16307         |16365       |
+ROW   |37336       |16308         |16366       |
+ROW   |37337       |16309         |16367       |
+ROW   |37338       |16311         |16369       |
+ROW   |37339       |16312         |16370       |
+ROW   |37340       |16313         |16371       |
+ROW   |37341       |16314         |16372       |
+ROW   |37342       |16315         |16373       |
+ROW   |37343       |16316         |16374       |
+ROW   |37344       |16317         |16375       |
+ROW   |37345       |16318         |16376       |
+ROW   |37346       |16457         |16458       |
+ROW   |37347       |17927         |17928       |
+ROW   |37348       |18181         |18182       |
+ROW   |37349       |19673         |19674       |
+ROW   |37350       |19701         |19702       |
+ROW   |37351       |19729         |19730       |
+ROW   |37352       |19757         |19758       |
+ROW   |37353       |19785         |19786       |
+ROW   |37354       |19813         |19814       |
+ROW   |37355       |19841         |19842       |
+ROW   |37356       |19869         |19870       |
+ROW   |37357       |19897         |19898       |
+ROW   |37358       |19925         |19926       |
+ROW   |37359       |19953         |19954       |
+ROW   |37360       |19981         |19982       |
+ROW   |37361       |20009         |20010       |
+ROW   |37362       |20037         |20038       |
+ROW   |37363       |20065         |20066       |
+ROW   |37364       |20093         |20094       |
+ROW   |37365       |20121         |20122       |
+ROW   |37366       |20149         |20150       |
+ROW   |37367       |20177         |20178       |
+ROW   |37368       |20205         |20206       |
+ROW   |37369       |20233         |20234       |
+ROW   |37370       |20261         |20262       |
+ROW   |37371       |20289         |20290       |
+ROW   |37372       |20317         |20318       |
+ROW   |37373       |20345         |20346       |
+ROW   |37374       |20373         |20374       |
+ROW   |37375       |20401         |20402       |
+ROW   |37376       |20429         |20430       |
+ROW   |37377       |20457         |20458       |
+ROW   |37378       |20485         |20486       |
+ROW   |37379       |20513         |20514       |
+ROW   |37380       |20541         |20542       |
+ROW   |37381       |20569         |20570       |
+ROW   |37382       |20597         |20598       |
+ROW   |37383       |20625         |20626       |
+ROW   |37384       |20653         |20654       |
+ROW   |37385       |20681         |20682       |
+ROW   |37386       |20709         |20710       |
+ROW   |37387       |20737         |20738       |
+ROW   |37388       |20765         |20766       |
+ROW   |37389       |20793         |20794       |
+ROW   |37390       |20821         |20822       |
+ROW   |37391       |20849         |20850       |
+ROW   |37392       |20877         |20878       |
+ROW   |37393       |20905         |20906       |
+ROW   |37394       |20933         |20934       |
+ROW   |37395       |20961         |20962       |
+ROW   |37396       |20989         |20990       |
+ROW   |37397       |21017         |21018       |
+ROW   |37398       |21045         |21046       |
+ROW   |37399       |21073         |21074       |
+ROW   |37400       |21101         |21102       |
+ROW   |37401       |21129         |21130       |
+ROW   |37402       |21157         |21158       |
+ROW   |37403       |16289         |14293       |
+ROW   |37404       |16285         |14717       |
+ROW   |37405       |16348         |14311       |
+ROW   |37406       |16349         |14327       |
+ROW   |37407       |16350         |14347       |
+ROW   |37408       |16351         |14356       |
+ROW   |37409       |16352         |14389       |
+ROW   |37410       |16353         |14403       |
+ROW   |37411       |16354         |14451       |
+ROW   |37412       |16355         |14468       |
+ROW   |37413       |16356         |14486       |
+ROW   |37414       |16357         |14505       |
+ROW   |37415       |16358         |14534       |
+ROW   |37416       |16359         |14544       |
+ROW   |37417       |16360         |14582       |
+ROW   |37418       |16361         |14598       |
+ROW   |37419       |16362         |14615       |
+ROW   |37420       |16363         |14652       |
+ROW   |37421       |16364         |14673       |
+ROW   |37422       |16365         |14691       |
+ROW   |37423       |16366         |14704       |
+ROW   |37424       |16367         |14906       |
+ROW   |37425       |16369         |15220       |
+ROW   |37426       |16370         |15701       |
+ROW   |37427       |16371         |15723       |
+ROW   |37428       |16372         |15755       |
+ROW   |37429       |16373         |15819       |
+ROW   |37430       |16374         |15840       |
+ROW   |37431       |16375         |15990       |
+ROW   |37432       |16376         |16017       |
+ROW   |37433       |16458         |16453       |
+ROW   |37434       |17928         |17923       |
+ROW   |37435       |18182         |18177       |
+ROW   |37436       |19674         |19669       |
+ROW   |37437       |19702         |19697       |
+ROW   |37438       |19730         |19725       |
+ROW   |37439       |19758         |19753       |
+ROW   |37440       |19786         |19781       |
+ROW   |37441       |19814         |19809       |
+ROW   |37442       |19842         |19837       |
+ROW   |37443       |19870         |19865       |
+ROW   |37444       |19898         |19893       |
+ROW   |37445       |19926         |19921       |
+ROW   |37446       |19954         |19949       |
+ROW   |37447       |19982         |19977       |
+ROW   |37448       |20010         |20005       |
+ROW   |37449       |20038         |20033       |
+ROW   |37450       |20066         |20061       |
+ROW   |37451       |20094         |20089       |
+ROW   |37452       |20122         |20117       |
+ROW   |37453       |20150         |20145       |
+ROW   |37454       |20178         |20173       |
+ROW   |37455       |20206         |20201       |
+ROW   |37456       |20234         |20229       |
+ROW   |37457       |20262         |20257       |
+ROW   |37458       |20290         |20285       |
+ROW   |37459       |20318         |20313       |
+ROW   |37460       |20346         |20341       |
+ROW   |37461       |20374         |20369       |
+ROW   |37462       |20402         |20397       |
+ROW   |37463       |20430         |20425       |
+ROW   |37464       |20458         |20453       |
+ROW   |37465       |20486         |20481       |
+ROW   |37466       |20514         |20509       |
+ROW   |37467       |20542         |20537       |
+ROW   |37468       |20570         |20565       |
+ROW   |37469       |20598         |20593       |
+ROW   |37470       |20626         |20621       |
+ROW   |37471       |20654         |20649       |
+ROW   |37472       |20682         |20677       |
+ROW   |37473       |20710         |20705       |
+ROW   |37474       |20738         |20733       |
+ROW   |37475       |20766         |20761       |
+ROW   |37476       |20794         |20789       |
+ROW   |37477       |20822         |20817       |
+ROW   |37478       |20850         |20845       |
+ROW   |37479       |20878         |20873       |
+ROW   |37480       |20906         |20901       |
+ROW   |37481       |20934         |20929       |
+ROW   |37482       |20962         |20957       |
+ROW   |37483       |20990         |20985       |
+ROW   |37484       |21018         |21013       |
+ROW   |37485       |21046         |21041       |
+ROW   |37486       |21074         |21069       |
+ROW   |37487       |21102         |21097       |
+ROW   |37488       |21130         |21125       |
+ROW   |37489       |21158         |21153       |
+ROW   |37490       |16631         |16630       |
+ROW   |37491       |16640         |16636       |
+ROW   |37492       |16642         |16638       |
+ROW   |37493       |16643         |16639       |
+ROW   |37494       |15695         |16863       |
+ROW   |37495       |18242         |16863       |
+ROW   |37496       |18243         |16863       |
+ROW   |37497       |15694         |16868       |
+ROW   |37498       |15696         |16864       |
+ROW   |37499       |15697         |16865       |
+ROW   |37500       |18244         |16864       |
+ROW   |37501       |18245         |16865       |
+ROW   |37502       |18246         |16868       |
+ROW   |37503       |18247         |16864       |
+ROW   |37504       |18248         |16865       |
+ROW   |37505       |18249         |16868       |
+ROW   |37506       |15671         |16841       |
+ROW   |37507       |18250         |16841       |
+ROW   |37508       |18251         |16841       |
+ROW   |37509       |15672         |16842       |
+ROW   |37510       |15673         |16843       |
+ROW   |37511       |15674         |16844       |
+ROW   |37512       |15675         |16845       |
+ROW   |37513       |15676         |16846       |
+ROW   |37514       |15677         |16847       |
+ROW   |37515       |15678         |16848       |
+ROW   |37516       |15679         |16849       |
+ROW   |37517       |15680         |16850       |
+ROW   |37518       |15681         |16851       |
+ROW   |37519       |15682         |16852       |
+ROW   |37520       |15683         |16853       |
+ROW   |37521       |15684         |16854       |
+ROW   |37522       |15685         |16855       |
+ROW   |37523       |15686         |16856       |
+ROW   |37524       |15687         |16857       |
+ROW   |37525       |15689         |16858       |
+ROW   |37526       |15691         |16860       |
+ROW   |37527       |15708         |16861       |
+ROW   |37528       |15997         |16862       |
+ROW   |37529       |19677         |19678       |
+ROW   |37530       |19705         |19706       |
+ROW   |37531       |19733         |19734       |
+ROW   |37532       |19761         |19762       |
+ROW   |37533       |19789         |19790       |
+ROW   |37534       |19817         |19818       |
+ROW   |37535       |19845         |19846       |
+ROW   |37536       |19873         |19874       |
+ROW   |37537       |19901         |19902       |
+ROW   |37538       |19929         |19930       |
+ROW   |37539       |19957         |19958       |
+ROW   |37540       |19985         |19986       |
+ROW   |37541       |20013         |20014       |
+ROW   |37542       |20041         |20042       |
+ROW   |37543       |20069         |20070       |
+ROW   |37544       |20097         |20098       |
+ROW   |37545       |20125         |20126       |
+ROW   |37546       |20153         |20154       |
+ROW   |37547       |20181         |20182       |
+ROW   |37548       |20209         |20210       |
+ROW   |37549       |20237         |20238       |
+ROW   |37550       |20265         |20266       |
+ROW   |37551       |20293         |20294       |
+ROW   |37552       |20321         |20322       |
+ROW   |37553       |20349         |20350       |
+ROW   |37554       |20377         |20378       |
+ROW   |37555       |20405         |20406       |
+ROW   |37556       |20433         |20434       |
+ROW   |37557       |20461         |20462       |
+ROW   |37558       |20489         |20490       |
+ROW   |37559       |20517         |20518       |
+ROW   |37560       |20545         |20546       |
+ROW   |37561       |20573         |20574       |
+ROW   |37562       |20601         |20602       |
+ROW   |37563       |20629         |20630       |
+ROW   |37564       |20657         |20658       |
+ROW   |37565       |20685         |20686       |
+ROW   |37566       |20713         |20714       |
+ROW   |37567       |20741         |20742       |
+ROW   |37568       |20769         |20770       |
+ROW   |37569       |20797         |20798       |
+ROW   |37570       |20825         |20826       |
+ROW   |37571       |20853         |20854       |
+ROW   |37572       |20881         |20882       |
+ROW   |37573       |20909         |20910       |
+ROW   |37574       |20937         |20938       |
+ROW   |37575       |20965         |20966       |
+ROW   |37576       |20993         |20994       |
+ROW   |37577       |21021         |21022       |
+ROW   |37578       |21049         |21050       |
+ROW   |37579       |21077         |21078       |
+ROW   |37580       |21105         |21106       |
+ROW   |37581       |21133         |21134       |
+ROW   |37582       |21161         |21162       |
+ROW   |37583       |18252         |16842       |
+ROW   |37584       |18253         |16843       |
+ROW   |37585       |18254         |16844       |
+ROW   |37586       |18255         |16845       |
+ROW   |37587       |18256         |16846       |
+ROW   |37588       |18257         |16847       |
+ROW   |37589       |18258         |16848       |
+ROW   |37590       |18259         |16849       |
+ROW   |37591       |18260         |16850       |
+ROW   |37592       |18261         |16851       |
+ROW   |37593       |18262         |16852       |
+ROW   |37594       |18263         |16853       |
+ROW   |37595       |18264         |16854       |
+ROW   |37596       |18265         |16855       |
+ROW   |37597       |18266         |16856       |
+ROW   |37598       |18267         |16857       |
+ROW   |37599       |18268         |16858       |
+ROW   |37600       |18270         |16860       |
+ROW   |37601       |18271         |16861       |
+ROW   |37602       |18272         |16862       |
+ROW   |37603       |19676         |19678       |
+ROW   |37604       |19704         |19706       |
+ROW   |37605       |19732         |19734       |
+ROW   |37606       |19760         |19762       |
+ROW   |37607       |19788         |19790       |
+ROW   |37608       |19816         |19818       |
+ROW   |37609       |19844         |19846       |
+ROW   |37610       |19872         |19874       |
+ROW   |37611       |19900         |19902       |
+ROW   |37612       |19928         |19930       |
+ROW   |37613       |19956         |19958       |
+ROW   |37614       |19984         |19986       |
+ROW   |37615       |20012         |20014       |
+ROW   |37616       |20040         |20042       |
+ROW   |37617       |20068         |20070       |
+ROW   |37618       |20096         |20098       |
+ROW   |37619       |20124         |20126       |
+ROW   |37620       |20152         |20154       |
+ROW   |37621       |20180         |20182       |
+ROW   |37622       |20208         |20210       |
+ROW   |37623       |20236         |20238       |
+ROW   |37624       |20264         |20266       |
+ROW   |37625       |20292         |20294       |
+ROW   |37626       |20320         |20322       |
+ROW   |37627       |20348         |20350       |
+ROW   |37628       |20376         |20378       |
+ROW   |37629       |20404         |20406       |
+ROW   |37630       |20432         |20434       |
+ROW   |37631       |20460         |20462       |
+ROW   |37632       |20488         |20490       |
+ROW   |37633       |20516         |20518       |
+ROW   |37634       |20544         |20546       |
+ROW   |37635       |20572         |20574       |
+ROW   |37636       |20600         |20602       |
+ROW   |37637       |20628         |20630       |
+ROW   |37638       |20656         |20658       |
+ROW   |37639       |20684         |20686       |
+ROW   |37640       |20712         |20714       |
+ROW   |37641       |20740         |20742       |
+ROW   |37642       |20768         |20770       |
+ROW   |37643       |20796         |20798       |
+ROW   |37644       |20824         |20826       |
+ROW   |37645       |20852         |20854       |
+ROW   |37646       |20880         |20882       |
+ROW   |37647       |20908         |20910       |
+ROW   |37648       |20936         |20938       |
+ROW   |37649       |20964         |20966       |
+ROW   |37650       |20992         |20994       |
+ROW   |37651       |21020         |21022       |
+ROW   |37652       |21048         |21050       |
+ROW   |37653       |21076         |21078       |
+ROW   |37654       |21104         |21106       |
+ROW   |37655       |21132         |21134       |
+ROW   |37656       |21160         |21162       |
+ROW   |37657       |18273         |16842       |
+ROW   |37658       |18274         |16843       |
+ROW   |37659       |18275         |16844       |
+ROW   |37660       |18276         |16845       |
+ROW   |37661       |18277         |16846       |
+ROW   |37662       |18278         |16847       |
+ROW   |37663       |18279         |16848       |
+ROW   |37664       |18280         |16849       |
+ROW   |37665       |18281         |16850       |
+ROW   |37666       |18282         |16851       |
+ROW   |37667       |18283         |16852       |
+ROW   |37668       |18284         |16853       |
+ROW   |37669       |18285         |16854       |
+ROW   |37670       |18286         |16855       |
+ROW   |37671       |18287         |16856       |
+ROW   |37672       |18288         |16857       |
+ROW   |37673       |18289         |16858       |
+ROW   |37674       |18291         |16860       |
+ROW   |37675       |18292         |16861       |
+ROW   |37676       |18293         |16862       |
+ROW   |37677       |19675         |19678       |
+ROW   |37678       |19703         |19706       |
+ROW   |37679       |19731         |19734       |
+ROW   |37680       |19759         |19762       |
+ROW   |37681       |19787         |19790       |
+ROW   |37682       |19815         |19818       |
+ROW   |37683       |19843         |19846       |
+ROW   |37684       |19871         |19874       |
+ROW   |37685       |19899         |19902       |
+ROW   |37686       |19927         |19930       |
+ROW   |37687       |19955         |19958       |
+ROW   |37688       |19983         |19986       |
+ROW   |37689       |20011         |20014       |
+ROW   |37690       |20039         |20042       |
+ROW   |37691       |20067         |20070       |
+ROW   |37692       |20095         |20098       |
+ROW   |37693       |20123         |20126       |
+ROW   |37694       |20151         |20154       |
+ROW   |37695       |20179         |20182       |
+ROW   |37696       |20207         |20210       |
+ROW   |37697       |20235         |20238       |
+ROW   |37698       |20263         |20266       |
+ROW   |37699       |20291         |20294       |
+ROW   |37700       |20319         |20322       |
+ROW   |37701       |20347         |20350       |
+ROW   |37702       |20375         |20378       |
+ROW   |37703       |20403         |20406       |
+ROW   |37704       |20431         |20434       |
+ROW   |37705       |20459         |20462       |
+ROW   |37706       |20487         |20490       |
+ROW   |37707       |20515         |20518       |
+ROW   |37708       |20543         |20546       |
+ROW   |37709       |20571         |20574       |
+ROW   |37710       |20599         |20602       |
+ROW   |37711       |20627         |20630       |
+ROW   |37712       |20655         |20658       |
+ROW   |37713       |20683         |20686       |
+ROW   |37714       |20711         |20714       |
+ROW   |37715       |20739         |20742       |
+ROW   |37716       |20767         |20770       |
+ROW   |37717       |20795         |20798       |
+ROW   |37718       |20823         |20826       |
+ROW   |37719       |20851         |20854       |
+ROW   |37720       |20879         |20882       |
+ROW   |37721       |20907         |20910       |
+ROW   |37722       |20935         |20938       |
+ROW   |37723       |20963         |20966       |
+ROW   |37724       |20991         |20994       |
+ROW   |37725       |21019         |21022       |
+ROW   |37726       |21047         |21050       |
+ROW   |37727       |21075         |21078       |
+ROW   |37728       |21103         |21106       |
+ROW   |37729       |21131         |21134       |
+ROW   |37730       |21159         |21162       |
+ROW   |37731       |15698         |16866       |
+ROW   |37732       |18294         |16866       |
+ROW   |37733       |18295         |16866       |
+ROW   |37734       |16028         |16867       |
+ROW   |37735       |18296         |16867       |
+ROW   |37736       |18297         |16867       |
+ROW   |37737       |18100         |18099       |
+ROW   |37738       |18106         |18105       |
+ROW   |37739       |14318         |14319       |
+ROW   |37740       |17554         |15717       |
+ROW   |37741       |17555         |15717       |
+ROW   |37742       |17555         |17554       |
+ROW   |37743       |17556         |15717       |
+ROW   |37744       |17557         |15717       |
+ROW   |37745       |17557         |17556       |
+ROW   |37746       |17559         |17558       |
+ROW   |37747       |17561         |17560       |
+ROW   |37748       |17563         |17562       |
+ROW   |37749       |17565         |17564       |
+ROW   |37750       |15721         |15720       |
+ROW   |37751       |15394         |15393       |
+ROW   |37752       |15392         |15391       |
+ROW   |37753       |17322         |14339       |
+ROW   |37754       |15382         |15381       |
+ROW   |37755       |15380         |15379       |
+ROW   |37756       |16504         |16505       |
+ROW   |37757       |14372         |14373       |
+ROW   |37758       |15386         |15385       |
+ROW   |37759       |15384         |15383       |
+ROW   |37760       |14380         |14381       |
+ROW   |37761       |18299         |18298       |
+ROW   |37762       |18300         |18299       |
+ROW   |37763       |18300         |18298       |
+ROW   |37764       |18303         |18302       |
+ROW   |37765       |18309         |18308       |
+ROW   |37766       |18311         |18316       |
+ROW   |37767       |18312         |18316       |
+ROW   |37768       |18313         |18316       |
+ROW   |37769       |18314         |18316       |
+ROW   |37770       |18315         |18316       |
+ROW   |37771       |18319         |18318       |
+ROW   |37772       |18321         |18320       |
+ROW   |37773       |18323         |18322       |
+ROW   |37774       |18326         |18325       |
+ROW   |37775       |18327         |18326       |
+ROW   |37776       |18327         |18325       |
+ROW   |37777       |18330         |18329       |
+ROW   |37778       |18336         |18335       |
+ROW   |37779       |18338         |18343       |
+ROW   |37780       |18339         |18343       |
+ROW   |37781       |18340         |18343       |
+ROW   |37782       |18341         |18343       |
+ROW   |37783       |18342         |18343       |
+ROW   |37784       |18346         |18345       |
+ROW   |37785       |18348         |18347       |
+ROW   |37786       |18350         |18349       |
+ROW   |37787       |18353         |18352       |
+ROW   |37788       |18354         |18353       |
+ROW   |37789       |18354         |18352       |
+ROW   |37790       |18357         |18356       |
+ROW   |37791       |18363         |18362       |
+ROW   |37792       |18365         |18370       |
+ROW   |37793       |18366         |18370       |
+ROW   |37794       |18367         |18370       |
+ROW   |37795       |18368         |18370       |
+ROW   |37796       |18369         |18370       |
+ROW   |37797       |18373         |18372       |
+ROW   |37798       |18375         |18374       |
+ROW   |37799       |18377         |18376       |
+ROW   |37800       |18380         |18379       |
+ROW   |37801       |18381         |18380       |
+ROW   |37802       |18381         |18379       |
+ROW   |37803       |18384         |18383       |
+ROW   |37804       |18390         |18389       |
+ROW   |37805       |18392         |18397       |
+ROW   |37806       |18393         |18397       |
+ROW   |37807       |18394         |18397       |
+ROW   |37808       |18395         |18397       |
+ROW   |37809       |18396         |18397       |
+ROW   |37810       |18400         |18399       |
+ROW   |37811       |18402         |18401       |
+ROW   |37812       |18404         |18403       |
+ROW   |37813       |18407         |18406       |
+ROW   |37814       |18408         |18407       |
+ROW   |37815       |18408         |18406       |
+ROW   |37816       |18411         |18410       |
+ROW   |37817       |18417         |18416       |
+ROW   |37818       |18419         |18424       |
+ROW   |37819       |18420         |18424       |
+ROW   |37820       |18421         |18424       |
+ROW   |37821       |18422         |18424       |
+ROW   |37822       |18423         |18424       |
+ROW   |37823       |18427         |18426       |
+ROW   |37824       |18429         |18428       |
+ROW   |37825       |18431         |18430       |
+ROW   |37826       |15347         |15346       |
+ROW   |37827       |15345         |15344       |
+ROW   |37828       |17567         |17566       |
+ROW   |37829       |15363         |15360       |
+ROW   |37830       |15364         |15361       |
+ROW   |37831       |15365         |15362       |
+ROW   |37832       |15357         |15354       |
+ROW   |37833       |15358         |15355       |
+ROW   |37834       |15359         |15356       |
+ROW   |37835       |17571         |17568       |
+ROW   |37836       |17572         |17569       |
+ROW   |37837       |17573         |17570       |
+ROW   |37838       |15334         |15333       |
+ROW   |37839       |15332         |15331       |
+ROW   |37840       |14460         |14461       |
+ROW   |37841       |14476         |14477       |
+ROW   |37842       |14495         |14496       |
+ROW   |37843       |14511         |17574       |
+ROW   |37844       |19666         |19665       |
+ROW   |37845       |19667         |19668       |
+ROW   |37846       |14551         |14552       |
+ROW   |37847       |15374         |15373       |
+ROW   |37848       |15376         |15375       |
+ROW   |37849       |14914         |14915       |
+ROW   |37850       |14589         |14590       |
+ROW   |37851       |15338         |15337       |
+ROW   |37852       |17333         |17332       |
+ROW   |37853       |14624         |14625       |
+ROW   |37854       |18434         |18433       |
+ROW   |37855       |18435         |18434       |
+ROW   |37856       |18435         |18433       |
+ROW   |37857       |18438         |18439       |
+ROW   |37858       |18439         |18433       |
+ROW   |37859       |18441         |18444       |
+ROW   |37860       |18442         |18444       |
+ROW   |37861       |18443         |18444       |
+ROW   |37862       |18446         |18447       |
+ROW   |37863       |18450         |18449       |
+ROW   |37864       |19685         |19684       |
+ROW   |37865       |19688         |19687       |
+ROW   |37866       |19696         |19695       |
+ROW   |37867       |19713         |19712       |
+ROW   |37868       |19716         |19715       |
+ROW   |37869       |19724         |19723       |
+ROW   |37870       |19741         |19740       |
+ROW   |37871       |19744         |19743       |
+ROW   |37872       |19752         |19751       |
+ROW   |37873       |19769         |19768       |
+ROW   |37874       |19772         |19771       |
+ROW   |37875       |19780         |19779       |
+ROW   |37876       |19797         |19796       |
+ROW   |37877       |19800         |19799       |
+ROW   |37878       |19808         |19807       |
+ROW   |37879       |19825         |19824       |
+ROW   |37880       |19828         |19827       |
+ROW   |37881       |19836         |19835       |
+ROW   |37882       |19853         |19852       |
+ROW   |37883       |19856         |19855       |
+ROW   |37884       |19864         |19863       |
+ROW   |37885       |19881         |19880       |
+ROW   |37886       |19884         |19883       |
+ROW   |37887       |19892         |19891       |
+ROW   |37888       |19909         |19908       |
+ROW   |37889       |19912         |19911       |
+ROW   |37890       |19920         |19919       |
+ROW   |37891       |19937         |19936       |
+ROW   |37892       |19940         |19939       |
+ROW   |37893       |19948         |19947       |
+ROW   |37894       |19965         |19964       |
+ROW   |37895       |19968         |19967       |
+ROW   |37896       |19976         |19975       |
+ROW   |37897       |19993         |19992       |
+ROW   |37898       |19996         |19995       |
+ROW   |37899       |20004         |20003       |
+ROW   |37900       |20021         |20020       |
+ROW   |37901       |20024         |20023       |
+ROW   |37902       |20032         |20031       |
+ROW   |37903       |20049         |20048       |
+ROW   |37904       |20052         |20051       |
+ROW   |37905       |20060         |20059       |
+ROW   |37906       |20077         |20076       |
+ROW   |37907       |20080         |20079       |
+ROW   |37908       |20088         |20087       |
+ROW   |37909       |20105         |20104       |
+ROW   |37910       |20108         |20107       |
+ROW   |37911       |20116         |20115       |
+ROW   |37912       |20133         |20132       |
+ROW   |37913       |20136         |20135       |
+ROW   |37914       |20144         |20143       |
+ROW   |37915       |20161         |20160       |
+ROW   |37916       |20164         |20163       |
+ROW   |37917       |20172         |20171       |
+ROW   |37918       |20189         |20188       |
+ROW   |37919       |20192         |20191       |
+ROW   |37920       |20200         |20199       |
+ROW   |37921       |20217         |20216       |
+ROW   |37922       |20220         |20219       |
+ROW   |37923       |20228         |20227       |
+ROW   |37924       |20245         |20244       |
+ROW   |37925       |20248         |20247       |
+ROW   |37926       |20256         |20255       |
+ROW   |37927       |20273         |20272       |
+ROW   |37928       |20276         |20275       |
+ROW   |37929       |20284         |20283       |
+ROW   |37930       |20301         |20300       |
+ROW   |37931       |20304         |20303       |
+ROW   |37932       |20312         |20311       |
+ROW   |37933       |20329         |20328       |
+ROW   |37934       |20332         |20331       |
+ROW   |37935       |20340         |20339       |
+ROW   |37936       |20357         |20356       |
+ROW   |37937       |20360         |20359       |
+ROW   |37938       |20368         |20367       |
+ROW   |37939       |20385         |20384       |
+ROW   |37940       |20388         |20387       |
+ROW   |37941       |20396         |20395       |
+ROW   |37942       |20413         |20412       |
+ROW   |37943       |20416         |20415       |
+ROW   |37944       |20424         |20423       |
+ROW   |37945       |20441         |20440       |
+ROW   |37946       |20444         |20443       |
+ROW   |37947       |20452         |20451       |
+ROW   |37948       |20469         |20468       |
+ROW   |37949       |20472         |20471       |
+ROW   |37950       |20480         |20479       |
+ROW   |37951       |20497         |20496       |
+ROW   |37952       |20500         |20499       |
+ROW   |37953       |20508         |20507       |
+ROW   |37954       |20525         |20524       |
+ROW   |37955       |20528         |20527       |
+ROW   |37956       |20536         |20535       |
+ROW   |37957       |20553         |20552       |
+ROW   |37958       |20556         |20555       |
+ROW   |37959       |20564         |20563       |
+ROW   |37960       |20581         |20580       |
+ROW   |37961       |20584         |20583       |
+ROW   |37962       |20592         |20591       |
+ROW   |37963       |20609         |20608       |
+ROW   |37964       |20612         |20611       |
+ROW   |37965       |20620         |20619       |
+ROW   |37966       |20637         |20636       |
+ROW   |37967       |20640         |20639       |
+ROW   |37968       |20648         |20647       |
+ROW   |37969       |20665         |20664       |
+ROW   |37970       |20668         |20667       |
+ROW   |37971       |20676         |20675       |
+ROW   |37972       |20693         |20692       |
+ROW   |37973       |20696         |20695       |
+ROW   |37974       |20704         |20703       |
+ROW   |37975       |20721         |20720       |
+ROW   |37976       |20724         |20723       |
+ROW   |37977       |20732         |20731       |
+ROW   |37978       |20749         |20748       |
+ROW   |37979       |20752         |20751       |
+ROW   |37980       |20760         |20759       |
+ROW   |37981       |20777         |20776       |
+ROW   |37982       |20780         |20779       |
+ROW   |37983       |20788         |20787       |
+ROW   |37984       |20805         |20804       |
+ROW   |37985       |20808         |20807       |
+ROW   |37986       |20816         |20815       |
+ROW   |37987       |20833         |20832       |
+ROW   |37988       |20836         |20835       |
+ROW   |37989       |20844         |20843       |
+ROW   |37990       |20861         |20860       |
+ROW   |37991       |20864         |20863       |
+ROW   |37992       |20872         |20871       |
+ROW   |37993       |20889         |20888       |
+ROW   |37994       |20892         |20891       |
+ROW   |37995       |20900         |20899       |
+ROW   |37996       |20917         |20916       |
+ROW   |37997       |20920         |20919       |
+ROW   |37998       |20928         |20927       |
+ROW   |37999       |20945         |20944       |
+ROW   |38000       |20948         |20947       |
+ROW   |38001       |20956         |20955       |
+ROW   |38002       |20973         |20972       |
+ROW   |38003       |20976         |20975       |
+ROW   |38004       |20984         |20983       |
+ROW   |38005       |21001         |21000       |
+ROW   |38006       |21004         |21003       |
+ROW   |38007       |21012         |21011       |
+ROW   |38008       |21029         |21028       |
+ROW   |38009       |21032         |21031       |
+ROW   |38010       |21040         |21039       |
+ROW   |38011       |21057         |21056       |
+ROW   |38012       |21060         |21059       |
+ROW   |38013       |21068         |21067       |
+ROW   |38014       |21085         |21084       |
+ROW   |38015       |21088         |21087       |
+ROW   |38016       |21096         |21095       |
+ROW   |38017       |21113         |21112       |
+ROW   |38018       |21116         |21115       |
+ROW   |38019       |21124         |21123       |
+ROW   |38020       |21141         |21140       |
+ROW   |38021       |21144         |21143       |
+ROW   |38022       |21152         |21151       |
+ROW   |38023       |21169         |21168       |
+ROW   |38024       |21172         |21171       |
+ROW   |38025       |21180         |21179       |
+ROW   |38026       |14664         |14665       |
+ROW   |38027       |17085         |17086       |
+ROW   |38028       |16547         |16546       |
+ROW   |38029       |17576         |17575       |
+ROW   |38030       |17578         |17577       |
+ROW   |38031       |17628         |17626       |
+ROW   |38032       |17629         |17627       |
+ROW   |38033       |17632         |17630       |
+ROW   |38034       |17633         |17631       |
+ROW   |38035       |17635         |17634       |
+ROW   |38036       |17637         |17636       |
+ROW   |38037       |17686         |17684       |
+ROW   |38038       |17687         |17685       |
+ROW   |38039       |17690         |17688       |
+ROW   |38040       |17691         |17689       |
+ROW   |38041       |17693         |17692       |
+ROW   |38042       |17695         |17694       |
+ROW   |38043       |17730         |17728       |
+ROW   |38044       |17731         |17729       |
+ROW   |38045       |17734         |17732       |
+ROW   |38046       |17735         |17733       |
+ROW   |38047       |17737         |17736       |
+ROW   |38048       |17754         |17752       |
+ROW   |38049       |17755         |17753       |
+ROW   |38050       |17757         |17756       |
+ROW   |38051       |17819         |17817       |
+ROW   |38052       |17820         |17818       |
+ROW   |38053       |17823         |17821       |
+ROW   |38054       |17824         |17822       |
+ROW   |38055       |17826         |17825       |
+ROW   |38056       |17860         |17858       |
+ROW   |38057       |17861         |17859       |
+ROW   |38058       |17864         |17862       |
+ROW   |38059       |17865         |17863       |
+ROW   |38060       |17899         |17897       |
+ROW   |38061       |17900         |17898       |
+ROW   |38062       |17903         |17901       |
+ROW   |38063       |17904         |17902       |
+ROW   |38064       |17906         |17905       |
+ROW   |38065       |17908         |17907       |
+ROW   |38066       |17910         |17909       |
+ROW   |38067       |16551         |16552       |
+ROW   |38068       |16031         |16563       |
+ROW   |38069       |16045         |16564       |
+ROW   |38070       |16046         |16565       |
+ROW   |38071       |16039         |16040       |
+ROW   |38072       |16061         |16063       |
+ROW   |38073       |16062         |16064       |
+ROW   |38074       |16042         |16579       |
+ROW   |38075       |16067         |16580       |
+ROW   |38076       |16068         |16581       |
+ROW   |38077       |16041         |16042       |
+ROW   |38078       |16065         |16067       |
+ROW   |38079       |16066         |16068       |
+ROW   |38080       |16041         |16579       |
+ROW   |38081       |16065         |16580       |
+ROW   |38082       |16066         |16581       |
+ROW   |38083       |18132         |18452       |
+ROW   |38084       |18135         |18453       |
+ROW   |38085       |18138         |18454       |
+ROW   |38086       |18130         |18132       |
+ROW   |38087       |18133         |18135       |
+ROW   |38088       |18136         |18138       |
+ROW   |38089       |18130         |18452       |
+ROW   |38090       |18133         |18453       |
+ROW   |38091       |18136         |18454       |
+ROW   |38092       |16070         |16069       |
+ROW   |38093       |16072         |16071       |
+ROW   |38094       |16076         |17024       |
+ROW   |38095       |18455         |17024       |
+ROW   |38096       |16079         |16077       |
+ROW   |38097       |16080         |16078       |
+ROW   |38098       |16083         |16081       |
+ROW   |38099       |16084         |16082       |
+ROW   |38100       |16091         |17026       |
+ROW   |38101       |16092         |17028       |
+ROW   |38102       |18456         |17026       |
+ROW   |38103       |18457         |17028       |
+ROW   |38104       |17244         |17243       |
+ROW   |38105       |17257         |17256       |
+ROW   |38106       |17246         |17240       |
+ROW   |38107       |17259         |17253       |
+ROW   |38108       |17249         |17247       |
+ROW   |38109       |17262         |17260       |
+ROW   |38110       |17251         |17249       |
+ROW   |38111       |17264         |17262       |
+ROW   |38112       |17251         |17247       |
+ROW   |38113       |17264         |17260       |
+ROW   |38114       |18144         |18458       |
+ROW   |38115       |18147         |18459       |
+ROW   |38116       |18142         |18144       |
+ROW   |38117       |18145         |18147       |
+ROW   |38118       |18142         |18458       |
+ROW   |38119       |18145         |18459       |
+ROW   |38120       |17268         |17267       |
+ROW   |38121       |17270         |17269       |
+ROW   |38122       |17271         |17273       |
+ROW   |38123       |18460         |17273       |
+ROW   |38124       |17276         |17275       |
+ROW   |38125       |17278         |17277       |
+ROW   |38126       |17279         |17281       |
+ROW   |38127       |18461         |17281       |
+ROW   |38128       |16141         |16142       |
+ROW   |38129       |16146         |16573       |
+ROW   |38130       |16143         |16584       |
+ROW   |38131       |18152         |18462       |
+ROW   |38132       |18150         |18152       |
+ROW   |38133       |18150         |18462       |
+ROW   |38134       |16152         |16883       |
+ROW   |38135       |16153         |16883       |
+ROW   |38136       |18463         |16883       |
+ROW   |38137       |18464         |16883       |
+ROW   |38138       |16156         |16155       |
+ROW   |38139       |16158         |16157       |
+ROW   |38140       |18157         |18156       |
+ROW   |38141       |18160         |18159       |
+ROW   |38142       |18155         |18157       |
+ROW   |38143       |18158         |18160       |
+ROW   |38144       |18155         |18156       |
+ROW   |38145       |18158         |18159       |
+ROW   |38146       |16009         |16008       |
+ROW   |38147       |16011         |16010       |
+ROW   |38148       |16014         |16013       |
+ROW   |38149       |16016         |16015       |
+ROW   |38150       |16161         |16160       |
+ROW   |38151       |16172         |16171       |
+ROW   |38152       |16162         |16161       |
+ROW   |38153       |16173         |16172       |
+ROW   |38154       |16162         |16160       |
+ROW   |38155       |16173         |16171       |
+ROW   |38156       |16166         |18162       |
+ROW   |38157       |16177         |18164       |
+ROW   |38158       |16167         |18162       |
+ROW   |38159       |16178         |18164       |
+ROW   |38160       |17035         |16160       |
+ROW   |38161       |17037         |16171       |
+ROW   |38162       |18161         |18162       |
+ROW   |38163       |18163         |18164       |
+ROW   |38164       |16183         |16182       |
+ROW   |38165       |17911         |17042       |
+ROW   |38166       |18465         |17042       |
+ROW   |38167       |18466         |17042       |
+ROW   |38168       |17043         |17912       |
+ROW   |38169       |17043         |17913       |
+ROW   |38170       |16190         |16189       |
+ROW   |38171       |17914         |17047       |
+ROW   |38172       |18467         |17047       |
+ROW   |38173       |18468         |17047       |
+ROW   |38174       |17048         |17915       |
+ROW   |38175       |17048         |17916       |
+ROW   |38176       |17285         |17287       |
+ROW   |38177       |17296         |17298       |
+ROW   |38178       |17286         |17285       |
+ROW   |38179       |17297         |17296       |
+ROW   |38180       |17286         |17287       |
+ROW   |38181       |17297         |17298       |
+ROW   |38182       |17291         |18170       |
+ROW   |38183       |17302         |18172       |
+ROW   |38184       |17292         |18170       |
+ROW   |38185       |17303         |18172       |
+ROW   |38186       |17283         |17287       |
+ROW   |38187       |17294         |17298       |
+ROW   |38188       |18169         |18170       |
+ROW   |38189       |18171         |18172       |
+ROW   |38190       |17306         |17305       |
+ROW   |38191       |17917         |17310       |
+ROW   |38192       |18469         |17310       |
+ROW   |38193       |18470         |17310       |
+ROW   |38194       |17311         |17918       |
+ROW   |38195       |17311         |17919       |
+ROW   |38196       |17314         |17313       |
+ROW   |38197       |17920         |17318       |
+ROW   |38198       |18471         |17318       |
+ROW   |38199       |18472         |17318       |
+ROW   |38200       |17319         |17921       |
+ROW   |38201       |17319         |17922       |
+ROW   |38202       |18596         |18597       |
+ROW   |38203       |18629         |18630       |
+ROW   |38204       |18662         |18663       |
+ROW   |38205       |18695         |18696       |
+ROW   |38206       |18728         |18729       |
+ROW   |38207       |18947         |18948       |
+ROW   |38208       |18794         |18795       |
+ROW   |38209       |18495         |18496       |
+ROW   |38210       |18831         |18832       |
+ROW   |38211       |18864         |18865       |
+ROW   |38212       |18897         |18898       |
+ROW   |38213       |16772         |16773       |
+ROW   |38214       |16771         |16772       |
+ROW   |38215       |16771         |16773       |
+ROW   |38216       |16769         |16770       |
+ROW   |38217       |16768         |16769       |
+ROW   |38218       |16768         |16770       |
+ROW   |38219       |19230         |19231       |
+ROW   |38220       |19233         |19232       |
+ROW   |38221       |19235         |19234       |
+ROW   |38222       |19236         |19234       |
+ROW   |38223       |19236         |19235       |
+ROW   |38224       |19238         |19237       |
+ROW   |38225       |19239         |19240       |
+ROW   |38226       |19242         |19243       |
+ROW   |38227       |19245         |19244       |
+ROW   |38228       |19247         |19246       |
+ROW   |38229       |19249         |19250       |
+ROW   |38230       |19249         |19252       |
+ROW   |38231       |19249         |19248       |
+ROW   |38232       |19249         |19254       |
+ROW   |38233       |19251         |19250       |
+ROW   |38234       |19251         |19252       |
+ROW   |38235       |19251         |19248       |
+ROW   |38236       |19251         |19254       |
+ROW   |38237       |19253         |19250       |
+ROW   |38238       |19253         |19252       |
+ROW   |38239       |19253         |19248       |
+ROW   |38240       |19253         |19254       |
+ROW   |38241       |19255         |19250       |
+ROW   |38242       |19255         |19252       |
+ROW   |38243       |19255         |19248       |
+ROW   |38244       |19255         |19254       |
+ROW   |38245       |19258         |19257       |
+ROW   |38246       |16488         |16487       |
+ROW   |38247       |16485         |16484       |
+ROW   |38248       |16486         |16484       |
+ROW   |38249       |16486         |16485       |
+ROW   |38250       |16480         |16479       |
+ROW   |38251       |16482         |16481       |
+ROW   |38252       |16475         |16474       |
+ROW   |38253       |16471         |16472       |
+ROW   |38254       |16468         |16469       |
+ROW   |38255       |16459         |16460       |
+ROW   |38256       |16462         |16463       |
+ROW   |38257       |16465         |16466       |
+ROW   |38258       |16477         |16476       |
+ROW   |38259       |19263         |19262       |
+ROW   |38260       |19266         |19265       |
+ROW   |38261       |19268         |19267       |
+ROW   |38262       |19270         |19269       |
+ROW   |38263       |19272         |19271       |
+ROW   |38264       |19276         |19275       |
+ROW   |38265       |19278         |19277       |
+ROW   |38266       |19280         |19279       |
+ROW   |38267       |19282         |19281       |
+ROW   |38268       |19288         |19287       |
+ROW   |38269       |19293         |19292       |
+ROW   |38270       |19294         |19292       |
+ROW   |38271       |19294         |19293       |
+ROW   |38272       |19295         |19296       |
+ROW   |38273       |19297         |19295       |
+ROW   |38274       |19297         |19296       |
+ROW   |38275       |19299         |19298       |
+ROW   |38276       |19301         |19302       |
+ROW   |38277       |19303         |19302       |
+ROW   |38278       |19305         |19304       |
+ROW   |38279       |19307         |19306       |
+ROW   |38280       |19308         |19306       |
+ROW   |38281       |19308         |19307       |
+ROW   |38282       |19310         |19309       |
+ROW   |38283       |19314         |19313       |
+ROW   |38284       |19317         |19316       |
+ROW   |38285       |19319         |19318       |
+ROW   |38286       |19321         |19320       |
+ROW   |38287       |19323         |19322       |
+ROW   |38288       |19327         |19326       |
+ROW   |38289       |19329         |19328       |
+ROW   |38290       |19331         |19330       |
+ROW   |38291       |19333         |19332       |
+ROW   |38292       |19339         |19338       |
+ROW   |38293       |19344         |19343       |
+ROW   |38294       |19345         |19343       |
+ROW   |38295       |19345         |19344       |
+ROW   |38296       |19346         |19347       |
+ROW   |38297       |19348         |19346       |
+ROW   |38298       |19348         |19347       |
+ROW   |38299       |19350         |19349       |
+ROW   |38300       |19352         |19353       |
+ROW   |38301       |19354         |19353       |
+ROW   |38302       |19356         |19355       |
+ROW   |38303       |19358         |19357       |
+ROW   |38304       |19359         |19357       |
+ROW   |38305       |19359         |19358       |
+ROW   |38306       |19361         |19360       |
+ROW   |38307       |19365         |19364       |
+ROW   |38308       |19368         |19367       |
+ROW   |38309       |19370         |19369       |
+ROW   |38310       |19372         |19371       |
+ROW   |38311       |19374         |19373       |
+ROW   |38312       |19378         |19377       |
+ROW   |38313       |19380         |19379       |
+ROW   |38314       |19382         |19381       |
+ROW   |38315       |19384         |19383       |
+ROW   |38316       |19390         |19389       |
+ROW   |38317       |19395         |19394       |
+ROW   |38318       |19396         |19394       |
+ROW   |38319       |19396         |19395       |
+ROW   |38320       |19397         |19398       |
+ROW   |38321       |19399         |19397       |
+ROW   |38322       |19399         |19398       |
+ROW   |38323       |19401         |19400       |
+ROW   |38324       |19403         |19404       |
+ROW   |38325       |19405         |19404       |
+ROW   |38326       |19407         |19406       |
+ROW   |38327       |19409         |19408       |
+ROW   |38328       |19410         |19408       |
+ROW   |38329       |19410         |19409       |
+ROW   |38330       |19412         |19411       |
+ROW   |38331       |19416         |19415       |
+ROW   |38332       |19419         |19418       |
+ROW   |38333       |19421         |19420       |
+ROW   |38334       |19423         |19422       |
+ROW   |38335       |19425         |19424       |
+ROW   |38336       |19429         |19428       |
+ROW   |38337       |19431         |19430       |
+ROW   |38338       |19433         |19432       |
+ROW   |38339       |19435         |19434       |
+ROW   |38340       |19441         |19440       |
+ROW   |38341       |19446         |19445       |
+ROW   |38342       |19447         |19445       |
+ROW   |38343       |19447         |19446       |
+ROW   |38344       |19448         |19449       |
+ROW   |38345       |19450         |19448       |
+ROW   |38346       |19450         |19449       |
+ROW   |38347       |19452         |19451       |
+ROW   |38348       |19454         |19455       |
+ROW   |38349       |19456         |19455       |
+ROW   |38350       |19458         |19457       |
+ROW   |38351       |19460         |19459       |
+ROW   |38352       |19461         |19459       |
+ROW   |38353       |19461         |19460       |
+ROW   |38354       |19463         |19462       |
+ROW   |38355       |15729         |15728       |
+ROW   |38356       |15730         |15728       |
+ROW   |38357       |15730         |15729       |
+ROW   |38358       |15752         |15754       |
+ROW   |38359       |15753         |15754       |
+ROW   |38360       |15753         |15752       |
+ROW   |38361       |15742         |15741       |
+ROW   |38362       |15750         |15749       |
+ROW   |38363       |15751         |15750       |
+ROW   |38364       |15751         |15749       |
+ROW   |38365       |15746         |15743       |
+ROW   |38366       |15744         |15743       |
+ROW   |38367       |15740         |15739       |
+ROW   |38368       |17946         |17945       |
+ROW   |38369       |17948         |17947       |
+ROW   |38370       |15748         |15747       |
+ROW   |38371       |19467         |19466       |
+ROW   |38372       |19471         |19470       |
+ROW   |38373       |19473         |19472       |
+ROW   |38374       |19474         |19472       |
+ROW   |38375       |19474         |19473       |
+ROW   |38376       |19476         |19475       |
+ROW   |38377       |19478         |19477       |
+ROW   |38378       |19480         |19479       |
+ROW   |38379       |19482         |19483       |
+ROW   |38380       |19484         |19483       |
+ROW   |38381       |19486         |19485       |
+ROW   |38382       |19509         |19508       |
+ROW   |38383       |19513         |19512       |
+ROW   |38384       |19517         |19516       |
+ROW   |38385       |19519         |19518       |
+ROW   |38386       |19520         |19518       |
+ROW   |38387       |19520         |19519       |
+ROW   |38388       |19522         |19521       |
+ROW   |38389       |19524         |19523       |
+ROW   |38390       |19526         |19525       |
+ROW   |38391       |19528         |19529       |
+ROW   |38392       |19530         |19529       |
+ROW   |38393       |19532         |19531       |
+ROW   |38394       |19555         |19554       |
+ROW   |38395       |19559         |19558       |
+ROW   |38396       |19563         |19562       |
+ROW   |38397       |19565         |19564       |
+ROW   |38398       |19566         |19564       |
+ROW   |38399       |19566         |19565       |
+ROW   |38400       |19568         |19567       |
+ROW   |38401       |19570         |19569       |
+ROW   |38402       |19572         |19571       |
+ROW   |38403       |19574         |19575       |
+ROW   |38404       |19576         |19575       |
+ROW   |38405       |19578         |19577       |
+ROW   |38406       |19601         |19600       |
+ROW   |38407       |19605         |19604       |
+ROW   |38408       |19609         |19608       |
+ROW   |38409       |19611         |19610       |
+ROW   |38410       |19612         |19610       |
+ROW   |38411       |19612         |19611       |
+ROW   |38412       |19614         |19613       |
+ROW   |38413       |19616         |19615       |
+ROW   |38414       |19618         |19617       |
+ROW   |38415       |19620         |19621       |
+ROW   |38416       |19622         |19621       |
+ROW   |38417       |19624         |19623       |
+ROW   |38418       |19647         |19646       |
+ROW   |38419       |16440         |16439       |
+ROW   |38420       |18003         |15790       |
+ROW   |38421       |18004         |15787       |
+ROW   |38422       |18005         |15787       |
+ROW   |38423       |18005         |18004       |
+ROW   |38424       |15786         |15785       |
+ROW   |38425       |15784         |15783       |
+ROW   |38426       |15794         |15792       |
+ROW   |38427       |15793         |15792       |
+ROW   |38428       |15782         |15781       |
+ROW   |38429       |15797         |15796       |
+ROW   |38430       |15825         |15824       |
+ROW   |38431       |15826         |15824       |
+ROW   |38432       |15826         |15825       |
+ROW   |38433       |15828         |15829       |
+ROW   |38434       |15831         |15832       |
+ROW   |38435       |15834         |15835       |
+ROW   |38436       |15845         |15846       |
+ROW   |38437       |17223         |17227       |
+ROW   |38438       |17226         |17227       |
 
 TABLE |functions
 FIELDS|functionid|itemid|triggerid|name     |parameter                                                                    |
@@ -27458,6 +27468,11 @@ ROW   |28249     |35487 |19026    |last     |$
 ROW   |28250     |35484 |19026    |last     |$                                                                            |
 ROW   |28251     |35486 |19027    |last     |$                                                                            |
 ROW   |28252     |35483 |19027    |last     |$                                                                            |
+ROW   |28253     |39822 |21197    |avg      |$,10m                                                                        |
+ROW   |28254     |39823 |21198    |avg      |$,10m                                                                        |
+ROW   |28255     |39824 |21199    |avg      |$,10m                                                                        |
+ROW   |28256     |39825 |21200    |avg      |$,10m                                                                        |
+ROW   |28257     |39826 |21201    |avg      |$,10m                                                                        |
 
 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                            |
@@ -29434,2718 +29449,2726 @@ ROW   |72156  |2075   |39704 |0       |2        |F63100|1        |2       |0   |
 ROW   |72157  |2075   |39701 |0       |3        |A54F10|1        |2       |0   |
 ROW   |72158  |2075   |39703 |0       |4        |FC6EA3|1        |2       |0   |
 ROW   |72159  |2075   |39700 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |78195  |1397   |32451 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78196  |1397   |32450 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78197  |1398   |32452 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78198  |1398   |32449 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78199  |1399   |32444 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78200  |1399   |32446 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78201  |1399   |32448 |5       |2        |F63100|0        |2       |0   |
-ROW   |78202  |1400   |32460 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78203  |1401   |32458 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78204  |1401   |32457 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78205  |1402   |32461 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78206  |1402   |32456 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78207  |1172   |30918 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78208  |1172   |30919 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78209  |1172   |30920 |0       |2        |F63100|0        |2       |0   |
-ROW   |78210  |1172   |30921 |2       |3        |A54F10|0        |2       |0   |
-ROW   |78211  |1173   |30922 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78212  |835    |28744 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78213  |835    |28745 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78214  |1174   |30913 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78215  |1175   |30906 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78216  |1175   |30908 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78217  |1175   |30915 |0       |2        |F63100|0        |2       |0   |
-ROW   |78218  |1175   |30897 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78219  |1175   |30901 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78220  |1175   |30899 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78221  |1175   |30907 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78222  |1175   |30905 |0       |7        |611F27|0        |2       |0   |
-ROW   |78223  |1175   |30904 |0       |8        |F230E0|0        |2       |0   |
-ROW   |78224  |1175   |30900 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |78225  |1175   |30898 |0       |10       |40CDFF|0        |2       |0   |
-ROW   |78226  |1176   |30910 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78227  |1176   |30909 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78228  |836    |28798 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78229  |836    |28799 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78230  |836    |28800 |0       |2        |F63100|0        |2       |0   |
-ROW   |78231  |836    |28801 |2       |3        |A54F10|0        |2       |0   |
-ROW   |78232  |837    |28803 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78233  |838    |28793 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78234  |840    |28787 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78235  |840    |28784 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78236  |840    |28782 |0       |2        |F63100|0        |2       |0   |
-ROW   |78237  |840    |28781 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78238  |840    |28780 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78239  |840    |28778 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78240  |840    |28786 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78241  |840    |28785 |0       |7        |611F27|0        |2       |0   |
-ROW   |78242  |840    |28783 |0       |8        |F230E0|0        |2       |0   |
-ROW   |78243  |840    |28779 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |78244  |840    |28796 |0       |10       |40CDFF|0        |2       |0   |
-ROW   |78245  |839    |28789 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78246  |839    |28788 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78247  |1339   |32172 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78248  |1339   |32173 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78249  |1403   |32511 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78250  |1403   |32514 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78251  |1404   |32512 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78252  |1404   |32515 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78253  |1405   |32507 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78254  |1405   |32508 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78255  |1405   |32513 |0       |2        |F63100|0        |2       |0   |
-ROW   |78256  |1343   |32135 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78257  |1343   |32142 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78258  |1344   |32167 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78259  |1344   |32136 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78260  |1345   |32141 |1       |0        |1A7C11|0        |2       |0   |
-ROW   |78261  |1345   |32138 |1       |1        |2774A4|0        |2       |0   |
-ROW   |78262  |1346   |32156 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78263  |1346   |32158 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78264  |1346   |32159 |0       |2        |F63100|0        |2       |0   |
-ROW   |78265  |1346   |32154 |2       |3        |A54F10|0        |2       |0   |
-ROW   |78266  |1346   |32155 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78267  |1346   |32146 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78268  |1347   |32150 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78269  |1347   |32151 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78270  |1347   |32152 |0       |2        |F63100|0        |2       |0   |
-ROW   |78271  |1622   |35078 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78272  |1622   |35091 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78273  |1622   |35098 |0       |2        |F63100|0        |2       |0   |
-ROW   |78274  |1622   |35100 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78275  |1622   |35099 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78276  |1623   |35090 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78277  |1623   |35101 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78278  |1624   |35097 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78279  |1624   |35096 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78280  |1624   |35095 |0       |2        |F63100|0        |2       |0   |
-ROW   |78281  |1625   |35089 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78282  |1625   |35088 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78283  |1625   |35087 |0       |2        |F63100|0        |2       |0   |
-ROW   |78284  |1625   |35086 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78285  |1625   |35085 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78286  |1626   |35079 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78287  |1626   |35082 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78288  |1627   |35080 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78289  |1627   |35102 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78290  |1628   |35093 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78291  |1628   |35092 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78292  |1628   |35081 |0       |2        |F63100|0        |2       |0   |
-ROW   |78293  |1628   |35084 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78294  |1628   |35083 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78295  |1121   |30606 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78296  |1121   |30590 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78297  |1121   |30582 |5       |2        |F63100|0        |2       |0   |
-ROW   |78298  |1122   |30580 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78299  |1122   |30578 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78300  |1123   |30586 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78301  |1123   |30608 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78302  |1123   |30585 |2       |2        |F63100|0        |2       |0   |
-ROW   |78303  |1123   |30589 |2       |3        |A54F10|0        |2       |0   |
-ROW   |78304  |1123   |30584 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |78305  |1123   |30588 |2       |5        |6C59DC|0        |2       |0   |
-ROW   |78306  |1124   |30583 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78307  |1124   |30587 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78308  |1125   |30555 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78309  |1125   |30554 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78310  |1125   |30556 |2       |2        |F63100|0        |2       |0   |
-ROW   |78311  |1125   |30557 |2       |3        |A54F10|0        |2       |0   |
-ROW   |78312  |1126   |30565 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78313  |1127   |30567 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78314  |1127   |30568 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78315  |1128   |30536 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78316  |1129   |30566 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78317  |1129   |30549 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78318  |1129   |30553 |2       |2        |F63100|0        |2       |0   |
-ROW   |78319  |1129   |30570 |2       |3        |A54F10|0        |2       |0   |
-ROW   |78320  |1143   |30714 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78321  |1143   |30716 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78322  |1143   |30717 |0       |2        |F63100|0        |2       |0   |
-ROW   |78323  |1143   |30715 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78324  |1144   |30753 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78325  |1144   |30738 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78326  |1145   |30718 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78327  |1145   |30737 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78328  |1145   |30727 |0       |2        |F63100|0        |2       |0   |
-ROW   |78329  |1145   |30729 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78330  |1146   |30730 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78331  |1146   |30732 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78332  |1146   |30731 |0       |2        |F63100|0        |2       |0   |
-ROW   |78333  |1146   |30733 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78334  |1147   |30734 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78335  |1147   |30736 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78336  |1147   |30735 |0       |2        |F63100|0        |2       |0   |
-ROW   |78337  |1147   |30758 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78338  |1148   |30711 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78339  |1148   |30706 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78340  |1148   |30710 |0       |2        |F63100|0        |2       |0   |
-ROW   |78341  |1148   |30712 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78342  |1148   |30702 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78343  |1148   |30707 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78344  |1148   |30704 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78345  |1177   |30927 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78346  |1177   |30944 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78347  |1178   |30935 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78348  |1178   |30942 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78349  |1179   |30949 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78350  |1179   |30950 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78351  |1179   |30951 |0       |2        |F63100|0        |2       |0   |
-ROW   |78352  |1180   |30952 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78353  |1180   |30954 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78354  |1180   |30955 |0       |2        |F63100|0        |2       |0   |
-ROW   |78355  |1181   |30936 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78356  |1181   |30940 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78357  |1182   |30930 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78358  |1182   |30929 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78359  |1182   |30928 |0       |2        |F63100|0        |2       |0   |
-ROW   |78360  |1182   |30931 |2       |3        |A54F10|1        |2       |0   |
-ROW   |78361  |1183   |30934 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78362  |1183   |30941 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78363  |1406   |32532 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |78364  |1406   |32535 |0       |1        |2774A4|1        |2       |0   |
-ROW   |78365  |1406   |32533 |0       |2        |F63100|0        |2       |0   |
-ROW   |78366  |1406   |32534 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78367  |1406   |32536 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78368  |1406   |32537 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78369  |1407   |32543 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78370  |1407   |32544 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78371  |1408   |32518 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78372  |1408   |32521 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78373  |1408   |32523 |0       |2        |F63100|0        |2       |0   |
-ROW   |78374  |1408   |32524 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78375  |1409   |32562 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |78376  |1409   |32565 |0       |1        |2774A4|1        |2       |0   |
-ROW   |78377  |1409   |32563 |0       |2        |F63100|0        |2       |0   |
-ROW   |78378  |1409   |32564 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78379  |1409   |32566 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78380  |1409   |32567 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78381  |1410   |32573 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78382  |1410   |32574 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78383  |1411   |32548 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78384  |1411   |32551 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78385  |1411   |32553 |0       |2        |F63100|0        |2       |0   |
-ROW   |78386  |1411   |32554 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78387  |1250   |31527 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78388  |1250   |31529 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78389  |1250   |31499 |0       |2        |F63100|0        |2       |0   |
-ROW   |78390  |1251   |31532 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78391  |1251   |31534 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78392  |1251   |31538 |0       |2        |F63100|0        |2       |0   |
-ROW   |78393  |1251   |31536 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78394  |1251   |31528 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78395  |1251   |31542 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78396  |1252   |31552 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78397  |1252   |31551 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78398  |1252   |31541 |0       |2        |F63100|0        |2       |0   |
-ROW   |78399  |1253   |31513 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78400  |1253   |31526 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78401  |1253   |31525 |0       |2        |F63100|0        |2       |0   |
-ROW   |78402  |1254   |31502 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78403  |1254   |31501 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78404  |1254   |31503 |0       |2        |F63100|0        |2       |0   |
-ROW   |78405  |1255   |31505 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78406  |1255   |31504 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78407  |1255   |31506 |0       |2        |F63100|0        |2       |0   |
-ROW   |78408  |1256   |31508 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78409  |1256   |31507 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78410  |1256   |31509 |0       |2        |F63100|0        |2       |0   |
-ROW   |78411  |1257   |31511 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78412  |1257   |31510 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78413  |1257   |31500 |0       |2        |F63100|0        |2       |0   |
-ROW   |78414  |1258   |31514 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78415  |1258   |31512 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78416  |1258   |31515 |0       |2        |F63100|0        |2       |0   |
-ROW   |78417  |1259   |31516 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78418  |1259   |31517 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78419  |1260   |31523 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78420  |1260   |31522 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78421  |1260   |31524 |0       |2        |F63100|0        |2       |0   |
-ROW   |78422  |1412   |32601 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78423  |1412   |32602 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78424  |1412   |32603 |0       |2        |F63100|0        |2       |0   |
-ROW   |78425  |1412   |32604 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78426  |1412   |32606 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78427  |1412   |32606 |2       |5        |6C59DC|0        |2       |0   |
-ROW   |78428  |1413   |32608 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78429  |1413   |32610 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78430  |1413   |32611 |0       |2        |F63100|0        |2       |0   |
-ROW   |78431  |1414   |32582 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78432  |1414   |32580 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78433  |1414   |32581 |2       |2        |F63100|0        |2       |0   |
-ROW   |78434  |1414   |32597 |0       |3        |A54F10|1        |2       |0   |
-ROW   |78435  |1414   |32599 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |78436  |1414   |32588 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |78437  |1415   |32583 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78438  |1415   |32584 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78439  |1415   |32585 |0       |2        |F63100|0        |2       |0   |
-ROW   |78440  |1415   |32579 |2       |3        |A54F10|0        |2       |0   |
-ROW   |78441  |1416   |32587 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78442  |1416   |32590 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78443  |1416   |32589 |0       |2        |F63100|0        |2       |0   |
-ROW   |78444  |1417   |32673 |1       |0        |1A7C11|0        |2       |0   |
-ROW   |78445  |1417   |32679 |1       |1        |2774A4|0        |2       |0   |
-ROW   |78446  |1629   |35114 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78447  |1629   |35113 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78448  |1075   |30204 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78449  |1075   |30205 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78450  |1630   |35112 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78451  |1630   |35111 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78452  |1630   |35110 |0       |2        |F63100|0        |2       |0   |
-ROW   |78453  |1630   |35108 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78454  |1630   |35105 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78455  |1076   |30209 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78456  |1076   |30208 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78457  |1077   |30206 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78458  |1077   |30207 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78459  |1078   |30216 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78460  |1078   |30215 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78461  |1079   |30210 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78462  |1079   |30211 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78463  |1079   |30212 |0       |2        |F63100|0        |2       |0   |
-ROW   |78464  |1079   |30213 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78465  |1079   |30214 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78466  |1631   |35127 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78467  |1631   |35126 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78468  |1632   |35124 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78469  |1632   |35123 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78470  |1632   |35122 |0       |2        |F63100|0        |2       |0   |
-ROW   |78471  |1632   |30222 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78472  |1632   |30223 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78473  |1080   |30226 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78474  |1080   |30225 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78475  |1633   |35139 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78476  |1633   |35138 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78477  |1081   |30247 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78478  |1081   |30248 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78479  |1634   |35137 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78480  |1634   |35136 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78481  |1634   |35135 |0       |2        |F63100|0        |2       |0   |
-ROW   |78482  |1634   |35133 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78483  |1634   |35130 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78484  |1082   |30252 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78485  |1082   |30251 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78486  |1083   |30249 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78487  |1083   |30250 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78488  |1084   |30259 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78489  |1084   |30258 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78490  |1085   |30253 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78491  |1085   |30254 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78492  |1085   |30255 |0       |2        |F63100|0        |2       |0   |
-ROW   |78493  |1085   |30256 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78494  |1085   |30257 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78495  |1635   |35152 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78496  |1635   |35151 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78497  |1636   |35149 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78498  |1636   |35148 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78499  |1636   |35147 |0       |2        |F63100|0        |2       |0   |
-ROW   |78500  |1636   |30265 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78501  |1636   |30266 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78502  |1086   |30269 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78503  |1086   |30268 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78504  |1184   |30982 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78505  |1184   |30980 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78506  |1185   |30983 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78507  |1185   |30981 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78508  |1186   |30976 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78509  |1186   |30985 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78510  |1186   |30997 |0       |2        |F63100|0        |2       |0   |
-ROW   |78511  |1186   |30970 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78512  |1186   |30973 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78513  |1186   |30995 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78514  |1186   |30998 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78515  |1186   |30978 |0       |7        |611F27|0        |2       |0   |
-ROW   |78516  |1187   |31024 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78517  |1187   |31022 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78518  |1188   |31025 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78519  |1188   |31023 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78520  |1189   |31018 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78521  |1189   |31027 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78522  |1189   |31039 |0       |2        |F63100|0        |2       |0   |
-ROW   |78523  |1189   |31012 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78524  |1189   |31015 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78525  |1189   |31037 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78526  |1189   |31040 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78527  |1189   |31020 |0       |7        |611F27|0        |2       |0   |
-ROW   |78528  |1499   |33478 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78529  |1499   |33467 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78530  |1500   |33468 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78531  |1500   |33479 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78532  |1501   |33442 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78533  |1501   |33441 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78534  |1501   |33440 |0       |2        |F63100|0        |2       |0   |
-ROW   |78535  |1502   |33423 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78536  |1502   |33419 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78537  |1502   |33422 |0       |2        |F63100|0        |2       |0   |
-ROW   |78538  |1502   |33421 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78539  |1502   |33412 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78540  |1418   |32700 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78541  |1418   |32699 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78542  |1419   |32710 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78543  |1419   |32709 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78544  |1420   |32693 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78545  |1420   |32724 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78546  |1421   |32730 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78547  |1421   |32731 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78548  |1421   |32728 |0       |2        |F63100|0        |2       |0   |
-ROW   |78549  |1421   |32729 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78550  |1422   |32705 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78551  |1422   |32706 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78552  |1423   |32702 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78553  |1423   |32703 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78554  |1424   |32708 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78555  |1424   |32722 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78556  |1424   |32695 |0       |2        |F63100|0        |2       |0   |
-ROW   |78557  |1424   |32753 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78558  |1424   |32740 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |78559  |1424   |32723 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78560  |1424   |32747 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78561  |1424   |32748 |2       |7        |611F27|0        |2       |0   |
-ROW   |78562  |1424   |32749 |0       |8        |F230E0|0        |2       |0   |
-ROW   |78563  |1424   |32750 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |78564  |1424   |32751 |2       |10       |40CDFF|0        |2       |0   |
-ROW   |78565  |1424   |32752 |0       |11       |40FFA0|0        |2       |0   |
-ROW   |78566  |1425   |32746 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78567  |1425   |32745 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78568  |1425   |32744 |0       |2        |F63100|0        |2       |0   |
-ROW   |78569  |1425   |32743 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78570  |1425   |32743 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |78571  |1425   |32742 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78572  |1426   |32720 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78573  |1426   |32721 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78574  |1426   |32719 |0       |2        |F63100|0        |2       |0   |
-ROW   |78575  |1426   |32718 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78576  |1130   |30613 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78577  |1130   |30635 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78578  |1130   |30625 |0       |2        |F63100|0        |2       |0   |
-ROW   |78579  |1131   |30632 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78580  |1131   |30633 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78581  |1131   |30629 |5       |2        |F63100|0        |2       |0   |
-ROW   |78582  |1132   |30630 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78583  |1132   |30628 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78584  |1132   |30631 |2       |2        |F63100|0        |2       |0   |
-ROW   |78585  |1133   |30619 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78586  |1133   |30618 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78587  |1134   |30623 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78588  |1134   |30622 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78589  |1135   |30615 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78590  |841    |28813 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78591  |841    |28811 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78592  |841    |28812 |0       |2        |F63100|0        |2       |0   |
-ROW   |78593  |841    |28814 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78594  |842    |28817 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78595  |842    |28815 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78596  |842    |28816 |0       |2        |F63100|0        |2       |0   |
-ROW   |78597  |844    |28808 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78598  |844    |28807 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78599  |843    |28818 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78600  |845    |28829 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78601  |845    |28831 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78602  |845    |28832 |0       |2        |F63100|0        |2       |0   |
-ROW   |78603  |845    |28830 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78604  |846    |28826 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78605  |846    |28828 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78606  |846    |28827 |0       |2        |F63100|0        |2       |0   |
-ROW   |78607  |847    |28825 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78608  |1637   |35187 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78609  |1638   |35189 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78610  |1638   |35188 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78611  |1638   |35190 |5       |2        |F63100|0        |2       |0   |
-ROW   |78612  |1638   |35191 |5       |3        |A54F10|0        |2       |0   |
-ROW   |78613  |1638   |35192 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |78614  |1639   |35198 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78615  |1640   |35200 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78616  |1640   |35199 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78617  |1640   |35201 |5       |2        |F63100|0        |2       |0   |
-ROW   |78618  |1640   |35202 |5       |3        |A54F10|0        |2       |0   |
-ROW   |78619  |1640   |35203 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |78620  |1641   |35221 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78621  |1641   |35220 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78622  |1641   |35219 |5       |2        |F63100|0        |2       |0   |
-ROW   |78623  |1642   |35214 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78624  |1642   |35216 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78625  |1642   |35207 |5       |2        |F63100|0        |2       |0   |
-ROW   |78626  |1642   |35213 |5       |3        |A54F10|0        |2       |0   |
-ROW   |78627  |1642   |35212 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |78628  |1643   |35228 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78629  |1643   |35229 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78630  |1643   |35227 |5       |2        |F63100|0        |2       |0   |
-ROW   |78631  |1644   |35231 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78632  |1644   |35230 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78633  |1644   |35235 |5       |2        |F63100|0        |2       |0   |
-ROW   |78634  |1644   |35233 |5       |3        |A54F10|0        |2       |0   |
-ROW   |78635  |1644   |35232 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |78636  |1644   |35234 |5       |5        |6C59DC|0        |2       |0   |
-ROW   |78637  |1644   |35236 |5       |6        |AC8C14|0        |2       |0   |
-ROW   |78638  |1644   |35237 |5       |7        |611F27|0        |2       |0   |
-ROW   |78639  |1645   |35243 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78640  |1645   |35244 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78641  |1645   |35245 |5       |2        |F63100|0        |2       |0   |
-ROW   |78642  |1646   |35252 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78643  |1646   |35253 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78644  |1646   |35254 |5       |2        |F63100|0        |2       |0   |
-ROW   |78645  |1647   |35172 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78646  |1647   |35168 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78647  |1647   |35164 |5       |2        |F63100|0        |2       |0   |
-ROW   |78648  |1647   |35163 |5       |3        |A54F10|0        |2       |0   |
-ROW   |78649  |1648   |35170 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78650  |1649   |35167 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78651  |1649   |35166 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78652  |1649   |35165 |5       |2        |F63100|0        |2       |0   |
-ROW   |78653  |1650   |35176 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78654  |1262   |31592 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78655  |1262   |31584 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78656  |1262   |31582 |0       |2        |F63100|0        |2       |0   |
-ROW   |78657  |1262   |31585 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78658  |1263   |31591 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78659  |1263   |31583 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78660  |1263   |31590 |0       |2        |F63100|0        |2       |0   |
-ROW   |78661  |1264   |31602 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78662  |1264   |31597 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78663  |1264   |31601 |0       |2        |F63100|0        |2       |0   |
-ROW   |78664  |1264   |31604 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78665  |1265   |31609 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78666  |1265   |31610 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78667  |1265   |31608 |0       |2        |F63100|0        |2       |0   |
-ROW   |78668  |1001   |29729 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78669  |1001   |29728 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78670  |1001   |29727 |0       |2        |F63100|0        |2       |0   |
-ROW   |78671  |1001   |29725 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78672  |1001   |29723 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78673  |1001   |29733 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78674  |1001   |29737 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78675  |1001   |29731 |0       |7        |611F27|0        |2       |0   |
-ROW   |78676  |1000   |29720 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78677  |1000   |29730 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78678  |1000   |29721 |0       |2        |F63100|0        |2       |0   |
-ROW   |78679  |1000   |29726 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78680  |1000   |29724 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78681  |1000   |29734 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78682  |1000   |29722 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78683  |1000   |29732 |0       |7        |611F27|0        |2       |0   |
-ROW   |78684  |1027   |30022 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78685  |1027   |30021 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78686  |1027   |30019 |0       |2        |F63100|0        |2       |0   |
-ROW   |78687  |1008   |29698 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78688  |1008   |29700 |2       |1        |FF0000|0        |2       |0   |
-ROW   |78689  |1007   |29691 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78690  |1013   |29657 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78691  |1013   |29658 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78692  |1009   |29687 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78693  |1009   |29694 |2       |1        |FF0000|0        |2       |0   |
-ROW   |78694  |1029   |30017 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78695  |1029   |30016 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78696  |1029   |30015 |0       |2        |F63100|0        |2       |0   |
-ROW   |78697  |1031   |30007 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78698  |1031   |30013 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78699  |1031   |30011 |0       |2        |F63100|0        |2       |0   |
-ROW   |78700  |1031   |30009 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78701  |1031   |30005 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78702  |1031   |30003 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78703  |1031   |30023 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78704  |1031   |30001 |0       |7        |611F27|0        |2       |0   |
-ROW   |78705  |1030   |30008 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78706  |1030   |30014 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78707  |1030   |30012 |0       |2        |F63100|0        |2       |0   |
-ROW   |78708  |1030   |30010 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78709  |1030   |30006 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78710  |1030   |30004 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78711  |1030   |30000 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78712  |1030   |30002 |0       |7        |611F27|0        |2       |0   |
-ROW   |78713  |1011   |29695 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78714  |1028   |30020 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78715  |1010   |29701 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78716  |1010   |29697 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78717  |1012   |29692 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78718  |1015   |29812 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78719  |1015   |29811 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78720  |1015   |29810 |0       |2        |F63100|0        |2       |0   |
-ROW   |78721  |1015   |29808 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78722  |1015   |29806 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78723  |1015   |29816 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78724  |1015   |29820 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78725  |1015   |29814 |0       |7        |611F27|0        |2       |0   |
-ROW   |78726  |1014   |29803 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78727  |1014   |29813 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78728  |1014   |29804 |0       |2        |F63100|0        |2       |0   |
-ROW   |78729  |1014   |29809 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78730  |1014   |29807 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78731  |1014   |29817 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78732  |1014   |29805 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78733  |1014   |29815 |0       |7        |611F27|0        |2       |0   |
-ROW   |78734  |1016   |29768 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78735  |1016   |29767 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78736  |1016   |29765 |0       |2        |F63100|0        |2       |0   |
-ROW   |78737  |1022   |29782 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78738  |1022   |29781 |2       |1        |FF0000|0        |2       |0   |
-ROW   |78739  |1021   |29783 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78740  |1023   |29780 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78741  |1023   |29784 |2       |1        |FF0000|0        |2       |0   |
-ROW   |78742  |1018   |29763 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78743  |1018   |29762 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78744  |1018   |29761 |0       |2        |F63100|0        |2       |0   |
-ROW   |78745  |1020   |29753 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78746  |1020   |29759 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78747  |1020   |29757 |0       |2        |F63100|0        |2       |0   |
-ROW   |78748  |1020   |29755 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78749  |1020   |29751 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78750  |1020   |29749 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78751  |1020   |29769 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78752  |1020   |29747 |0       |7        |611F27|0        |2       |0   |
-ROW   |78753  |1019   |29754 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78754  |1019   |29760 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78755  |1019   |29758 |0       |2        |F63100|0        |2       |0   |
-ROW   |78756  |1019   |29756 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78757  |1019   |29752 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78758  |1019   |29750 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78759  |1019   |29746 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78760  |1019   |29748 |0       |7        |611F27|0        |2       |0   |
-ROW   |78761  |1025   |29775 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78762  |1017   |29766 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78763  |1024   |29776 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78764  |1024   |29777 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78765  |1026   |29772 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78766  |1356   |32276 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78767  |1356   |32275 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78768  |1357   |32281 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78769  |1357   |32267 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78770  |1357   |32279 |0       |2        |F63100|0        |2       |0   |
-ROW   |78771  |1358   |32268 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78772  |1358   |32274 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78773  |1358   |32271 |0       |2        |F63100|0        |2       |0   |
-ROW   |78774  |1359   |32288 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78775  |1359   |32291 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78776  |1360   |32247 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78777  |1360   |32245 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78778  |1360   |32246 |0       |2        |F63100|0        |2       |0   |
-ROW   |78779  |1361   |32248 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78780  |1361   |32249 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78781  |1361   |32250 |0       |2        |F63100|0        |2       |0   |
-ROW   |78782  |1362   |32240 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78783  |1362   |32273 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78784  |1363   |32282 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78785  |1363   |32283 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78786  |1363   |32289 |0       |2        |F63100|0        |2       |0   |
-ROW   |78787  |1363   |32290 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78788  |1363   |32286 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78789  |1363   |32287 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78790  |1363   |32241 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78791  |1363   |32242 |0       |7        |611F27|0        |2       |0   |
-ROW   |78792  |1363   |32243 |0       |8        |F230E0|0        |2       |0   |
-ROW   |78793  |1363   |32244 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |78794  |1363   |32277 |0       |10       |40CDFF|0        |2       |0   |
-ROW   |78795  |1363   |32278 |0       |11       |40FFA0|0        |2       |0   |
-ROW   |78796  |1427   |32768 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78797  |1427   |32767 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78798  |1428   |32774 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78799  |1428   |32772 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78800  |1428   |32775 |5       |2        |F63100|0        |2       |0   |
-ROW   |78801  |1428   |32773 |5       |3        |A54F10|0        |2       |0   |
-ROW   |78802  |1429   |32779 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78803  |1429   |32777 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78804  |1429   |32778 |5       |2        |F63100|0        |2       |0   |
-ROW   |78805  |1806   |36785 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78806  |1806   |36786 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78807  |1806   |36787 |0       |2        |F63100|0        |2       |0   |
-ROW   |78808  |1430   |32837 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |78809  |1430   |32836 |2       |1        |2774A4|0        |2       |0   |
-ROW   |78810  |1430   |32835 |2       |2        |F63100|0        |2       |0   |
-ROW   |78811  |1431   |32856 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78812  |1432   |32828 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78813  |1433   |32847 |5       |0        |34bdeb|0        |2       |0   |
-ROW   |78814  |1434   |32797 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78815  |1434   |32796 |5       |1        |2774A4|0        |2       |0   |
-ROW   |78816  |1434   |32801 |2       |2        |F63100|0        |2       |0   |
-ROW   |78817  |1435   |32834 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78818  |1436   |32819 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78819  |1437   |32826 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |78820  |1614   |34976 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78821  |1614   |34975 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78822  |1614   |34978 |0       |2        |F63100|0        |2       |0   |
-ROW   |78823  |1614   |34979 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78824  |1614   |34980 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78825  |1615   |34982 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78826  |1615   |34997 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78827  |1615   |35001 |0       |2        |F63100|0        |2       |0   |
-ROW   |78828  |1615   |35000 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78829  |1615   |34998 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78830  |1615   |34996 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78831  |1616   |35015 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78832  |1616   |35014 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78833  |1617   |35012 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78834  |1617   |35013 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78835  |1618   |34951 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78836  |1618   |34952 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78837  |1618   |34953 |0       |2        |F63100|0        |2       |0   |
-ROW   |78838  |1618   |34954 |0       |3        |A54F10|0        |2       |0   |
-ROW   |78839  |1618   |34956 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |78840  |1618   |34950 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |78841  |1618   |34957 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |78842  |1618   |34959 |0       |7        |611F27|0        |2       |0   |
-ROW   |78843  |1618   |34965 |0       |8        |F230E0|0        |2       |0   |
-ROW   |78844  |1445   |22404 |0       |0        |990099|0        |2       |0   |
-ROW   |78845  |1445   |22399 |0       |1        |990000|0        |2       |0   |
-ROW   |78846  |1445   |22416 |0       |2        |0000EE|0        |2       |0   |
-ROW   |78847  |1445   |25366 |0       |3        |FF33FF|0        |2       |0   |
-ROW   |78848  |1445   |22418 |0       |4        |009600|0        |2       |0   |
-ROW   |78849  |1445   |22402 |0       |5        |003300|0        |2       |0   |
-ROW   |78850  |1445   |22400 |0       |6        |33FFFF|0        |2       |0   |
-ROW   |78851  |1445   |22689 |0       |7        |DD0000|0        |2       |0   |
-ROW   |78852  |1445   |23171 |0       |8        |000099|0        |2       |0   |
-ROW   |78853  |1445   |22401 |0       |9        |00FF00|0        |2       |0   |
-ROW   |78854  |1445   |33023 |0       |10       |5A2B57|0        |2       |0   |
-ROW   |78855  |1651   |22406 |0       |0        |00EE00|0        |2       |0   |
-ROW   |78856  |1651   |25665 |0       |1        |0000EE|0        |2       |0   |
-ROW   |78857  |1651   |25666 |0       |2        |FFAA00|0        |2       |0   |
-ROW   |78858  |1651   |28537 |0       |3        |00EEEE|0        |2       |0   |
-ROW   |78859  |1651   |28535 |0       |4        |990099|0        |2       |0   |
-ROW   |78860  |1652   |22426 |0       |0        |00EE00|0        |2       |0   |
-ROW   |78861  |1652   |22408 |0       |1        |FFAA00|0        |2       |0   |
-ROW   |78862  |1652   |22412 |0       |2        |990099|0        |2       |0   |
-ROW   |78863  |1652   |22414 |0       |3        |FF66FF|0        |2       |0   |
-ROW   |78864  |1652   |23663 |0       |4        |009999|0        |2       |0   |
-ROW   |78865  |1652   |33022 |0       |5        |2B5429|0        |2       |0   |
-ROW   |78866  |1652   |22430 |0       |6        |8048B4|0        |2       |0   |
-ROW   |78867  |1652   |22420 |0       |7        |FD5434|0        |2       |0   |
-ROW   |78868  |1653   |22422 |0       |0        |00EE00|0        |2       |0   |
-ROW   |78869  |1653   |22424 |0       |1        |0000EE|0        |2       |0   |
-ROW   |78870  |1653   |25370 |0       |2        |FFAA00|0        |2       |0   |
-ROW   |78871  |1653   |29822 |0       |3        |00EEEE|0        |2       |0   |
-ROW   |78872  |1653   |34317 |0       |4        |990099|0        |2       |0   |
-ROW   |78873  |1653   |34316 |0       |5        |EE0000|0        |2       |0   |
-ROW   |78874  |1654   |33021 |0       |0        |C80000|0        |2       |0   |
-ROW   |78875  |1654   |33020 |0       |1        |00C800|0        |2       |0   |
-ROW   |78876  |527    |22199 |0       |0        |C80000|0        |2       |0   |
-ROW   |78877  |527    |22196 |0       |1        |00C800|0        |2       |0   |
-ROW   |78878  |410    |22185 |0       |0        |009900|0        |2       |0   |
-ROW   |78879  |410    |22189 |0       |1        |DD0000|0        |2       |0   |
-ROW   |78880  |410    |22396 |0       |2        |00DDDD|0        |2       |0   |
-ROW   |78881  |410    |22183 |0       |3        |3333FF|0        |2       |0   |
-ROW   |78882  |410    |22191 |0       |4        |999900|0        |2       |0   |
-ROW   |78883  |410    |23634 |0       |5        |00FF00|0        |2       |0   |
-ROW   |78884  |404    |22404 |0       |0        |990099|0        |2       |0   |
-ROW   |78885  |404    |22399 |0       |1        |990000|0        |2       |0   |
-ROW   |78886  |404    |22416 |0       |2        |0000EE|0        |2       |0   |
-ROW   |78887  |404    |22430 |0       |3        |FF33FF|0        |2       |0   |
-ROW   |78888  |404    |22418 |0       |4        |009600|0        |2       |0   |
-ROW   |78889  |404    |22402 |0       |5        |003300|0        |2       |0   |
-ROW   |78890  |404    |22420 |0       |6        |CCCC00|0        |2       |0   |
-ROW   |78891  |404    |22400 |0       |7        |33FFFF|0        |2       |0   |
-ROW   |78892  |404    |22689 |0       |8        |DD0000|0        |2       |0   |
-ROW   |78893  |404    |23171 |0       |9        |000099|0        |2       |0   |
-ROW   |78894  |404    |22401 |0       |10       |00FF00|0        |2       |0   |
-ROW   |78895  |404    |33023 |0       |11       |5A2B57|0        |2       |0   |
-ROW   |78896  |406    |22426 |0       |1        |00EE00|0        |2       |0   |
-ROW   |78897  |406    |22422 |0       |2        |0000EE|0        |2       |0   |
-ROW   |78898  |406    |22408 |0       |3        |FFAA00|0        |2       |0   |
-ROW   |78899  |406    |22424 |0       |4        |00EEEE|0        |2       |0   |
-ROW   |78900  |406    |22412 |0       |5        |990099|0        |2       |0   |
-ROW   |78901  |406    |22406 |0       |6        |EE0000|0        |2       |0   |
-ROW   |78902  |406    |22414 |0       |7        |FF66FF|0        |2       |0   |
-ROW   |78903  |406    |23663 |0       |8        |009999|0        |2       |0   |
-ROW   |78904  |406    |25366 |0       |9        |BBBB00|0        |2       |0   |
-ROW   |78905  |406    |25370 |0       |10       |AA0000|0        |2       |0   |
-ROW   |78906  |406    |25665 |0       |11       |990000|0        |2       |0   |
-ROW   |78907  |406    |25666 |0       |12       |008800|0        |2       |0   |
-ROW   |78908  |406    |28535 |0       |13       |80B0E0|0        |2       |0   |
-ROW   |78909  |406    |28537 |0       |14       |4080B0|0        |2       |0   |
-ROW   |78910  |406    |29822 |0       |15       |8000FF|0        |2       |0   |
-ROW   |78911  |406    |33022 |0       |16       |2B5429|0        |2       |0   |
-ROW   |78912  |406    |34317 |0       |17       |8048B4|0        |2       |0   |
-ROW   |78913  |406    |34316 |0       |18       |FD5434|0        |2       |0   |
-ROW   |78914  |406    |35274 |0       |19       |790E1F|0        |2       |0   |
-ROW   |78915  |406    |35272 |0       |20       |87AC4D|0        |2       |0   |
-ROW   |78916  |788    |28248 |0       |0        |008800|0        |2       |0   |
-ROW   |78917  |788    |28533 |0       |1        |EE0000|0        |2       |0   |
-ROW   |78918  |392    |22187 |5       |0        |00C800|0        |2       |0   |
-ROW   |78919  |392    |23251 |0       |1        |F63100|0        |2       |0   |
-ROW   |78920  |1444   |28581 |0       |0        |990099|0        |2       |0   |
-ROW   |78921  |1444   |28574 |0       |1        |990000|0        |2       |0   |
-ROW   |78922  |1444   |28571 |0       |2        |0000EE|0        |2       |0   |
-ROW   |78923  |1444   |28562 |0       |3        |FF33FF|0        |2       |0   |
-ROW   |78924  |1444   |28570 |0       |4        |009600|0        |2       |0   |
-ROW   |78925  |1444   |28569 |0       |5        |003300|0        |2       |0   |
-ROW   |78926  |1444   |28552 |0       |6        |33FFFF|0        |2       |0   |
-ROW   |78927  |1444   |28573 |0       |7        |DD0000|0        |2       |0   |
-ROW   |78928  |1444   |28579 |0       |8        |000099|0        |2       |0   |
-ROW   |78929  |1444   |28559 |0       |9        |00FF00|0        |2       |0   |
-ROW   |78930  |1444   |33017 |0       |10       |5A2B57|0        |2       |0   |
-ROW   |78931  |1659   |28567 |0       |0        |00EE00|0        |2       |0   |
-ROW   |78932  |1659   |28575 |0       |1        |0000EE|0        |2       |0   |
-ROW   |78933  |1659   |28576 |0       |2        |FFAA00|0        |2       |0   |
-ROW   |78934  |1659   |28583 |0       |3        |00EEEE|0        |2       |0   |
-ROW   |78935  |1659   |28582 |0       |4        |990099|0        |2       |0   |
-ROW   |78936  |1660   |28572 |0       |0        |00EE00|0        |2       |0   |
-ROW   |78937  |1660   |28568 |0       |1        |FFAA00|0        |2       |0   |
-ROW   |78938  |1660   |28564 |0       |2        |990099|0        |2       |0   |
-ROW   |78939  |1660   |28578 |0       |3        |FF66FF|0        |2       |0   |
-ROW   |78940  |1660   |28580 |0       |4        |009999|0        |2       |0   |
-ROW   |78941  |1660   |33016 |0       |5        |2B5429|0        |2       |0   |
-ROW   |78942  |1660   |28565 |0       |6        |8048B4|0        |2       |0   |
-ROW   |78943  |1660   |28577 |0       |7        |FD5434|0        |2       |0   |
-ROW   |78944  |1661   |28566 |0       |0        |00EE00|0        |2       |0   |
-ROW   |78945  |1661   |28561 |0       |1        |0000EE|0        |2       |0   |
-ROW   |78946  |1661   |28563 |0       |2        |FFAA00|0        |2       |0   |
-ROW   |78947  |1661   |29821 |0       |3        |00EEEE|0        |2       |0   |
-ROW   |78948  |1661   |34314 |0       |4        |990099|0        |2       |0   |
-ROW   |78949  |1661   |34315 |0       |5        |EE0000|0        |2       |0   |
-ROW   |78950  |1662   |33015 |0       |0        |C80000|0        |2       |0   |
-ROW   |78951  |1662   |33014 |0       |1        |00C800|0        |2       |0   |
-ROW   |78952  |797    |28546 |0       |0        |C80000|0        |2       |0   |
-ROW   |78953  |797    |28545 |0       |1        |00C800|0        |2       |0   |
-ROW   |78954  |798    |28551 |0       |0        |009900|0        |2       |0   |
-ROW   |78955  |798    |28543 |0       |1        |DD0000|0        |2       |0   |
-ROW   |78956  |798    |28542 |0       |2        |00DDDD|0        |2       |0   |
-ROW   |78957  |798    |28549 |0       |3        |3333FF|0        |2       |0   |
-ROW   |78958  |798    |28544 |0       |4        |999900|0        |2       |0   |
-ROW   |78959  |798    |28548 |0       |5        |00FF00|0        |2       |0   |
-ROW   |78960  |799    |28581 |0       |0        |990099|0        |2       |0   |
-ROW   |78961  |799    |28574 |0       |1        |990000|0        |2       |0   |
-ROW   |78962  |799    |28571 |0       |2        |0000EE|0        |2       |0   |
-ROW   |78963  |799    |28565 |0       |3        |FF33FF|0        |2       |0   |
-ROW   |78964  |799    |28570 |0       |4        |009600|0        |2       |0   |
-ROW   |78965  |799    |28569 |0       |5        |003300|0        |2       |0   |
-ROW   |78966  |799    |28577 |0       |6        |CCCC00|0        |2       |0   |
-ROW   |78967  |799    |28552 |0       |7        |33FFFF|0        |2       |0   |
-ROW   |78968  |799    |28573 |0       |8        |DD0000|0        |2       |0   |
-ROW   |78969  |799    |28579 |0       |9        |000099|0        |2       |0   |
-ROW   |78970  |799    |28559 |0       |10       |00FF00|0        |2       |0   |
-ROW   |78971  |799    |33017 |0       |11       |5A2B57|0        |2       |0   |
-ROW   |78972  |800    |28572 |0       |1        |00EE00|0        |2       |0   |
-ROW   |78973  |800    |28566 |0       |2        |0000EE|0        |2       |0   |
-ROW   |78974  |800    |28568 |0       |3        |FFAA00|0        |2       |0   |
-ROW   |78975  |800    |28561 |0       |4        |00EEEE|0        |2       |0   |
-ROW   |78976  |800    |28564 |0       |5        |990099|0        |2       |0   |
-ROW   |78977  |800    |28567 |0       |6        |EE0000|0        |2       |0   |
-ROW   |78978  |800    |28578 |0       |7        |FF66FF|0        |2       |0   |
-ROW   |78979  |800    |28580 |0       |8        |009999|0        |2       |0   |
-ROW   |78980  |800    |28562 |0       |9        |BBBB00|0        |2       |0   |
-ROW   |78981  |800    |28563 |0       |10       |AA0000|0        |2       |0   |
-ROW   |78982  |800    |28575 |0       |11       |990000|0        |2       |0   |
-ROW   |78983  |800    |28576 |0       |12       |008800|0        |2       |0   |
-ROW   |78984  |800    |28582 |0       |13       |80B0E0|0        |2       |0   |
-ROW   |78985  |800    |28583 |0       |14       |4080B0|0        |2       |0   |
-ROW   |78986  |800    |29821 |0       |15       |8000FF|0        |2       |0   |
-ROW   |78987  |800    |33016 |0       |16       |2B5429|0        |2       |0   |
-ROW   |78988  |800    |34314 |0       |17       |8048B4|0        |2       |0   |
-ROW   |78989  |800    |34315 |0       |18       |FD5434|0        |2       |0   |
-ROW   |78990  |800    |35279 |0       |19       |790E1F|0        |2       |0   |
-ROW   |78991  |800    |35278 |0       |20       |87AC4D|0        |2       |0   |
-ROW   |78992  |801    |28560 |0       |0        |008800|0        |2       |0   |
-ROW   |78993  |801    |28584 |0       |1        |EE0000|0        |2       |0   |
-ROW   |78994  |802    |28550 |5       |0        |00C800|0        |2       |0   |
-ROW   |78995  |802    |28540 |0       |1        |F63100|0        |2       |0   |
-ROW   |78996  |1438   |33001 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |78997  |1438   |33002 |0       |1        |2774A4|0        |2       |0   |
-ROW   |78998  |1438   |33000 |2       |2        |F63100|0        |2       |0   |
-ROW   |78999  |1439   |33005 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79000  |1439   |33004 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79001  |1440   |32980 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79002  |1440   |32970 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79003  |1441   |32967 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79004  |1441   |32968 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79005  |1441   |32995 |2       |2        |F63100|0        |2       |0   |
-ROW   |79006  |1442   |32997 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79007  |1442   |32984 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79008  |1443   |32973 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79009  |1443   |32971 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79010  |1503   |33518 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79011  |1504   |33501 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79012  |803    |28599 |0       |0        |DD0000|0        |2       |0   |
-ROW   |79013  |803    |28596 |0       |1        |00DDDD|0        |2       |0   |
-ROW   |79014  |803    |28597 |0       |2        |3333FF|0        |2       |0   |
-ROW   |79015  |803    |28598 |0       |3        |00FF00|0        |2       |0   |
-ROW   |79016  |804    |28602 |0       |1        |990099|0        |2       |0   |
-ROW   |79017  |804    |28606 |0       |2        |990000|0        |2       |0   |
-ROW   |79018  |804    |28608 |0       |3        |0000EE|0        |2       |0   |
-ROW   |79019  |804    |28615 |0       |4        |FF33FF|0        |2       |0   |
-ROW   |79020  |804    |28610 |0       |5        |00EE00|0        |2       |0   |
-ROW   |79021  |804    |28611 |0       |6        |003300|0        |2       |0   |
-ROW   |79022  |804    |28616 |0       |7        |33FFFF|0        |2       |0   |
-ROW   |79023  |804    |28607 |0       |8        |DD0000|0        |2       |0   |
-ROW   |79024  |804    |28604 |0       |9        |000099|0        |2       |0   |
-ROW   |79025  |804    |28588 |0       |10       |00FF00|0        |2       |0   |
-ROW   |79026  |804    |33013 |0       |11       |BB2A02|0        |2       |0   |
-ROW   |79027  |805    |28612 |0       |1        |FFAA00|0        |2       |0   |
-ROW   |79028  |805    |28600 |0       |2        |990099|0        |2       |0   |
-ROW   |79029  |805    |28613 |0       |3        |EE0000|0        |2       |0   |
-ROW   |79030  |805    |28605 |0       |4        |FF66FF|0        |2       |0   |
-ROW   |79031  |805    |28614 |0       |5        |960000|0        |2       |0   |
-ROW   |79032  |805    |28601 |0       |6        |009600|0        |2       |0   |
-ROW   |79033  |805    |28603 |0       |7        |009999|0        |2       |0   |
-ROW   |79034  |805    |28609 |0       |8        |BBBB00|0        |2       |0   |
-ROW   |79035  |805    |33012 |0       |9        |F230E0|0        |2       |0   |
-ROW   |79036  |806    |28595 |0       |0        |00C800|0        |2       |0   |
-ROW   |79037  |806    |28586 |0       |1        |C80000|0        |2       |0   |
-ROW   |79038  |529    |23357 |0       |0        |DD0000|0        |2       |0   |
-ROW   |79039  |529    |23341 |0       |1        |00DDDD|0        |2       |0   |
-ROW   |79040  |529    |23342 |0       |2        |3333FF|0        |2       |0   |
-ROW   |79041  |529    |28251 |0       |3        |00FF00|0        |2       |0   |
-ROW   |79042  |530    |23345 |0       |1        |990099|0        |2       |0   |
-ROW   |79043  |530    |23348 |0       |2        |990000|0        |2       |0   |
-ROW   |79044  |530    |23355 |0       |3        |0000EE|0        |2       |0   |
-ROW   |79045  |530    |23352 |0       |4        |FF33FF|0        |2       |0   |
-ROW   |79046  |530    |23356 |0       |5        |007700|0        |2       |0   |
-ROW   |79047  |530    |23354 |0       |6        |003300|0        |2       |0   |
-ROW   |79048  |530    |23346 |0       |7        |33FFFF|0        |2       |0   |
-ROW   |79049  |530    |23349 |0       |8        |DD0000|0        |2       |0   |
-ROW   |79050  |530    |23344 |0       |9        |000099|0        |7       |0   |
-ROW   |79051  |530    |28250 |0       |10       |00FF00|0        |2       |0   |
-ROW   |79052  |530    |33019 |0       |11       |BB2A02|0        |2       |0   |
-ROW   |79053  |531    |23353 |0       |1        |FFAA00|0        |2       |0   |
-ROW   |79054  |531    |23347 |0       |2        |990099|0        |2       |0   |
-ROW   |79055  |531    |23350 |0       |3        |EE0000|0        |2       |0   |
-ROW   |79056  |531    |23343 |0       |4        |FF66FF|0        |2       |0   |
-ROW   |79057  |531    |23351 |0       |5        |0000EE|0        |2       |0   |
-ROW   |79058  |531    |23360 |0       |6        |00EE00|0        |2       |0   |
-ROW   |79059  |531    |25369 |0       |7        |009999|0        |2       |0   |
-ROW   |79060  |531    |25368 |0       |8        |BBBB00|0        |2       |0   |
-ROW   |79061  |531    |28618 |0       |9        |990000|0        |2       |0   |
-ROW   |79062  |531    |28619 |0       |10       |008800|0        |2       |0   |
-ROW   |79063  |531    |33018 |0       |11       |BB2A02|0        |2       |0   |
-ROW   |79064  |807    |28617 |0       |0        |008800|0        |2       |0   |
-ROW   |79065  |532    |23340 |5       |0        |00C800|0        |2       |0   |
-ROW   |79066  |532    |23358 |5       |1        |C80000|1        |2       |0   |
-ROW   |79067  |472    |22945 |5       |0        |00AA00|0        |2       |0   |
-ROW   |79068  |472    |22946 |5       |1        |3333FF|0        |2       |0   |
-ROW   |79069  |473    |22950 |0       |0        |C80000|0        |2       |2   |
-ROW   |79070  |473    |22948 |0       |1        |00C800|0        |2       |0   |
-ROW   |79071  |471    |22924 |0       |0        |009900|0        |2       |0   |
-ROW   |79072  |471    |22920 |0       |1        |000099|0        |2       |0   |
-ROW   |79073  |469    |22922 |0       |0        |009900|0        |2       |0   |
-ROW   |79074  |469    |22923 |0       |1        |000099|0        |2       |0   |
-ROW   |79075  |469    |22921 |0       |2        |990000|0        |2       |0   |
-ROW   |79076  |498    |23109 |0       |0        |009999|0        |2       |0   |
-ROW   |79077  |498    |23112 |0       |1        |990099|0        |2       |0   |
-ROW   |79078  |498    |23115 |0       |2        |999900|0        |2       |0   |
-ROW   |79079  |498    |23113 |0       |3        |990000|0        |2       |0   |
-ROW   |79080  |498    |23114 |0       |4        |000099|0        |2       |0   |
-ROW   |79081  |498    |23110 |0       |5        |009900|0        |2       |0   |
-ROW   |79082  |540    |22942 |5       |0        |00C800|0        |2       |0   |
-ROW   |79083  |492    |23073 |5       |0        |00AA00|0        |2       |0   |
-ROW   |79084  |492    |23074 |5       |1        |3333FF|0        |2       |0   |
-ROW   |79085  |467    |22910 |0       |0        |C80000|0        |2       |2   |
-ROW   |79086  |467    |22908 |0       |1        |00C800|0        |2       |0   |
-ROW   |79087  |465    |22884 |0       |0        |009900|0        |2       |0   |
-ROW   |79088  |465    |22880 |0       |1        |000099|0        |2       |0   |
-ROW   |79089  |463    |22882 |0       |0        |009900|0        |2       |0   |
-ROW   |79090  |463    |22883 |0       |1        |000099|0        |2       |0   |
-ROW   |79091  |463    |22881 |0       |2        |990000|0        |2       |0   |
-ROW   |79092  |462    |22886 |1       |0        |009999|0        |2       |0   |
-ROW   |79093  |462    |22888 |1       |1        |990099|0        |2       |0   |
-ROW   |79094  |462    |22891 |1       |2        |990000|0        |2       |0   |
-ROW   |79095  |462    |22892 |1       |3        |000099|0        |2       |0   |
-ROW   |79096  |462    |22885 |1       |4        |009900|0        |2       |0   |
-ROW   |79097  |541    |22902 |5       |0        |00C800|0        |2       |0   |
-ROW   |79098  |464    |22897 |0       |0        |AA0000|0        |2       |2   |
-ROW   |79099  |464    |22895 |0       |1        |00AA00|0        |2       |0   |
-ROW   |79100  |478    |22985 |5       |0        |00AA00|0        |2       |0   |
-ROW   |79101  |478    |22986 |5       |1        |3333FF|0        |2       |0   |
-ROW   |79102  |479    |22990 |0       |0        |C80000|0        |2       |2   |
-ROW   |79103  |479    |22988 |0       |1        |00C800|0        |2       |0   |
-ROW   |79104  |475    |22962 |0       |0        |009900|0        |2       |0   |
-ROW   |79105  |475    |22963 |0       |1        |000099|0        |2       |0   |
-ROW   |79106  |475    |22961 |0       |2        |990000|0        |2       |0   |
-ROW   |79107  |474    |22968 |1       |0        |990099|0        |2       |0   |
-ROW   |79108  |474    |22971 |1       |1        |990000|0        |2       |0   |
-ROW   |79109  |474    |22972 |1       |2        |000099|0        |2       |0   |
-ROW   |79110  |474    |22965 |1       |3        |009900|0        |2       |0   |
-ROW   |79111  |542    |22982 |5       |0        |00C800|0        |2       |0   |
-ROW   |79112  |491    |23070 |0       |0        |C80000|0        |2       |2   |
-ROW   |79113  |491    |23068 |0       |1        |00C800|0        |2       |0   |
-ROW   |79114  |487    |23042 |0       |0        |009900|0        |2       |0   |
-ROW   |79115  |487    |23043 |0       |1        |000099|0        |2       |0   |
-ROW   |79116  |487    |23041 |0       |2        |990000|0        |2       |0   |
-ROW   |79117  |543    |23062 |5       |0        |00C800|0        |2       |0   |
-ROW   |79118  |494    |23077 |5       |0        |00AA00|0        |2       |0   |
-ROW   |79119  |494    |23078 |5       |1        |3333FF|0        |2       |0   |
-ROW   |79120  |493    |23075 |5       |0        |00AA00|0        |2       |0   |
-ROW   |79121  |493    |23076 |5       |1        |3333FF|0        |2       |0   |
-ROW   |79122  |461    |22870 |0       |0        |C80000|0        |2       |2   |
-ROW   |79123  |461    |22868 |0       |1        |00C800|0        |2       |0   |
-ROW   |79124  |459    |22844 |0       |0        |009900|0        |2       |0   |
-ROW   |79125  |459    |22840 |0       |1        |000099|0        |2       |0   |
-ROW   |79126  |457    |22842 |0       |0        |009900|0        |2       |0   |
-ROW   |79127  |457    |22843 |0       |1        |000099|0        |2       |0   |
-ROW   |79128  |457    |22841 |0       |2        |990000|0        |2       |0   |
-ROW   |79129  |456    |22846 |1       |0        |009999|0        |2       |0   |
-ROW   |79130  |456    |22848 |1       |1        |990099|0        |2       |0   |
-ROW   |79131  |456    |22851 |1       |2        |990000|0        |2       |0   |
-ROW   |79132  |456    |22852 |1       |3        |000099|0        |2       |0   |
-ROW   |79133  |456    |22845 |1       |4        |009900|0        |2       |0   |
-ROW   |79134  |544    |22862 |5       |0        |00C800|0        |2       |0   |
-ROW   |79135  |458    |22857 |0       |0        |AA0000|0        |2       |2   |
-ROW   |79136  |458    |22855 |0       |1        |00AA00|0        |2       |0   |
-ROW   |79137  |484    |23025 |5       |0        |00AA00|0        |2       |0   |
-ROW   |79138  |484    |23026 |5       |1        |3333FF|0        |2       |0   |
-ROW   |79139  |485    |23030 |0       |0        |C80000|0        |2       |2   |
-ROW   |79140  |485    |23028 |0       |1        |00C800|0        |2       |0   |
-ROW   |79141  |483    |23004 |0       |0        |009900|0        |2       |0   |
-ROW   |79142  |483    |23000 |0       |1        |000099|0        |2       |0   |
-ROW   |79143  |481    |23002 |0       |0        |009900|0        |2       |0   |
-ROW   |79144  |481    |23003 |0       |1        |000099|0        |2       |0   |
-ROW   |79145  |481    |23001 |0       |2        |990000|0        |2       |0   |
-ROW   |79146  |480    |23007 |1       |0        |999900|0        |2       |0   |
-ROW   |79147  |480    |23011 |1       |1        |990000|0        |2       |0   |
-ROW   |79148  |480    |23012 |1       |2        |000099|0        |2       |0   |
-ROW   |79149  |480    |23005 |1       |3        |009900|0        |2       |0   |
-ROW   |79150  |545    |23022 |5       |0        |00C800|0        |2       |0   |
-ROW   |79151  |482    |23017 |0       |0        |AA0000|0        |2       |2   |
-ROW   |79152  |482    |23015 |0       |1        |00AA00|0        |2       |0   |
-ROW   |79153  |651    |26928 |5       |0        |EE0000|0        |2       |0   |
-ROW   |79154  |651    |26927 |0       |1        |000000|1        |2       |0   |
-ROW   |79155  |652    |26925 |2       |0        |880000|0        |2       |0   |
-ROW   |79156  |652    |26932 |0       |1        |009900|0        |2       |0   |
-ROW   |79157  |652    |26930 |0       |2        |00CCCC|0        |2       |0   |
-ROW   |79158  |652    |26931 |0       |3        |000000|0        |2       |0   |
-ROW   |79159  |652    |26929 |0       |4        |3333FF|0        |2       |0   |
-ROW   |79160  |652    |26926 |0       |5        |777700|0        |2       |0   |
-ROW   |79161  |653    |26933 |2       |0        |EE0000|0        |2       |0   |
-ROW   |79162  |653    |26943 |2       |1        |EE00EE|0        |2       |0   |
-ROW   |79163  |653    |26935 |0       |2        |000000|1        |2       |0   |
-ROW   |79164  |653    |26936 |4       |3        |000000|1        |2       |0   |
-ROW   |79165  |654    |26934 |2       |0        |880000|0        |2       |0   |
-ROW   |79166  |654    |26939 |0       |1        |009900|0        |2       |0   |
-ROW   |79167  |654    |26942 |0       |2        |00CCCC|0        |2       |0   |
-ROW   |79168  |654    |26938 |0       |3        |000000|0        |2       |0   |
-ROW   |79169  |654    |26937 |0       |4        |3333FF|0        |2       |0   |
-ROW   |79170  |1447   |33113 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79171  |1447   |33112 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79172  |1447   |33099 |0       |2        |F63100|0        |2       |0   |
-ROW   |79173  |1447   |33098 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79174  |1448   |33125 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79175  |1448   |33110 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79176  |1449   |33080 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79177  |1449   |33081 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79178  |1450   |33089 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79179  |1450   |33085 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79180  |1451   |33082 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79181  |1451   |33086 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79182  |1451   |33083 |0       |2        |F63100|0        |2       |0   |
-ROW   |79183  |1451   |33084 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79184  |1451   |33087 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79185  |1451   |33088 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79186  |1452   |33093 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79187  |1452   |33092 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79188  |1453   |33077 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79189  |1453   |33063 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79190  |1454   |33094 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79191  |1454   |33059 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79192  |1455   |33066 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79193  |1455   |33071 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79194  |1455   |33067 |0       |2        |F63100|0        |2       |0   |
-ROW   |79195  |1455   |33068 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79196  |1455   |33072 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79197  |1455   |33073 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79198  |1159   |30886 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79199  |1159   |30887 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79200  |1160   |30888 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79201  |1160   |30882 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79202  |1160   |30890 |0       |2        |F63100|0        |2       |0   |
-ROW   |79203  |1160   |30881 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79204  |1160   |30889 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79205  |1161   |30847 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79206  |1161   |30872 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79207  |1162   |30853 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79208  |1162   |30849 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79209  |1162   |30852 |2       |2        |F63100|0        |2       |0   |
-ROW   |79210  |1162   |30851 |2       |3        |A54F10|0        |2       |0   |
-ROW   |79211  |1162   |30848 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |79212  |1163   |30856 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79213  |1163   |30855 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79214  |1163   |30854 |2       |2        |F63100|1        |2       |0   |
-ROW   |79215  |1164   |30859 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79216  |1164   |30870 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79217  |1165   |30860 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79218  |1165   |30871 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79219  |1166   |30868 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79220  |1166   |30869 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79221  |1166   |30867 |0       |2        |F63100|0        |2       |0   |
-ROW   |79222  |1166   |30866 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79223  |1166   |30865 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79224  |1167   |30850 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79225  |1167   |30863 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79226  |1167   |30861 |5       |2        |F63100|0        |2       |0   |
-ROW   |79227  |1168   |30833 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79228  |1168   |30841 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79229  |1168   |30857 |2       |2        |F63100|0        |2       |0   |
-ROW   |79230  |1169   |30834 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79231  |1169   |30831 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79232  |1170   |30846 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79233  |1576   |34320 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79234  |1576   |30845 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79235  |1576   |30842 |0       |2        |F63100|0        |2       |0   |
-ROW   |79236  |1576   |30873 |2       |3        |A54F10|1        |2       |0   |
-ROW   |79237  |1663   |35291 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79238  |1663   |35300 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79239  |1664   |35295 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79240  |1664   |35296 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79241  |1665   |35301 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79242  |1665   |35306 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79243  |1665   |35304 |0       |2        |F63100|0        |2       |0   |
-ROW   |79244  |1665   |35302 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79245  |1666   |35308 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79246  |1666   |35310 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79247  |1666   |35309 |0       |2        |F63100|0        |2       |0   |
-ROW   |79248  |1667   |35322 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79249  |1667   |35320 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79250  |1668   |35329 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79251  |1668   |35330 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79252  |1669   |35332 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79253  |1669   |35334 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79254  |1670   |35335 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79255  |1670   |35333 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79256  |1671   |35338 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79257  |1671   |35341 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79258  |1671   |35339 |0       |2        |F63100|0        |2       |0   |
-ROW   |79259  |1671   |35340 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79260  |1672   |35347 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79261  |1672   |35346 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79262  |1672   |35345 |0       |2        |F63100|0        |2       |0   |
-ROW   |79263  |1673   |35350 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79264  |1673   |35351 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79265  |1674   |35349 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79266  |1674   |35352 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79267  |1674   |35353 |0       |2        |F63100|0        |2       |0   |
-ROW   |79268  |1675   |35355 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79269  |1675   |35356 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79270  |1505   |33553 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79271  |1505   |33562 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79272  |1506   |33557 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79273  |1506   |33558 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79274  |1507   |33563 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79275  |1507   |33568 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79276  |1507   |33566 |0       |2        |F63100|0        |2       |0   |
-ROW   |79277  |1507   |33564 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79278  |1508   |33570 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79279  |1508   |33572 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79280  |1508   |33571 |0       |2        |F63100|0        |2       |0   |
-ROW   |79281  |1509   |33584 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79282  |1509   |33582 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79283  |1510   |33591 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79284  |1510   |33592 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79285  |1511   |33594 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79286  |1511   |33596 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79287  |1512   |33597 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79288  |1512   |33595 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79289  |1513   |33600 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79290  |1513   |33603 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79291  |1513   |33601 |0       |2        |F63100|0        |2       |0   |
-ROW   |79292  |1513   |33602 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79293  |1514   |33609 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79294  |1514   |33608 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79295  |1514   |33607 |0       |2        |F63100|0        |2       |0   |
-ROW   |79296  |1515   |33612 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79297  |1515   |33613 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79298  |1516   |33611 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79299  |1516   |33614 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79300  |1516   |33615 |0       |2        |F63100|0        |2       |0   |
-ROW   |79301  |1517   |33617 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79302  |1517   |33618 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79303  |1807   |36817 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79304  |1807   |36816 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79305  |1808   |36815 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79306  |1808   |36814 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79307  |1808   |36818 |0       |2        |F63100|0        |2       |0   |
-ROW   |79308  |1808   |36819 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79309  |1809   |36805 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79310  |1809   |36804 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79311  |1527   |33819 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79312  |1527   |33839 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79313  |1528   |33820 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79314  |1528   |33816 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79315  |1529   |33826 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79316  |1529   |33831 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79317  |1529   |33829 |0       |2        |F63100|0        |2       |0   |
-ROW   |79318  |1529   |33821 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79319  |1529   |33825 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79320  |1529   |33833 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79321  |1529   |33823 |2       |6        |AC8C14|0        |2       |0   |
-ROW   |79322  |1530   |33828 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79323  |1530   |33832 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79324  |1530   |33830 |0       |2        |F63100|0        |2       |0   |
-ROW   |79325  |1530   |33822 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79326  |1530   |33815 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79327  |1530   |33834 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79328  |1530   |33824 |2       |6        |AC8C14|0        |2       |0   |
-ROW   |79329  |1531   |33840 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79330  |1531   |33845 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79331  |1532   |33844 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79332  |1532   |33847 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79333  |1532   |33843 |0       |2        |F63100|0        |2       |0   |
-ROW   |79334  |1532   |33841 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79335  |1533   |33863 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79336  |1534   |33792 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79337  |1534   |33791 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79338  |1534   |33793 |0       |2        |F63100|0        |2       |0   |
-ROW   |79339  |1535   |33802 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79340  |1535   |33770 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79341  |1536   |33800 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79342  |1536   |33799 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79343  |1536   |33801 |0       |2        |F63100|0        |2       |0   |
-ROW   |79344  |1537   |33798 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79345  |1537   |33806 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79346  |1537   |33774 |0       |2        |F63100|0        |2       |0   |
-ROW   |79347  |1538   |33769 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79348  |1538   |33787 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79349  |1538   |33789 |0       |2        |F63100|0        |2       |0   |
-ROW   |79350  |1538   |33790 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79351  |1539   |33785 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79352  |1539   |33772 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79353  |1539   |33773 |0       |2        |F63100|0        |2       |0   |
-ROW   |79354  |1539   |33771 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79355  |1540   |33776 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79356  |1540   |33775 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79357  |1541   |33782 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79358  |1541   |33781 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79359  |1541   |33780 |0       |2        |F63100|0        |2       |0   |
-ROW   |79360  |1541   |33783 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79361  |1541   |33777 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79362  |1541   |33778 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79363  |1542   |33804 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79364  |1542   |33803 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79365  |1542   |33805 |2       |2        |F63100|0        |2       |0   |
-ROW   |79366  |1543   |33937 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79367  |1543   |33940 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79368  |1543   |33936 |0       |2        |F63100|0        |2       |0   |
-ROW   |79369  |1543   |33934 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79370  |1544   |33915 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79371  |1544   |33911 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79372  |1544   |33912 |0       |2        |F63100|0        |2       |0   |
-ROW   |79373  |1544   |33910 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79374  |1544   |33914 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79375  |1545   |33918 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79376  |1545   |33905 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79377  |1545   |33917 |0       |2        |F63100|0        |2       |0   |
-ROW   |79378  |1545   |33916 |2       |3        |A54F10|1        |2       |0   |
-ROW   |79379  |1546   |33908 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79380  |1546   |33909 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79381  |1546   |33902 |0       |2        |F63100|0        |2       |0   |
-ROW   |79382  |1547   |33893 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79383  |1547   |33892 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79384  |1548   |33899 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79385  |1548   |33898 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79386  |1548   |33895 |2       |2        |F63100|0        |2       |0   |
-ROW   |79387  |1548   |33900 |2       |3        |A54F10|0        |2       |0   |
-ROW   |79388  |1548   |33896 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |79389  |1548   |33891 |2       |5        |6C59DC|0        |2       |0   |
-ROW   |79390  |1190   |31140 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79391  |1190   |31141 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79392  |1261   |31145 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79393  |1261   |31146 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79394  |1261   |31147 |0       |2        |F63100|0        |2       |0   |
-ROW   |79395  |1191   |31138 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79396  |1192   |31157 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79397  |1192   |31158 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79398  |1193   |31092 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79399  |1193   |31108 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79400  |1193   |31110 |0       |2        |F63100|0        |2       |0   |
-ROW   |79401  |1193   |31067 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79402  |1193   |31086 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79403  |1193   |31087 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79404  |1194   |31120 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79405  |1194   |31105 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79406  |1194   |31071 |0       |2        |F63100|0        |2       |0   |
-ROW   |79407  |1194   |31081 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79408  |1195   |31098 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79409  |1195   |31099 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79410  |1196   |31072 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79411  |1196   |31072 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79412  |1197   |31103 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79413  |1197   |31074 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79414  |1198   |31104 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79415  |1198   |31063 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79416  |1198   |31111 |0       |2        |F63100|0        |2       |0   |
-ROW   |79417  |1198   |31112 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79418  |1198   |31084 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79419  |1199   |31115 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79420  |1199   |31116 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79421  |1199   |31062 |0       |2        |F63100|0        |2       |0   |
-ROW   |79422  |1199   |31118 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79423  |1199   |31056 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79424  |1200   |31107 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79425  |1200   |31090 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79426  |1201   |31097 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79427  |1201   |31096 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79428  |1202   |31089 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79429  |1202   |31061 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79430  |1203   |31064 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79431  |1204   |31065 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79432  |1204   |31066 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79433  |1204   |31068 |0       |2        |F63100|0        |2       |0   |
-ROW   |79434  |1204   |31070 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79435  |1204   |31101 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79436  |1204   |31106 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79437  |1204   |31114 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |79438  |1205   |31069 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79439  |1206   |31076 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79440  |1206   |31078 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79441  |1206   |31109 |0       |2        |F63100|0        |2       |0   |
-ROW   |79442  |1206   |31075 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79443  |1207   |31080 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79444  |1207   |31095 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79445  |1208   |31113 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79446  |1208   |31118 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79447  |1209   |31058 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79448  |1209   |31077 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79449  |1209   |31056 |0       |2        |F63100|0        |2       |0   |
-ROW   |79450  |1209   |31117 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79451  |1109   |30453 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79452  |1109   |30455 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79453  |1110   |30471 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79454  |1110   |30470 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79455  |1110   |30466 |0       |2        |F63100|0        |2       |0   |
-ROW   |79456  |1110   |30441 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79457  |1111   |30463 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79458  |1111   |30452 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79459  |1111   |30451 |0       |2        |F63100|0        |2       |0   |
-ROW   |79460  |1111   |30437 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79461  |1112   |30456 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79462  |1112   |30457 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79463  |1112   |30458 |0       |2        |F63100|0        |2       |0   |
-ROW   |79464  |1112   |30459 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79465  |1113   |30442 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79466  |1113   |30444 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79467  |1113   |30445 |0       |2        |F63100|0        |2       |0   |
-ROW   |79468  |1114   |30446 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79469  |1114   |30447 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79470  |1114   |31168 |0       |2        |F63100|0        |2       |0   |
-ROW   |79471  |1114   |30449 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79472  |1136   |30659 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79473  |1136   |30661 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79474  |1137   |30677 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79475  |1137   |30676 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79476  |1137   |30672 |0       |2        |F63100|0        |2       |0   |
-ROW   |79477  |1137   |30647 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79478  |1138   |30669 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79479  |1138   |30658 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79480  |1138   |30657 |0       |2        |F63100|0        |2       |0   |
-ROW   |79481  |1138   |30643 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79482  |1139   |30662 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79483  |1139   |30663 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79484  |1139   |30664 |0       |2        |F63100|0        |2       |0   |
-ROW   |79485  |1139   |30665 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79486  |1140   |30648 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79487  |1140   |30650 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79488  |1140   |30651 |0       |2        |F63100|0        |2       |0   |
-ROW   |79489  |1141   |30652 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79490  |1141   |30653 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79491  |1141   |31172 |0       |2        |F63100|0        |2       |0   |
-ROW   |79492  |1141   |30655 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79493  |1115   |30506 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79494  |1115   |30507 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79495  |1116   |30504 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79496  |1116   |30505 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79497  |1116   |30518 |0       |2        |F63100|0        |2       |0   |
-ROW   |79498  |1116   |30492 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79499  |1117   |30493 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79500  |1117   |30500 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79501  |1117   |30486 |0       |2        |F63100|0        |2       |0   |
-ROW   |79502  |1117   |30488 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79503  |1118   |30508 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79504  |1118   |30509 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79505  |1118   |30503 |0       |2        |F63100|0        |2       |0   |
-ROW   |79506  |1118   |30510 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79507  |1119   |30491 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79508  |1119   |30494 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79509  |1119   |30495 |0       |2        |F63100|0        |2       |0   |
-ROW   |79510  |1120   |30496 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79511  |1120   |30497 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79512  |1120   |31176 |0       |2        |F63100|0        |2       |0   |
-ROW   |79513  |1120   |30499 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79514  |1266   |31773 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79515  |1266   |31774 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79516  |1267   |31777 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79517  |1267   |31779 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79518  |1267   |33168 |0       |2        |F63100|0        |2       |0   |
-ROW   |79519  |1268   |31685 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79520  |1268   |31738 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79521  |1269   |31723 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79522  |1269   |31757 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79523  |1269   |31721 |0       |2        |F63100|0        |2       |0   |
-ROW   |79524  |1270   |31728 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79525  |1270   |31759 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79526  |1271   |31745 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79527  |1271   |31727 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79528  |1272   |31687 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79529  |1272   |31710 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79530  |1273   |31705 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79531  |1273   |31703 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79532  |1273   |31706 |0       |2        |F63100|0        |2       |0   |
-ROW   |79533  |1273   |31701 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79534  |1273   |31708 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79535  |1274   |31715 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79536  |1274   |31726 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79537  |1274   |31717 |0       |2        |F63100|0        |2       |0   |
-ROW   |79538  |1274   |31716 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79539  |1274   |31714 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79540  |1274   |31713 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79541  |1210   |31261 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79542  |1210   |31262 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79543  |1211   |31269 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79544  |1211   |31271 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79545  |1211   |33170 |0       |2        |F63100|0        |2       |0   |
-ROW   |79546  |1212   |31233 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79547  |1212   |31234 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79548  |1213   |31216 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79549  |1213   |31237 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79550  |1213   |31214 |0       |2        |F63100|0        |2       |0   |
-ROW   |79551  |1214   |31191 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79552  |1214   |31221 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79553  |1215   |31206 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79554  |1215   |31220 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79555  |1216   |31192 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79556  |1216   |31193 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79557  |1217   |31200 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79558  |1217   |31197 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79559  |1217   |31201 |0       |2        |F63100|0        |2       |0   |
-ROW   |79560  |1217   |31198 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79561  |1217   |31202 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79562  |1218   |31207 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79563  |1218   |31208 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79564  |1218   |31210 |0       |2        |F63100|0        |2       |0   |
-ROW   |79565  |1218   |31209 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79566  |1218   |31219 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79567  |1218   |31205 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79568  |1380   |32423 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79569  |1380   |32421 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79570  |1381   |32405 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79571  |1382   |32426 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79572  |1382   |32408 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79573  |1382   |32422 |0       |2        |F63100|0        |2       |0   |
-ROW   |79574  |1382   |32425 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79575  |1383   |32409 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79576  |1384   |32419 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |79577  |1384   |32416 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79578  |1384   |32413 |0       |2        |F63100|1        |2       |0   |
-ROW   |79579  |1384   |32418 |5       |3        |A54F10|0        |2       |0   |
-ROW   |79580  |1384   |32415 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |79581  |1384   |32412 |5       |5        |6C59DC|0        |2       |0   |
-ROW   |79582  |1385   |32420 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79583  |1385   |32417 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79584  |1385   |32414 |0       |2        |F63100|0        |2       |0   |
-ROW   |79585  |1386   |32433 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79586  |1386   |32432 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79587  |1387   |32431 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79588  |1387   |32430 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79589  |1387   |32429 |0       |2        |F63100|0        |2       |0   |
-ROW   |79590  |1387   |32428 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79591  |1387   |32427 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79592  |1388   |32386 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |79593  |1388   |32391 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79594  |1388   |32387 |0       |2        |F63100|1        |2       |0   |
-ROW   |79595  |1388   |32390 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79596  |1388   |32395 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79597  |1388   |32389 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79598  |1389   |32393 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79599  |1389   |32392 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79600  |1389   |32394 |0       |2        |F63100|1        |2       |0   |
-ROW   |79601  |1389   |32388 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79602  |1390   |32401 |5       |0        |1A7C11|1        |2       |0   |
-ROW   |79603  |1390   |32402 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79604  |1390   |32397 |0       |2        |F63100|1        |2       |0   |
-ROW   |79605  |1390   |32398 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79606  |1390   |32399 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79607  |1390   |32400 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79608  |1390   |32396 |0       |6        |AC8C14|1        |2       |0   |
-ROW   |79609  |1391   |32367 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79610  |1391   |32366 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79611  |1392   |32370 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79612  |1393   |32382 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |79613  |1393   |32381 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79614  |1393   |32383 |0       |2        |F63100|1        |2       |0   |
-ROW   |79615  |1393   |32384 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79616  |1394   |32377 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79617  |1394   |32374 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79618  |1395   |32403 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79619  |1395   |32385 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79620  |1219   |31363 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79621  |1219   |31346 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79622  |1219   |31345 |0       |2        |F63100|0        |2       |0   |
-ROW   |79623  |1219   |31344 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79624  |1219   |31343 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79625  |1219   |31342 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79626  |1219   |31340 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |79627  |1219   |31339 |0       |7        |611F27|0        |2       |0   |
-ROW   |79628  |1219   |31341 |0       |8        |F230E0|0        |2       |0   |
-ROW   |79629  |1219   |31341 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |79630  |1220   |31337 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79631  |1221   |31360 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79632  |1221   |31359 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79633  |1221   |31357 |0       |2        |F63100|0        |2       |0   |
-ROW   |79634  |1221   |31356 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79635  |1221   |31354 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79636  |1221   |31353 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79637  |1221   |31352 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |79638  |1221   |31350 |0       |7        |611F27|0        |2       |0   |
-ROW   |79639  |1221   |31351 |0       |8        |F230E0|0        |2       |0   |
-ROW   |79640  |1221   |31338 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |79641  |1221   |31349 |0       |10       |40CDFF|0        |2       |0   |
-ROW   |79642  |1221   |31348 |0       |11       |40FFA0|0        |2       |0   |
-ROW   |79643  |1221   |31347 |0       |12       |AE4500|0        |2       |0   |
-ROW   |79644  |1222   |31336 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79645  |1456   |33178 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79646  |1456   |33179 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79647  |1456   |33180 |0       |2        |F63100|0        |2       |0   |
-ROW   |79648  |1087   |30346 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79649  |1087   |30345 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79650  |1088   |30350 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79651  |1088   |30349 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79652  |1089   |30396 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79653  |1090   |30398 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79654  |1091   |30322 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79655  |1091   |30277 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79656  |1092   |30284 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79657  |1093   |30313 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79658  |1093   |30314 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79659  |1093   |30315 |5       |2        |F63100|0        |2       |0   |
-ROW   |79660  |1093   |30316 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79661  |1094   |30279 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79662  |1094   |30280 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79663  |1095   |30290 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79664  |1095   |30293 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79665  |1096   |30318 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79666  |1096   |30308 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79667  |1096   |30320 |2       |2        |F63100|0        |2       |0   |
-ROW   |79668  |1097   |30317 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79669  |1098   |30289 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79670  |1098   |30291 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79671  |1099   |30334 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79672  |1099   |30325 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79673  |1100   |30306 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79674  |1101   |30274 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79675  |1102   |30281 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79676  |1577   |34351 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79677  |1577   |34350 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79678  |1578   |34387 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79679  |1578   |34388 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79680  |1579   |34393 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79681  |1579   |34386 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79682  |1580   |34370 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79683  |1580   |34384 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79684  |1580   |34383 |0       |2        |F63100|0        |2       |0   |
-ROW   |79685  |1581   |34438 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79686  |1581   |34413 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79687  |1581   |34427 |0       |2        |F63100|0        |2       |0   |
-ROW   |79688  |1582   |34420 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79689  |1582   |34419 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79690  |1582   |34418 |0       |2        |F63100|0        |2       |0   |
-ROW   |79691  |1060   |30159 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79692  |1065   |30161 |0       |0        |969696|0        |9       |2   |
-ROW   |79693  |1065   |30162 |0       |1        |C80000|0        |9       |0   |
-ROW   |79694  |1070   |30142 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79695  |741    |27084 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79696  |741    |27085 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79697  |741    |27083 |0       |2        |F63100|1        |2       |0   |
-ROW   |79698  |741    |27086 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79699  |741    |27082 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79700  |741    |27079 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79701  |745    |27104 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79702  |745    |27105 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79703  |745    |27103 |0       |2        |F63100|1        |2       |0   |
-ROW   |79704  |745    |27106 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79705  |745    |27102 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79706  |745    |27099 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79707  |766    |27124 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79708  |766    |27125 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79709  |766    |27123 |0       |2        |F63100|1        |2       |0   |
-ROW   |79710  |766    |27126 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79711  |766    |27122 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79712  |766    |27119 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79713  |668    |27208 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79714  |1032   |30088 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79715  |1032   |30087 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79716  |1033   |30089 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79717  |671    |27240 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79718  |1034   |30093 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79719  |675    |27294 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79720  |1035   |30094 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79721  |1676   |35369 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79722  |1677   |35372 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79723  |1678   |35379 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79724  |1678   |35386 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79725  |1678   |35377 |0       |2        |F63100|0        |2       |0   |
-ROW   |79726  |1678   |35384 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79727  |1678   |35376 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79728  |1678   |35383 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79729  |1679   |35387 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79730  |1679   |35380 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79731  |1680   |35378 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79732  |1680   |35385 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79733  |1681   |35403 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79734  |1681   |35404 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79735  |1549   |33966 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79736  |1550   |33971 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79737  |1551   |33974 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79738  |1551   |33977 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79739  |1551   |33976 |0       |2        |F63100|1        |2       |0   |
-ROW   |79740  |1551   |33973 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79741  |1551   |33975 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79742  |1551   |33972 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79743  |1552   |34007 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79744  |1553   |34012 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79745  |1554   |34015 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79746  |1554   |34018 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79747  |1554   |34017 |0       |2        |F63100|1        |2       |0   |
-ROW   |79748  |1554   |34014 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79749  |1554   |34016 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79750  |1554   |34013 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79751  |1555   |34048 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79752  |1556   |34053 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79753  |1557   |34056 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79754  |1557   |34059 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79755  |1557   |34058 |0       |2        |F63100|1        |2       |0   |
-ROW   |79756  |1557   |34055 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79757  |1557   |34057 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79758  |1557   |34054 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79759  |1558   |34089 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79760  |1559   |34094 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79761  |1560   |34097 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79762  |1560   |34100 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79763  |1560   |34099 |0       |2        |F63100|1        |2       |0   |
-ROW   |79764  |1560   |34096 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79765  |1560   |34098 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79766  |1560   |34095 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79767  |1561   |34130 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79768  |1562   |34135 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79769  |1563   |34138 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79770  |1563   |34141 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79771  |1563   |34140 |0       |2        |F63100|1        |2       |0   |
-ROW   |79772  |1563   |34137 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79773  |1563   |34139 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79774  |1563   |34136 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79775  |1038   |30101 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79776  |786    |28246 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79777  |687    |27417 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79778  |691    |27376 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79779  |694    |27478 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79780  |1042   |30105 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79781  |1043   |30107 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79782  |698    |27511 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79783  |1044   |30108 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79784  |701    |27547 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79785  |1045   |27591 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79786  |1045   |30110 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79787  |1046   |30111 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79788  |704    |27586 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79789  |1682   |35439 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79790  |1683   |35441 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79791  |1684   |35443 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79792  |1685   |35446 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79793  |1686   |35450 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79794  |1686   |35465 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79795  |1686   |35456 |0       |2        |F63100|0        |2       |0   |
-ROW   |79796  |1686   |35447 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79797  |1686   |35468 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79798  |1686   |35471 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79799  |1686   |35459 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |79800  |1687   |35449 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79801  |1687   |35464 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79802  |1687   |35455 |0       |2        |F63100|0        |2       |0   |
-ROW   |79803  |1687   |35461 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79804  |1687   |35467 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79805  |1687   |35470 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79806  |1687   |35457 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |79807  |1688   |35473 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79808  |1688   |35463 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79809  |1688   |35454 |0       |2        |F63100|0        |2       |0   |
-ROW   |79810  |1688   |35472 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79811  |1688   |35466 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79812  |1688   |35469 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79813  |1688   |35458 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |79814  |1689   |35474 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79815  |1690   |35476 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79816  |1691   |35478 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79817  |1691   |35480 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79818  |1692   |35487 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79819  |1692   |35484 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79820  |1693   |35486 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79821  |1693   |35483 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79822  |1694   |35490 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79823  |1694   |35488 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79824  |1694   |35489 |0       |2        |F63100|0        |2       |0   |
-ROW   |79825  |1695   |35497 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79826  |1695   |35493 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79827  |1695   |35503 |0       |2        |F63100|0        |2       |0   |
-ROW   |79828  |1695   |35499 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79829  |1695   |35496 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79830  |1695   |35502 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79831  |1696   |35508 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79832  |1696   |35507 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79833  |1696   |35510 |0       |2        |F63100|0        |2       |0   |
-ROW   |79834  |1696   |35509 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79835  |1697   |35516 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79836  |1697   |35515 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79837  |1697   |35518 |0       |2        |F63100|0        |2       |0   |
-ROW   |79838  |1697   |35517 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79839  |1698   |35524 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79840  |1698   |35523 |0       |1        |2774A4|1        |2       |0   |
-ROW   |79841  |1698   |35526 |0       |2        |F63100|0        |2       |0   |
-ROW   |79842  |1698   |35525 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79843  |1699   |35531 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79844  |1699   |35529 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79845  |1699   |35530 |0       |2        |F63100|0        |2       |0   |
-ROW   |79846  |1700   |35411 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79847  |1700   |35409 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79848  |1700   |35407 |0       |2        |F63100|0        |2       |0   |
-ROW   |79849  |1700   |35413 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79850  |1700   |35412 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |79851  |1700   |35410 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |79852  |708    |27671 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79853  |1047   |30112 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79854  |1048   |30114 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |79855  |1048   |30113 |5       |1        |2774A4|0        |2       |0   |
-ROW   |79856  |1049   |30115 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79857  |775    |28143 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79858  |714    |27753 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79859  |1050   |30116 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79860  |856    |28894 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79861  |1051   |30118 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79862  |1564   |34166 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79863  |1564   |34169 |2       |1        |2774A4|0        |2       |0   |
-ROW   |79864  |1564   |34168 |0       |2        |F63100|1        |2       |0   |
-ROW   |79865  |1564   |34165 |0       |3        |A54F10|1        |2       |0   |
-ROW   |79866  |1564   |34167 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |79867  |1564   |34164 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |79868  |1565   |34174 |0       |0        |969696|0        |9       |2   |
-ROW   |79869  |1565   |34175 |0       |1        |C80000|0        |9       |0   |
-ROW   |79870  |1566   |34178 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79871  |1567   |34154 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79872  |1811   |36861 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79873  |1812   |36867 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79874  |1812   |36865 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79875  |1812   |36864 |0       |2        |F63100|0        |2       |0   |
-ROW   |79876  |1812   |36866 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79877  |1813   |36878 |0       |0        |969696|0        |9       |2   |
-ROW   |79878  |1813   |36879 |0       |1        |C80000|0        |9       |0   |
-ROW   |79879  |1814   |36853 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79880  |1816   |36915 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79881  |1817   |36921 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79882  |1817   |36919 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79883  |1817   |36918 |0       |2        |F63100|0        |2       |0   |
-ROW   |79884  |1817   |36920 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79885  |1818   |36932 |0       |0        |969696|0        |9       |2   |
-ROW   |79886  |1818   |36933 |0       |1        |C80000|0        |9       |0   |
-ROW   |79887  |1819   |36907 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79888  |1821   |36969 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79889  |1822   |36975 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79890  |1822   |36973 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79891  |1822   |36972 |0       |2        |F63100|0        |2       |0   |
-ROW   |79892  |1822   |36974 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79893  |1823   |36986 |0       |0        |969696|0        |9       |2   |
-ROW   |79894  |1823   |36987 |0       |1        |C80000|0        |9       |0   |
-ROW   |79895  |1824   |36961 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79896  |1826   |37023 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79897  |1827   |37029 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79898  |1827   |37027 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79899  |1827   |37026 |0       |2        |F63100|0        |2       |0   |
-ROW   |79900  |1827   |37028 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79901  |1828   |37040 |0       |0        |969696|0        |9       |2   |
-ROW   |79902  |1828   |37041 |0       |1        |C80000|0        |9       |0   |
-ROW   |79903  |1829   |37015 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79904  |1831   |37077 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79905  |1832   |37083 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79906  |1832   |37081 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79907  |1832   |37080 |0       |2        |F63100|0        |2       |0   |
-ROW   |79908  |1832   |37082 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79909  |1833   |37094 |0       |0        |969696|0        |9       |2   |
-ROW   |79910  |1833   |37095 |0       |1        |C80000|0        |9       |0   |
-ROW   |79911  |1834   |37069 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79912  |1836   |37131 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79913  |1837   |37137 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79914  |1837   |37135 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79915  |1837   |37134 |0       |2        |F63100|0        |2       |0   |
-ROW   |79916  |1837   |37136 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79917  |1838   |37148 |0       |0        |969696|0        |9       |2   |
-ROW   |79918  |1838   |37149 |0       |1        |C80000|0        |9       |0   |
-ROW   |79919  |1839   |37123 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79920  |1841   |37185 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79921  |1842   |37191 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79922  |1842   |37189 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79923  |1842   |37188 |0       |2        |F63100|0        |2       |0   |
-ROW   |79924  |1842   |37190 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79925  |1843   |37202 |0       |0        |969696|0        |9       |2   |
-ROW   |79926  |1843   |37203 |0       |1        |C80000|0        |9       |0   |
-ROW   |79927  |1844   |37177 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79928  |1846   |37239 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79929  |1847   |37245 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79930  |1847   |37243 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79931  |1847   |37242 |0       |2        |F63100|0        |2       |0   |
-ROW   |79932  |1847   |37244 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79933  |1848   |37256 |0       |0        |969696|0        |9       |2   |
-ROW   |79934  |1848   |37257 |0       |1        |C80000|0        |9       |0   |
-ROW   |79935  |1849   |37231 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79936  |1851   |37293 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79937  |1852   |37299 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79938  |1852   |37297 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79939  |1852   |37296 |0       |2        |F63100|0        |2       |0   |
-ROW   |79940  |1852   |37298 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79941  |1853   |37310 |0       |0        |969696|0        |9       |2   |
-ROW   |79942  |1853   |37311 |0       |1        |C80000|0        |9       |0   |
-ROW   |79943  |1854   |37285 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79944  |1856   |37347 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79945  |1857   |37353 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79946  |1857   |37351 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79947  |1857   |37350 |0       |2        |F63100|0        |2       |0   |
-ROW   |79948  |1857   |37352 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79949  |1858   |37364 |0       |0        |969696|0        |9       |2   |
-ROW   |79950  |1858   |37365 |0       |1        |C80000|0        |9       |0   |
-ROW   |79951  |1859   |37339 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79952  |1861   |37401 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79953  |1862   |37407 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79954  |1862   |37405 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79955  |1862   |37404 |0       |2        |F63100|0        |2       |0   |
-ROW   |79956  |1862   |37406 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79957  |1863   |37418 |0       |0        |969696|0        |9       |2   |
-ROW   |79958  |1863   |37419 |0       |1        |C80000|0        |9       |0   |
-ROW   |79959  |1864   |37393 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79960  |1866   |37455 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79961  |1867   |37461 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79962  |1867   |37459 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79963  |1867   |37458 |0       |2        |F63100|0        |2       |0   |
-ROW   |79964  |1867   |37460 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79965  |1868   |37472 |0       |0        |969696|0        |9       |2   |
-ROW   |79966  |1868   |37473 |0       |1        |C80000|0        |9       |0   |
-ROW   |79967  |1869   |37447 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79968  |1871   |37509 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79969  |1872   |37515 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79970  |1872   |37513 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79971  |1872   |37512 |0       |2        |F63100|0        |2       |0   |
-ROW   |79972  |1872   |37514 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79973  |1873   |37526 |0       |0        |969696|0        |9       |2   |
-ROW   |79974  |1873   |37527 |0       |1        |C80000|0        |9       |0   |
-ROW   |79975  |1874   |37501 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79976  |1876   |37563 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79977  |1877   |37569 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79978  |1877   |37567 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79979  |1877   |37566 |0       |2        |F63100|0        |2       |0   |
-ROW   |79980  |1877   |37568 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79981  |1878   |37580 |0       |0        |969696|0        |9       |2   |
-ROW   |79982  |1878   |37581 |0       |1        |C80000|0        |9       |0   |
-ROW   |79983  |1879   |37555 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79984  |1881   |37617 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79985  |1882   |37623 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79986  |1882   |37621 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79987  |1882   |37620 |0       |2        |F63100|0        |2       |0   |
-ROW   |79988  |1882   |37622 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79989  |1883   |37634 |0       |0        |969696|0        |9       |2   |
-ROW   |79990  |1883   |37635 |0       |1        |C80000|0        |9       |0   |
-ROW   |79991  |1884   |37609 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79992  |1886   |37671 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |79993  |1887   |37677 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |79994  |1887   |37675 |0       |1        |2774A4|0        |2       |0   |
-ROW   |79995  |1887   |37674 |0       |2        |F63100|0        |2       |0   |
-ROW   |79996  |1887   |37676 |0       |3        |A54F10|0        |2       |0   |
-ROW   |79997  |1888   |37688 |0       |0        |969696|0        |9       |2   |
-ROW   |79998  |1888   |37689 |0       |1        |C80000|0        |9       |0   |
-ROW   |79999  |1889   |37663 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80000  |1891   |37725 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80001  |1892   |37731 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80002  |1892   |37729 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80003  |1892   |37728 |0       |2        |F63100|0        |2       |0   |
-ROW   |80004  |1892   |37730 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80005  |1893   |37742 |0       |0        |969696|0        |9       |2   |
-ROW   |80006  |1893   |37743 |0       |1        |C80000|0        |9       |0   |
-ROW   |80007  |1894   |37717 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80008  |1896   |37779 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80009  |1897   |37785 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80010  |1897   |37783 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80011  |1897   |37782 |0       |2        |F63100|0        |2       |0   |
-ROW   |80012  |1897   |37784 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80013  |1898   |37796 |0       |0        |969696|0        |9       |2   |
-ROW   |80014  |1898   |37797 |0       |1        |C80000|0        |9       |0   |
-ROW   |80015  |1899   |37771 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80016  |1901   |37833 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80017  |1902   |37839 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80018  |1902   |37837 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80019  |1902   |37836 |0       |2        |F63100|0        |2       |0   |
-ROW   |80020  |1902   |37838 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80021  |1903   |37850 |0       |0        |969696|0        |9       |2   |
-ROW   |80022  |1903   |37851 |0       |1        |C80000|0        |9       |0   |
-ROW   |80023  |1904   |37825 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80024  |1906   |37887 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80025  |1907   |37893 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80026  |1907   |37891 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80027  |1907   |37890 |0       |2        |F63100|0        |2       |0   |
-ROW   |80028  |1907   |37892 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80029  |1908   |37904 |0       |0        |969696|0        |9       |2   |
-ROW   |80030  |1908   |37905 |0       |1        |C80000|0        |9       |0   |
-ROW   |80031  |1909   |37879 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80032  |1911   |37941 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80033  |1912   |37947 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80034  |1912   |37945 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80035  |1912   |37944 |0       |2        |F63100|0        |2       |0   |
-ROW   |80036  |1912   |37946 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80037  |1913   |37958 |0       |0        |969696|0        |9       |2   |
-ROW   |80038  |1913   |37959 |0       |1        |C80000|0        |9       |0   |
-ROW   |80039  |1914   |37933 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80040  |1916   |37995 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80041  |1917   |38001 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80042  |1917   |37999 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80043  |1917   |37998 |0       |2        |F63100|0        |2       |0   |
-ROW   |80044  |1917   |38000 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80045  |1918   |38012 |0       |0        |969696|0        |9       |2   |
-ROW   |80046  |1918   |38013 |0       |1        |C80000|0        |9       |0   |
-ROW   |80047  |1919   |37987 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80048  |1921   |38049 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80049  |1922   |38055 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80050  |1922   |38053 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80051  |1922   |38052 |0       |2        |F63100|0        |2       |0   |
-ROW   |80052  |1922   |38054 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80053  |1923   |38066 |0       |0        |969696|0        |9       |2   |
-ROW   |80054  |1923   |38067 |0       |1        |C80000|0        |9       |0   |
-ROW   |80055  |1924   |38041 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80056  |1926   |38103 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80057  |1927   |38109 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80058  |1927   |38107 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80059  |1927   |38106 |0       |2        |F63100|0        |2       |0   |
-ROW   |80060  |1927   |38108 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80061  |1928   |38120 |0       |0        |969696|0        |9       |2   |
-ROW   |80062  |1928   |38121 |0       |1        |C80000|0        |9       |0   |
-ROW   |80063  |1929   |38095 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80064  |1931   |38157 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80065  |1932   |38163 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80066  |1932   |38161 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80067  |1932   |38160 |0       |2        |F63100|0        |2       |0   |
-ROW   |80068  |1932   |38162 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80069  |1933   |38174 |0       |0        |969696|0        |9       |2   |
-ROW   |80070  |1933   |38175 |0       |1        |C80000|0        |9       |0   |
-ROW   |80071  |1934   |38149 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80072  |1936   |38211 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80073  |1937   |38217 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80074  |1937   |38215 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80075  |1937   |38214 |0       |2        |F63100|0        |2       |0   |
-ROW   |80076  |1937   |38216 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80077  |1938   |38228 |0       |0        |969696|0        |9       |2   |
-ROW   |80078  |1938   |38229 |0       |1        |C80000|0        |9       |0   |
-ROW   |80079  |1939   |38203 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80080  |1941   |38265 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80081  |1942   |38271 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80082  |1942   |38269 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80083  |1942   |38268 |0       |2        |F63100|0        |2       |0   |
-ROW   |80084  |1942   |38270 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80085  |1943   |38282 |0       |0        |969696|0        |9       |2   |
-ROW   |80086  |1943   |38283 |0       |1        |C80000|0        |9       |0   |
-ROW   |80087  |1944   |38257 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80088  |1946   |38319 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80089  |1947   |38325 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80090  |1947   |38323 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80091  |1947   |38322 |0       |2        |F63100|0        |2       |0   |
-ROW   |80092  |1947   |38324 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80093  |1948   |38336 |0       |0        |969696|0        |9       |2   |
-ROW   |80094  |1948   |38337 |0       |1        |C80000|0        |9       |0   |
-ROW   |80095  |1949   |38311 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80096  |1951   |38373 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80097  |1952   |38379 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80098  |1952   |38377 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80099  |1952   |38376 |0       |2        |F63100|0        |2       |0   |
-ROW   |80100  |1952   |38378 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80101  |1953   |38390 |0       |0        |969696|0        |9       |2   |
-ROW   |80102  |1953   |38391 |0       |1        |C80000|0        |9       |0   |
-ROW   |80103  |1954   |38365 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80104  |1956   |38427 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80105  |1957   |38433 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80106  |1957   |38431 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80107  |1957   |38430 |0       |2        |F63100|0        |2       |0   |
-ROW   |80108  |1957   |38432 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80109  |1958   |38444 |0       |0        |969696|0        |9       |2   |
-ROW   |80110  |1958   |38445 |0       |1        |C80000|0        |9       |0   |
-ROW   |80111  |1959   |38419 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80112  |1961   |38481 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80113  |1962   |38487 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80114  |1962   |38485 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80115  |1962   |38484 |0       |2        |F63100|0        |2       |0   |
-ROW   |80116  |1962   |38486 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80117  |1963   |38498 |0       |0        |969696|0        |9       |2   |
-ROW   |80118  |1963   |38499 |0       |1        |C80000|0        |9       |0   |
-ROW   |80119  |1964   |38473 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80120  |1966   |38535 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80121  |1967   |38541 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80122  |1967   |38539 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80123  |1967   |38538 |0       |2        |F63100|0        |2       |0   |
-ROW   |80124  |1967   |38540 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80125  |1968   |38552 |0       |0        |969696|0        |9       |2   |
-ROW   |80126  |1968   |38553 |0       |1        |C80000|0        |9       |0   |
-ROW   |80127  |1969   |38527 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80128  |1971   |38589 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80129  |1972   |38595 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80130  |1972   |38593 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80131  |1972   |38592 |0       |2        |F63100|0        |2       |0   |
-ROW   |80132  |1972   |38594 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80133  |1973   |38606 |0       |0        |969696|0        |9       |2   |
-ROW   |80134  |1973   |38607 |0       |1        |C80000|0        |9       |0   |
-ROW   |80135  |1974   |38581 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80136  |1976   |38643 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80137  |1977   |38649 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80138  |1977   |38647 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80139  |1977   |38646 |0       |2        |F63100|0        |2       |0   |
-ROW   |80140  |1977   |38648 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80141  |1978   |38660 |0       |0        |969696|0        |9       |2   |
-ROW   |80142  |1978   |38661 |0       |1        |C80000|0        |9       |0   |
-ROW   |80143  |1979   |38635 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80144  |1981   |38697 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80145  |1982   |38703 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80146  |1982   |38701 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80147  |1982   |38700 |0       |2        |F63100|0        |2       |0   |
-ROW   |80148  |1982   |38702 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80149  |1983   |38714 |0       |0        |969696|0        |9       |2   |
-ROW   |80150  |1983   |38715 |0       |1        |C80000|0        |9       |0   |
-ROW   |80151  |1984   |38689 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80152  |1986   |38751 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80153  |1987   |38757 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80154  |1987   |38755 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80155  |1987   |38754 |0       |2        |F63100|0        |2       |0   |
-ROW   |80156  |1987   |38756 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80157  |1988   |38768 |0       |0        |969696|0        |9       |2   |
-ROW   |80158  |1988   |38769 |0       |1        |C80000|0        |9       |0   |
-ROW   |80159  |1989   |38743 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80160  |1991   |38805 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80161  |1992   |38811 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80162  |1992   |38809 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80163  |1992   |38808 |0       |2        |F63100|0        |2       |0   |
-ROW   |80164  |1992   |38810 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80165  |1993   |38822 |0       |0        |969696|0        |9       |2   |
-ROW   |80166  |1993   |38823 |0       |1        |C80000|0        |9       |0   |
-ROW   |80167  |1994   |38797 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80168  |1996   |38859 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80169  |1997   |38865 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80170  |1997   |38863 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80171  |1997   |38862 |0       |2        |F63100|0        |2       |0   |
-ROW   |80172  |1997   |38864 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80173  |1998   |38876 |0       |0        |969696|0        |9       |2   |
-ROW   |80174  |1998   |38877 |0       |1        |C80000|0        |9       |0   |
-ROW   |80175  |1999   |38851 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80176  |2001   |38913 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80177  |2002   |38919 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80178  |2002   |38917 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80179  |2002   |38916 |0       |2        |F63100|0        |2       |0   |
-ROW   |80180  |2002   |38918 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80181  |2003   |38930 |0       |0        |969696|0        |9       |2   |
-ROW   |80182  |2003   |38931 |0       |1        |C80000|0        |9       |0   |
-ROW   |80183  |2004   |38905 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80184  |2006   |38967 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80185  |2007   |38973 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80186  |2007   |38971 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80187  |2007   |38970 |0       |2        |F63100|0        |2       |0   |
-ROW   |80188  |2007   |38972 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80189  |2008   |38984 |0       |0        |969696|0        |9       |2   |
-ROW   |80190  |2008   |38985 |0       |1        |C80000|0        |9       |0   |
-ROW   |80191  |2009   |38959 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80192  |2011   |39021 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80193  |2012   |39027 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80194  |2012   |39025 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80195  |2012   |39024 |0       |2        |F63100|0        |2       |0   |
-ROW   |80196  |2012   |39026 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80197  |2013   |39038 |0       |0        |969696|0        |9       |2   |
-ROW   |80198  |2013   |39039 |0       |1        |C80000|0        |9       |0   |
-ROW   |80199  |2014   |39013 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80200  |2016   |39075 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80201  |2017   |39081 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80202  |2017   |39079 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80203  |2017   |39078 |0       |2        |F63100|0        |2       |0   |
-ROW   |80204  |2017   |39080 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80205  |2018   |39092 |0       |0        |969696|0        |9       |2   |
-ROW   |80206  |2018   |39093 |0       |1        |C80000|0        |9       |0   |
-ROW   |80207  |2019   |39067 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80208  |2021   |39129 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80209  |2022   |39135 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80210  |2022   |39133 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80211  |2022   |39132 |0       |2        |F63100|0        |2       |0   |
-ROW   |80212  |2022   |39134 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80213  |2023   |39146 |0       |0        |969696|0        |9       |2   |
-ROW   |80214  |2023   |39147 |0       |1        |C80000|0        |9       |0   |
-ROW   |80215  |2024   |39121 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80216  |2026   |39183 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80217  |2027   |39189 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80218  |2027   |39187 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80219  |2027   |39186 |0       |2        |F63100|0        |2       |0   |
-ROW   |80220  |2027   |39188 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80221  |2028   |39200 |0       |0        |969696|0        |9       |2   |
-ROW   |80222  |2028   |39201 |0       |1        |C80000|0        |9       |0   |
-ROW   |80223  |2029   |39175 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80224  |2031   |39237 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80225  |2032   |39243 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80226  |2032   |39241 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80227  |2032   |39240 |0       |2        |F63100|0        |2       |0   |
-ROW   |80228  |2032   |39242 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80229  |2033   |39254 |0       |0        |969696|0        |9       |2   |
-ROW   |80230  |2033   |39255 |0       |1        |C80000|0        |9       |0   |
-ROW   |80231  |2034   |39229 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80232  |2036   |39291 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80233  |2037   |39297 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80234  |2037   |39295 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80235  |2037   |39294 |0       |2        |F63100|0        |2       |0   |
-ROW   |80236  |2037   |39296 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80237  |2038   |39308 |0       |0        |969696|0        |9       |2   |
-ROW   |80238  |2038   |39309 |0       |1        |C80000|0        |9       |0   |
-ROW   |80239  |2039   |39283 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80240  |2041   |39345 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80241  |2042   |39351 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80242  |2042   |39349 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80243  |2042   |39348 |0       |2        |F63100|0        |2       |0   |
-ROW   |80244  |2042   |39350 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80245  |2043   |39362 |0       |0        |969696|0        |9       |2   |
-ROW   |80246  |2043   |39363 |0       |1        |C80000|0        |9       |0   |
-ROW   |80247  |2044   |39337 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80248  |2046   |39399 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80249  |2047   |39405 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80250  |2047   |39403 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80251  |2047   |39402 |0       |2        |F63100|0        |2       |0   |
-ROW   |80252  |2047   |39404 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80253  |2048   |39416 |0       |0        |969696|0        |9       |2   |
-ROW   |80254  |2048   |39417 |0       |1        |C80000|0        |9       |0   |
-ROW   |80255  |2049   |39391 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80256  |2051   |39453 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80257  |2052   |39459 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80258  |2052   |39457 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80259  |2052   |39456 |0       |2        |F63100|0        |2       |0   |
-ROW   |80260  |2052   |39458 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80261  |2053   |39470 |0       |0        |969696|0        |9       |2   |
-ROW   |80262  |2053   |39471 |0       |1        |C80000|0        |9       |0   |
-ROW   |80263  |2054   |39445 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80264  |2056   |39507 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80265  |2057   |39513 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80266  |2057   |39511 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80267  |2057   |39510 |0       |2        |F63100|0        |2       |0   |
-ROW   |80268  |2057   |39512 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80269  |2058   |39524 |0       |0        |969696|0        |9       |2   |
-ROW   |80270  |2058   |39525 |0       |1        |C80000|0        |9       |0   |
-ROW   |80271  |2059   |39499 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80272  |2061   |39561 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80273  |2062   |39567 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80274  |2062   |39565 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80275  |2062   |39564 |0       |2        |F63100|0        |2       |0   |
-ROW   |80276  |2062   |39566 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80277  |2063   |39578 |0       |0        |969696|0        |9       |2   |
-ROW   |80278  |2063   |39579 |0       |1        |C80000|0        |9       |0   |
-ROW   |80279  |2064   |39553 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80280  |2066   |39615 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80281  |2067   |39621 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80282  |2067   |39619 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80283  |2067   |39618 |0       |2        |F63100|0        |2       |0   |
-ROW   |80284  |2067   |39620 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80285  |2068   |39632 |0       |0        |969696|0        |9       |2   |
-ROW   |80286  |2068   |39633 |0       |1        |C80000|0        |9       |0   |
-ROW   |80287  |2069   |39607 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80288  |2071   |39669 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80289  |2072   |39675 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80290  |2072   |39673 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80291  |2072   |39672 |0       |2        |F63100|0        |2       |0   |
-ROW   |80292  |2072   |39674 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80293  |2073   |39686 |0       |0        |969696|0        |9       |2   |
-ROW   |80294  |2073   |39687 |0       |1        |C80000|0        |9       |0   |
-ROW   |80295  |2074   |39661 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80296  |2076   |39723 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80297  |2077   |39729 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80298  |2077   |39727 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80299  |2077   |39726 |0       |2        |F63100|0        |2       |0   |
-ROW   |80300  |2077   |39728 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80301  |2078   |39740 |0       |0        |969696|0        |9       |2   |
-ROW   |80302  |2078   |39741 |0       |1        |C80000|0        |9       |0   |
-ROW   |80303  |2079   |39715 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80304  |724    |27904 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80305  |1396   |32439 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80306  |1396   |32437 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80307  |1396   |32436 |0       |2        |F63100|0        |2       |0   |
-ROW   |80308  |1396   |32438 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80309  |1052   |27907 |0       |0        |969696|0        |9       |2   |
-ROW   |80310  |1052   |27908 |0       |1        |C80000|0        |9       |0   |
-ROW   |80311  |1053   |30120 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80312  |1457   |33206 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80313  |1457   |33193 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80314  |1458   |33195 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80315  |1458   |33203 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80316  |1458   |33202 |5       |2        |F63100|0        |2       |0   |
-ROW   |80317  |1459   |33200 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80318  |1459   |33194 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80319  |1460   |33187 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80320  |1460   |33186 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80321  |1460   |33204 |5       |2        |F63100|0        |2       |0   |
-ROW   |80322  |1461   |33226 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80323  |1461   |33215 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80324  |1462   |33207 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80325  |1463   |33223 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80326  |1463   |33218 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80327  |1464   |33210 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80328  |1464   |33209 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80329  |1464   |33224 |5       |2        |F63100|0        |2       |0   |
-ROW   |80330  |1465   |33249 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80331  |1465   |33236 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80332  |1466   |33238 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80333  |1466   |33246 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80334  |1466   |33245 |5       |2        |F63100|0        |2       |0   |
-ROW   |80335  |1467   |33243 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80336  |1467   |33237 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80337  |1468   |33230 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80338  |1468   |33229 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80339  |1468   |33247 |5       |2        |F63100|0        |2       |0   |
-ROW   |80340  |1469   |33258 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80341  |1470   |33251 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80342  |1471   |33256 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80343  |1472   |33277 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80344  |1473   |33274 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80345  |1473   |33273 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80346  |1473   |33272 |5       |2        |F63100|0        |2       |0   |
-ROW   |80347  |1474   |33270 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80348  |1475   |33269 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80349  |1476   |33261 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80350  |1476   |33275 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80351  |1477   |33296 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80352  |1478   |33293 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80353  |1478   |33292 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80354  |1478   |33291 |5       |2        |F63100|0        |2       |0   |
-ROW   |80355  |1479   |33289 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80356  |1480   |33288 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80357  |1481   |33280 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80358  |1481   |33294 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80359  |1482   |33312 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80360  |1483   |33313 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80361  |1484   |33314 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80362  |1485   |33319 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80363  |1486   |33320 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80364  |1487   |33304 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80365  |1487   |33305 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80366  |727    |27936 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80367  |1054   |27935 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |80368  |1054   |30122 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80369  |1055   |30123 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80370  |730    |27975 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80371  |1056   |30126 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80372  |733    |28003 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80373  |1057   |30131 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80374  |736    |28031 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80375  |1058   |30136 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80376  |2080   |39768 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80377  |2080   |39769 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80378  |2080   |39770 |0       |2        |F63100|0        |2       |0   |
-ROW   |80379  |2080   |39771 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80380  |2081   |39772 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80381  |2081   |39773 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80382  |2082   |39774 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80383  |2082   |39775 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80384  |2082   |39780 |0       |2        |F63100|0        |2       |0   |
-ROW   |80385  |2083   |39777 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80386  |2083   |39778 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80387  |2083   |39781 |0       |2        |F63100|0        |2       |0   |
-ROW   |80388  |2084   |39792 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80389  |2084   |39790 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80390  |2084   |39793 |0       |2        |F63100|0        |2       |0   |
-ROW   |80391  |2084   |39795 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80392  |2084   |39796 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80393  |1701   |35553 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80394  |1701   |35556 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80395  |1702   |35558 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80396  |1702   |35561 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80397  |1703   |35562 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80398  |1704   |35563 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80399  |1705   |35592 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80400  |1705   |35584 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80401  |1705   |35594 |0       |2        |F63100|0        |2       |0   |
-ROW   |80402  |1705   |35586 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80403  |1705   |35595 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80404  |1705   |35587 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80405  |1706   |35593 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80406  |1706   |35585 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80407  |1707   |35583 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80408  |1707   |35591 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80409  |1708   |35598 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80410  |1709   |35606 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80411  |1710   |35607 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80412  |1711   |35566 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80413  |1712   |35622 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80414  |1713   |35634 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80415  |1713   |35626 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80416  |1713   |35636 |0       |2        |F63100|0        |2       |0   |
-ROW   |80417  |1713   |35628 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80418  |1713   |35637 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80419  |1713   |35629 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80420  |1714   |35635 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80421  |1714   |35627 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80422  |1715   |35625 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80423  |1715   |35633 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80424  |1716   |35640 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80425  |1717   |35641 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80426  |1718   |35610 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80427  |1719   |35658 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80428  |1720   |35659 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80429  |1721   |35660 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80430  |1722   |35661 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80431  |1723   |35669 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80432  |1723   |35679 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80433  |1723   |35670 |0       |2        |F63100|0        |2       |0   |
-ROW   |80434  |1723   |35665 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80435  |1723   |35672 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80436  |1723   |35666 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80437  |1724   |35663 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80438  |1724   |35664 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80439  |1725   |35686 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80440  |1725   |35693 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80441  |1725   |35684 |0       |2        |F63100|0        |2       |0   |
-ROW   |80442  |1725   |35691 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80443  |1725   |35683 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80444  |1725   |35690 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80445  |1726   |35685 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80446  |1726   |35692 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80447  |1727   |35694 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80448  |1727   |35687 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80449  |1728   |35707 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80450  |1729   |35708 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80451  |1730   |35725 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80452  |1731   |35726 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80453  |1732   |35727 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80454  |1733   |35728 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80455  |1734   |35736 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80456  |1734   |35746 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80457  |1734   |35737 |0       |2        |F63100|0        |2       |0   |
-ROW   |80458  |1734   |35732 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80459  |1734   |35739 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80460  |1734   |35733 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80461  |1735   |35730 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80462  |1735   |35731 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80463  |1736   |35753 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80464  |1736   |35760 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80465  |1736   |35751 |0       |2        |F63100|0        |2       |0   |
-ROW   |80466  |1736   |35758 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80467  |1736   |35750 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80468  |1736   |35757 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80469  |1737   |35752 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80470  |1737   |35759 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80471  |1738   |35761 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80472  |1738   |35754 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80473  |1739   |35774 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80474  |1740   |35775 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80475  |1741   |35791 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80476  |1742   |35799 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80477  |1742   |35802 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80478  |1743   |35804 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80479  |1743   |35807 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80480  |1744   |35808 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80481  |1745   |35809 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80482  |1746   |35834 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80483  |1746   |35826 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80484  |1746   |35836 |0       |2        |F63100|0        |2       |0   |
-ROW   |80485  |1746   |35828 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80486  |1746   |35837 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80487  |1746   |35829 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80488  |1747   |35835 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80489  |1747   |35827 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80490  |1748   |35825 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80491  |1748   |35833 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80492  |1749   |35840 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80493  |1750   |35812 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80494  |1751   |35876 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80495  |1751   |35868 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80496  |1751   |35878 |0       |2        |F63100|0        |2       |0   |
-ROW   |80497  |1751   |35870 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80498  |1751   |35879 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80499  |1751   |35871 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80500  |1752   |35877 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80501  |1752   |35869 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80502  |1753   |35867 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80503  |1753   |35875 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80504  |1754   |35882 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80505  |1755   |35890 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80506  |1756   |35891 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80507  |1757   |35850 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80508  |1758   |35920 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80509  |1758   |35912 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80510  |1758   |35922 |0       |2        |F63100|0        |2       |0   |
-ROW   |80511  |1758   |35914 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80512  |1758   |35923 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80513  |1758   |35915 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80514  |1759   |35921 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80515  |1759   |35913 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80516  |1760   |35911 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80517  |1760   |35919 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80518  |1761   |35926 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80519  |1762   |35934 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80520  |1763   |35935 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80521  |1764   |35894 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80522  |1765   |35952 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80523  |1766   |35964 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80524  |1766   |35956 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80525  |1766   |35966 |0       |2        |F63100|0        |2       |0   |
-ROW   |80526  |1766   |35958 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80527  |1766   |35967 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80528  |1766   |35959 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80529  |1767   |35965 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80530  |1767   |35957 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80531  |1768   |35955 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80532  |1768   |35963 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80533  |1769   |35970 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80534  |1770   |35978 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80535  |1771   |35979 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80536  |1772   |35938 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80537  |1773   |35996 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80538  |1774   |36008 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80539  |1774   |36000 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80540  |1774   |36010 |0       |2        |F63100|0        |2       |0   |
-ROW   |80541  |1774   |36002 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80542  |1774   |36011 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80543  |1774   |36003 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80544  |1775   |36009 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80545  |1775   |36001 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80546  |1776   |35999 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80547  |1776   |36007 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80548  |1777   |36014 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80549  |1778   |36022 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80550  |1779   |36023 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80551  |1780   |35982 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80552  |1781   |36041 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80553  |1782   |36053 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80554  |1782   |36045 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80555  |1782   |36055 |0       |2        |F63100|0        |2       |0   |
-ROW   |80556  |1782   |36047 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80557  |1782   |36056 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80558  |1782   |36048 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80559  |1783   |36054 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80560  |1783   |36046 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80561  |1784   |36044 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80562  |1784   |36052 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80563  |1785   |36059 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80564  |1786   |36067 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80565  |1787   |36068 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80566  |1788   |36026 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80567  |1789   |36086 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80568  |1790   |36098 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80569  |1790   |36090 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80570  |1790   |36100 |0       |2        |F63100|0        |2       |0   |
-ROW   |80571  |1790   |36092 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80572  |1790   |36101 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80573  |1790   |36093 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80574  |1791   |36099 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80575  |1791   |36091 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80576  |1792   |36089 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80577  |1792   |36097 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80578  |1793   |36104 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80579  |1794   |36112 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80580  |1795   |36113 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80581  |1796   |36071 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80582  |1797   |36131 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80583  |1798   |36144 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80584  |1798   |36136 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80585  |1798   |36146 |0       |2        |F63100|0        |2       |0   |
-ROW   |80586  |1798   |36138 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80587  |1798   |36147 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80588  |1798   |36139 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80589  |1799   |36145 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80590  |1799   |36137 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80591  |1800   |36135 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80592  |1800   |36143 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80593  |1801   |36150 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80594  |1802   |36158 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80595  |1803   |36159 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80596  |1804   |36116 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80597  |1223   |31370 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80598  |1223   |31371 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80599  |1226   |31380 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80600  |1226   |31383 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80601  |1229   |31379 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |80602  |1229   |31382 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80603  |887    |29211 |0       |0        |969696|0        |9       |2   |
-ROW   |80604  |887    |29210 |0       |1        |C80000|0        |9       |0   |
-ROW   |80605  |899    |29216 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80606  |899    |29217 |2       |1        |2774A4|0        |2       |0   |
-ROW   |80607  |899    |29218 |0       |2        |F63100|1        |2       |0   |
-ROW   |80608  |899    |29219 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80609  |899    |29220 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |80610  |899    |29221 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |80611  |911    |29089 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80612  |911    |29102 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80613  |908    |29098 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80614  |908    |29097 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80615  |908    |29095 |0       |2        |F63100|0        |2       |0   |
-ROW   |80616  |908    |29088 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80617  |908    |29094 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80618  |908    |29093 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80619  |908    |29092 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |80620  |908    |29091 |0       |7        |611F27|0        |2       |0   |
-ROW   |80621  |908    |29090 |0       |8        |F230E0|0        |2       |0   |
-ROW   |80622  |905    |29198 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80623  |917    |29104 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |80624  |917    |29105 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80625  |914    |31364 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80626  |923    |29118 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80627  |923    |29119 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80628  |923    |29117 |0       |2        |F63100|0        |2       |0   |
-ROW   |80629  |920    |29107 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80630  |920    |29106 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80631  |902    |29096 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80632  |902    |29101 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80633  |902    |29100 |0       |2        |F63100|0        |2       |0   |
-ROW   |80634  |902    |29087 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80635  |1279   |31902 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80636  |1279   |31903 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80637  |1281   |31933 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80638  |1281   |31936 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80639  |1283   |31932 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |80640  |1283   |31935 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80641  |1285   |31907 |0       |0        |969696|0        |9       |2   |
-ROW   |80642  |1285   |31908 |0       |1        |C80000|0        |9       |0   |
-ROW   |80643  |1287   |31911 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80644  |1287   |31914 |2       |1        |2774A4|0        |2       |0   |
-ROW   |80645  |1287   |31913 |0       |2        |F63100|1        |2       |0   |
-ROW   |80646  |1287   |31910 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80647  |1287   |31912 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |80648  |1287   |31909 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |80649  |1289   |31831 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80650  |1289   |31820 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80651  |1291   |31822 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80652  |1291   |31835 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80653  |1291   |31825 |0       |2        |F63100|0        |2       |0   |
-ROW   |80654  |1291   |31826 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80655  |1291   |31823 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80656  |1291   |31827 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80657  |1291   |31824 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |80658  |1291   |31828 |0       |7        |611F27|0        |2       |0   |
-ROW   |80659  |1291   |31830 |0       |8        |F230E0|0        |2       |0   |
-ROW   |80660  |1293   |31892 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80661  |1295   |31855 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |80662  |1295   |31853 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80663  |1297   |31893 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80664  |1299   |31838 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80665  |1299   |31839 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80666  |1299   |31837 |0       |2        |F63100|0        |2       |0   |
-ROW   |80667  |1301   |31850 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80668  |1301   |31852 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80669  |1303   |31829 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80670  |1303   |31833 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80671  |1303   |31834 |0       |2        |F63100|0        |2       |0   |
-ROW   |80672  |1303   |31832 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80673  |952    |29436 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80674  |952    |29437 |2       |1        |2774A4|0        |2       |0   |
-ROW   |80675  |952    |29438 |0       |2        |F63100|1        |2       |0   |
-ROW   |80676  |952    |29439 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80677  |952    |29441 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |80678  |952    |29440 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |80679  |955    |29434 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80680  |955    |29435 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80681  |954    |29448 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80682  |954    |29449 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80683  |956    |29452 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |80684  |956    |29453 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80685  |953    |29446 |0       |0        |969696|0        |9       |2   |
-ROW   |80686  |953    |29432 |0       |1        |C80000|0        |9       |0   |
-ROW   |80687  |960    |29405 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80688  |960    |29406 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80689  |959    |29426 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80690  |959    |29413 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80691  |959    |29411 |0       |2        |F63100|0        |2       |0   |
-ROW   |80692  |959    |29410 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80693  |959    |29399 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80694  |959    |29409 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80695  |959    |29412 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |80696  |959    |29408 |0       |7        |611F27|0        |2       |0   |
-ROW   |80697  |959    |29407 |0       |8        |F230E0|0        |2       |0   |
-ROW   |80698  |958    |29427 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80699  |962    |29403 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |80700  |962    |29402 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80701  |961    |29396 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80702  |963    |29400 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80703  |963    |29401 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80704  |957    |29420 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80705  |957    |29419 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80706  |957    |29418 |0       |2        |F63100|0        |2       |0   |
-ROW   |80707  |957    |29417 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80708  |866    |29014 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80709  |866    |29015 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80710  |868    |29018 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80711  |868    |29019 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80712  |868    |29022 |0       |2        |F63100|0        |2       |0   |
-ROW   |80713  |868    |29023 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80714  |868    |29020 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |80715  |868    |29024 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |80716  |868    |29021 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |80717  |868    |29025 |0       |7        |611F27|0        |2       |0   |
-ROW   |80718  |868    |29026 |0       |8        |F230E0|0        |2       |0   |
-ROW   |80719  |870    |29048 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80720  |872    |29028 |0       |0        |969696|0        |9       |2   |
-ROW   |80721  |872    |29027 |0       |1        |C80000|0        |9       |0   |
-ROW   |80722  |882    |28992 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80723  |882    |28991 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80724  |876    |28982 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |80725  |876    |28983 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80726  |874    |28978 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80727  |878    |28985 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80728  |878    |28984 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80729  |880    |28987 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80730  |880    |28988 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80731  |880    |28989 |0       |2        |F63100|0        |2       |0   |
-ROW   |80732  |880    |28990 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80733  |964    |29513 |0       |0        |969696|0        |9       |2   |
-ROW   |80734  |964    |29512 |0       |1        |C80000|0        |9       |0   |
-ROW   |80735  |1238   |31435 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80736  |1238   |31438 |2       |1        |2774A4|0        |2       |0   |
-ROW   |80737  |1238   |31437 |0       |2        |F63100|1        |2       |0   |
-ROW   |80738  |1238   |31434 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80739  |1238   |31436 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |80740  |1238   |31433 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |80741  |1488   |33321 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80742  |1488   |33324 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80743  |1490   |33322 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80744  |1490   |33323 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80745  |1240   |31441 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80746  |1240   |31442 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80747  |1242   |31440 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |80748  |1242   |31439 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80749  |974    |29456 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80750  |974    |29455 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80751  |976    |29458 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80752  |976    |29457 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80753  |972    |29454 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80754  |978    |29462 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80755  |980    |31421 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80756  |980    |29466 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80757  |1305   |32013 |0       |0        |969696|0        |9       |2   |
-ROW   |80758  |1305   |32014 |0       |1        |C80000|0        |9       |0   |
-ROW   |80759  |1307   |32017 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80760  |1307   |32020 |2       |1        |2774A4|0        |2       |0   |
-ROW   |80761  |1307   |32019 |0       |2        |F63100|1        |2       |0   |
-ROW   |80762  |1307   |32016 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80763  |1307   |32018 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |80764  |1307   |32015 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |80765  |1492   |33329 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80766  |1492   |33332 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80767  |1494   |33330 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80768  |1494   |33331 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80769  |1309   |32023 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80770  |1309   |32024 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80771  |1311   |32022 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |80772  |1311   |32021 |5       |1        |2774A4|0        |2       |0   |
-ROW   |80773  |1313   |31952 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80774  |1313   |31949 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80775  |1315   |31951 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80776  |1315   |31950 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80777  |1317   |31954 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80778  |1319   |31973 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80779  |1321   |31969 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80780  |1321   |31970 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80781  |1583   |34451 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80782  |1584   |34465 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80783  |1584   |34463 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80784  |1585   |34466 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80785  |1585   |34462 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80786  |1586   |34499 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80787  |1587   |34513 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80788  |1587   |34511 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80789  |1588   |34514 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80790  |1588   |34510 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80791  |1589   |34547 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80792  |1590   |34561 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80793  |1590   |34559 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80794  |1591   |34562 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80795  |1591   |34558 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80796  |1592   |34595 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80797  |1593   |34609 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80798  |1593   |34607 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80799  |1594   |34610 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80800  |1594   |34606 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80801  |1595   |34643 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80802  |1596   |34657 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80803  |1596   |34655 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80804  |1597   |34658 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80805  |1597   |34654 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80806  |1619   |35016 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80807  |1620   |35030 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80808  |1620   |35028 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80809  |1621   |35031 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80810  |1621   |35027 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80811  |1601   |34739 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80812  |1602   |34753 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80813  |1602   |34751 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80814  |1603   |34754 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80815  |1603   |34750 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80816  |1604   |34787 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80817  |1569   |34192 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80818  |1569   |34180 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80819  |1570   |34194 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80820  |1570   |34190 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80821  |1605   |34793 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80822  |1606   |34807 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80823  |1606   |34805 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80824  |1607   |34808 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80825  |1607   |34804 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80826  |1608   |34841 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80827  |1609   |34855 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80828  |1609   |34853 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80829  |1610   |34856 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80830  |1610   |34852 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80831  |1611   |34889 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80832  |1612   |34903 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80833  |1612   |34901 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80834  |1613   |34904 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80835  |1613   |34900 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80836  |1518   |33705 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80837  |1519   |33724 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80838  |1519   |33722 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80839  |1519   |33726 |0       |2        |F63100|0        |2       |0   |
-ROW   |80840  |1520   |33719 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80841  |1520   |33720 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80842  |1520   |33721 |0       |2        |F63100|0        |2       |0   |
-ROW   |80843  |1521   |33725 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80844  |1521   |33723 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80845  |1521   |33727 |0       |2        |F63100|0        |2       |0   |
-ROW   |80846  |1522   |33730 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80847  |1523   |33734 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80848  |1523   |33732 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80849  |1523   |33736 |0       |2        |F63100|0        |2       |0   |
-ROW   |80850  |1524   |33735 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80851  |1524   |33733 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80852  |1524   |33737 |0       |2        |F63100|0        |2       |0   |
-ROW   |80853  |1525   |33743 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80854  |1525   |33742 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80855  |1525   |33738 |0       |2        |F63100|0        |2       |0   |
-ROW   |80856  |1526   |33692 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80857  |1526   |33693 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80858  |1571   |34269 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80859  |1571   |34270 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80860  |1571   |34271 |0       |2        |F63100|0        |2       |0   |
-ROW   |80861  |1571   |34272 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80862  |1572   |34311 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80863  |1572   |34301 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80864  |1573   |34243 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80865  |1573   |34244 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80866  |1573   |34246 |0       |2        |F63100|0        |2       |0   |
-ROW   |80867  |1573   |34245 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80868  |1574   |34239 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80869  |1574   |34227 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80870  |1574   |34236 |0       |2        |F63100|0        |2       |0   |
-ROW   |80871  |1574   |34237 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80872  |1575   |34253 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80873  |1575   |34252 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80874  |1575   |34249 |0       |2        |F63100|0        |2       |0   |
-ROW   |80875  |1575   |34251 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80876  |1496   |33368 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80877  |1497   |33371 |1       |0        |1A7C11|0        |2       |0   |
-ROW   |80878  |1497   |33371 |1       |1        |2774A4|0        |2       |0   |
-ROW   |80879  |1498   |33379 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80880  |1498   |33382 |2       |1        |2774A4|0        |2       |0   |
-ROW   |80881  |1498   |33381 |0       |2        |F63100|1        |2       |0   |
-ROW   |80882  |1498   |33378 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80883  |1498   |33380 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |80884  |1498   |33377 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |80885  |1142   |30689 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80886  |1805   |36187 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |80887  |1805   |36192 |2       |1        |2774A4|0        |2       |0   |
-ROW   |80888  |1805   |36190 |0       |2        |F63100|1        |2       |0   |
-ROW   |80889  |1805   |36185 |0       |3        |A54F10|1        |2       |0   |
-ROW   |80890  |1805   |36189 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |80891  |1805   |36184 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |80892  |1275   |31794 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80893  |1275   |31792 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80894  |1275   |31800 |0       |2        |F63100|1        |2       |0   |
-ROW   |80895  |1276   |36771 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80896  |1276   |33390 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80897  |1276   |31799 |0       |2        |F63100|0        |2       |0   |
-ROW   |80898  |1276   |31797 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80899  |1277   |36770 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80900  |1277   |33389 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80901  |1277   |31795 |0       |2        |F63100|0        |2       |0   |
-ROW   |80902  |1278   |36769 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |80903  |1278   |31793 |0       |1        |2774A4|0        |2       |0   |
-ROW   |80904  |1278   |31802 |0       |2        |F63100|0        |2       |0   |
-ROW   |80905  |1278   |31790 |0       |3        |A54F10|0        |2       |0   |
-ROW   |80906  |1278   |31791 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |80907  |1397   |32451 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80908  |1397   |32450 |5       |1        |2774A4|0        |2       |0   |
+ROW   |80909  |1398   |32452 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80910  |1398   |32449 |5       |1        |2774A4|0        |2       |0   |
+ROW   |80911  |1399   |32444 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80912  |1399   |32446 |5       |1        |2774A4|0        |2       |0   |
+ROW   |80913  |1399   |32448 |5       |2        |F63100|0        |2       |0   |
+ROW   |80914  |1400   |32460 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80915  |1401   |32458 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80916  |1401   |32457 |5       |1        |2774A4|0        |2       |0   |
+ROW   |80917  |1402   |32461 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80918  |1402   |32456 |5       |1        |2774A4|0        |2       |0   |
+ROW   |80919  |1172   |30918 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80920  |1172   |30919 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80921  |1172   |30920 |0       |2        |F63100|0        |2       |0   |
+ROW   |80922  |1172   |30921 |2       |3        |A54F10|0        |2       |0   |
+ROW   |80923  |1173   |30922 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80924  |835    |28744 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80925  |835    |28745 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80926  |1174   |30913 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80927  |1175   |30906 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80928  |1175   |30908 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80929  |1175   |30915 |0       |2        |F63100|0        |2       |0   |
+ROW   |80930  |1175   |30897 |0       |3        |A54F10|0        |2       |0   |
+ROW   |80931  |1175   |30901 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |80932  |1175   |30899 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |80933  |1175   |30907 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |80934  |1175   |30905 |0       |7        |611F27|0        |2       |0   |
+ROW   |80935  |1175   |30904 |0       |8        |F230E0|0        |2       |0   |
+ROW   |80936  |1175   |30900 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |80937  |1175   |30898 |0       |10       |40CDFF|0        |2       |0   |
+ROW   |80938  |1176   |30910 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80939  |1176   |30909 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80940  |836    |28798 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80941  |836    |28799 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80942  |836    |28800 |0       |2        |F63100|0        |2       |0   |
+ROW   |80943  |836    |28801 |2       |3        |A54F10|0        |2       |0   |
+ROW   |80944  |837    |28803 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80945  |838    |28793 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |80946  |840    |28787 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80947  |840    |28784 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80948  |840    |28782 |0       |2        |F63100|0        |2       |0   |
+ROW   |80949  |840    |28781 |0       |3        |A54F10|0        |2       |0   |
+ROW   |80950  |840    |28780 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |80951  |840    |28778 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |80952  |840    |28786 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |80953  |840    |28785 |0       |7        |611F27|0        |2       |0   |
+ROW   |80954  |840    |28783 |0       |8        |F230E0|0        |2       |0   |
+ROW   |80955  |840    |28779 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |80956  |840    |28796 |0       |10       |40CDFF|0        |2       |0   |
+ROW   |80957  |839    |28789 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80958  |839    |28788 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80959  |1339   |32172 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80960  |1339   |32173 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80961  |1403   |32511 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80962  |1403   |32514 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80963  |1404   |32512 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80964  |1404   |32515 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80965  |1405   |32507 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80966  |1405   |32508 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80967  |1405   |32513 |0       |2        |F63100|0        |2       |0   |
+ROW   |80968  |1343   |32135 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80969  |1343   |32142 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80970  |1344   |32167 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80971  |1344   |32136 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80972  |1345   |32141 |1       |0        |1A7C11|0        |2       |0   |
+ROW   |80973  |1345   |32138 |1       |1        |2774A4|0        |2       |0   |
+ROW   |80974  |1346   |32156 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |80975  |1346   |32158 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80976  |1346   |32159 |0       |2        |F63100|0        |2       |0   |
+ROW   |80977  |1346   |32154 |2       |3        |A54F10|0        |2       |0   |
+ROW   |80978  |1346   |32155 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |80979  |1346   |32146 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |80980  |1347   |32150 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |80981  |1347   |32151 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80982  |1347   |32152 |0       |2        |F63100|0        |2       |0   |
+ROW   |80983  |1622   |35078 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80984  |1622   |35091 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80985  |1622   |35098 |0       |2        |F63100|0        |2       |0   |
+ROW   |80986  |1622   |35100 |0       |3        |A54F10|0        |2       |0   |
+ROW   |80987  |1622   |35099 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |80988  |1623   |35090 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80989  |1623   |35101 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80990  |1624   |35097 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80991  |1624   |35096 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80992  |1624   |35095 |0       |2        |F63100|0        |2       |0   |
+ROW   |80993  |1625   |35089 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80994  |1625   |35088 |0       |1        |2774A4|0        |2       |0   |
+ROW   |80995  |1625   |35087 |0       |2        |F63100|0        |2       |0   |
+ROW   |80996  |1625   |35086 |0       |3        |A54F10|0        |2       |0   |
+ROW   |80997  |1625   |35085 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |80998  |1626   |35079 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |80999  |1626   |35082 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81000  |1627   |35080 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81001  |1627   |35102 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81002  |1628   |35093 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81003  |1628   |35092 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81004  |1628   |35081 |0       |2        |F63100|0        |2       |0   |
+ROW   |81005  |1628   |35084 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81006  |1628   |35083 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81007  |1121   |30606 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81008  |1121   |30590 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81009  |1121   |30582 |5       |2        |F63100|0        |2       |0   |
+ROW   |81010  |1122   |30580 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81011  |1122   |30578 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81012  |1123   |30586 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81013  |1123   |30608 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81014  |1123   |30585 |2       |2        |F63100|0        |2       |0   |
+ROW   |81015  |1123   |30589 |2       |3        |A54F10|0        |2       |0   |
+ROW   |81016  |1123   |30584 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |81017  |1123   |30588 |2       |5        |6C59DC|0        |2       |0   |
+ROW   |81018  |1124   |30583 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81019  |1124   |30587 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81020  |1125   |30555 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81021  |1125   |30554 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81022  |1125   |30556 |2       |2        |F63100|0        |2       |0   |
+ROW   |81023  |1125   |30557 |2       |3        |A54F10|0        |2       |0   |
+ROW   |81024  |1126   |30565 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81025  |1127   |30567 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81026  |1127   |30568 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81027  |1128   |30536 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81028  |1129   |30566 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81029  |1129   |30549 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81030  |1129   |30553 |2       |2        |F63100|0        |2       |0   |
+ROW   |81031  |1129   |30570 |2       |3        |A54F10|0        |2       |0   |
+ROW   |81032  |1143   |30714 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81033  |1143   |30716 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81034  |1143   |30717 |0       |2        |F63100|0        |2       |0   |
+ROW   |81035  |1143   |30715 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81036  |1144   |30753 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81037  |1144   |30738 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81038  |1145   |30718 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81039  |1145   |30737 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81040  |1145   |30727 |0       |2        |F63100|0        |2       |0   |
+ROW   |81041  |1145   |30729 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81042  |1146   |30730 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81043  |1146   |30732 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81044  |1146   |30731 |0       |2        |F63100|0        |2       |0   |
+ROW   |81045  |1146   |30733 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81046  |1147   |30734 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81047  |1147   |30736 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81048  |1147   |30735 |0       |2        |F63100|0        |2       |0   |
+ROW   |81049  |1147   |30758 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81050  |1148   |30711 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81051  |1148   |30706 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81052  |1148   |30710 |0       |2        |F63100|0        |2       |0   |
+ROW   |81053  |1148   |30712 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81054  |1148   |30702 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81055  |1148   |30707 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81056  |1148   |30704 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81057  |1177   |30927 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81058  |1177   |30944 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81059  |1178   |30935 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81060  |1178   |30942 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81061  |1179   |30949 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81062  |1179   |30950 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81063  |1179   |30951 |0       |2        |F63100|0        |2       |0   |
+ROW   |81064  |1180   |30952 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81065  |1180   |30954 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81066  |1180   |30955 |0       |2        |F63100|0        |2       |0   |
+ROW   |81067  |1181   |30936 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81068  |1181   |30940 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81069  |1182   |30930 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81070  |1182   |30929 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81071  |1182   |30928 |0       |2        |F63100|0        |2       |0   |
+ROW   |81072  |1182   |30931 |2       |3        |A54F10|1        |2       |0   |
+ROW   |81073  |1183   |30934 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81074  |1183   |30941 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81075  |1406   |32532 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |81076  |1406   |32535 |0       |1        |2774A4|1        |2       |0   |
+ROW   |81077  |1406   |32533 |0       |2        |F63100|0        |2       |0   |
+ROW   |81078  |1406   |32534 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81079  |1406   |32536 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81080  |1406   |32537 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81081  |1407   |32543 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81082  |1407   |32544 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81083  |1408   |32518 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81084  |1408   |32521 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81085  |1408   |32523 |0       |2        |F63100|0        |2       |0   |
+ROW   |81086  |1408   |32524 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81087  |1409   |32562 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |81088  |1409   |32565 |0       |1        |2774A4|1        |2       |0   |
+ROW   |81089  |1409   |32563 |0       |2        |F63100|0        |2       |0   |
+ROW   |81090  |1409   |32564 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81091  |1409   |32566 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81092  |1409   |32567 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81093  |1410   |32573 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81094  |1410   |32574 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81095  |1411   |32548 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81096  |1411   |32551 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81097  |1411   |32553 |0       |2        |F63100|0        |2       |0   |
+ROW   |81098  |1411   |32554 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81099  |1250   |31527 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81100  |1250   |31529 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81101  |1250   |31499 |0       |2        |F63100|0        |2       |0   |
+ROW   |81102  |1251   |31532 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81103  |1251   |31534 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81104  |1251   |31538 |0       |2        |F63100|0        |2       |0   |
+ROW   |81105  |1251   |31536 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81106  |1251   |31528 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81107  |1251   |31542 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81108  |1252   |31552 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81109  |1252   |31551 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81110  |1252   |31541 |0       |2        |F63100|0        |2       |0   |
+ROW   |81111  |1253   |31513 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81112  |1253   |31526 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81113  |1253   |31525 |0       |2        |F63100|0        |2       |0   |
+ROW   |81114  |1254   |31502 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81115  |1254   |31501 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81116  |1254   |31503 |0       |2        |F63100|0        |2       |0   |
+ROW   |81117  |1255   |31505 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81118  |1255   |31504 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81119  |1255   |31506 |0       |2        |F63100|0        |2       |0   |
+ROW   |81120  |1256   |31508 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81121  |1256   |31507 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81122  |1256   |31509 |0       |2        |F63100|0        |2       |0   |
+ROW   |81123  |1257   |31511 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81124  |1257   |31510 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81125  |1257   |31500 |0       |2        |F63100|0        |2       |0   |
+ROW   |81126  |1258   |31514 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81127  |1258   |31512 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81128  |1258   |31515 |0       |2        |F63100|0        |2       |0   |
+ROW   |81129  |1259   |31516 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81130  |1259   |31517 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81131  |1260   |31523 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81132  |1260   |31522 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81133  |1260   |31524 |0       |2        |F63100|0        |2       |0   |
+ROW   |81134  |1412   |32601 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81135  |1412   |32602 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81136  |1412   |32603 |0       |2        |F63100|0        |2       |0   |
+ROW   |81137  |1412   |32604 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81138  |1412   |32606 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81139  |1412   |32606 |2       |5        |6C59DC|0        |2       |0   |
+ROW   |81140  |1413   |32608 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81141  |1413   |32610 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81142  |1413   |32611 |0       |2        |F63100|0        |2       |0   |
+ROW   |81143  |1414   |32582 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81144  |1414   |32580 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81145  |1414   |32581 |2       |2        |F63100|0        |2       |0   |
+ROW   |81146  |1414   |32597 |0       |3        |A54F10|1        |2       |0   |
+ROW   |81147  |1414   |32599 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |81148  |1414   |32588 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |81149  |1415   |32583 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81150  |1415   |32584 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81151  |1415   |32585 |0       |2        |F63100|0        |2       |0   |
+ROW   |81152  |1415   |32579 |2       |3        |A54F10|0        |2       |0   |
+ROW   |81153  |1416   |32587 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81154  |1416   |32590 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81155  |1416   |32589 |0       |2        |F63100|0        |2       |0   |
+ROW   |81156  |1417   |32673 |1       |0        |1A7C11|0        |2       |0   |
+ROW   |81157  |1417   |32679 |1       |1        |2774A4|0        |2       |0   |
+ROW   |81158  |1629   |35114 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81159  |1629   |35113 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81160  |1075   |30204 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81161  |1075   |30205 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81162  |1630   |35112 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81163  |1630   |35111 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81164  |1630   |35110 |0       |2        |F63100|0        |2       |0   |
+ROW   |81165  |1630   |35108 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81166  |1630   |35105 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81167  |1076   |30209 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81168  |1076   |30208 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81169  |1077   |30206 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81170  |1077   |30207 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81171  |1078   |30216 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81172  |1078   |30215 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81173  |1079   |30210 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81174  |1079   |30211 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81175  |1079   |30212 |0       |2        |F63100|0        |2       |0   |
+ROW   |81176  |1079   |30213 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81177  |1079   |30214 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81178  |1631   |35127 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81179  |1631   |35126 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81180  |1632   |35124 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81181  |1632   |35123 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81182  |1632   |35122 |0       |2        |F63100|0        |2       |0   |
+ROW   |81183  |1632   |30222 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81184  |1632   |30223 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81185  |1080   |30226 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81186  |1080   |30225 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81187  |1633   |35139 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81188  |1633   |35138 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81189  |1081   |30247 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81190  |1081   |30248 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81191  |1634   |35137 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81192  |1634   |35136 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81193  |1634   |35135 |0       |2        |F63100|0        |2       |0   |
+ROW   |81194  |1634   |35133 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81195  |1634   |35130 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81196  |1082   |30252 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81197  |1082   |30251 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81198  |1083   |30249 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81199  |1083   |30250 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81200  |1084   |30259 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81201  |1084   |30258 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81202  |1085   |30253 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81203  |1085   |30254 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81204  |1085   |30255 |0       |2        |F63100|0        |2       |0   |
+ROW   |81205  |1085   |30256 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81206  |1085   |30257 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81207  |1635   |35152 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81208  |1635   |35151 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81209  |1636   |35149 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81210  |1636   |35148 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81211  |1636   |35147 |0       |2        |F63100|0        |2       |0   |
+ROW   |81212  |1636   |30265 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81213  |1636   |30266 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81214  |1086   |30269 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81215  |1086   |30268 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81216  |1184   |30982 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81217  |1184   |30980 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81218  |1185   |30983 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81219  |1185   |30981 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81220  |1186   |30976 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81221  |1186   |30985 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81222  |1186   |30997 |0       |2        |F63100|0        |2       |0   |
+ROW   |81223  |1186   |30970 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81224  |1186   |30973 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81225  |1186   |30995 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81226  |1186   |30998 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81227  |1186   |30978 |0       |7        |611F27|0        |2       |0   |
+ROW   |81228  |1187   |31024 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81229  |1187   |31022 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81230  |1188   |31025 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81231  |1188   |31023 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81232  |1189   |31018 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81233  |1189   |31027 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81234  |1189   |31039 |0       |2        |F63100|0        |2       |0   |
+ROW   |81235  |1189   |31012 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81236  |1189   |31015 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81237  |1189   |31037 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81238  |1189   |31040 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81239  |1189   |31020 |0       |7        |611F27|0        |2       |0   |
+ROW   |81240  |1499   |33478 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81241  |1499   |33467 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81242  |1500   |33468 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81243  |1500   |33479 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81244  |1501   |33442 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81245  |1501   |33441 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81246  |1501   |33440 |0       |2        |F63100|0        |2       |0   |
+ROW   |81247  |1502   |33423 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81248  |1502   |33419 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81249  |1502   |33422 |0       |2        |F63100|0        |2       |0   |
+ROW   |81250  |1502   |33421 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81251  |1502   |33412 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81252  |1418   |32700 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81253  |1418   |32699 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81254  |1419   |32710 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81255  |1419   |32709 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81256  |1420   |32693 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81257  |1420   |32724 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81258  |1421   |32730 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81259  |1421   |32731 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81260  |1421   |32728 |0       |2        |F63100|0        |2       |0   |
+ROW   |81261  |1421   |32729 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81262  |1422   |32705 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81263  |1422   |32706 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81264  |1423   |32702 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81265  |1423   |32703 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81266  |1424   |32708 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81267  |1424   |32722 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81268  |1424   |32695 |0       |2        |F63100|0        |2       |0   |
+ROW   |81269  |1424   |32753 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81270  |1424   |32740 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |81271  |1424   |32723 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81272  |1424   |32747 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81273  |1424   |32748 |2       |7        |611F27|0        |2       |0   |
+ROW   |81274  |1424   |32749 |0       |8        |F230E0|0        |2       |0   |
+ROW   |81275  |1424   |32750 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |81276  |1424   |32751 |2       |10       |40CDFF|0        |2       |0   |
+ROW   |81277  |1424   |32752 |0       |11       |40FFA0|0        |2       |0   |
+ROW   |81278  |1425   |32746 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81279  |1425   |32745 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81280  |1425   |32744 |0       |2        |F63100|0        |2       |0   |
+ROW   |81281  |1425   |32743 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81282  |1425   |32743 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |81283  |1425   |32742 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81284  |1426   |32720 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81285  |1426   |32721 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81286  |1426   |32719 |0       |2        |F63100|0        |2       |0   |
+ROW   |81287  |1426   |32718 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81288  |1130   |30613 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81289  |1130   |30635 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81290  |1130   |30625 |0       |2        |F63100|0        |2       |0   |
+ROW   |81291  |1131   |30632 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81292  |1131   |30633 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81293  |1131   |30629 |5       |2        |F63100|0        |2       |0   |
+ROW   |81294  |1132   |30630 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81295  |1132   |30628 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81296  |1132   |30631 |2       |2        |F63100|0        |2       |0   |
+ROW   |81297  |1133   |30619 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81298  |1133   |30618 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81299  |1134   |30623 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81300  |1134   |30622 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81301  |1135   |30615 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81302  |841    |28813 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81303  |841    |28811 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81304  |841    |28812 |0       |2        |F63100|0        |2       |0   |
+ROW   |81305  |841    |28814 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81306  |842    |28817 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81307  |842    |28815 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81308  |842    |28816 |0       |2        |F63100|0        |2       |0   |
+ROW   |81309  |844    |28808 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81310  |844    |28807 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81311  |843    |28818 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81312  |845    |28829 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81313  |845    |28831 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81314  |845    |28832 |0       |2        |F63100|0        |2       |0   |
+ROW   |81315  |845    |28830 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81316  |846    |28826 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81317  |846    |28828 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81318  |846    |28827 |0       |2        |F63100|0        |2       |0   |
+ROW   |81319  |847    |28825 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81320  |1637   |35187 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81321  |1638   |35189 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81322  |1638   |35188 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81323  |1638   |35190 |5       |2        |F63100|0        |2       |0   |
+ROW   |81324  |1638   |35191 |5       |3        |A54F10|0        |2       |0   |
+ROW   |81325  |1638   |35192 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |81326  |1639   |35198 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81327  |1640   |35200 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81328  |1640   |35199 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81329  |1640   |35201 |5       |2        |F63100|0        |2       |0   |
+ROW   |81330  |1640   |35202 |5       |3        |A54F10|0        |2       |0   |
+ROW   |81331  |1640   |35203 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |81332  |1641   |35221 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81333  |1641   |35220 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81334  |1641   |35219 |5       |2        |F63100|0        |2       |0   |
+ROW   |81335  |1642   |35214 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81336  |1642   |35216 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81337  |1642   |35207 |5       |2        |F63100|0        |2       |0   |
+ROW   |81338  |1642   |35213 |5       |3        |A54F10|0        |2       |0   |
+ROW   |81339  |1642   |35212 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |81340  |1643   |35228 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81341  |1643   |35229 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81342  |1643   |35227 |5       |2        |F63100|0        |2       |0   |
+ROW   |81343  |1644   |35231 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81344  |1644   |35230 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81345  |1644   |35235 |5       |2        |F63100|0        |2       |0   |
+ROW   |81346  |1644   |35233 |5       |3        |A54F10|0        |2       |0   |
+ROW   |81347  |1644   |35232 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |81348  |1644   |35234 |5       |5        |6C59DC|0        |2       |0   |
+ROW   |81349  |1644   |35236 |5       |6        |AC8C14|0        |2       |0   |
+ROW   |81350  |1644   |35237 |5       |7        |611F27|0        |2       |0   |
+ROW   |81351  |1645   |35243 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81352  |1645   |35244 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81353  |1645   |35245 |5       |2        |F63100|0        |2       |0   |
+ROW   |81354  |1646   |35252 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81355  |1646   |35253 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81356  |1646   |35254 |5       |2        |F63100|0        |2       |0   |
+ROW   |81357  |1647   |35172 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81358  |1647   |35168 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81359  |1647   |35164 |5       |2        |F63100|0        |2       |0   |
+ROW   |81360  |1647   |35163 |5       |3        |A54F10|0        |2       |0   |
+ROW   |81361  |1648   |35170 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81362  |1649   |35167 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81363  |1649   |35166 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81364  |1649   |35165 |5       |2        |F63100|0        |2       |0   |
+ROW   |81365  |1650   |35176 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81366  |1262   |31592 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81367  |1262   |31584 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81368  |1262   |31582 |0       |2        |F63100|0        |2       |0   |
+ROW   |81369  |1262   |31585 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81370  |1263   |31591 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81371  |1263   |31583 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81372  |1263   |31590 |0       |2        |F63100|0        |2       |0   |
+ROW   |81373  |1264   |31602 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81374  |1264   |31597 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81375  |1264   |31601 |0       |2        |F63100|0        |2       |0   |
+ROW   |81376  |1264   |31604 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81377  |1265   |31609 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81378  |1265   |31610 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81379  |1265   |31608 |0       |2        |F63100|0        |2       |0   |
+ROW   |81380  |1001   |29729 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81381  |1001   |29728 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81382  |1001   |29727 |0       |2        |F63100|0        |2       |0   |
+ROW   |81383  |1001   |29725 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81384  |1001   |29723 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81385  |1001   |29733 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81386  |1001   |29737 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81387  |1001   |29731 |0       |7        |611F27|0        |2       |0   |
+ROW   |81388  |1000   |29720 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81389  |1000   |29730 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81390  |1000   |29721 |0       |2        |F63100|0        |2       |0   |
+ROW   |81391  |1000   |29726 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81392  |1000   |29724 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81393  |1000   |29734 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81394  |1000   |29722 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81395  |1000   |29732 |0       |7        |611F27|0        |2       |0   |
+ROW   |81396  |1027   |30022 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81397  |1027   |30021 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81398  |1027   |30019 |0       |2        |F63100|0        |2       |0   |
+ROW   |81399  |1008   |29698 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81400  |1008   |29700 |2       |1        |FF0000|0        |2       |0   |
+ROW   |81401  |1007   |29691 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81402  |1013   |29657 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81403  |1013   |29658 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81404  |1009   |29687 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81405  |1009   |29694 |2       |1        |FF0000|0        |2       |0   |
+ROW   |81406  |1029   |30017 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81407  |1029   |30016 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81408  |1029   |30015 |0       |2        |F63100|0        |2       |0   |
+ROW   |81409  |1031   |30007 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81410  |1031   |30013 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81411  |1031   |30011 |0       |2        |F63100|0        |2       |0   |
+ROW   |81412  |1031   |30009 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81413  |1031   |30005 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81414  |1031   |30003 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81415  |1031   |30023 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81416  |1031   |30001 |0       |7        |611F27|0        |2       |0   |
+ROW   |81417  |1030   |30008 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81418  |1030   |30014 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81419  |1030   |30012 |0       |2        |F63100|0        |2       |0   |
+ROW   |81420  |1030   |30010 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81421  |1030   |30006 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81422  |1030   |30004 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81423  |1030   |30000 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81424  |1030   |30002 |0       |7        |611F27|0        |2       |0   |
+ROW   |81425  |1011   |29695 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81426  |1028   |30020 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81427  |1010   |29701 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81428  |1010   |29697 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81429  |1012   |29692 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81430  |1015   |29812 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81431  |1015   |29811 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81432  |1015   |29810 |0       |2        |F63100|0        |2       |0   |
+ROW   |81433  |1015   |29808 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81434  |1015   |29806 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81435  |1015   |29816 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81436  |1015   |29820 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81437  |1015   |29814 |0       |7        |611F27|0        |2       |0   |
+ROW   |81438  |1014   |29803 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81439  |1014   |29813 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81440  |1014   |29804 |0       |2        |F63100|0        |2       |0   |
+ROW   |81441  |1014   |29809 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81442  |1014   |29807 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81443  |1014   |29817 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81444  |1014   |29805 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81445  |1014   |29815 |0       |7        |611F27|0        |2       |0   |
+ROW   |81446  |1016   |29768 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81447  |1016   |29767 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81448  |1016   |29765 |0       |2        |F63100|0        |2       |0   |
+ROW   |81449  |1022   |29782 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81450  |1022   |29781 |2       |1        |FF0000|0        |2       |0   |
+ROW   |81451  |1021   |29783 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81452  |1023   |29780 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81453  |1023   |29784 |2       |1        |FF0000|0        |2       |0   |
+ROW   |81454  |1018   |29763 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81455  |1018   |29762 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81456  |1018   |29761 |0       |2        |F63100|0        |2       |0   |
+ROW   |81457  |1020   |29753 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81458  |1020   |29759 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81459  |1020   |29757 |0       |2        |F63100|0        |2       |0   |
+ROW   |81460  |1020   |29755 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81461  |1020   |29751 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81462  |1020   |29749 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81463  |1020   |29769 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81464  |1020   |29747 |0       |7        |611F27|0        |2       |0   |
+ROW   |81465  |1019   |29754 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81466  |1019   |29760 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81467  |1019   |29758 |0       |2        |F63100|0        |2       |0   |
+ROW   |81468  |1019   |29756 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81469  |1019   |29752 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81470  |1019   |29750 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81471  |1019   |29746 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81472  |1019   |29748 |0       |7        |611F27|0        |2       |0   |
+ROW   |81473  |1025   |29775 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81474  |1017   |29766 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81475  |1024   |29776 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81476  |1024   |29777 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81477  |1026   |29772 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81478  |1356   |32276 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81479  |1356   |32275 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81480  |1357   |32281 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81481  |1357   |32267 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81482  |1357   |32279 |0       |2        |F63100|0        |2       |0   |
+ROW   |81483  |1358   |32268 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81484  |1358   |32274 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81485  |1358   |32271 |0       |2        |F63100|0        |2       |0   |
+ROW   |81486  |1359   |32288 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81487  |1359   |32291 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81488  |1360   |32247 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81489  |1360   |32245 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81490  |1360   |32246 |0       |2        |F63100|0        |2       |0   |
+ROW   |81491  |1361   |32248 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81492  |1361   |32249 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81493  |1361   |32250 |0       |2        |F63100|0        |2       |0   |
+ROW   |81494  |1362   |32240 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81495  |1362   |32273 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81496  |1363   |32282 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81497  |1363   |32283 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81498  |1363   |32289 |0       |2        |F63100|0        |2       |0   |
+ROW   |81499  |1363   |32290 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81500  |1363   |32286 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81501  |1363   |32287 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81502  |1363   |32241 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81503  |1363   |32242 |0       |7        |611F27|0        |2       |0   |
+ROW   |81504  |1363   |32243 |0       |8        |F230E0|0        |2       |0   |
+ROW   |81505  |1363   |32244 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |81506  |1363   |32277 |0       |10       |40CDFF|0        |2       |0   |
+ROW   |81507  |1363   |32278 |0       |11       |40FFA0|0        |2       |0   |
+ROW   |81508  |1427   |32768 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81509  |1427   |32767 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81510  |1428   |32774 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81511  |1428   |32772 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81512  |1428   |32775 |5       |2        |F63100|0        |2       |0   |
+ROW   |81513  |1428   |32773 |5       |3        |A54F10|0        |2       |0   |
+ROW   |81514  |1429   |32779 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81515  |1429   |32777 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81516  |1429   |32778 |5       |2        |F63100|0        |2       |0   |
+ROW   |81517  |1806   |36785 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81518  |1806   |36786 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81519  |1806   |36787 |0       |2        |F63100|0        |2       |0   |
+ROW   |81520  |1430   |32837 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81521  |1430   |32836 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81522  |1430   |32835 |2       |2        |F63100|0        |2       |0   |
+ROW   |81523  |1431   |32856 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81524  |1432   |32828 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81525  |1433   |32847 |5       |0        |34bdeb|0        |2       |0   |
+ROW   |81526  |1434   |32797 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81527  |1434   |32796 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81528  |1434   |32801 |2       |2        |F63100|0        |2       |0   |
+ROW   |81529  |1435   |32834 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81530  |1436   |32819 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81531  |1437   |32826 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81532  |1614   |34976 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81533  |1614   |34975 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81534  |1614   |34978 |0       |2        |F63100|0        |2       |0   |
+ROW   |81535  |1614   |34979 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81536  |1614   |34980 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81537  |1615   |34982 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81538  |1615   |34997 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81539  |1615   |35001 |0       |2        |F63100|0        |2       |0   |
+ROW   |81540  |1615   |35000 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81541  |1615   |34998 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81542  |1615   |34996 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81543  |1616   |35015 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81544  |1616   |35014 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81545  |1617   |35012 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81546  |1617   |35013 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81547  |1618   |34951 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81548  |1618   |34952 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81549  |1618   |34953 |0       |2        |F63100|0        |2       |0   |
+ROW   |81550  |1618   |34954 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81551  |1618   |34956 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81552  |1618   |34950 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81553  |1618   |34957 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |81554  |1618   |34959 |0       |7        |611F27|0        |2       |0   |
+ROW   |81555  |1618   |34965 |0       |8        |F230E0|0        |2       |0   |
+ROW   |81556  |1445   |22404 |0       |0        |990099|0        |2       |0   |
+ROW   |81557  |1445   |22399 |0       |1        |990000|0        |2       |0   |
+ROW   |81558  |1445   |22416 |0       |2        |0000EE|0        |2       |0   |
+ROW   |81559  |1445   |25366 |0       |3        |FF33FF|0        |2       |0   |
+ROW   |81560  |1445   |22418 |0       |4        |009600|0        |2       |0   |
+ROW   |81561  |1445   |22402 |0       |5        |003300|0        |2       |0   |
+ROW   |81562  |1445   |22400 |0       |6        |33FFFF|0        |2       |0   |
+ROW   |81563  |1445   |22689 |0       |7        |DD0000|0        |2       |0   |
+ROW   |81564  |1445   |23171 |0       |8        |000099|0        |2       |0   |
+ROW   |81565  |1445   |22401 |0       |9        |00FF00|0        |2       |0   |
+ROW   |81566  |1445   |33023 |0       |10       |5A2B57|0        |2       |0   |
+ROW   |81567  |1445   |39822 |0       |11       |9FA8DA|0        |2       |0   |
+ROW   |81568  |1651   |22406 |0       |0        |00EE00|0        |2       |0   |
+ROW   |81569  |1651   |25665 |0       |1        |0000EE|0        |2       |0   |
+ROW   |81570  |1651   |25666 |0       |2        |FFAA00|0        |2       |0   |
+ROW   |81571  |1651   |28537 |0       |3        |00EEEE|0        |2       |0   |
+ROW   |81572  |1651   |28535 |0       |4        |990099|0        |2       |0   |
+ROW   |81573  |1652   |22426 |0       |0        |00EE00|0        |2       |0   |
+ROW   |81574  |1652   |22408 |0       |1        |FFAA00|0        |2       |0   |
+ROW   |81575  |1652   |22412 |0       |2        |990099|0        |2       |0   |
+ROW   |81576  |1652   |22414 |0       |3        |FF66FF|0        |2       |0   |
+ROW   |81577  |1652   |23663 |0       |4        |009999|0        |2       |0   |
+ROW   |81578  |1652   |33022 |0       |5        |2B5429|0        |2       |0   |
+ROW   |81579  |1652   |22430 |0       |6        |8048B4|0        |2       |0   |
+ROW   |81580  |1652   |22420 |0       |7        |FD5434|0        |2       |0   |
+ROW   |81581  |1653   |22422 |0       |0        |00EE00|0        |2       |0   |
+ROW   |81582  |1653   |22424 |0       |1        |0000EE|0        |2       |0   |
+ROW   |81583  |1653   |25370 |0       |2        |FFAA00|0        |2       |0   |
+ROW   |81584  |1653   |29822 |0       |3        |00EEEE|0        |2       |0   |
+ROW   |81585  |1653   |34317 |0       |4        |990099|0        |2       |0   |
+ROW   |81586  |1653   |34316 |0       |5        |EE0000|0        |2       |0   |
+ROW   |81587  |1654   |33021 |0       |0        |C80000|0        |2       |0   |
+ROW   |81588  |1654   |33020 |0       |1        |00C800|0        |2       |0   |
+ROW   |81589  |527    |22199 |0       |0        |C80000|0        |2       |0   |
+ROW   |81590  |527    |22196 |0       |1        |00C800|0        |2       |0   |
+ROW   |81591  |410    |22185 |0       |0        |009900|0        |2       |0   |
+ROW   |81592  |410    |22189 |0       |1        |DD0000|0        |2       |0   |
+ROW   |81593  |410    |22396 |0       |2        |00DDDD|0        |2       |0   |
+ROW   |81594  |410    |22183 |0       |3        |3333FF|0        |2       |0   |
+ROW   |81595  |410    |22191 |0       |4        |999900|0        |2       |0   |
+ROW   |81596  |410    |23634 |0       |5        |00FF00|0        |2       |0   |
+ROW   |81597  |404    |22404 |0       |0        |990099|0        |2       |0   |
+ROW   |81598  |404    |22399 |0       |1        |990000|0        |2       |0   |
+ROW   |81599  |404    |22416 |0       |2        |0000EE|0        |2       |0   |
+ROW   |81600  |404    |22430 |0       |3        |FF33FF|0        |2       |0   |
+ROW   |81601  |404    |22418 |0       |4        |009600|0        |2       |0   |
+ROW   |81602  |404    |22402 |0       |5        |003300|0        |2       |0   |
+ROW   |81603  |404    |22420 |0       |6        |CCCC00|0        |2       |0   |
+ROW   |81604  |404    |22400 |0       |7        |33FFFF|0        |2       |0   |
+ROW   |81605  |404    |22689 |0       |8        |DD0000|0        |2       |0   |
+ROW   |81606  |404    |23171 |0       |9        |000099|0        |2       |0   |
+ROW   |81607  |404    |22401 |0       |10       |00FF00|0        |2       |0   |
+ROW   |81608  |404    |33023 |0       |11       |5A2B57|0        |2       |0   |
+ROW   |81609  |404    |39822 |0       |12       |9FA8DA|0        |2       |0   |
+ROW   |81610  |406    |22426 |0       |1        |00EE00|0        |2       |0   |
+ROW   |81611  |406    |22422 |0       |2        |0000EE|0        |2       |0   |
+ROW   |81612  |406    |22408 |0       |3        |FFAA00|0        |2       |0   |
+ROW   |81613  |406    |22424 |0       |4        |00EEEE|0        |2       |0   |
+ROW   |81614  |406    |22412 |0       |5        |990099|0        |2       |0   |
+ROW   |81615  |406    |22406 |0       |6        |EE0000|0        |2       |0   |
+ROW   |81616  |406    |22414 |0       |7        |FF66FF|0        |2       |0   |
+ROW   |81617  |406    |23663 |0       |8        |009999|0        |2       |0   |
+ROW   |81618  |406    |25366 |0       |9        |BBBB00|0        |2       |0   |
+ROW   |81619  |406    |25370 |0       |10       |AA0000|0        |2       |0   |
+ROW   |81620  |406    |25665 |0       |11       |990000|0        |2       |0   |
+ROW   |81621  |406    |25666 |0       |12       |008800|0        |2       |0   |
+ROW   |81622  |406    |28535 |0       |13       |80B0E0|0        |2       |0   |
+ROW   |81623  |406    |28537 |0       |14       |4080B0|0        |2       |0   |
+ROW   |81624  |406    |29822 |0       |15       |8000FF|0        |2       |0   |
+ROW   |81625  |406    |33022 |0       |16       |2B5429|0        |2       |0   |
+ROW   |81626  |406    |34317 |0       |17       |8048B4|0        |2       |0   |
+ROW   |81627  |406    |34316 |0       |18       |FD5434|0        |2       |0   |
+ROW   |81628  |406    |35274 |0       |19       |790E1F|0        |2       |0   |
+ROW   |81629  |406    |35272 |0       |20       |87AC4D|0        |2       |0   |
+ROW   |81630  |788    |28248 |0       |0        |008800|0        |2       |0   |
+ROW   |81631  |788    |28533 |0       |1        |EE0000|0        |2       |0   |
+ROW   |81632  |392    |22187 |5       |0        |00C800|0        |2       |0   |
+ROW   |81633  |392    |23251 |0       |1        |F63100|0        |2       |0   |
+ROW   |81634  |1446   |39823 |0       |11       |9FA8DA|0        |2       |0   |
+ROW   |81635  |518    |39823 |0       |12       |9FA8DA|0        |2       |0   |
+ROW   |81636  |1444   |28581 |0       |0        |990099|0        |2       |0   |
+ROW   |81637  |1444   |28574 |0       |1        |990000|0        |2       |0   |
+ROW   |81638  |1444   |28571 |0       |2        |0000EE|0        |2       |0   |
+ROW   |81639  |1444   |28562 |0       |3        |FF33FF|0        |2       |0   |
+ROW   |81640  |1444   |28570 |0       |4        |009600|0        |2       |0   |
+ROW   |81641  |1444   |28569 |0       |5        |003300|0        |2       |0   |
+ROW   |81642  |1444   |28552 |0       |6        |33FFFF|0        |2       |0   |
+ROW   |81643  |1444   |28573 |0       |7        |DD0000|0        |2       |0   |
+ROW   |81644  |1444   |28579 |0       |8        |000099|0        |2       |0   |
+ROW   |81645  |1444   |28559 |0       |9        |00FF00|0        |2       |0   |
+ROW   |81646  |1444   |33017 |0       |10       |5A2B57|0        |2       |0   |
+ROW   |81647  |1444   |39824 |0       |11       |9FA8DA|0        |2       |0   |
+ROW   |81648  |1659   |28567 |0       |0        |00EE00|0        |2       |0   |
+ROW   |81649  |1659   |28575 |0       |1        |0000EE|0        |2       |0   |
+ROW   |81650  |1659   |28576 |0       |2        |FFAA00|0        |2       |0   |
+ROW   |81651  |1659   |28583 |0       |3        |00EEEE|0        |2       |0   |
+ROW   |81652  |1659   |28582 |0       |4        |990099|0        |2       |0   |
+ROW   |81653  |1660   |28572 |0       |0        |00EE00|0        |2       |0   |
+ROW   |81654  |1660   |28568 |0       |1        |FFAA00|0        |2       |0   |
+ROW   |81655  |1660   |28564 |0       |2        |990099|0        |2       |0   |
+ROW   |81656  |1660   |28578 |0       |3        |FF66FF|0        |2       |0   |
+ROW   |81657  |1660   |28580 |0       |4        |009999|0        |2       |0   |
+ROW   |81658  |1660   |33016 |0       |5        |2B5429|0        |2       |0   |
+ROW   |81659  |1660   |28565 |0       |6        |8048B4|0        |2       |0   |
+ROW   |81660  |1660   |28577 |0       |7        |FD5434|0        |2       |0   |
+ROW   |81661  |1661   |28566 |0       |0        |00EE00|0        |2       |0   |
+ROW   |81662  |1661   |28561 |0       |1        |0000EE|0        |2       |0   |
+ROW   |81663  |1661   |28563 |0       |2        |FFAA00|0        |2       |0   |
+ROW   |81664  |1661   |29821 |0       |3        |00EEEE|0        |2       |0   |
+ROW   |81665  |1661   |34314 |0       |4        |990099|0        |2       |0   |
+ROW   |81666  |1661   |34315 |0       |5        |EE0000|0        |2       |0   |
+ROW   |81667  |1662   |33015 |0       |0        |C80000|0        |2       |0   |
+ROW   |81668  |1662   |33014 |0       |1        |00C800|0        |2       |0   |
+ROW   |81669  |797    |28546 |0       |0        |C80000|0        |2       |0   |
+ROW   |81670  |797    |28545 |0       |1        |00C800|0        |2       |0   |
+ROW   |81671  |798    |28551 |0       |0        |009900|0        |2       |0   |
+ROW   |81672  |798    |28543 |0       |1        |DD0000|0        |2       |0   |
+ROW   |81673  |798    |28542 |0       |2        |00DDDD|0        |2       |0   |
+ROW   |81674  |798    |28549 |0       |3        |3333FF|0        |2       |0   |
+ROW   |81675  |798    |28544 |0       |4        |999900|0        |2       |0   |
+ROW   |81676  |798    |28548 |0       |5        |00FF00|0        |2       |0   |
+ROW   |81677  |799    |28581 |0       |0        |990099|0        |2       |0   |
+ROW   |81678  |799    |28574 |0       |1        |990000|0        |2       |0   |
+ROW   |81679  |799    |28571 |0       |2        |0000EE|0        |2       |0   |
+ROW   |81680  |799    |28565 |0       |3        |FF33FF|0        |2       |0   |
+ROW   |81681  |799    |28570 |0       |4        |009600|0        |2       |0   |
+ROW   |81682  |799    |28569 |0       |5        |003300|0        |2       |0   |
+ROW   |81683  |799    |28577 |0       |6        |CCCC00|0        |2       |0   |
+ROW   |81684  |799    |28552 |0       |7        |33FFFF|0        |2       |0   |
+ROW   |81685  |799    |28573 |0       |8        |DD0000|0        |2       |0   |
+ROW   |81686  |799    |28579 |0       |9        |000099|0        |2       |0   |
+ROW   |81687  |799    |28559 |0       |10       |00FF00|0        |2       |0   |
+ROW   |81688  |799    |33017 |0       |11       |5A2B57|0        |2       |0   |
+ROW   |81689  |799    |39824 |0       |12       |9FA8DA|0        |2       |0   |
+ROW   |81690  |800    |28572 |0       |1        |00EE00|0        |2       |0   |
+ROW   |81691  |800    |28566 |0       |2        |0000EE|0        |2       |0   |
+ROW   |81692  |800    |28568 |0       |3        |FFAA00|0        |2       |0   |
+ROW   |81693  |800    |28561 |0       |4        |00EEEE|0        |2       |0   |
+ROW   |81694  |800    |28564 |0       |5        |990099|0        |2       |0   |
+ROW   |81695  |800    |28567 |0       |6        |EE0000|0        |2       |0   |
+ROW   |81696  |800    |28578 |0       |7        |FF66FF|0        |2       |0   |
+ROW   |81697  |800    |28580 |0       |8        |009999|0        |2       |0   |
+ROW   |81698  |800    |28562 |0       |9        |BBBB00|0        |2       |0   |
+ROW   |81699  |800    |28563 |0       |10       |AA0000|0        |2       |0   |
+ROW   |81700  |800    |28575 |0       |11       |990000|0        |2       |0   |
+ROW   |81701  |800    |28576 |0       |12       |008800|0        |2       |0   |
+ROW   |81702  |800    |28582 |0       |13       |80B0E0|0        |2       |0   |
+ROW   |81703  |800    |28583 |0       |14       |4080B0|0        |2       |0   |
+ROW   |81704  |800    |29821 |0       |15       |8000FF|0        |2       |0   |
+ROW   |81705  |800    |33016 |0       |16       |2B5429|0        |2       |0   |
+ROW   |81706  |800    |34314 |0       |17       |8048B4|0        |2       |0   |
+ROW   |81707  |800    |34315 |0       |18       |FD5434|0        |2       |0   |
+ROW   |81708  |800    |35279 |0       |19       |790E1F|0        |2       |0   |
+ROW   |81709  |800    |35278 |0       |20       |87AC4D|0        |2       |0   |
+ROW   |81710  |801    |28560 |0       |0        |008800|0        |2       |0   |
+ROW   |81711  |801    |28584 |0       |1        |EE0000|0        |2       |0   |
+ROW   |81712  |802    |28550 |5       |0        |00C800|0        |2       |0   |
+ROW   |81713  |802    |28540 |0       |1        |F63100|0        |2       |0   |
+ROW   |81714  |1438   |33001 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81715  |1438   |33002 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81716  |1438   |33000 |2       |2        |F63100|0        |2       |0   |
+ROW   |81717  |1439   |33005 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81718  |1439   |33004 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81719  |1440   |32980 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81720  |1440   |32970 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81721  |1441   |32967 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81722  |1441   |32968 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81723  |1441   |32995 |2       |2        |F63100|0        |2       |0   |
+ROW   |81724  |1442   |32997 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81725  |1442   |32984 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81726  |1443   |32973 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81727  |1443   |32971 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81728  |1503   |33518 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81729  |1504   |33501 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81730  |803    |28599 |0       |0        |DD0000|0        |2       |0   |
+ROW   |81731  |803    |28596 |0       |1        |00DDDD|0        |2       |0   |
+ROW   |81732  |803    |28597 |0       |2        |3333FF|0        |2       |0   |
+ROW   |81733  |803    |28598 |0       |3        |00FF00|0        |2       |0   |
+ROW   |81734  |804    |28602 |0       |1        |990099|0        |2       |0   |
+ROW   |81735  |804    |28606 |0       |2        |990000|0        |2       |0   |
+ROW   |81736  |804    |28608 |0       |3        |0000EE|0        |2       |0   |
+ROW   |81737  |804    |28615 |0       |4        |FF33FF|0        |2       |0   |
+ROW   |81738  |804    |28610 |0       |5        |00EE00|0        |2       |0   |
+ROW   |81739  |804    |28611 |0       |6        |003300|0        |2       |0   |
+ROW   |81740  |804    |28616 |0       |7        |33FFFF|0        |2       |0   |
+ROW   |81741  |804    |28607 |0       |8        |DD0000|0        |2       |0   |
+ROW   |81742  |804    |28604 |0       |9        |000099|0        |2       |0   |
+ROW   |81743  |804    |28588 |0       |10       |00FF00|0        |2       |0   |
+ROW   |81744  |804    |33013 |0       |11       |BB2A02|0        |2       |0   |
+ROW   |81745  |804    |39825 |0       |12       |9FA8DA|0        |2       |0   |
+ROW   |81746  |805    |28612 |0       |1        |FFAA00|0        |2       |0   |
+ROW   |81747  |805    |28600 |0       |2        |990099|0        |2       |0   |
+ROW   |81748  |805    |28613 |0       |3        |EE0000|0        |2       |0   |
+ROW   |81749  |805    |28605 |0       |4        |FF66FF|0        |2       |0   |
+ROW   |81750  |805    |28614 |0       |5        |960000|0        |2       |0   |
+ROW   |81751  |805    |28601 |0       |6        |009600|0        |2       |0   |
+ROW   |81752  |805    |28603 |0       |7        |009999|0        |2       |0   |
+ROW   |81753  |805    |28609 |0       |8        |BBBB00|0        |2       |0   |
+ROW   |81754  |805    |33012 |0       |9        |F230E0|0        |2       |0   |
+ROW   |81755  |806    |28595 |0       |0        |00C800|0        |2       |0   |
+ROW   |81756  |806    |28586 |0       |1        |C80000|0        |2       |0   |
+ROW   |81757  |529    |23357 |0       |0        |DD0000|0        |2       |0   |
+ROW   |81758  |529    |23341 |0       |1        |00DDDD|0        |2       |0   |
+ROW   |81759  |529    |23342 |0       |2        |3333FF|0        |2       |0   |
+ROW   |81760  |529    |28251 |0       |3        |00FF00|0        |2       |0   |
+ROW   |81761  |530    |23345 |0       |1        |990099|0        |2       |0   |
+ROW   |81762  |530    |23348 |0       |2        |990000|0        |2       |0   |
+ROW   |81763  |530    |23355 |0       |3        |0000EE|0        |2       |0   |
+ROW   |81764  |530    |23352 |0       |4        |FF33FF|0        |2       |0   |
+ROW   |81765  |530    |23356 |0       |5        |007700|0        |2       |0   |
+ROW   |81766  |530    |23354 |0       |6        |003300|0        |2       |0   |
+ROW   |81767  |530    |23346 |0       |7        |33FFFF|0        |2       |0   |
+ROW   |81768  |530    |23349 |0       |8        |DD0000|0        |2       |0   |
+ROW   |81769  |530    |23344 |0       |9        |000099|0        |7       |0   |
+ROW   |81770  |530    |28250 |0       |10       |00FF00|0        |2       |0   |
+ROW   |81771  |530    |33019 |0       |11       |BB2A02|0        |2       |0   |
+ROW   |81772  |530    |39826 |0       |12       |9FA8DA|0        |2       |0   |
+ROW   |81773  |531    |23353 |0       |1        |FFAA00|0        |2       |0   |
+ROW   |81774  |531    |23347 |0       |2        |990099|0        |2       |0   |
+ROW   |81775  |531    |23350 |0       |3        |EE0000|0        |2       |0   |
+ROW   |81776  |531    |23343 |0       |4        |FF66FF|0        |2       |0   |
+ROW   |81777  |531    |23351 |0       |5        |0000EE|0        |2       |0   |
+ROW   |81778  |531    |23360 |0       |6        |00EE00|0        |2       |0   |
+ROW   |81779  |531    |25369 |0       |7        |009999|0        |2       |0   |
+ROW   |81780  |531    |25368 |0       |8        |BBBB00|0        |2       |0   |
+ROW   |81781  |531    |28618 |0       |9        |990000|0        |2       |0   |
+ROW   |81782  |531    |28619 |0       |10       |008800|0        |2       |0   |
+ROW   |81783  |531    |33018 |0       |11       |BB2A02|0        |2       |0   |
+ROW   |81784  |807    |28617 |0       |0        |008800|0        |2       |0   |
+ROW   |81785  |532    |23340 |5       |0        |00C800|0        |2       |0   |
+ROW   |81786  |532    |23358 |5       |1        |C80000|1        |2       |0   |
+ROW   |81787  |472    |22945 |5       |0        |00AA00|0        |2       |0   |
+ROW   |81788  |472    |22946 |5       |1        |3333FF|0        |2       |0   |
+ROW   |81789  |473    |22950 |0       |0        |C80000|0        |2       |2   |
+ROW   |81790  |473    |22948 |0       |1        |00C800|0        |2       |0   |
+ROW   |81791  |471    |22924 |0       |0        |009900|0        |2       |0   |
+ROW   |81792  |471    |22920 |0       |1        |000099|0        |2       |0   |
+ROW   |81793  |469    |22922 |0       |0        |009900|0        |2       |0   |
+ROW   |81794  |469    |22923 |0       |1        |000099|0        |2       |0   |
+ROW   |81795  |469    |22921 |0       |2        |990000|0        |2       |0   |
+ROW   |81796  |498    |23109 |0       |0        |009999|0        |2       |0   |
+ROW   |81797  |498    |23112 |0       |1        |990099|0        |2       |0   |
+ROW   |81798  |498    |23115 |0       |2        |999900|0        |2       |0   |
+ROW   |81799  |498    |23113 |0       |3        |990000|0        |2       |0   |
+ROW   |81800  |498    |23114 |0       |4        |000099|0        |2       |0   |
+ROW   |81801  |498    |23110 |0       |5        |009900|0        |2       |0   |
+ROW   |81802  |540    |22942 |5       |0        |00C800|0        |2       |0   |
+ROW   |81803  |492    |23073 |5       |0        |00AA00|0        |2       |0   |
+ROW   |81804  |492    |23074 |5       |1        |3333FF|0        |2       |0   |
+ROW   |81805  |467    |22910 |0       |0        |C80000|0        |2       |2   |
+ROW   |81806  |467    |22908 |0       |1        |00C800|0        |2       |0   |
+ROW   |81807  |465    |22884 |0       |0        |009900|0        |2       |0   |
+ROW   |81808  |465    |22880 |0       |1        |000099|0        |2       |0   |
+ROW   |81809  |463    |22882 |0       |0        |009900|0        |2       |0   |
+ROW   |81810  |463    |22883 |0       |1        |000099|0        |2       |0   |
+ROW   |81811  |463    |22881 |0       |2        |990000|0        |2       |0   |
+ROW   |81812  |462    |22886 |1       |0        |009999|0        |2       |0   |
+ROW   |81813  |462    |22888 |1       |1        |990099|0        |2       |0   |
+ROW   |81814  |462    |22891 |1       |2        |990000|0        |2       |0   |
+ROW   |81815  |462    |22892 |1       |3        |000099|0        |2       |0   |
+ROW   |81816  |462    |22885 |1       |4        |009900|0        |2       |0   |
+ROW   |81817  |541    |22902 |5       |0        |00C800|0        |2       |0   |
+ROW   |81818  |464    |22897 |0       |0        |AA0000|0        |2       |2   |
+ROW   |81819  |464    |22895 |0       |1        |00AA00|0        |2       |0   |
+ROW   |81820  |478    |22985 |5       |0        |00AA00|0        |2       |0   |
+ROW   |81821  |478    |22986 |5       |1        |3333FF|0        |2       |0   |
+ROW   |81822  |479    |22990 |0       |0        |C80000|0        |2       |2   |
+ROW   |81823  |479    |22988 |0       |1        |00C800|0        |2       |0   |
+ROW   |81824  |475    |22962 |0       |0        |009900|0        |2       |0   |
+ROW   |81825  |475    |22963 |0       |1        |000099|0        |2       |0   |
+ROW   |81826  |475    |22961 |0       |2        |990000|0        |2       |0   |
+ROW   |81827  |474    |22968 |1       |0        |990099|0        |2       |0   |
+ROW   |81828  |474    |22971 |1       |1        |990000|0        |2       |0   |
+ROW   |81829  |474    |22972 |1       |2        |000099|0        |2       |0   |
+ROW   |81830  |474    |22965 |1       |3        |009900|0        |2       |0   |
+ROW   |81831  |542    |22982 |5       |0        |00C800|0        |2       |0   |
+ROW   |81832  |491    |23070 |0       |0        |C80000|0        |2       |2   |
+ROW   |81833  |491    |23068 |0       |1        |00C800|0        |2       |0   |
+ROW   |81834  |487    |23042 |0       |0        |009900|0        |2       |0   |
+ROW   |81835  |487    |23043 |0       |1        |000099|0        |2       |0   |
+ROW   |81836  |487    |23041 |0       |2        |990000|0        |2       |0   |
+ROW   |81837  |543    |23062 |5       |0        |00C800|0        |2       |0   |
+ROW   |81838  |494    |23077 |5       |0        |00AA00|0        |2       |0   |
+ROW   |81839  |494    |23078 |5       |1        |3333FF|0        |2       |0   |
+ROW   |81840  |493    |23075 |5       |0        |00AA00|0        |2       |0   |
+ROW   |81841  |493    |23076 |5       |1        |3333FF|0        |2       |0   |
+ROW   |81842  |461    |22870 |0       |0        |C80000|0        |2       |2   |
+ROW   |81843  |461    |22868 |0       |1        |00C800|0        |2       |0   |
+ROW   |81844  |459    |22844 |0       |0        |009900|0        |2       |0   |
+ROW   |81845  |459    |22840 |0       |1        |000099|0        |2       |0   |
+ROW   |81846  |457    |22842 |0       |0        |009900|0        |2       |0   |
+ROW   |81847  |457    |22843 |0       |1        |000099|0        |2       |0   |
+ROW   |81848  |457    |22841 |0       |2        |990000|0        |2       |0   |
+ROW   |81849  |456    |22846 |1       |0        |009999|0        |2       |0   |
+ROW   |81850  |456    |22848 |1       |1        |990099|0        |2       |0   |
+ROW   |81851  |456    |22851 |1       |2        |990000|0        |2       |0   |
+ROW   |81852  |456    |22852 |1       |3        |000099|0        |2       |0   |
+ROW   |81853  |456    |22845 |1       |4        |009900|0        |2       |0   |
+ROW   |81854  |544    |22862 |5       |0        |00C800|0        |2       |0   |
+ROW   |81855  |458    |22857 |0       |0        |AA0000|0        |2       |2   |
+ROW   |81856  |458    |22855 |0       |1        |00AA00|0        |2       |0   |
+ROW   |81857  |484    |23025 |5       |0        |00AA00|0        |2       |0   |
+ROW   |81858  |484    |23026 |5       |1        |3333FF|0        |2       |0   |
+ROW   |81859  |485    |23030 |0       |0        |C80000|0        |2       |2   |
+ROW   |81860  |485    |23028 |0       |1        |00C800|0        |2       |0   |
+ROW   |81861  |483    |23004 |0       |0        |009900|0        |2       |0   |
+ROW   |81862  |483    |23000 |0       |1        |000099|0        |2       |0   |
+ROW   |81863  |481    |23002 |0       |0        |009900|0        |2       |0   |
+ROW   |81864  |481    |23003 |0       |1        |000099|0        |2       |0   |
+ROW   |81865  |481    |23001 |0       |2        |990000|0        |2       |0   |
+ROW   |81866  |480    |23007 |1       |0        |999900|0        |2       |0   |
+ROW   |81867  |480    |23011 |1       |1        |990000|0        |2       |0   |
+ROW   |81868  |480    |23012 |1       |2        |000099|0        |2       |0   |
+ROW   |81869  |480    |23005 |1       |3        |009900|0        |2       |0   |
+ROW   |81870  |545    |23022 |5       |0        |00C800|0        |2       |0   |
+ROW   |81871  |482    |23017 |0       |0        |AA0000|0        |2       |2   |
+ROW   |81872  |482    |23015 |0       |1        |00AA00|0        |2       |0   |
+ROW   |81873  |651    |26928 |5       |0        |EE0000|0        |2       |0   |
+ROW   |81874  |651    |26927 |0       |1        |000000|1        |2       |0   |
+ROW   |81875  |652    |26925 |2       |0        |880000|0        |2       |0   |
+ROW   |81876  |652    |26932 |0       |1        |009900|0        |2       |0   |
+ROW   |81877  |652    |26930 |0       |2        |00CCCC|0        |2       |0   |
+ROW   |81878  |652    |26931 |0       |3        |000000|0        |2       |0   |
+ROW   |81879  |652    |26929 |0       |4        |3333FF|0        |2       |0   |
+ROW   |81880  |652    |26926 |0       |5        |777700|0        |2       |0   |
+ROW   |81881  |653    |26933 |2       |0        |EE0000|0        |2       |0   |
+ROW   |81882  |653    |26943 |2       |1        |EE00EE|0        |2       |0   |
+ROW   |81883  |653    |26935 |0       |2        |000000|1        |2       |0   |
+ROW   |81884  |653    |26936 |4       |3        |000000|1        |2       |0   |
+ROW   |81885  |654    |26934 |2       |0        |880000|0        |2       |0   |
+ROW   |81886  |654    |26939 |0       |1        |009900|0        |2       |0   |
+ROW   |81887  |654    |26942 |0       |2        |00CCCC|0        |2       |0   |
+ROW   |81888  |654    |26938 |0       |3        |000000|0        |2       |0   |
+ROW   |81889  |654    |26937 |0       |4        |3333FF|0        |2       |0   |
+ROW   |81890  |1447   |33113 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81891  |1447   |33112 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81892  |1447   |33099 |0       |2        |F63100|0        |2       |0   |
+ROW   |81893  |1447   |33098 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81894  |1448   |33125 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81895  |1448   |33110 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81896  |1449   |33080 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81897  |1449   |33081 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81898  |1450   |33089 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81899  |1450   |33085 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81900  |1451   |33082 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81901  |1451   |33086 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81902  |1451   |33083 |0       |2        |F63100|0        |2       |0   |
+ROW   |81903  |1451   |33084 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81904  |1451   |33087 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81905  |1451   |33088 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81906  |1452   |33093 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81907  |1452   |33092 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81908  |1453   |33077 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81909  |1453   |33063 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81910  |1454   |33094 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81911  |1454   |33059 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81912  |1455   |33066 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81913  |1455   |33071 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81914  |1455   |33067 |0       |2        |F63100|0        |2       |0   |
+ROW   |81915  |1455   |33068 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81916  |1455   |33072 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81917  |1455   |33073 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |81918  |1159   |30886 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81919  |1159   |30887 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81920  |1160   |30888 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81921  |1160   |30882 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81922  |1160   |30890 |0       |2        |F63100|0        |2       |0   |
+ROW   |81923  |1160   |30881 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81924  |1160   |30889 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81925  |1161   |30847 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81926  |1161   |30872 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81927  |1162   |30853 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81928  |1162   |30849 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81929  |1162   |30852 |2       |2        |F63100|0        |2       |0   |
+ROW   |81930  |1162   |30851 |2       |3        |A54F10|0        |2       |0   |
+ROW   |81931  |1162   |30848 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |81932  |1163   |30856 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81933  |1163   |30855 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81934  |1163   |30854 |2       |2        |F63100|1        |2       |0   |
+ROW   |81935  |1164   |30859 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81936  |1164   |30870 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81937  |1165   |30860 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81938  |1165   |30871 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81939  |1166   |30868 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81940  |1166   |30869 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81941  |1166   |30867 |0       |2        |F63100|0        |2       |0   |
+ROW   |81942  |1166   |30866 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81943  |1166   |30865 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |81944  |1167   |30850 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |81945  |1167   |30863 |5       |1        |2774A4|0        |2       |0   |
+ROW   |81946  |1167   |30861 |5       |2        |F63100|0        |2       |0   |
+ROW   |81947  |1168   |30833 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81948  |1168   |30841 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81949  |1168   |30857 |2       |2        |F63100|0        |2       |0   |
+ROW   |81950  |1169   |30834 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81951  |1169   |30831 |2       |1        |2774A4|0        |2       |0   |
+ROW   |81952  |1170   |30846 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81953  |1576   |34320 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81954  |1576   |30845 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81955  |1576   |30842 |0       |2        |F63100|0        |2       |0   |
+ROW   |81956  |1576   |30873 |2       |3        |A54F10|1        |2       |0   |
+ROW   |81957  |1663   |35291 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81958  |1663   |35300 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81959  |1664   |35295 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81960  |1664   |35296 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81961  |1665   |35301 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81962  |1665   |35306 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81963  |1665   |35304 |0       |2        |F63100|0        |2       |0   |
+ROW   |81964  |1665   |35302 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81965  |1666   |35308 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81966  |1666   |35310 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81967  |1666   |35309 |0       |2        |F63100|0        |2       |0   |
+ROW   |81968  |1667   |35322 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81969  |1667   |35320 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81970  |1668   |35329 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81971  |1668   |35330 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81972  |1669   |35332 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81973  |1669   |35334 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81974  |1670   |35335 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81975  |1670   |35333 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81976  |1671   |35338 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81977  |1671   |35341 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81978  |1671   |35339 |0       |2        |F63100|0        |2       |0   |
+ROW   |81979  |1671   |35340 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81980  |1672   |35347 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81981  |1672   |35346 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81982  |1672   |35345 |0       |2        |F63100|0        |2       |0   |
+ROW   |81983  |1673   |35350 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81984  |1673   |35351 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81985  |1674   |35349 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81986  |1674   |35352 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81987  |1674   |35353 |0       |2        |F63100|0        |2       |0   |
+ROW   |81988  |1675   |35355 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81989  |1675   |35356 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81990  |1505   |33553 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81991  |1505   |33562 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81992  |1506   |33557 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |81993  |1506   |33558 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81994  |1507   |33563 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81995  |1507   |33568 |0       |1        |2774A4|0        |2       |0   |
+ROW   |81996  |1507   |33566 |0       |2        |F63100|0        |2       |0   |
+ROW   |81997  |1507   |33564 |0       |3        |A54F10|0        |2       |0   |
+ROW   |81998  |1508   |33570 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |81999  |1508   |33572 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82000  |1508   |33571 |0       |2        |F63100|0        |2       |0   |
+ROW   |82001  |1509   |33584 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82002  |1509   |33582 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82003  |1510   |33591 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82004  |1510   |33592 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82005  |1511   |33594 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82006  |1511   |33596 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82007  |1512   |33597 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82008  |1512   |33595 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82009  |1513   |33600 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82010  |1513   |33603 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82011  |1513   |33601 |0       |2        |F63100|0        |2       |0   |
+ROW   |82012  |1513   |33602 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82013  |1514   |33609 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82014  |1514   |33608 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82015  |1514   |33607 |0       |2        |F63100|0        |2       |0   |
+ROW   |82016  |1515   |33612 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82017  |1515   |33613 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82018  |1516   |33611 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82019  |1516   |33614 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82020  |1516   |33615 |0       |2        |F63100|0        |2       |0   |
+ROW   |82021  |1517   |33617 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82022  |1517   |33618 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82023  |1807   |36817 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82024  |1807   |36816 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82025  |1808   |36815 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82026  |1808   |36814 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82027  |1808   |36818 |0       |2        |F63100|0        |2       |0   |
+ROW   |82028  |1808   |36819 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82029  |1809   |36805 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82030  |1809   |36804 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82031  |1527   |33819 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82032  |1527   |33839 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82033  |1528   |33820 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82034  |1528   |33816 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82035  |1529   |33826 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82036  |1529   |33831 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82037  |1529   |33829 |0       |2        |F63100|0        |2       |0   |
+ROW   |82038  |1529   |33821 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82039  |1529   |33825 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82040  |1529   |33833 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82041  |1529   |33823 |2       |6        |AC8C14|0        |2       |0   |
+ROW   |82042  |1530   |33828 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82043  |1530   |33832 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82044  |1530   |33830 |0       |2        |F63100|0        |2       |0   |
+ROW   |82045  |1530   |33822 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82046  |1530   |33815 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82047  |1530   |33834 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82048  |1530   |33824 |2       |6        |AC8C14|0        |2       |0   |
+ROW   |82049  |1531   |33840 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82050  |1531   |33845 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82051  |1532   |33844 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82052  |1532   |33847 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82053  |1532   |33843 |0       |2        |F63100|0        |2       |0   |
+ROW   |82054  |1532   |33841 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82055  |1533   |33863 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82056  |1534   |33792 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82057  |1534   |33791 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82058  |1534   |33793 |0       |2        |F63100|0        |2       |0   |
+ROW   |82059  |1535   |33802 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82060  |1535   |33770 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82061  |1536   |33800 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82062  |1536   |33799 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82063  |1536   |33801 |0       |2        |F63100|0        |2       |0   |
+ROW   |82064  |1537   |33798 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82065  |1537   |33806 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82066  |1537   |33774 |0       |2        |F63100|0        |2       |0   |
+ROW   |82067  |1538   |33769 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82068  |1538   |33787 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82069  |1538   |33789 |0       |2        |F63100|0        |2       |0   |
+ROW   |82070  |1538   |33790 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82071  |1539   |33785 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82072  |1539   |33772 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82073  |1539   |33773 |0       |2        |F63100|0        |2       |0   |
+ROW   |82074  |1539   |33771 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82075  |1540   |33776 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82076  |1540   |33775 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82077  |1541   |33782 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82078  |1541   |33781 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82079  |1541   |33780 |0       |2        |F63100|0        |2       |0   |
+ROW   |82080  |1541   |33783 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82081  |1541   |33777 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82082  |1541   |33778 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82083  |1542   |33804 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82084  |1542   |33803 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82085  |1542   |33805 |2       |2        |F63100|0        |2       |0   |
+ROW   |82086  |1543   |33937 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82087  |1543   |33940 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82088  |1543   |33936 |0       |2        |F63100|0        |2       |0   |
+ROW   |82089  |1543   |33934 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82090  |1544   |33915 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82091  |1544   |33911 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82092  |1544   |33912 |0       |2        |F63100|0        |2       |0   |
+ROW   |82093  |1544   |33910 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82094  |1544   |33914 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82095  |1545   |33918 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82096  |1545   |33905 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82097  |1545   |33917 |0       |2        |F63100|0        |2       |0   |
+ROW   |82098  |1545   |33916 |2       |3        |A54F10|1        |2       |0   |
+ROW   |82099  |1546   |33908 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82100  |1546   |33909 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82101  |1546   |33902 |0       |2        |F63100|0        |2       |0   |
+ROW   |82102  |1547   |33893 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82103  |1547   |33892 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82104  |1548   |33899 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82105  |1548   |33898 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82106  |1548   |33895 |2       |2        |F63100|0        |2       |0   |
+ROW   |82107  |1548   |33900 |2       |3        |A54F10|0        |2       |0   |
+ROW   |82108  |1548   |33896 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |82109  |1548   |33891 |2       |5        |6C59DC|0        |2       |0   |
+ROW   |82110  |1190   |31140 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82111  |1190   |31141 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82112  |1261   |31145 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82113  |1261   |31146 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82114  |1261   |31147 |0       |2        |F63100|0        |2       |0   |
+ROW   |82115  |1191   |31138 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82116  |1192   |31157 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82117  |1192   |31158 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82118  |1193   |31092 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82119  |1193   |31108 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82120  |1193   |31110 |0       |2        |F63100|0        |2       |0   |
+ROW   |82121  |1193   |31067 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82122  |1193   |31086 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82123  |1193   |31087 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82124  |1194   |31120 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82125  |1194   |31105 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82126  |1194   |31071 |0       |2        |F63100|0        |2       |0   |
+ROW   |82127  |1194   |31081 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82128  |1195   |31098 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82129  |1195   |31099 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82130  |1196   |31072 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82131  |1196   |31072 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82132  |1197   |31103 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82133  |1197   |31074 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82134  |1198   |31104 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82135  |1198   |31063 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82136  |1198   |31111 |0       |2        |F63100|0        |2       |0   |
+ROW   |82137  |1198   |31112 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82138  |1198   |31084 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82139  |1199   |31115 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82140  |1199   |31116 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82141  |1199   |31062 |0       |2        |F63100|0        |2       |0   |
+ROW   |82142  |1199   |31118 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82143  |1199   |31056 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82144  |1200   |31107 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82145  |1200   |31090 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82146  |1201   |31097 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82147  |1201   |31096 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82148  |1202   |31089 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82149  |1202   |31061 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82150  |1203   |31064 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82151  |1204   |31065 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82152  |1204   |31066 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82153  |1204   |31068 |0       |2        |F63100|0        |2       |0   |
+ROW   |82154  |1204   |31070 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82155  |1204   |31101 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82156  |1204   |31106 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82157  |1204   |31114 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |82158  |1205   |31069 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82159  |1206   |31076 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82160  |1206   |31078 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82161  |1206   |31109 |0       |2        |F63100|0        |2       |0   |
+ROW   |82162  |1206   |31075 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82163  |1207   |31080 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82164  |1207   |31095 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82165  |1208   |31113 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82166  |1208   |31118 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82167  |1209   |31058 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82168  |1209   |31077 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82169  |1209   |31056 |0       |2        |F63100|0        |2       |0   |
+ROW   |82170  |1209   |31117 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82171  |1109   |30453 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82172  |1109   |30455 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82173  |1110   |30471 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82174  |1110   |30470 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82175  |1110   |30466 |0       |2        |F63100|0        |2       |0   |
+ROW   |82176  |1110   |30441 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82177  |1111   |30463 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82178  |1111   |30452 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82179  |1111   |30451 |0       |2        |F63100|0        |2       |0   |
+ROW   |82180  |1111   |30437 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82181  |1112   |30456 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82182  |1112   |30457 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82183  |1112   |30458 |0       |2        |F63100|0        |2       |0   |
+ROW   |82184  |1112   |30459 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82185  |1113   |30442 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82186  |1113   |30444 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82187  |1113   |30445 |0       |2        |F63100|0        |2       |0   |
+ROW   |82188  |1114   |30446 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82189  |1114   |30447 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82190  |1114   |31168 |0       |2        |F63100|0        |2       |0   |
+ROW   |82191  |1114   |30449 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82192  |1136   |30659 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82193  |1136   |30661 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82194  |1137   |30677 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82195  |1137   |30676 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82196  |1137   |30672 |0       |2        |F63100|0        |2       |0   |
+ROW   |82197  |1137   |30647 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82198  |1138   |30669 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82199  |1138   |30658 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82200  |1138   |30657 |0       |2        |F63100|0        |2       |0   |
+ROW   |82201  |1138   |30643 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82202  |1139   |30662 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82203  |1139   |30663 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82204  |1139   |30664 |0       |2        |F63100|0        |2       |0   |
+ROW   |82205  |1139   |30665 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82206  |1140   |30648 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82207  |1140   |30650 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82208  |1140   |30651 |0       |2        |F63100|0        |2       |0   |
+ROW   |82209  |1141   |30652 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82210  |1141   |30653 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82211  |1141   |31172 |0       |2        |F63100|0        |2       |0   |
+ROW   |82212  |1141   |30655 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82213  |1115   |30506 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82214  |1115   |30507 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82215  |1116   |30504 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82216  |1116   |30505 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82217  |1116   |30518 |0       |2        |F63100|0        |2       |0   |
+ROW   |82218  |1116   |30492 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82219  |1117   |30493 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82220  |1117   |30500 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82221  |1117   |30486 |0       |2        |F63100|0        |2       |0   |
+ROW   |82222  |1117   |30488 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82223  |1118   |30508 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82224  |1118   |30509 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82225  |1118   |30503 |0       |2        |F63100|0        |2       |0   |
+ROW   |82226  |1118   |30510 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82227  |1119   |30491 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82228  |1119   |30494 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82229  |1119   |30495 |0       |2        |F63100|0        |2       |0   |
+ROW   |82230  |1120   |30496 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82231  |1120   |30497 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82232  |1120   |31176 |0       |2        |F63100|0        |2       |0   |
+ROW   |82233  |1120   |30499 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82234  |1266   |31773 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82235  |1266   |31774 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82236  |1267   |31777 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82237  |1267   |31779 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82238  |1267   |33168 |0       |2        |F63100|0        |2       |0   |
+ROW   |82239  |1268   |31685 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82240  |1268   |31738 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82241  |1269   |31723 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82242  |1269   |31757 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82243  |1269   |31721 |0       |2        |F63100|0        |2       |0   |
+ROW   |82244  |1270   |31728 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82245  |1270   |31759 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82246  |1271   |31745 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82247  |1271   |31727 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82248  |1272   |31687 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82249  |1272   |31710 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82250  |1273   |31705 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82251  |1273   |31703 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82252  |1273   |31706 |0       |2        |F63100|0        |2       |0   |
+ROW   |82253  |1273   |31701 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82254  |1273   |31708 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82255  |1274   |31715 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82256  |1274   |31726 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82257  |1274   |31717 |0       |2        |F63100|0        |2       |0   |
+ROW   |82258  |1274   |31716 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82259  |1274   |31714 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82260  |1274   |31713 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82261  |1210   |31261 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82262  |1210   |31262 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82263  |1211   |31269 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82264  |1211   |31271 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82265  |1211   |33170 |0       |2        |F63100|0        |2       |0   |
+ROW   |82266  |1212   |31233 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82267  |1212   |31234 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82268  |1213   |31216 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82269  |1213   |31237 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82270  |1213   |31214 |0       |2        |F63100|0        |2       |0   |
+ROW   |82271  |1214   |31191 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82272  |1214   |31221 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82273  |1215   |31206 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82274  |1215   |31220 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82275  |1216   |31192 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82276  |1216   |31193 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82277  |1217   |31200 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82278  |1217   |31197 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82279  |1217   |31201 |0       |2        |F63100|0        |2       |0   |
+ROW   |82280  |1217   |31198 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82281  |1217   |31202 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82282  |1218   |31207 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82283  |1218   |31208 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82284  |1218   |31210 |0       |2        |F63100|0        |2       |0   |
+ROW   |82285  |1218   |31209 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82286  |1218   |31219 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82287  |1218   |31205 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82288  |1380   |32423 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82289  |1380   |32421 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82290  |1381   |32405 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82291  |1382   |32426 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82292  |1382   |32408 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82293  |1382   |32422 |0       |2        |F63100|0        |2       |0   |
+ROW   |82294  |1382   |32425 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82295  |1383   |32409 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82296  |1384   |32419 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |82297  |1384   |32416 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82298  |1384   |32413 |0       |2        |F63100|1        |2       |0   |
+ROW   |82299  |1384   |32418 |5       |3        |A54F10|0        |2       |0   |
+ROW   |82300  |1384   |32415 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |82301  |1384   |32412 |5       |5        |6C59DC|0        |2       |0   |
+ROW   |82302  |1385   |32420 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82303  |1385   |32417 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82304  |1385   |32414 |0       |2        |F63100|0        |2       |0   |
+ROW   |82305  |1386   |32433 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82306  |1386   |32432 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82307  |1387   |32431 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82308  |1387   |32430 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82309  |1387   |32429 |0       |2        |F63100|0        |2       |0   |
+ROW   |82310  |1387   |32428 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82311  |1387   |32427 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82312  |1388   |32386 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |82313  |1388   |32391 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82314  |1388   |32387 |0       |2        |F63100|1        |2       |0   |
+ROW   |82315  |1388   |32390 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82316  |1388   |32395 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82317  |1388   |32389 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82318  |1389   |32393 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82319  |1389   |32392 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82320  |1389   |32394 |0       |2        |F63100|1        |2       |0   |
+ROW   |82321  |1389   |32388 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82322  |1390   |32401 |5       |0        |1A7C11|1        |2       |0   |
+ROW   |82323  |1390   |32402 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82324  |1390   |32397 |0       |2        |F63100|1        |2       |0   |
+ROW   |82325  |1390   |32398 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82326  |1390   |32399 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82327  |1390   |32400 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82328  |1390   |32396 |0       |6        |AC8C14|1        |2       |0   |
+ROW   |82329  |1391   |32367 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82330  |1391   |32366 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82331  |1392   |32370 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82332  |1393   |32382 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |82333  |1393   |32381 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82334  |1393   |32383 |0       |2        |F63100|1        |2       |0   |
+ROW   |82335  |1393   |32384 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82336  |1394   |32377 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82337  |1394   |32374 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82338  |1395   |32403 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82339  |1395   |32385 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82340  |1219   |31363 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82341  |1219   |31346 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82342  |1219   |31345 |0       |2        |F63100|0        |2       |0   |
+ROW   |82343  |1219   |31344 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82344  |1219   |31343 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82345  |1219   |31342 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82346  |1219   |31340 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |82347  |1219   |31339 |0       |7        |611F27|0        |2       |0   |
+ROW   |82348  |1219   |31341 |0       |8        |F230E0|0        |2       |0   |
+ROW   |82349  |1219   |31341 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |82350  |1220   |31337 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82351  |1221   |31360 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82352  |1221   |31359 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82353  |1221   |31357 |0       |2        |F63100|0        |2       |0   |
+ROW   |82354  |1221   |31356 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82355  |1221   |31354 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82356  |1221   |31353 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82357  |1221   |31352 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |82358  |1221   |31350 |0       |7        |611F27|0        |2       |0   |
+ROW   |82359  |1221   |31351 |0       |8        |F230E0|0        |2       |0   |
+ROW   |82360  |1221   |31338 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |82361  |1221   |31349 |0       |10       |40CDFF|0        |2       |0   |
+ROW   |82362  |1221   |31348 |0       |11       |40FFA0|0        |2       |0   |
+ROW   |82363  |1221   |31347 |0       |12       |AE4500|0        |2       |0   |
+ROW   |82364  |1222   |31336 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82365  |1456   |33178 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82366  |1456   |33179 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82367  |1456   |33180 |0       |2        |F63100|0        |2       |0   |
+ROW   |82368  |1087   |30346 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82369  |1087   |30345 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82370  |1088   |30350 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82371  |1088   |30349 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82372  |1089   |30396 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82373  |1090   |30398 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82374  |1091   |30322 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82375  |1091   |30277 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82376  |1092   |30284 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82377  |1093   |30313 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82378  |1093   |30314 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82379  |1093   |30315 |5       |2        |F63100|0        |2       |0   |
+ROW   |82380  |1093   |30316 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82381  |1094   |30279 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82382  |1094   |30280 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82383  |1095   |30290 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82384  |1095   |30293 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82385  |1096   |30318 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82386  |1096   |30308 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82387  |1096   |30320 |2       |2        |F63100|0        |2       |0   |
+ROW   |82388  |1097   |30317 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82389  |1098   |30289 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82390  |1098   |30291 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82391  |1099   |30334 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82392  |1099   |30325 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82393  |1100   |30306 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82394  |1101   |30274 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82395  |1102   |30281 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82396  |1577   |34351 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82397  |1577   |34350 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82398  |1578   |34387 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82399  |1578   |34388 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82400  |1579   |34393 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82401  |1579   |34386 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82402  |1580   |34370 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82403  |1580   |34384 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82404  |1580   |34383 |0       |2        |F63100|0        |2       |0   |
+ROW   |82405  |1581   |34438 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82406  |1581   |34413 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82407  |1581   |34427 |0       |2        |F63100|0        |2       |0   |
+ROW   |82408  |1582   |34420 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82409  |1582   |34419 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82410  |1582   |34418 |0       |2        |F63100|0        |2       |0   |
+ROW   |82411  |1060   |30159 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82412  |1065   |30161 |0       |0        |969696|0        |9       |2   |
+ROW   |82413  |1065   |30162 |0       |1        |C80000|0        |9       |0   |
+ROW   |82414  |1070   |30142 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82415  |741    |27084 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82416  |741    |27085 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82417  |741    |27083 |0       |2        |F63100|1        |2       |0   |
+ROW   |82418  |741    |27086 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82419  |741    |27082 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82420  |741    |27079 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82421  |745    |27104 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82422  |745    |27105 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82423  |745    |27103 |0       |2        |F63100|1        |2       |0   |
+ROW   |82424  |745    |27106 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82425  |745    |27102 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82426  |745    |27099 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82427  |766    |27124 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82428  |766    |27125 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82429  |766    |27123 |0       |2        |F63100|1        |2       |0   |
+ROW   |82430  |766    |27126 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82431  |766    |27122 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82432  |766    |27119 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82433  |668    |27208 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82434  |1032   |30088 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82435  |1032   |30087 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82436  |1033   |30089 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82437  |671    |27240 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82438  |1034   |30093 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82439  |675    |27294 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82440  |1035   |30094 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82441  |1676   |35369 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82442  |1677   |35372 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82443  |1678   |35379 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82444  |1678   |35386 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82445  |1678   |35377 |0       |2        |F63100|0        |2       |0   |
+ROW   |82446  |1678   |35384 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82447  |1678   |35376 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82448  |1678   |35383 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82449  |1679   |35387 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82450  |1679   |35380 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82451  |1680   |35378 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82452  |1680   |35385 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82453  |1681   |35403 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82454  |1681   |35404 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82455  |1549   |33966 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82456  |1550   |33971 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82457  |1551   |33974 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82458  |1551   |33977 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82459  |1551   |33976 |0       |2        |F63100|1        |2       |0   |
+ROW   |82460  |1551   |33973 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82461  |1551   |33975 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82462  |1551   |33972 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82463  |1552   |34007 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82464  |1553   |34012 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82465  |1554   |34015 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82466  |1554   |34018 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82467  |1554   |34017 |0       |2        |F63100|1        |2       |0   |
+ROW   |82468  |1554   |34014 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82469  |1554   |34016 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82470  |1554   |34013 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82471  |1555   |34048 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82472  |1556   |34053 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82473  |1557   |34056 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82474  |1557   |34059 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82475  |1557   |34058 |0       |2        |F63100|1        |2       |0   |
+ROW   |82476  |1557   |34055 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82477  |1557   |34057 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82478  |1557   |34054 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82479  |1558   |34089 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82480  |1559   |34094 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82481  |1560   |34097 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82482  |1560   |34100 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82483  |1560   |34099 |0       |2        |F63100|1        |2       |0   |
+ROW   |82484  |1560   |34096 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82485  |1560   |34098 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82486  |1560   |34095 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82487  |1561   |34130 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82488  |1562   |34135 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82489  |1563   |34138 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82490  |1563   |34141 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82491  |1563   |34140 |0       |2        |F63100|1        |2       |0   |
+ROW   |82492  |1563   |34137 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82493  |1563   |34139 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82494  |1563   |34136 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82495  |1038   |30101 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82496  |786    |28246 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82497  |687    |27417 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82498  |691    |27376 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82499  |694    |27478 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82500  |1042   |30105 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82501  |1043   |30107 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82502  |698    |27511 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82503  |1044   |30108 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82504  |701    |27547 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82505  |1045   |27591 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82506  |1045   |30110 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82507  |1046   |30111 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82508  |704    |27586 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82509  |1682   |35439 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82510  |1683   |35441 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82511  |1684   |35443 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82512  |1685   |35446 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82513  |1686   |35450 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82514  |1686   |35465 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82515  |1686   |35456 |0       |2        |F63100|0        |2       |0   |
+ROW   |82516  |1686   |35447 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82517  |1686   |35468 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82518  |1686   |35471 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82519  |1686   |35459 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |82520  |1687   |35449 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82521  |1687   |35464 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82522  |1687   |35455 |0       |2        |F63100|0        |2       |0   |
+ROW   |82523  |1687   |35461 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82524  |1687   |35467 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82525  |1687   |35470 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82526  |1687   |35457 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |82527  |1688   |35473 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82528  |1688   |35463 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82529  |1688   |35454 |0       |2        |F63100|0        |2       |0   |
+ROW   |82530  |1688   |35472 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82531  |1688   |35466 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82532  |1688   |35469 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82533  |1688   |35458 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |82534  |1689   |35474 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82535  |1690   |35476 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82536  |1691   |35478 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82537  |1691   |35480 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82538  |1692   |35487 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82539  |1692   |35484 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82540  |1693   |35486 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82541  |1693   |35483 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82542  |1694   |35490 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82543  |1694   |35488 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82544  |1694   |35489 |0       |2        |F63100|0        |2       |0   |
+ROW   |82545  |1695   |35497 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82546  |1695   |35493 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82547  |1695   |35503 |0       |2        |F63100|0        |2       |0   |
+ROW   |82548  |1695   |35499 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82549  |1695   |35496 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82550  |1695   |35502 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82551  |1696   |35508 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82552  |1696   |35507 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82553  |1696   |35510 |0       |2        |F63100|0        |2       |0   |
+ROW   |82554  |1696   |35509 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82555  |1697   |35516 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82556  |1697   |35515 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82557  |1697   |35518 |0       |2        |F63100|0        |2       |0   |
+ROW   |82558  |1697   |35517 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82559  |1698   |35524 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82560  |1698   |35523 |0       |1        |2774A4|1        |2       |0   |
+ROW   |82561  |1698   |35526 |0       |2        |F63100|0        |2       |0   |
+ROW   |82562  |1698   |35525 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82563  |1699   |35531 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82564  |1699   |35529 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82565  |1699   |35530 |0       |2        |F63100|0        |2       |0   |
+ROW   |82566  |1700   |35411 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82567  |1700   |35409 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82568  |1700   |35407 |0       |2        |F63100|0        |2       |0   |
+ROW   |82569  |1700   |35413 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82570  |1700   |35412 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |82571  |1700   |35410 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |82572  |708    |27671 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82573  |1047   |30112 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82574  |1048   |30114 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |82575  |1048   |30113 |5       |1        |2774A4|0        |2       |0   |
+ROW   |82576  |1049   |30115 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82577  |775    |28143 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82578  |714    |27753 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82579  |1050   |30116 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82580  |856    |28894 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82581  |1051   |30118 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82582  |1564   |34166 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82583  |1564   |34169 |2       |1        |2774A4|0        |2       |0   |
+ROW   |82584  |1564   |34168 |0       |2        |F63100|1        |2       |0   |
+ROW   |82585  |1564   |34165 |0       |3        |A54F10|1        |2       |0   |
+ROW   |82586  |1564   |34167 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |82587  |1564   |34164 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |82588  |1565   |34174 |0       |0        |969696|0        |9       |2   |
+ROW   |82589  |1565   |34175 |0       |1        |C80000|0        |9       |0   |
+ROW   |82590  |1566   |34178 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82591  |1567   |34154 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82592  |1811   |36861 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82593  |1812   |36867 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82594  |1812   |36865 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82595  |1812   |36864 |0       |2        |F63100|0        |2       |0   |
+ROW   |82596  |1812   |36866 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82597  |1813   |36878 |0       |0        |969696|0        |9       |2   |
+ROW   |82598  |1813   |36879 |0       |1        |C80000|0        |9       |0   |
+ROW   |82599  |1814   |36853 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82600  |1816   |36915 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82601  |1817   |36921 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82602  |1817   |36919 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82603  |1817   |36918 |0       |2        |F63100|0        |2       |0   |
+ROW   |82604  |1817   |36920 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82605  |1818   |36932 |0       |0        |969696|0        |9       |2   |
+ROW   |82606  |1818   |36933 |0       |1        |C80000|0        |9       |0   |
+ROW   |82607  |1819   |36907 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82608  |1821   |36969 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82609  |1822   |36975 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82610  |1822   |36973 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82611  |1822   |36972 |0       |2        |F63100|0        |2       |0   |
+ROW   |82612  |1822   |36974 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82613  |1823   |36986 |0       |0        |969696|0        |9       |2   |
+ROW   |82614  |1823   |36987 |0       |1        |C80000|0        |9       |0   |
+ROW   |82615  |1824   |36961 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82616  |1826   |37023 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82617  |1827   |37029 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82618  |1827   |37027 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82619  |1827   |37026 |0       |2        |F63100|0        |2       |0   |
+ROW   |82620  |1827   |37028 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82621  |1828   |37040 |0       |0        |969696|0        |9       |2   |
+ROW   |82622  |1828   |37041 |0       |1        |C80000|0        |9       |0   |
+ROW   |82623  |1829   |37015 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82624  |1831   |37077 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82625  |1832   |37083 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82626  |1832   |37081 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82627  |1832   |37080 |0       |2        |F63100|0        |2       |0   |
+ROW   |82628  |1832   |37082 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82629  |1833   |37094 |0       |0        |969696|0        |9       |2   |
+ROW   |82630  |1833   |37095 |0       |1        |C80000|0        |9       |0   |
+ROW   |82631  |1834   |37069 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82632  |1836   |37131 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82633  |1837   |37137 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82634  |1837   |37135 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82635  |1837   |37134 |0       |2        |F63100|0        |2       |0   |
+ROW   |82636  |1837   |37136 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82637  |1838   |37148 |0       |0        |969696|0        |9       |2   |
+ROW   |82638  |1838   |37149 |0       |1        |C80000|0        |9       |0   |
+ROW   |82639  |1839   |37123 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82640  |1841   |37185 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82641  |1842   |37191 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82642  |1842   |37189 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82643  |1842   |37188 |0       |2        |F63100|0        |2       |0   |
+ROW   |82644  |1842   |37190 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82645  |1843   |37202 |0       |0        |969696|0        |9       |2   |
+ROW   |82646  |1843   |37203 |0       |1        |C80000|0        |9       |0   |
+ROW   |82647  |1844   |37177 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82648  |1846   |37239 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82649  |1847   |37245 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82650  |1847   |37243 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82651  |1847   |37242 |0       |2        |F63100|0        |2       |0   |
+ROW   |82652  |1847   |37244 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82653  |1848   |37256 |0       |0        |969696|0        |9       |2   |
+ROW   |82654  |1848   |37257 |0       |1        |C80000|0        |9       |0   |
+ROW   |82655  |1849   |37231 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82656  |1851   |37293 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82657  |1852   |37299 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82658  |1852   |37297 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82659  |1852   |37296 |0       |2        |F63100|0        |2       |0   |
+ROW   |82660  |1852   |37298 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82661  |1853   |37310 |0       |0        |969696|0        |9       |2   |
+ROW   |82662  |1853   |37311 |0       |1        |C80000|0        |9       |0   |
+ROW   |82663  |1854   |37285 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82664  |1856   |37347 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82665  |1857   |37353 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82666  |1857   |37351 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82667  |1857   |37350 |0       |2        |F63100|0        |2       |0   |
+ROW   |82668  |1857   |37352 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82669  |1858   |37364 |0       |0        |969696|0        |9       |2   |
+ROW   |82670  |1858   |37365 |0       |1        |C80000|0        |9       |0   |
+ROW   |82671  |1859   |37339 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82672  |1861   |37401 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82673  |1862   |37407 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82674  |1862   |37405 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82675  |1862   |37404 |0       |2        |F63100|0        |2       |0   |
+ROW   |82676  |1862   |37406 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82677  |1863   |37418 |0       |0        |969696|0        |9       |2   |
+ROW   |82678  |1863   |37419 |0       |1        |C80000|0        |9       |0   |
+ROW   |82679  |1864   |37393 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82680  |1866   |37455 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82681  |1867   |37461 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82682  |1867   |37459 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82683  |1867   |37458 |0       |2        |F63100|0        |2       |0   |
+ROW   |82684  |1867   |37460 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82685  |1868   |37472 |0       |0        |969696|0        |9       |2   |
+ROW   |82686  |1868   |37473 |0       |1        |C80000|0        |9       |0   |
+ROW   |82687  |1869   |37447 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82688  |1871   |37509 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82689  |1872   |37515 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82690  |1872   |37513 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82691  |1872   |37512 |0       |2        |F63100|0        |2       |0   |
+ROW   |82692  |1872   |37514 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82693  |1873   |37526 |0       |0        |969696|0        |9       |2   |
+ROW   |82694  |1873   |37527 |0       |1        |C80000|0        |9       |0   |
+ROW   |82695  |1874   |37501 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82696  |1876   |37563 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82697  |1877   |37569 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82698  |1877   |37567 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82699  |1877   |37566 |0       |2        |F63100|0        |2       |0   |
+ROW   |82700  |1877   |37568 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82701  |1878   |37580 |0       |0        |969696|0        |9       |2   |
+ROW   |82702  |1878   |37581 |0       |1        |C80000|0        |9       |0   |
+ROW   |82703  |1879   |37555 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82704  |1881   |37617 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82705  |1882   |37623 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82706  |1882   |37621 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82707  |1882   |37620 |0       |2        |F63100|0        |2       |0   |
+ROW   |82708  |1882   |37622 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82709  |1883   |37634 |0       |0        |969696|0        |9       |2   |
+ROW   |82710  |1883   |37635 |0       |1        |C80000|0        |9       |0   |
+ROW   |82711  |1884   |37609 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82712  |1886   |37671 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82713  |1887   |37677 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82714  |1887   |37675 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82715  |1887   |37674 |0       |2        |F63100|0        |2       |0   |
+ROW   |82716  |1887   |37676 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82717  |1888   |37688 |0       |0        |969696|0        |9       |2   |
+ROW   |82718  |1888   |37689 |0       |1        |C80000|0        |9       |0   |
+ROW   |82719  |1889   |37663 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82720  |1891   |37725 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82721  |1892   |37731 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82722  |1892   |37729 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82723  |1892   |37728 |0       |2        |F63100|0        |2       |0   |
+ROW   |82724  |1892   |37730 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82725  |1893   |37742 |0       |0        |969696|0        |9       |2   |
+ROW   |82726  |1893   |37743 |0       |1        |C80000|0        |9       |0   |
+ROW   |82727  |1894   |37717 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82728  |1896   |37779 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82729  |1897   |37785 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82730  |1897   |37783 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82731  |1897   |37782 |0       |2        |F63100|0        |2       |0   |
+ROW   |82732  |1897   |37784 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82733  |1898   |37796 |0       |0        |969696|0        |9       |2   |
+ROW   |82734  |1898   |37797 |0       |1        |C80000|0        |9       |0   |
+ROW   |82735  |1899   |37771 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82736  |1901   |37833 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82737  |1902   |37839 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82738  |1902   |37837 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82739  |1902   |37836 |0       |2        |F63100|0        |2       |0   |
+ROW   |82740  |1902   |37838 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82741  |1903   |37850 |0       |0        |969696|0        |9       |2   |
+ROW   |82742  |1903   |37851 |0       |1        |C80000|0        |9       |0   |
+ROW   |82743  |1904   |37825 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82744  |1906   |37887 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82745  |1907   |37893 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82746  |1907   |37891 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82747  |1907   |37890 |0       |2        |F63100|0        |2       |0   |
+ROW   |82748  |1907   |37892 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82749  |1908   |37904 |0       |0        |969696|0        |9       |2   |
+ROW   |82750  |1908   |37905 |0       |1        |C80000|0        |9       |0   |
+ROW   |82751  |1909   |37879 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82752  |1911   |37941 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82753  |1912   |37947 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82754  |1912   |37945 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82755  |1912   |37944 |0       |2        |F63100|0        |2       |0   |
+ROW   |82756  |1912   |37946 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82757  |1913   |37958 |0       |0        |969696|0        |9       |2   |
+ROW   |82758  |1913   |37959 |0       |1        |C80000|0        |9       |0   |
+ROW   |82759  |1914   |37933 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82760  |1916   |37995 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82761  |1917   |38001 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82762  |1917   |37999 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82763  |1917   |37998 |0       |2        |F63100|0        |2       |0   |
+ROW   |82764  |1917   |38000 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82765  |1918   |38012 |0       |0        |969696|0        |9       |2   |
+ROW   |82766  |1918   |38013 |0       |1        |C80000|0        |9       |0   |
+ROW   |82767  |1919   |37987 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82768  |1921   |38049 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82769  |1922   |38055 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82770  |1922   |38053 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82771  |1922   |38052 |0       |2        |F63100|0        |2       |0   |
+ROW   |82772  |1922   |38054 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82773  |1923   |38066 |0       |0        |969696|0        |9       |2   |
+ROW   |82774  |1923   |38067 |0       |1        |C80000|0        |9       |0   |
+ROW   |82775  |1924   |38041 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82776  |1926   |38103 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82777  |1927   |38109 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82778  |1927   |38107 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82779  |1927   |38106 |0       |2        |F63100|0        |2       |0   |
+ROW   |82780  |1927   |38108 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82781  |1928   |38120 |0       |0        |969696|0        |9       |2   |
+ROW   |82782  |1928   |38121 |0       |1        |C80000|0        |9       |0   |
+ROW   |82783  |1929   |38095 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82784  |1931   |38157 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82785  |1932   |38163 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82786  |1932   |38161 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82787  |1932   |38160 |0       |2        |F63100|0        |2       |0   |
+ROW   |82788  |1932   |38162 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82789  |1933   |38174 |0       |0        |969696|0        |9       |2   |
+ROW   |82790  |1933   |38175 |0       |1        |C80000|0        |9       |0   |
+ROW   |82791  |1934   |38149 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82792  |1936   |38211 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82793  |1937   |38217 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82794  |1937   |38215 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82795  |1937   |38214 |0       |2        |F63100|0        |2       |0   |
+ROW   |82796  |1937   |38216 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82797  |1938   |38228 |0       |0        |969696|0        |9       |2   |
+ROW   |82798  |1938   |38229 |0       |1        |C80000|0        |9       |0   |
+ROW   |82799  |1939   |38203 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82800  |1941   |38265 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82801  |1942   |38271 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82802  |1942   |38269 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82803  |1942   |38268 |0       |2        |F63100|0        |2       |0   |
+ROW   |82804  |1942   |38270 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82805  |1943   |38282 |0       |0        |969696|0        |9       |2   |
+ROW   |82806  |1943   |38283 |0       |1        |C80000|0        |9       |0   |
+ROW   |82807  |1944   |38257 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82808  |1946   |38319 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82809  |1947   |38325 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82810  |1947   |38323 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82811  |1947   |38322 |0       |2        |F63100|0        |2       |0   |
+ROW   |82812  |1947   |38324 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82813  |1948   |38336 |0       |0        |969696|0        |9       |2   |
+ROW   |82814  |1948   |38337 |0       |1        |C80000|0        |9       |0   |
+ROW   |82815  |1949   |38311 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82816  |1951   |38373 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82817  |1952   |38379 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82818  |1952   |38377 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82819  |1952   |38376 |0       |2        |F63100|0        |2       |0   |
+ROW   |82820  |1952   |38378 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82821  |1953   |38390 |0       |0        |969696|0        |9       |2   |
+ROW   |82822  |1953   |38391 |0       |1        |C80000|0        |9       |0   |
+ROW   |82823  |1954   |38365 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82824  |1956   |38427 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82825  |1957   |38433 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82826  |1957   |38431 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82827  |1957   |38430 |0       |2        |F63100|0        |2       |0   |
+ROW   |82828  |1957   |38432 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82829  |1958   |38444 |0       |0        |969696|0        |9       |2   |
+ROW   |82830  |1958   |38445 |0       |1        |C80000|0        |9       |0   |
+ROW   |82831  |1959   |38419 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82832  |1961   |38481 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82833  |1962   |38487 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82834  |1962   |38485 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82835  |1962   |38484 |0       |2        |F63100|0        |2       |0   |
+ROW   |82836  |1962   |38486 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82837  |1963   |38498 |0       |0        |969696|0        |9       |2   |
+ROW   |82838  |1963   |38499 |0       |1        |C80000|0        |9       |0   |
+ROW   |82839  |1964   |38473 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82840  |1966   |38535 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82841  |1967   |38541 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82842  |1967   |38539 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82843  |1967   |38538 |0       |2        |F63100|0        |2       |0   |
+ROW   |82844  |1967   |38540 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82845  |1968   |38552 |0       |0        |969696|0        |9       |2   |
+ROW   |82846  |1968   |38553 |0       |1        |C80000|0        |9       |0   |
+ROW   |82847  |1969   |38527 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82848  |1971   |38589 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82849  |1972   |38595 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82850  |1972   |38593 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82851  |1972   |38592 |0       |2        |F63100|0        |2       |0   |
+ROW   |82852  |1972   |38594 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82853  |1973   |38606 |0       |0        |969696|0        |9       |2   |
+ROW   |82854  |1973   |38607 |0       |1        |C80000|0        |9       |0   |
+ROW   |82855  |1974   |38581 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82856  |1976   |38643 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82857  |1977   |38649 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82858  |1977   |38647 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82859  |1977   |38646 |0       |2        |F63100|0        |2       |0   |
+ROW   |82860  |1977   |38648 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82861  |1978   |38660 |0       |0        |969696|0        |9       |2   |
+ROW   |82862  |1978   |38661 |0       |1        |C80000|0        |9       |0   |
+ROW   |82863  |1979   |38635 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82864  |1981   |38697 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82865  |1982   |38703 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82866  |1982   |38701 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82867  |1982   |38700 |0       |2        |F63100|0        |2       |0   |
+ROW   |82868  |1982   |38702 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82869  |1983   |38714 |0       |0        |969696|0        |9       |2   |
+ROW   |82870  |1983   |38715 |0       |1        |C80000|0        |9       |0   |
+ROW   |82871  |1984   |38689 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82872  |1986   |38751 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82873  |1987   |38757 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82874  |1987   |38755 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82875  |1987   |38754 |0       |2        |F63100|0        |2       |0   |
+ROW   |82876  |1987   |38756 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82877  |1988   |38768 |0       |0        |969696|0        |9       |2   |
+ROW   |82878  |1988   |38769 |0       |1        |C80000|0        |9       |0   |
+ROW   |82879  |1989   |38743 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82880  |1991   |38805 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82881  |1992   |38811 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82882  |1992   |38809 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82883  |1992   |38808 |0       |2        |F63100|0        |2       |0   |
+ROW   |82884  |1992   |38810 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82885  |1993   |38822 |0       |0        |969696|0        |9       |2   |
+ROW   |82886  |1993   |38823 |0       |1        |C80000|0        |9       |0   |
+ROW   |82887  |1994   |38797 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82888  |1996   |38859 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82889  |1997   |38865 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82890  |1997   |38863 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82891  |1997   |38862 |0       |2        |F63100|0        |2       |0   |
+ROW   |82892  |1997   |38864 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82893  |1998   |38876 |0       |0        |969696|0        |9       |2   |
+ROW   |82894  |1998   |38877 |0       |1        |C80000|0        |9       |0   |
+ROW   |82895  |1999   |38851 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82896  |2001   |38913 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82897  |2002   |38919 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82898  |2002   |38917 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82899  |2002   |38916 |0       |2        |F63100|0        |2       |0   |
+ROW   |82900  |2002   |38918 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82901  |2003   |38930 |0       |0        |969696|0        |9       |2   |
+ROW   |82902  |2003   |38931 |0       |1        |C80000|0        |9       |0   |
+ROW   |82903  |2004   |38905 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82904  |2006   |38967 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82905  |2007   |38973 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82906  |2007   |38971 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82907  |2007   |38970 |0       |2        |F63100|0        |2       |0   |
+ROW   |82908  |2007   |38972 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82909  |2008   |38984 |0       |0        |969696|0        |9       |2   |
+ROW   |82910  |2008   |38985 |0       |1        |C80000|0        |9       |0   |
+ROW   |82911  |2009   |38959 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82912  |2011   |39021 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82913  |2012   |39027 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82914  |2012   |39025 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82915  |2012   |39024 |0       |2        |F63100|0        |2       |0   |
+ROW   |82916  |2012   |39026 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82917  |2013   |39038 |0       |0        |969696|0        |9       |2   |
+ROW   |82918  |2013   |39039 |0       |1        |C80000|0        |9       |0   |
+ROW   |82919  |2014   |39013 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82920  |2016   |39075 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82921  |2017   |39081 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82922  |2017   |39079 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82923  |2017   |39078 |0       |2        |F63100|0        |2       |0   |
+ROW   |82924  |2017   |39080 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82925  |2018   |39092 |0       |0        |969696|0        |9       |2   |
+ROW   |82926  |2018   |39093 |0       |1        |C80000|0        |9       |0   |
+ROW   |82927  |2019   |39067 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82928  |2021   |39129 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82929  |2022   |39135 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82930  |2022   |39133 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82931  |2022   |39132 |0       |2        |F63100|0        |2       |0   |
+ROW   |82932  |2022   |39134 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82933  |2023   |39146 |0       |0        |969696|0        |9       |2   |
+ROW   |82934  |2023   |39147 |0       |1        |C80000|0        |9       |0   |
+ROW   |82935  |2024   |39121 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82936  |2026   |39183 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82937  |2027   |39189 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82938  |2027   |39187 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82939  |2027   |39186 |0       |2        |F63100|0        |2       |0   |
+ROW   |82940  |2027   |39188 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82941  |2028   |39200 |0       |0        |969696|0        |9       |2   |
+ROW   |82942  |2028   |39201 |0       |1        |C80000|0        |9       |0   |
+ROW   |82943  |2029   |39175 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82944  |2031   |39237 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82945  |2032   |39243 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82946  |2032   |39241 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82947  |2032   |39240 |0       |2        |F63100|0        |2       |0   |
+ROW   |82948  |2032   |39242 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82949  |2033   |39254 |0       |0        |969696|0        |9       |2   |
+ROW   |82950  |2033   |39255 |0       |1        |C80000|0        |9       |0   |
+ROW   |82951  |2034   |39229 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82952  |2036   |39291 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82953  |2037   |39297 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82954  |2037   |39295 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82955  |2037   |39294 |0       |2        |F63100|0        |2       |0   |
+ROW   |82956  |2037   |39296 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82957  |2038   |39308 |0       |0        |969696|0        |9       |2   |
+ROW   |82958  |2038   |39309 |0       |1        |C80000|0        |9       |0   |
+ROW   |82959  |2039   |39283 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82960  |2041   |39345 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82961  |2042   |39351 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82962  |2042   |39349 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82963  |2042   |39348 |0       |2        |F63100|0        |2       |0   |
+ROW   |82964  |2042   |39350 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82965  |2043   |39362 |0       |0        |969696|0        |9       |2   |
+ROW   |82966  |2043   |39363 |0       |1        |C80000|0        |9       |0   |
+ROW   |82967  |2044   |39337 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82968  |2046   |39399 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82969  |2047   |39405 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82970  |2047   |39403 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82971  |2047   |39402 |0       |2        |F63100|0        |2       |0   |
+ROW   |82972  |2047   |39404 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82973  |2048   |39416 |0       |0        |969696|0        |9       |2   |
+ROW   |82974  |2048   |39417 |0       |1        |C80000|0        |9       |0   |
+ROW   |82975  |2049   |39391 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82976  |2051   |39453 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82977  |2052   |39459 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82978  |2052   |39457 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82979  |2052   |39456 |0       |2        |F63100|0        |2       |0   |
+ROW   |82980  |2052   |39458 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82981  |2053   |39470 |0       |0        |969696|0        |9       |2   |
+ROW   |82982  |2053   |39471 |0       |1        |C80000|0        |9       |0   |
+ROW   |82983  |2054   |39445 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82984  |2056   |39507 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82985  |2057   |39513 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82986  |2057   |39511 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82987  |2057   |39510 |0       |2        |F63100|0        |2       |0   |
+ROW   |82988  |2057   |39512 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82989  |2058   |39524 |0       |0        |969696|0        |9       |2   |
+ROW   |82990  |2058   |39525 |0       |1        |C80000|0        |9       |0   |
+ROW   |82991  |2059   |39499 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82992  |2061   |39561 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |82993  |2062   |39567 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |82994  |2062   |39565 |0       |1        |2774A4|0        |2       |0   |
+ROW   |82995  |2062   |39564 |0       |2        |F63100|0        |2       |0   |
+ROW   |82996  |2062   |39566 |0       |3        |A54F10|0        |2       |0   |
+ROW   |82997  |2063   |39578 |0       |0        |969696|0        |9       |2   |
+ROW   |82998  |2063   |39579 |0       |1        |C80000|0        |9       |0   |
+ROW   |82999  |2064   |39553 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83000  |2066   |39615 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83001  |2067   |39621 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83002  |2067   |39619 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83003  |2067   |39618 |0       |2        |F63100|0        |2       |0   |
+ROW   |83004  |2067   |39620 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83005  |2068   |39632 |0       |0        |969696|0        |9       |2   |
+ROW   |83006  |2068   |39633 |0       |1        |C80000|0        |9       |0   |
+ROW   |83007  |2069   |39607 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83008  |2071   |39669 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83009  |2072   |39675 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83010  |2072   |39673 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83011  |2072   |39672 |0       |2        |F63100|0        |2       |0   |
+ROW   |83012  |2072   |39674 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83013  |2073   |39686 |0       |0        |969696|0        |9       |2   |
+ROW   |83014  |2073   |39687 |0       |1        |C80000|0        |9       |0   |
+ROW   |83015  |2074   |39661 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83016  |2076   |39723 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83017  |2077   |39729 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83018  |2077   |39727 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83019  |2077   |39726 |0       |2        |F63100|0        |2       |0   |
+ROW   |83020  |2077   |39728 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83021  |2078   |39740 |0       |0        |969696|0        |9       |2   |
+ROW   |83022  |2078   |39741 |0       |1        |C80000|0        |9       |0   |
+ROW   |83023  |2079   |39715 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83024  |724    |27904 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83025  |1396   |32439 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83026  |1396   |32437 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83027  |1396   |32436 |0       |2        |F63100|0        |2       |0   |
+ROW   |83028  |1396   |32438 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83029  |1052   |27907 |0       |0        |969696|0        |9       |2   |
+ROW   |83030  |1052   |27908 |0       |1        |C80000|0        |9       |0   |
+ROW   |83031  |1053   |30120 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83032  |1457   |33206 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83033  |1457   |33193 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83034  |1458   |33195 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83035  |1458   |33203 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83036  |1458   |33202 |5       |2        |F63100|0        |2       |0   |
+ROW   |83037  |1459   |33200 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83038  |1459   |33194 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83039  |1460   |33187 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83040  |1460   |33186 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83041  |1460   |33204 |5       |2        |F63100|0        |2       |0   |
+ROW   |83042  |1461   |33226 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83043  |1461   |33215 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83044  |1462   |33207 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83045  |1463   |33223 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83046  |1463   |33218 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83047  |1464   |33210 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83048  |1464   |33209 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83049  |1464   |33224 |5       |2        |F63100|0        |2       |0   |
+ROW   |83050  |1465   |33249 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83051  |1465   |33236 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83052  |1466   |33238 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83053  |1466   |33246 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83054  |1466   |33245 |5       |2        |F63100|0        |2       |0   |
+ROW   |83055  |1467   |33243 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83056  |1467   |33237 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83057  |1468   |33230 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83058  |1468   |33229 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83059  |1468   |33247 |5       |2        |F63100|0        |2       |0   |
+ROW   |83060  |1469   |33258 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83061  |1470   |33251 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83062  |1471   |33256 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83063  |1472   |33277 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83064  |1473   |33274 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83065  |1473   |33273 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83066  |1473   |33272 |5       |2        |F63100|0        |2       |0   |
+ROW   |83067  |1474   |33270 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83068  |1475   |33269 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83069  |1476   |33261 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83070  |1476   |33275 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83071  |1477   |33296 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83072  |1478   |33293 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83073  |1478   |33292 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83074  |1478   |33291 |5       |2        |F63100|0        |2       |0   |
+ROW   |83075  |1479   |33289 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83076  |1480   |33288 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83077  |1481   |33280 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83078  |1481   |33294 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83079  |1482   |33312 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83080  |1483   |33313 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83081  |1484   |33314 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83082  |1485   |33319 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83083  |1486   |33320 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83084  |1487   |33304 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83085  |1487   |33305 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83086  |727    |27936 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83087  |1054   |27935 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |83088  |1054   |30122 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83089  |1055   |30123 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83090  |730    |27975 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83091  |1056   |30126 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83092  |733    |28003 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83093  |1057   |30131 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83094  |736    |28031 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83095  |1058   |30136 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83096  |2080   |39768 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83097  |2080   |39769 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83098  |2080   |39770 |0       |2        |F63100|0        |2       |0   |
+ROW   |83099  |2080   |39771 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83100  |2081   |39772 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83101  |2081   |39773 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83102  |2082   |39774 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83103  |2082   |39775 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83104  |2082   |39780 |0       |2        |F63100|0        |2       |0   |
+ROW   |83105  |2083   |39777 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83106  |2083   |39778 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83107  |2083   |39781 |0       |2        |F63100|0        |2       |0   |
+ROW   |83108  |2084   |39792 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83109  |2084   |39790 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83110  |2084   |39793 |0       |2        |F63100|0        |2       |0   |
+ROW   |83111  |2084   |39795 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83112  |2084   |39796 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83113  |1701   |35553 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83114  |1701   |35556 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83115  |1702   |35558 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83116  |1702   |35561 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83117  |1703   |35562 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83118  |1704   |35563 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83119  |1705   |35592 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83120  |1705   |35584 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83121  |1705   |35594 |0       |2        |F63100|0        |2       |0   |
+ROW   |83122  |1705   |35586 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83123  |1705   |35595 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83124  |1705   |35587 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83125  |1706   |35593 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83126  |1706   |35585 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83127  |1707   |35583 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83128  |1707   |35591 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83129  |1708   |35598 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83130  |1709   |35606 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83131  |1710   |35607 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83132  |1711   |35566 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83133  |1712   |35622 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83134  |1713   |35634 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83135  |1713   |35626 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83136  |1713   |35636 |0       |2        |F63100|0        |2       |0   |
+ROW   |83137  |1713   |35628 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83138  |1713   |35637 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83139  |1713   |35629 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83140  |1714   |35635 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83141  |1714   |35627 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83142  |1715   |35625 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83143  |1715   |35633 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83144  |1716   |35640 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83145  |1717   |35641 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83146  |1718   |35610 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83147  |1719   |35658 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83148  |1720   |35659 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83149  |1721   |35660 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83150  |1722   |35661 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83151  |1723   |35669 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83152  |1723   |35679 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83153  |1723   |35670 |0       |2        |F63100|0        |2       |0   |
+ROW   |83154  |1723   |35665 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83155  |1723   |35672 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83156  |1723   |35666 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83157  |1724   |35663 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83158  |1724   |35664 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83159  |1725   |35686 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83160  |1725   |35693 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83161  |1725   |35684 |0       |2        |F63100|0        |2       |0   |
+ROW   |83162  |1725   |35691 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83163  |1725   |35683 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83164  |1725   |35690 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83165  |1726   |35685 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83166  |1726   |35692 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83167  |1727   |35694 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83168  |1727   |35687 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83169  |1728   |35707 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83170  |1729   |35708 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83171  |1730   |35725 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83172  |1731   |35726 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83173  |1732   |35727 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83174  |1733   |35728 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83175  |1734   |35736 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83176  |1734   |35746 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83177  |1734   |35737 |0       |2        |F63100|0        |2       |0   |
+ROW   |83178  |1734   |35732 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83179  |1734   |35739 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83180  |1734   |35733 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83181  |1735   |35730 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83182  |1735   |35731 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83183  |1736   |35753 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83184  |1736   |35760 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83185  |1736   |35751 |0       |2        |F63100|0        |2       |0   |
+ROW   |83186  |1736   |35758 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83187  |1736   |35750 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83188  |1736   |35757 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83189  |1737   |35752 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83190  |1737   |35759 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83191  |1738   |35761 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83192  |1738   |35754 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83193  |1739   |35774 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83194  |1740   |35775 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83195  |1741   |35791 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83196  |1742   |35799 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83197  |1742   |35802 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83198  |1743   |35804 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83199  |1743   |35807 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83200  |1744   |35808 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83201  |1745   |35809 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83202  |1746   |35834 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83203  |1746   |35826 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83204  |1746   |35836 |0       |2        |F63100|0        |2       |0   |
+ROW   |83205  |1746   |35828 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83206  |1746   |35837 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83207  |1746   |35829 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83208  |1747   |35835 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83209  |1747   |35827 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83210  |1748   |35825 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83211  |1748   |35833 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83212  |1749   |35840 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83213  |1750   |35812 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83214  |1751   |35876 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83215  |1751   |35868 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83216  |1751   |35878 |0       |2        |F63100|0        |2       |0   |
+ROW   |83217  |1751   |35870 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83218  |1751   |35879 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83219  |1751   |35871 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83220  |1752   |35877 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83221  |1752   |35869 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83222  |1753   |35867 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83223  |1753   |35875 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83224  |1754   |35882 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83225  |1755   |35890 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83226  |1756   |35891 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83227  |1757   |35850 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83228  |1758   |35920 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83229  |1758   |35912 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83230  |1758   |35922 |0       |2        |F63100|0        |2       |0   |
+ROW   |83231  |1758   |35914 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83232  |1758   |35923 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83233  |1758   |35915 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83234  |1759   |35921 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83235  |1759   |35913 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83236  |1760   |35911 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83237  |1760   |35919 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83238  |1761   |35926 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83239  |1762   |35934 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83240  |1763   |35935 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83241  |1764   |35894 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83242  |1765   |35952 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83243  |1766   |35964 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83244  |1766   |35956 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83245  |1766   |35966 |0       |2        |F63100|0        |2       |0   |
+ROW   |83246  |1766   |35958 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83247  |1766   |35967 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83248  |1766   |35959 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83249  |1767   |35965 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83250  |1767   |35957 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83251  |1768   |35955 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83252  |1768   |35963 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83253  |1769   |35970 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83254  |1770   |35978 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83255  |1771   |35979 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83256  |1772   |35938 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83257  |1773   |35996 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83258  |1774   |36008 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83259  |1774   |36000 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83260  |1774   |36010 |0       |2        |F63100|0        |2       |0   |
+ROW   |83261  |1774   |36002 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83262  |1774   |36011 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83263  |1774   |36003 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83264  |1775   |36009 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83265  |1775   |36001 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83266  |1776   |35999 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83267  |1776   |36007 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83268  |1777   |36014 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83269  |1778   |36022 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83270  |1779   |36023 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83271  |1780   |35982 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83272  |1781   |36041 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83273  |1782   |36053 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83274  |1782   |36045 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83275  |1782   |36055 |0       |2        |F63100|0        |2       |0   |
+ROW   |83276  |1782   |36047 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83277  |1782   |36056 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83278  |1782   |36048 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83279  |1783   |36054 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83280  |1783   |36046 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83281  |1784   |36044 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83282  |1784   |36052 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83283  |1785   |36059 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83284  |1786   |36067 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83285  |1787   |36068 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83286  |1788   |36026 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83287  |1789   |36086 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83288  |1790   |36098 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83289  |1790   |36090 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83290  |1790   |36100 |0       |2        |F63100|0        |2       |0   |
+ROW   |83291  |1790   |36092 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83292  |1790   |36101 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83293  |1790   |36093 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83294  |1791   |36099 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83295  |1791   |36091 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83296  |1792   |36089 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83297  |1792   |36097 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83298  |1793   |36104 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83299  |1794   |36112 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83300  |1795   |36113 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83301  |1796   |36071 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83302  |1797   |36131 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83303  |1798   |36144 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83304  |1798   |36136 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83305  |1798   |36146 |0       |2        |F63100|0        |2       |0   |
+ROW   |83306  |1798   |36138 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83307  |1798   |36147 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83308  |1798   |36139 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83309  |1799   |36145 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83310  |1799   |36137 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83311  |1800   |36135 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83312  |1800   |36143 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83313  |1801   |36150 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83314  |1802   |36158 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83315  |1803   |36159 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83316  |1804   |36116 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83317  |1223   |31370 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83318  |1223   |31371 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83319  |1226   |31380 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83320  |1226   |31383 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83321  |1229   |31379 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |83322  |1229   |31382 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83323  |887    |29211 |0       |0        |969696|0        |9       |2   |
+ROW   |83324  |887    |29210 |0       |1        |C80000|0        |9       |0   |
+ROW   |83325  |899    |29216 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83326  |899    |29217 |2       |1        |2774A4|0        |2       |0   |
+ROW   |83327  |899    |29218 |0       |2        |F63100|1        |2       |0   |
+ROW   |83328  |899    |29219 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83329  |899    |29220 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |83330  |899    |29221 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |83331  |911    |29089 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83332  |911    |29102 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83333  |908    |29098 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83334  |908    |29097 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83335  |908    |29095 |0       |2        |F63100|0        |2       |0   |
+ROW   |83336  |908    |29088 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83337  |908    |29094 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83338  |908    |29093 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83339  |908    |29092 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |83340  |908    |29091 |0       |7        |611F27|0        |2       |0   |
+ROW   |83341  |908    |29090 |0       |8        |F230E0|0        |2       |0   |
+ROW   |83342  |905    |29198 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83343  |917    |29104 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |83344  |917    |29105 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83345  |914    |31364 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83346  |923    |29118 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83347  |923    |29119 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83348  |923    |29117 |0       |2        |F63100|0        |2       |0   |
+ROW   |83349  |920    |29107 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83350  |920    |29106 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83351  |902    |29096 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83352  |902    |29101 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83353  |902    |29100 |0       |2        |F63100|0        |2       |0   |
+ROW   |83354  |902    |29087 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83355  |1279   |31902 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83356  |1279   |31903 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83357  |1281   |31933 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83358  |1281   |31936 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83359  |1283   |31932 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |83360  |1283   |31935 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83361  |1285   |31907 |0       |0        |969696|0        |9       |2   |
+ROW   |83362  |1285   |31908 |0       |1        |C80000|0        |9       |0   |
+ROW   |83363  |1287   |31911 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83364  |1287   |31914 |2       |1        |2774A4|0        |2       |0   |
+ROW   |83365  |1287   |31913 |0       |2        |F63100|1        |2       |0   |
+ROW   |83366  |1287   |31910 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83367  |1287   |31912 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |83368  |1287   |31909 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |83369  |1289   |31831 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83370  |1289   |31820 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83371  |1291   |31822 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83372  |1291   |31835 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83373  |1291   |31825 |0       |2        |F63100|0        |2       |0   |
+ROW   |83374  |1291   |31826 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83375  |1291   |31823 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83376  |1291   |31827 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83377  |1291   |31824 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |83378  |1291   |31828 |0       |7        |611F27|0        |2       |0   |
+ROW   |83379  |1291   |31830 |0       |8        |F230E0|0        |2       |0   |
+ROW   |83380  |1293   |31892 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83381  |1295   |31855 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |83382  |1295   |31853 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83383  |1297   |31893 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83384  |1299   |31838 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83385  |1299   |31839 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83386  |1299   |31837 |0       |2        |F63100|0        |2       |0   |
+ROW   |83387  |1301   |31850 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83388  |1301   |31852 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83389  |1303   |31829 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83390  |1303   |31833 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83391  |1303   |31834 |0       |2        |F63100|0        |2       |0   |
+ROW   |83392  |1303   |31832 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83393  |952    |29436 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83394  |952    |29437 |2       |1        |2774A4|0        |2       |0   |
+ROW   |83395  |952    |29438 |0       |2        |F63100|1        |2       |0   |
+ROW   |83396  |952    |29439 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83397  |952    |29441 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |83398  |952    |29440 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |83399  |955    |29434 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83400  |955    |29435 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83401  |954    |29448 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83402  |954    |29449 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83403  |956    |29452 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |83404  |956    |29453 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83405  |953    |29446 |0       |0        |969696|0        |9       |2   |
+ROW   |83406  |953    |29432 |0       |1        |C80000|0        |9       |0   |
+ROW   |83407  |960    |29405 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83408  |960    |29406 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83409  |959    |29426 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83410  |959    |29413 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83411  |959    |29411 |0       |2        |F63100|0        |2       |0   |
+ROW   |83412  |959    |29410 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83413  |959    |29399 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83414  |959    |29409 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83415  |959    |29412 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |83416  |959    |29408 |0       |7        |611F27|0        |2       |0   |
+ROW   |83417  |959    |29407 |0       |8        |F230E0|0        |2       |0   |
+ROW   |83418  |958    |29427 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83419  |962    |29403 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |83420  |962    |29402 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83421  |961    |29396 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83422  |963    |29400 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83423  |963    |29401 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83424  |957    |29420 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83425  |957    |29419 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83426  |957    |29418 |0       |2        |F63100|0        |2       |0   |
+ROW   |83427  |957    |29417 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83428  |866    |29014 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83429  |866    |29015 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83430  |868    |29018 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83431  |868    |29019 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83432  |868    |29022 |0       |2        |F63100|0        |2       |0   |
+ROW   |83433  |868    |29023 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83434  |868    |29020 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |83435  |868    |29024 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |83436  |868    |29021 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |83437  |868    |29025 |0       |7        |611F27|0        |2       |0   |
+ROW   |83438  |868    |29026 |0       |8        |F230E0|0        |2       |0   |
+ROW   |83439  |870    |29048 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83440  |872    |29028 |0       |0        |969696|0        |9       |2   |
+ROW   |83441  |872    |29027 |0       |1        |C80000|0        |9       |0   |
+ROW   |83442  |882    |28992 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83443  |882    |28991 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83444  |876    |28982 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |83445  |876    |28983 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83446  |874    |28978 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83447  |878    |28985 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83448  |878    |28984 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83449  |880    |28987 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83450  |880    |28988 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83451  |880    |28989 |0       |2        |F63100|0        |2       |0   |
+ROW   |83452  |880    |28990 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83453  |964    |29513 |0       |0        |969696|0        |9       |2   |
+ROW   |83454  |964    |29512 |0       |1        |C80000|0        |9       |0   |
+ROW   |83455  |1238   |31435 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83456  |1238   |31438 |2       |1        |2774A4|0        |2       |0   |
+ROW   |83457  |1238   |31437 |0       |2        |F63100|1        |2       |0   |
+ROW   |83458  |1238   |31434 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83459  |1238   |31436 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |83460  |1238   |31433 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |83461  |1488   |33321 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83462  |1488   |33324 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83463  |1490   |33322 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83464  |1490   |33323 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83465  |1240   |31441 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83466  |1240   |31442 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83467  |1242   |31440 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |83468  |1242   |31439 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83469  |974    |29456 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83470  |974    |29455 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83471  |976    |29458 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83472  |976    |29457 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83473  |972    |29454 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83474  |978    |29462 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83475  |980    |31421 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83476  |980    |29466 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83477  |1305   |32013 |0       |0        |969696|0        |9       |2   |
+ROW   |83478  |1305   |32014 |0       |1        |C80000|0        |9       |0   |
+ROW   |83479  |1307   |32017 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83480  |1307   |32020 |2       |1        |2774A4|0        |2       |0   |
+ROW   |83481  |1307   |32019 |0       |2        |F63100|1        |2       |0   |
+ROW   |83482  |1307   |32016 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83483  |1307   |32018 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |83484  |1307   |32015 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |83485  |1492   |33329 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83486  |1492   |33332 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83487  |1494   |33330 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83488  |1494   |33331 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83489  |1309   |32023 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83490  |1309   |32024 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83491  |1311   |32022 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |83492  |1311   |32021 |5       |1        |2774A4|0        |2       |0   |
+ROW   |83493  |1313   |31952 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83494  |1313   |31949 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83495  |1315   |31951 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83496  |1315   |31950 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83497  |1317   |31954 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83498  |1319   |31973 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83499  |1321   |31969 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83500  |1321   |31970 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83501  |1583   |34451 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83502  |1584   |34465 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83503  |1584   |34463 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83504  |1585   |34466 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83505  |1585   |34462 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83506  |1586   |34499 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83507  |1587   |34513 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83508  |1587   |34511 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83509  |1588   |34514 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83510  |1588   |34510 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83511  |1589   |34547 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83512  |1590   |34561 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83513  |1590   |34559 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83514  |1591   |34562 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83515  |1591   |34558 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83516  |1592   |34595 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83517  |1593   |34609 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83518  |1593   |34607 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83519  |1594   |34610 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83520  |1594   |34606 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83521  |1595   |34643 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83522  |1596   |34657 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83523  |1596   |34655 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83524  |1597   |34658 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83525  |1597   |34654 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83526  |1619   |35016 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83527  |1620   |35030 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83528  |1620   |35028 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83529  |1621   |35031 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83530  |1621   |35027 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83531  |1601   |34739 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83532  |1602   |34753 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83533  |1602   |34751 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83534  |1603   |34754 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83535  |1603   |34750 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83536  |1604   |34787 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83537  |1569   |34192 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83538  |1569   |34180 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83539  |1570   |34194 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83540  |1570   |34190 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83541  |1605   |34793 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83542  |1606   |34807 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83543  |1606   |34805 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83544  |1607   |34808 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83545  |1607   |34804 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83546  |1608   |34841 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83547  |1609   |34855 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83548  |1609   |34853 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83549  |1610   |34856 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83550  |1610   |34852 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83551  |1611   |34889 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83552  |1612   |34903 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83553  |1612   |34901 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83554  |1613   |34904 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83555  |1613   |34900 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83556  |1518   |33705 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83557  |1519   |33724 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83558  |1519   |33722 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83559  |1519   |33726 |0       |2        |F63100|0        |2       |0   |
+ROW   |83560  |1520   |33719 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83561  |1520   |33720 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83562  |1520   |33721 |0       |2        |F63100|0        |2       |0   |
+ROW   |83563  |1521   |33725 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83564  |1521   |33723 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83565  |1521   |33727 |0       |2        |F63100|0        |2       |0   |
+ROW   |83566  |1522   |33730 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83567  |1523   |33734 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83568  |1523   |33732 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83569  |1523   |33736 |0       |2        |F63100|0        |2       |0   |
+ROW   |83570  |1524   |33735 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83571  |1524   |33733 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83572  |1524   |33737 |0       |2        |F63100|0        |2       |0   |
+ROW   |83573  |1525   |33743 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83574  |1525   |33742 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83575  |1525   |33738 |0       |2        |F63100|0        |2       |0   |
+ROW   |83576  |1526   |33692 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83577  |1526   |33693 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83578  |1571   |34269 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83579  |1571   |34270 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83580  |1571   |34271 |0       |2        |F63100|0        |2       |0   |
+ROW   |83581  |1571   |34272 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83582  |1572   |34311 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83583  |1572   |34301 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83584  |1573   |34243 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83585  |1573   |34244 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83586  |1573   |34246 |0       |2        |F63100|0        |2       |0   |
+ROW   |83587  |1573   |34245 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83588  |1574   |34239 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83589  |1574   |34227 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83590  |1574   |34236 |0       |2        |F63100|0        |2       |0   |
+ROW   |83591  |1574   |34237 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83592  |1575   |34253 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83593  |1575   |34252 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83594  |1575   |34249 |0       |2        |F63100|0        |2       |0   |
+ROW   |83595  |1575   |34251 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83596  |1496   |33368 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83597  |1497   |33371 |1       |0        |1A7C11|0        |2       |0   |
+ROW   |83598  |1497   |33371 |1       |1        |2774A4|0        |2       |0   |
+ROW   |83599  |1498   |33379 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83600  |1498   |33382 |2       |1        |2774A4|0        |2       |0   |
+ROW   |83601  |1498   |33381 |0       |2        |F63100|1        |2       |0   |
+ROW   |83602  |1498   |33378 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83603  |1498   |33380 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |83604  |1498   |33377 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |83605  |1142   |30689 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83606  |1805   |36187 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |83607  |1805   |36192 |2       |1        |2774A4|0        |2       |0   |
+ROW   |83608  |1805   |36190 |0       |2        |F63100|1        |2       |0   |
+ROW   |83609  |1805   |36185 |0       |3        |A54F10|1        |2       |0   |
+ROW   |83610  |1805   |36189 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |83611  |1805   |36184 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |83612  |1275   |31794 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83613  |1275   |31792 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83614  |1275   |31800 |0       |2        |F63100|1        |2       |0   |
+ROW   |83615  |1276   |36771 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83616  |1276   |33390 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83617  |1276   |31799 |0       |2        |F63100|0        |2       |0   |
+ROW   |83618  |1276   |31797 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83619  |1277   |36770 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83620  |1277   |33389 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83621  |1277   |31795 |0       |2        |F63100|0        |2       |0   |
+ROW   |83622  |1278   |36769 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |83623  |1278   |31793 |0       |1        |2774A4|0        |2       |0   |
+ROW   |83624  |1278   |31802 |0       |2        |F63100|0        |2       |0   |
+ROW   |83625  |1278   |31790 |0       |3        |A54F10|0        |2       |0   |
+ROW   |83626  |1278   |31791 |0       |4        |FC6EA3|0        |2       |0   |
 
 TABLE |hostmacro
 FIELDS|hostmacroid|hostid|macro                                                          |value                                                                                                                                                                                                                                                                                      |description                                                                                                                                                                                                                                                   |type|
@@ -49814,6 +49837,7 @@ ROW   |35276 |
 ROW   |35277 |
 ROW   |39805 |
 ROW   |39807 |
+ROW   |39823 |
 
 TABLE |item_preproc
 FIELDS|item_preprocid|itemid|step|type|params                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |error_handler|error_handler_params                          |
@@ -59873,6 +59897,8 @@ ROW   |87814         |32035 |1   |21  |return (100 - value)
 ROW   |87815         |39821 |1   |12  |$.receive                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |0            |                                              |
 ROW   |87816         |39821 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
 ROW   |87817         |31358 |3   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |2            |-1                                            |
+ROW   |87818         |39824 |1   |12  |$.data.process['odbc poller'].busy.avg                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |3            |Processes odbc poller not started             |
+ROW   |87819         |39825 |1   |12  |$.data.process['odbc poller'].busy.avg                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |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|
@@ -60003,436 +60029,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   |889           |30961 |trigger                                     |1   |0       |       |0   |
-ROW   |890           |30193 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |891           |30194 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |892           |30195 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |893           |30236 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |894           |30237 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |895           |30238 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |896           |33521 |trigger disabled non main channels          |1   |0       |       |0   |
-ROW   |897           |33810 |Primary metrics                             |1   |0       |       |0   |
-ROW   |898           |33810 |Arbiter metrics                             |2   |0       |       |0   |
-ROW   |899           |34346 |Too many missed regions trigger             |1   |0       |       |0   |
-ROW   |900           |34346 |Unresponsive peers trigger                  |2   |0       |       |0   |
-ROW   |901           |34403 |Failed GC-related operations trigger        |1   |0       |       |0   |
-ROW   |902           |34443 |Too many unreachable messages trigger       |1   |0       |       |0   |
-ROW   |903           |33657 |ID filter                                   |1   |0       |       |0   |
-ROW   |904           |33658 |Not NVMe                                    |2   |0       |       |0   |
-ROW   |905           |33658 |Self-test                                   |1   |0       |       |0   |
-ROW   |906           |33669 |ID filter                                   |1   |0       |       |0   |
-ROW   |907           |33670 |Not NVMe                                    |2   |0       |       |0   |
-ROW   |908           |33670 |Self-test                                   |1   |0       |       |0   |
-ROW   |909           |28306 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
-ROW   |910           |28306 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
-ROW   |911           |28306 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
-ROW   |912           |28306 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
-ROW   |913           |28307 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
-ROW   |914           |28307 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
-ROW   |915           |28307 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
-ROW   |916           |28307 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
-ROW   |917           |33182 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
-ROW   |918           |33182 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
-ROW   |919           |33182 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
-ROW   |920           |33182 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
-ROW   |921           |35366 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |922           |35542 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |923           |35543 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |924           |35575 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |925           |35619 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |926           |35653 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |927           |35654 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |928           |35720 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |929           |35721 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |930           |35787 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |931           |35788 |Trigger disabled                            |1   |0       |       |0   |
-ROW   |932           |35788 |Trigger enabled                             |2   |0       |       |0   |
-ROW   |933           |35820 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |934           |35859 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |935           |35903 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |936           |35947 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |937           |35991 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |938           |36036 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |939           |36081 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |940           |36126 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |941           |34478 |Temp                                        |1   |0       |       |0   |
-ROW   |942           |34479 |Temp                                        |1   |0       |       |0   |
-ROW   |943           |34526 |Temp                                        |1   |0       |       |0   |
-ROW   |944           |34527 |Temp                                        |1   |0       |       |0   |
-ROW   |945           |34574 |Temp                                        |1   |0       |       |0   |
-ROW   |946           |34575 |Temp                                        |1   |0       |       |0   |
-ROW   |947           |34622 |Temp                                        |1   |0       |       |0   |
-ROW   |948           |34623 |Temp                                        |1   |0       |       |0   |
-ROW   |949           |34670 |Temp                                        |1   |0       |       |0   |
-ROW   |950           |34671 |Temp                                        |1   |0       |       |0   |
-ROW   |951           |35043 |Temp                                        |1   |0       |       |0   |
-ROW   |952           |35044 |Temp                                        |1   |0       |       |0   |
-ROW   |953           |34766 |Temp                                        |1   |0       |       |0   |
-ROW   |954           |34767 |Temp                                        |1   |0       |       |0   |
-ROW   |955           |34209 |Temp                                        |1   |0       |       |0   |
-ROW   |956           |34210 |Temp                                        |1   |0       |       |0   |
-ROW   |957           |34820 |Temp                                        |1   |0       |       |0   |
-ROW   |958           |34821 |Temp                                        |1   |0       |       |0   |
-ROW   |959           |34868 |Temp                                        |1   |0       |       |0   |
-ROW   |960           |34869 |Temp                                        |1   |0       |       |0   |
-ROW   |961           |34916 |Temp                                        |1   |0       |       |0   |
-ROW   |962           |34917 |Temp                                        |1   |0       |       |0   |
-ROW   |963           |33354 |Do not discover aggregate metrics           |1   |0       |       |0   |
-ROW   |964           |30687 |trigger SENSOR_HI_CRIT                      |5   |0       |       |0   |
-ROW   |965           |30687 |trigger SENSOR_HI_DISAST                    |6   |0       |       |0   |
-ROW   |966           |30687 |trigger SENSOR_HI_WARN                      |4   |0       |       |0   |
-ROW   |967           |30687 |trigger SENSOR_LO_CRIT                      |2   |0       |       |0   |
-ROW   |968           |30687 |trigger SENSOR_LO_DISAST                    |3   |0       |       |0   |
-ROW   |969           |30687 |trigger SENSOR_LO_WARN                      |1   |0       |       |0   |
+ROW   |970           |30961 |trigger                                     |1   |0       |       |0   |
+ROW   |971           |30193 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |972           |30194 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |973           |30195 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |974           |30236 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |975           |30237 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |976           |30238 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |977           |33521 |trigger disabled non main channels          |1   |0       |       |0   |
+ROW   |978           |33810 |Primary metrics                             |1   |0       |       |0   |
+ROW   |979           |33810 |Arbiter metrics                             |2   |0       |       |0   |
+ROW   |980           |34346 |Too many missed regions trigger             |1   |0       |       |0   |
+ROW   |981           |34346 |Unresponsive peers trigger                  |2   |0       |       |0   |
+ROW   |982           |34403 |Failed GC-related operations trigger        |1   |0       |       |0   |
+ROW   |983           |34443 |Too many unreachable messages trigger       |1   |0       |       |0   |
+ROW   |984           |33657 |ID filter                                   |1   |0       |       |0   |
+ROW   |985           |33658 |Not NVMe                                    |2   |0       |       |0   |
+ROW   |986           |33658 |Self-test                                   |1   |0       |       |0   |
+ROW   |987           |33669 |ID filter                                   |1   |0       |       |0   |
+ROW   |988           |33670 |Not NVMe                                    |2   |0       |       |0   |
+ROW   |989           |33670 |Self-test                                   |1   |0       |       |0   |
+ROW   |990           |28306 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
+ROW   |991           |28306 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
+ROW   |992           |28306 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
+ROW   |993           |28306 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
+ROW   |994           |28307 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
+ROW   |995           |28307 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
+ROW   |996           |28307 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
+ROW   |997           |28307 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
+ROW   |998           |33182 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
+ROW   |999           |33182 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
+ROW   |1000          |33182 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
+ROW   |1001          |33182 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
+ROW   |1002          |35366 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1003          |35542 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1004          |35543 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1005          |35575 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1006          |35619 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1007          |35653 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1008          |35654 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1009          |35720 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1010          |35721 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1011          |35787 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1012          |35788 |Trigger disabled                            |1   |0       |       |0   |
+ROW   |1013          |35788 |Trigger enabled                             |2   |0       |       |0   |
+ROW   |1014          |35820 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1015          |35859 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1016          |35903 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1017          |35947 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1018          |35991 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1019          |36036 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1020          |36081 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1021          |36126 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |1022          |34478 |Temp                                        |1   |0       |       |0   |
+ROW   |1023          |34479 |Temp                                        |1   |0       |       |0   |
+ROW   |1024          |34526 |Temp                                        |1   |0       |       |0   |
+ROW   |1025          |34527 |Temp                                        |1   |0       |       |0   |
+ROW   |1026          |34574 |Temp                                        |1   |0       |       |0   |
+ROW   |1027          |34575 |Temp                                        |1   |0       |       |0   |
+ROW   |1028          |34622 |Temp                                        |1   |0       |       |0   |
+ROW   |1029          |34623 |Temp                                        |1   |0       |       |0   |
+ROW   |1030          |34670 |Temp                                        |1   |0       |       |0   |
+ROW   |1031          |34671 |Temp                                        |1   |0       |       |0   |
+ROW   |1032          |35043 |Temp                                        |1   |0       |       |0   |
+ROW   |1033          |35044 |Temp                                        |1   |0       |       |0   |
+ROW   |1034          |34766 |Temp                                        |1   |0       |       |0   |
+ROW   |1035          |34767 |Temp                                        |1   |0       |       |0   |
+ROW   |1036          |34209 |Temp                                        |1   |0       |       |0   |
+ROW   |1037          |34210 |Temp                                        |1   |0       |       |0   |
+ROW   |1038          |34820 |Temp                                        |1   |0       |       |0   |
+ROW   |1039          |34821 |Temp                                        |1   |0       |       |0   |
+ROW   |1040          |34868 |Temp                                        |1   |0       |       |0   |
+ROW   |1041          |34869 |Temp                                        |1   |0       |       |0   |
+ROW   |1042          |34916 |Temp                                        |1   |0       |       |0   |
+ROW   |1043          |34917 |Temp                                        |1   |0       |       |0   |
+ROW   |1044          |33354 |Do not discover aggregate metrics           |1   |0       |       |0   |
+ROW   |1045          |30687 |trigger SENSOR_HI_CRIT                      |5   |0       |       |0   |
+ROW   |1046          |30687 |trigger SENSOR_HI_DISAST                    |6   |0       |       |0   |
+ROW   |1047          |30687 |trigger SENSOR_HI_WARN                      |4   |0       |       |0   |
+ROW   |1048          |30687 |trigger SENSOR_LO_CRIT                      |2   |0       |       |0   |
+ROW   |1049          |30687 |trigger SENSOR_LO_DISAST                    |3   |0       |       |0   |
+ROW   |1050          |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   |768                     |889           |8       |{#GRPC.CODE}            |{$ETCD.GRPC_CODE.TRIGGER.MATCHES}     |
-ROW   |769                     |890           |8       |{#MODE}                 |tcp                                   |
-ROW   |770                     |891           |8       |{#MODE}                 |tcp                                   |
-ROW   |771                     |892           |8       |{#MODE}                 |tcp                                   |
-ROW   |772                     |893           |8       |{#MODE}                 |tcp                                   |
-ROW   |773                     |894           |8       |{#MODE}                 |tcp                                   |
-ROW   |774                     |895           |8       |{#MODE}                 |tcp                                   |
-ROW   |775                     |896           |9       |{#CHANNEL_ID}           |{$HIKVISION_MAIN_CHANNEL_ID}          |
-ROW   |776                     |897           |8       |{#NODE_STATE}           |1                                     |
-ROW   |777                     |898           |8       |{#NODE_STATE}           |7                                     |
-ROW   |778                     |899           |8       |{#TYPE}                 |miss_peer_region_count                |
-ROW   |779                     |900           |8       |{#TYPE}                 |down_peer_region_count                |
-ROW   |780                     |901           |8       |{#TYPE}                 |failed                                |
-ROW   |781                     |902           |8       |{#TYPE}                 |unreachable                           |
-ROW   |782                     |903           |8       |{#ID}                   |{$SMART.ATTRIBUTE.ID.MATCHES}         |
-ROW   |783                     |903           |8       |{#NAME}                 |{$SMART.DISK.NAME.MATCHES}            |
-ROW   |784                     |904           |9       |{#DISKTYPE}             |nvme                                  |
-ROW   |785                     |905           |8       |{#DISKTYPE}             |nvme                                  |
-ROW   |786                     |906           |8       |{#ID}                   |{$SMART.ATTRIBUTE.ID.MATCHES}         |
-ROW   |787                     |906           |8       |{#NAME}                 |{$SMART.DISK.NAME.MATCHES}            |
-ROW   |788                     |907           |9       |{#DISKTYPE}             |nvme                                  |
-ROW   |789                     |908           |8       |{#DISKTYPE}             |nvme                                  |
-ROW   |790                     |909           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
-ROW   |791                     |910           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
-ROW   |792                     |911           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
-ROW   |793                     |912           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
-ROW   |794                     |913           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
-ROW   |795                     |914           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
-ROW   |796                     |915           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
-ROW   |797                     |916           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
-ROW   |798                     |917           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
-ROW   |799                     |918           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
-ROW   |800                     |919           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
-ROW   |801                     |920           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
-ROW   |802                     |921           |9       |{#CISCO.IF.NAME}        |{$CISCO.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |803                     |922           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |804                     |923           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |805                     |924           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |806                     |925           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |807                     |926           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |808                     |927           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |809                     |928           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |810                     |929           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |811                     |930           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |812                     |931           |8       |{#ZYXEL.IF.NAME}        |.*                                    |
-ROW   |813                     |932           |8       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |814                     |933           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |815                     |934           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |816                     |935           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |817                     |936           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |818                     |937           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |819                     |938           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |820                     |939           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |821                     |940           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |822                     |941           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |823                     |942           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |824                     |943           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |825                     |944           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |826                     |945           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |827                     |946           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |828                     |947           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |829                     |948           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |830                     |949           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |831                     |950           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |832                     |951           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |833                     |952           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |834                     |953           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |835                     |954           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |836                     |955           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |837                     |956           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |838                     |957           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |839                     |958           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |840                     |959           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |841                     |960           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |842                     |961           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |843                     |962           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |844                     |963           |8       |{#FSTYPE}               |3&pipe;4                              |
+ROW   |845                     |970           |8       |{#GRPC.CODE}            |{$ETCD.GRPC_CODE.TRIGGER.MATCHES}     |
+ROW   |846                     |971           |8       |{#MODE}                 |tcp                                   |
+ROW   |847                     |972           |8       |{#MODE}                 |tcp                                   |
+ROW   |848                     |973           |8       |{#MODE}                 |tcp                                   |
+ROW   |849                     |974           |8       |{#MODE}                 |tcp                                   |
+ROW   |850                     |975           |8       |{#MODE}                 |tcp                                   |
+ROW   |851                     |976           |8       |{#MODE}                 |tcp                                   |
+ROW   |852                     |977           |9       |{#CHANNEL_ID}           |{$HIKVISION_MAIN_CHANNEL_ID}          |
+ROW   |853                     |978           |8       |{#NODE_STATE}           |1                                     |
+ROW   |854                     |979           |8       |{#NODE_STATE}           |7                                     |
+ROW   |855                     |980           |8       |{#TYPE}                 |miss_peer_region_count                |
+ROW   |856                     |981           |8       |{#TYPE}                 |down_peer_region_count                |
+ROW   |857                     |982           |8       |{#TYPE}                 |failed                                |
+ROW   |858                     |983           |8       |{#TYPE}                 |unreachable                           |
+ROW   |859                     |984           |8       |{#ID}                   |{$SMART.ATTRIBUTE.ID.MATCHES}         |
+ROW   |860                     |984           |8       |{#NAME}                 |{$SMART.DISK.NAME.MATCHES}            |
+ROW   |861                     |985           |9       |{#DISKTYPE}             |nvme                                  |
+ROW   |862                     |986           |8       |{#DISKTYPE}             |nvme                                  |
+ROW   |863                     |987           |8       |{#ID}                   |{$SMART.ATTRIBUTE.ID.MATCHES}         |
+ROW   |864                     |987           |8       |{#NAME}                 |{$SMART.DISK.NAME.MATCHES}            |
+ROW   |865                     |988           |9       |{#DISKTYPE}             |nvme                                  |
+ROW   |866                     |989           |8       |{#DISKTYPE}             |nvme                                  |
+ROW   |867                     |990           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
+ROW   |868                     |991           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
+ROW   |869                     |992           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
+ROW   |870                     |993           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
+ROW   |871                     |994           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
+ROW   |872                     |995           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
+ROW   |873                     |996           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
+ROW   |874                     |997           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
+ROW   |875                     |998           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
+ROW   |876                     |999           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
+ROW   |877                     |1000          |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
+ROW   |878                     |1001          |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
+ROW   |879                     |1002          |9       |{#CISCO.IF.NAME}        |{$CISCO.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |880                     |1003          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |881                     |1004          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |882                     |1005          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |883                     |1006          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |884                     |1007          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |885                     |1008          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |886                     |1009          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |887                     |1010          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |888                     |1011          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |889                     |1012          |8       |{#ZYXEL.IF.NAME}        |.*                                    |
+ROW   |890                     |1013          |8       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |891                     |1014          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |892                     |1015          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |893                     |1016          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |894                     |1017          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |895                     |1018          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |896                     |1019          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |897                     |1020          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |898                     |1021          |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |899                     |1022          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |900                     |1023          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |901                     |1024          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |902                     |1025          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |903                     |1026          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |904                     |1027          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |905                     |1028          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |906                     |1029          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |907                     |1030          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |908                     |1031          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |909                     |1032          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |910                     |1033          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |911                     |1034          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |912                     |1035          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |913                     |1036          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |914                     |1037          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |915                     |1038          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |916                     |1039          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |917                     |1040          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |918                     |1041          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |919                     |1042          |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |920                     |1043          |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |921                     |1044          |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   |922                     |889           |1              |2       |Too many failed gRPC requests              |
-ROW   |923                     |890           |0              |2       |Number of responses with codes             |
-ROW   |924                     |891           |0              |2       |Number of responses with codes             |
-ROW   |925                     |892           |0              |2       |Number of responses with codes             |
-ROW   |926                     |893           |0              |2       |Number of responses with codes             |
-ROW   |927                     |894           |0              |2       |Number of responses with codes             |
-ROW   |928                     |895           |0              |2       |Number of responses with codes             |
-ROW   |929                     |896           |1              |2       |Invalid video stream resolution parameters |
-ROW   |930                     |897           |0              |2       |Number of replicas                         |
-ROW   |931                     |897           |0              |2       |Unhealthy replicas                         |
-ROW   |932                     |897           |0              |2       |Number of unhealthy replicas               |
-ROW   |933                     |897           |0              |2       |Replication lag                            |
-ROW   |934                     |898           |0              |2       |Replication lag                            |
-ROW   |935                     |899           |1              |2       |Too many missed regions                    |
-ROW   |936                     |900           |1              |2       |There are unresponsive peers               |
-ROW   |937                     |901           |1              |2       |Too many failed GC-related operations      |
-ROW   |938                     |902           |1              |2       |Too many failure messages                  |
-ROW   |939                     |903           |0              |8       |                                           |
-ROW   |940                     |904           |0              |8       |Media&pipe;Percentage&pipe;Critical        |
-ROW   |941                     |905           |0              |2       |Self-test                                  |
-ROW   |942                     |906           |0              |8       |                                           |
-ROW   |943                     |907           |0              |8       |Media&pipe;Percentage&pipe;Critical        |
-ROW   |944                     |908           |0              |2       |Self-test                                  |
-ROW   |945                     |909           |1              |8       |Temperature is above the critical threshold|
-ROW   |946                     |910           |1              |8       |Temperature is above the warning threshold |
-ROW   |947                     |911           |1              |8       |Temperature is below the critical threshold|
-ROW   |948                     |912           |1              |8       |Temperature is below the warning threshold |
-ROW   |949                     |913           |1              |8       |Fan speed is above the critical threshold  |
-ROW   |950                     |914           |1              |8       |Fan speed is above the warning threshold   |
-ROW   |951                     |915           |1              |8       |Fan speed is below the critical threshold  |
-ROW   |952                     |916           |1              |8       |Fan speed is below the warning threshold   |
-ROW   |953                     |917           |1              |8       |Voltage is above the critical threshold    |
-ROW   |954                     |918           |1              |8       |Voltage is above the warning threshold     |
-ROW   |955                     |919           |1              |8       |Voltage is below the critical threshold    |
-ROW   |956                     |920           |1              |8       |Voltage is below the warning threshold     |
-ROW   |957                     |921           |1              |8       |.*                                         |
-ROW   |958                     |922           |1              |8       |.*                                         |
-ROW   |959                     |923           |1              |8       |.*                                         |
-ROW   |960                     |924           |1              |8       |.*                                         |
-ROW   |961                     |925           |1              |8       |.*                                         |
-ROW   |962                     |926           |1              |8       |.*                                         |
-ROW   |963                     |927           |1              |8       |.*                                         |
-ROW   |964                     |928           |1              |8       |.*                                         |
-ROW   |965                     |929           |1              |8       |.*                                         |
-ROW   |966                     |930           |1              |8       |.*                                         |
-ROW   |967                     |931           |1              |8       |.*                                         |
-ROW   |968                     |932           |1              |8       |.*                                         |
-ROW   |969                     |933           |1              |8       |.*                                         |
-ROW   |970                     |934           |1              |8       |.*                                         |
-ROW   |971                     |935           |1              |8       |.*                                         |
-ROW   |972                     |936           |1              |8       |.*                                         |
-ROW   |973                     |937           |1              |8       |.*                                         |
-ROW   |974                     |938           |1              |8       |.*                                         |
-ROW   |975                     |939           |1              |8       |.*                                         |
-ROW   |976                     |940           |1              |8       |.*                                         |
-ROW   |977                     |941           |0              |2       |Humidity                                   |
-ROW   |978                     |942           |0              |2       |Humidity                                   |
-ROW   |979                     |943           |0              |2       |Humidity                                   |
-ROW   |980                     |944           |0              |2       |Humidity                                   |
-ROW   |981                     |945           |0              |2       |Humidity                                   |
-ROW   |982                     |946           |0              |2       |Humidity                                   |
-ROW   |983                     |947           |0              |2       |Humidity                                   |
-ROW   |984                     |948           |0              |2       |Humidity                                   |
-ROW   |985                     |949           |0              |2       |Humidity                                   |
-ROW   |986                     |950           |0              |2       |Humidity                                   |
-ROW   |987                     |951           |0              |2       |Humidity                                   |
-ROW   |988                     |952           |0              |2       |Humidity                                   |
-ROW   |989                     |953           |0              |2       |Humidity                                   |
-ROW   |990                     |954           |0              |2       |Humidity                                   |
-ROW   |991                     |955           |0              |2       |Humidity                                   |
-ROW   |992                     |956           |0              |2       |Humidity                                   |
-ROW   |993                     |957           |0              |2       |Humidity                                   |
-ROW   |994                     |958           |0              |2       |Humidity                                   |
-ROW   |995                     |959           |0              |2       |Humidity                                   |
-ROW   |996                     |960           |0              |2       |Humidity                                   |
-ROW   |997                     |961           |0              |2       |Humidity                                   |
-ROW   |998                     |962           |0              |2       |Humidity                                   |
-ROW   |999                     |963           |0              |2       |Saved                                      |
-ROW   |1000                    |964           |1              |2       |{#SENSOR_HI_CRIT}                          |
-ROW   |1001                    |965           |1              |2       |{#SENSOR_HI_DISAST}                        |
-ROW   |1002                    |966           |1              |2       |{#SENSOR_HI_WARN}                          |
-ROW   |1003                    |967           |1              |2       |{#SENSOR_LO_CRIT}                          |
-ROW   |1004                    |968           |1              |2       |{#SENSOR_LO_DISAST}                        |
-ROW   |1005                    |969           |1              |2       |{#SENSOR_LO_WARN}                          |
+ROW   |1006                    |970           |1              |2       |Too many failed gRPC requests              |
+ROW   |1007                    |971           |0              |2       |Number of responses with codes             |
+ROW   |1008                    |972           |0              |2       |Number of responses with codes             |
+ROW   |1009                    |973           |0              |2       |Number of responses with codes             |
+ROW   |1010                    |974           |0              |2       |Number of responses with codes             |
+ROW   |1011                    |975           |0              |2       |Number of responses with codes             |
+ROW   |1012                    |976           |0              |2       |Number of responses with codes             |
+ROW   |1013                    |977           |1              |2       |Invalid video stream resolution parameters |
+ROW   |1014                    |978           |0              |2       |Number of replicas                         |
+ROW   |1015                    |978           |0              |2       |Unhealthy replicas                         |
+ROW   |1016                    |978           |0              |2       |Number of unhealthy replicas               |
+ROW   |1017                    |978           |0              |2       |Replication lag                            |
+ROW   |1018                    |979           |0              |2       |Replication lag                            |
+ROW   |1019                    |980           |1              |2       |Too many missed regions                    |
+ROW   |1020                    |981           |1              |2       |There are unresponsive peers               |
+ROW   |1021                    |982           |1              |2       |Too many failed GC-related operations      |
+ROW   |1022                    |983           |1              |2       |Too many failure messages                  |
+ROW   |1023                    |984           |0              |8       |                                           |
+ROW   |1024                    |985           |0              |8       |Media&pipe;Percentage&pipe;Critical        |
+ROW   |1025                    |986           |0              |2       |Self-test                                  |
+ROW   |1026                    |987           |0              |8       |                                           |
+ROW   |1027                    |988           |0              |8       |Media&pipe;Percentage&pipe;Critical        |
+ROW   |1028                    |989           |0              |2       |Self-test                                  |
+ROW   |1029                    |990           |1              |8       |Temperature is above the critical threshold|
+ROW   |1030                    |991           |1              |8       |Temperature is above the warning threshold |
+ROW   |1031                    |992           |1              |8       |Temperature is below the critical threshold|
+ROW   |1032                    |993           |1              |8       |Temperature is below the warning threshold |
+ROW   |1033                    |994           |1              |8       |Fan speed is above the critical threshold  |
+ROW   |1034                    |995           |1              |8       |Fan speed is above the warning threshold   |
+ROW   |1035                    |996           |1              |8       |Fan speed is below the critical threshold  |
+ROW   |1036                    |997           |1              |8       |Fan speed is below the warning threshold   |
+ROW   |1037                    |998           |1              |8       |Voltage is above the critical threshold    |
+ROW   |1038                    |999           |1              |8       |Voltage is above the warning threshold     |
+ROW   |1039                    |1000          |1              |8       |Voltage is below the critical threshold    |
+ROW   |1040                    |1001          |1              |8       |Voltage is below the warning threshold     |
+ROW   |1041                    |1002          |1              |8       |.*                                         |
+ROW   |1042                    |1003          |1              |8       |.*                                         |
+ROW   |1043                    |1004          |1              |8       |.*                                         |
+ROW   |1044                    |1005          |1              |8       |.*                                         |
+ROW   |1045                    |1006          |1              |8       |.*                                         |
+ROW   |1046                    |1007          |1              |8       |.*                                         |
+ROW   |1047                    |1008          |1              |8       |.*                                         |
+ROW   |1048                    |1009          |1              |8       |.*                                         |
+ROW   |1049                    |1010          |1              |8       |.*                                         |
+ROW   |1050                    |1011          |1              |8       |.*                                         |
+ROW   |1051                    |1012          |1              |8       |.*                                         |
+ROW   |1052                    |1013          |1              |8       |.*                                         |
+ROW   |1053                    |1014          |1              |8       |.*                                         |
+ROW   |1054                    |1015          |1              |8       |.*                                         |
+ROW   |1055                    |1016          |1              |8       |.*                                         |
+ROW   |1056                    |1017          |1              |8       |.*                                         |
+ROW   |1057                    |1018          |1              |8       |.*                                         |
+ROW   |1058                    |1019          |1              |8       |.*                                         |
+ROW   |1059                    |1020          |1              |8       |.*                                         |
+ROW   |1060                    |1021          |1              |8       |.*                                         |
+ROW   |1061                    |1022          |0              |2       |Humidity                                   |
+ROW   |1062                    |1023          |0              |2       |Humidity                                   |
+ROW   |1063                    |1024          |0              |2       |Humidity                                   |
+ROW   |1064                    |1025          |0              |2       |Humidity                                   |
+ROW   |1065                    |1026          |0              |2       |Humidity                                   |
+ROW   |1066                    |1027          |0              |2       |Humidity                                   |
+ROW   |1067                    |1028          |0              |2       |Humidity                                   |
+ROW   |1068                    |1029          |0              |2       |Humidity                                   |
+ROW   |1069                    |1030          |0              |2       |Humidity                                   |
+ROW   |1070                    |1031          |0              |2       |Humidity                                   |
+ROW   |1071                    |1032          |0              |2       |Humidity                                   |
+ROW   |1072                    |1033          |0              |2       |Humidity                                   |
+ROW   |1073                    |1034          |0              |2       |Humidity                                   |
+ROW   |1074                    |1035          |0              |2       |Humidity                                   |
+ROW   |1075                    |1036          |0              |2       |Humidity                                   |
+ROW   |1076                    |1037          |0              |2       |Humidity                                   |
+ROW   |1077                    |1038          |0              |2       |Humidity                                   |
+ROW   |1078                    |1039          |0              |2       |Humidity                                   |
+ROW   |1079                    |1040          |0              |2       |Humidity                                   |
+ROW   |1080                    |1041          |0              |2       |Humidity                                   |
+ROW   |1081                    |1042          |0              |2       |Humidity                                   |
+ROW   |1082                    |1043          |0              |2       |Humidity                                   |
+ROW   |1083                    |1044          |0              |2       |Saved                                      |
+ROW   |1084                    |1045          |1              |2       |{#SENSOR_HI_CRIT}                          |
+ROW   |1085                    |1046          |1              |2       |{#SENSOR_HI_DISAST}                        |
+ROW   |1086                    |1047          |1              |2       |{#SENSOR_HI_WARN}                          |
+ROW   |1087                    |1048          |1              |2       |{#SENSOR_LO_CRIT}                          |
+ROW   |1088                    |1049          |1              |2       |{#SENSOR_LO_DISAST}                        |
+ROW   |1089                    |1050          |1              |2       |{#SENSOR_LO_WARN}                          |
 
 TABLE |lld_override_opstatus
 FIELDS|lld_override_operationid|status|
 ROW   |201                     |0     |
 ROW   |202                     |0     |
-ROW   |922                     |0     |
-ROW   |923                     |0     |
-ROW   |924                     |0     |
-ROW   |925                     |0     |
-ROW   |926                     |0     |
-ROW   |927                     |0     |
-ROW   |928                     |0     |
-ROW   |929                     |0     |
-ROW   |930                     |0     |
-ROW   |931                     |0     |
-ROW   |932                     |0     |
-ROW   |933                     |0     |
-ROW   |934                     |0     |
-ROW   |935                     |0     |
-ROW   |936                     |0     |
-ROW   |937                     |0     |
-ROW   |938                     |0     |
-ROW   |939                     |0     |
-ROW   |940                     |0     |
-ROW   |941                     |0     |
-ROW   |942                     |0     |
-ROW   |943                     |0     |
-ROW   |944                     |0     |
-ROW   |945                     |0     |
-ROW   |946                     |0     |
-ROW   |947                     |0     |
-ROW   |948                     |0     |
-ROW   |949                     |0     |
-ROW   |950                     |0     |
-ROW   |951                     |0     |
-ROW   |952                     |0     |
-ROW   |953                     |0     |
-ROW   |954                     |0     |
-ROW   |955                     |0     |
-ROW   |956                     |0     |
-ROW   |957                     |0     |
-ROW   |958                     |0     |
-ROW   |959                     |0     |
-ROW   |960                     |0     |
-ROW   |961                     |0     |
-ROW   |962                     |0     |
-ROW   |963                     |0     |
-ROW   |964                     |0     |
-ROW   |965                     |0     |
-ROW   |966                     |0     |
-ROW   |967                     |0     |
-ROW   |968                     |0     |
-ROW   |969                     |0     |
-ROW   |970                     |0     |
-ROW   |971                     |0     |
-ROW   |972                     |0     |
-ROW   |973                     |0     |
-ROW   |974                     |0     |
-ROW   |975                     |0     |
-ROW   |976                     |0     |
-ROW   |977                     |0     |
-ROW   |978                     |0     |
-ROW   |979                     |0     |
-ROW   |980                     |0     |
-ROW   |981                     |0     |
-ROW   |982                     |0     |
-ROW   |983                     |0     |
-ROW   |984                     |0     |
-ROW   |985                     |0     |
-ROW   |986                     |0     |
-ROW   |987                     |0     |
-ROW   |988                     |0     |
-ROW   |989                     |0     |
-ROW   |990                     |0     |
-ROW   |991                     |0     |
-ROW   |992                     |0     |
-ROW   |993                     |0     |
-ROW   |994                     |0     |
-ROW   |995                     |0     |
-ROW   |996                     |0     |
-ROW   |997                     |0     |
-ROW   |998                     |0     |
-ROW   |999                     |0     |
-ROW   |1000                    |0     |
-ROW   |1001                    |0     |
-ROW   |1002                    |0     |
-ROW   |1003                    |0     |
-ROW   |1004                    |0     |
-ROW   |1005                    |0     |
+ROW   |1006                    |0     |
+ROW   |1007                    |0     |
+ROW   |1008                    |0     |
+ROW   |1009                    |0     |
+ROW   |1010                    |0     |
+ROW   |1011                    |0     |
+ROW   |1012                    |0     |
+ROW   |1013                    |0     |
+ROW   |1014                    |0     |
+ROW   |1015                    |0     |
+ROW   |1016                    |0     |
+ROW   |1017                    |0     |
+ROW   |1018                    |0     |
+ROW   |1019                    |0     |
+ROW   |1020                    |0     |
+ROW   |1021                    |0     |
+ROW   |1022                    |0     |
+ROW   |1023                    |0     |
+ROW   |1024                    |0     |
+ROW   |1025                    |0     |
+ROW   |1026                    |0     |
+ROW   |1027                    |0     |
+ROW   |1028                    |0     |
+ROW   |1029                    |0     |
+ROW   |1030                    |0     |
+ROW   |1031                    |0     |
+ROW   |1032                    |0     |
+ROW   |1033                    |0     |
+ROW   |1034                    |0     |
+ROW   |1035                    |0     |
+ROW   |1036                    |0     |
+ROW   |1037                    |0     |
+ROW   |1038                    |0     |
+ROW   |1039                    |0     |
+ROW   |1040                    |0     |
+ROW   |1041                    |0     |
+ROW   |1042                    |0     |
+ROW   |1043                    |0     |
+ROW   |1044                    |0     |
+ROW   |1045                    |0     |
+ROW   |1046                    |0     |
+ROW   |1047                    |0     |
+ROW   |1048                    |0     |
+ROW   |1049                    |0     |
+ROW   |1050                    |0     |
+ROW   |1051                    |0     |
+ROW   |1052                    |0     |
+ROW   |1053                    |0     |
+ROW   |1054                    |0     |
+ROW   |1055                    |0     |
+ROW   |1056                    |0     |
+ROW   |1057                    |0     |
+ROW   |1058                    |0     |
+ROW   |1059                    |0     |
+ROW   |1060                    |0     |
+ROW   |1061                    |0     |
+ROW   |1062                    |0     |
+ROW   |1063                    |0     |
+ROW   |1064                    |0     |
+ROW   |1065                    |0     |
+ROW   |1066                    |0     |
+ROW   |1067                    |0     |
+ROW   |1068                    |0     |
+ROW   |1069                    |0     |
+ROW   |1070                    |0     |
+ROW   |1071                    |0     |
+ROW   |1072                    |0     |
+ROW   |1073                    |0     |
+ROW   |1074                    |0     |
+ROW   |1075                    |0     |
+ROW   |1076                    |0     |
+ROW   |1077                    |0     |
+ROW   |1078                    |0     |
+ROW   |1079                    |0     |
+ROW   |1080                    |0     |
+ROW   |1081                    |0     |
+ROW   |1082                    |0     |
+ROW   |1083                    |0     |
+ROW   |1084                    |0     |
+ROW   |1085                    |0     |
+ROW   |1086                    |0     |
+ROW   |1087                    |0     |
+ROW   |1088                    |0     |
+ROW   |1089                    |0     |
 
 TABLE |lld_override_opdiscover
 FIELDS|lld_override_operationid|discover|
 ROW   |201                     |1       |
 ROW   |202                     |1       |
-ROW   |922                     |0       |
-ROW   |923                     |1       |
-ROW   |924                     |1       |
-ROW   |925                     |1       |
-ROW   |926                     |1       |
-ROW   |927                     |1       |
-ROW   |928                     |1       |
-ROW   |929                     |1       |
-ROW   |930                     |0       |
-ROW   |931                     |0       |
-ROW   |932                     |0       |
-ROW   |933                     |1       |
-ROW   |934                     |1       |
-ROW   |935                     |0       |
-ROW   |936                     |0       |
-ROW   |937                     |0       |
-ROW   |938                     |0       |
-ROW   |939                     |1       |
-ROW   |940                     |1       |
-ROW   |941                     |1       |
-ROW   |942                     |1       |
-ROW   |943                     |1       |
-ROW   |944                     |1       |
-ROW   |945                     |1       |
-ROW   |946                     |1       |
-ROW   |947                     |1       |
-ROW   |948                     |1       |
-ROW   |949                     |1       |
-ROW   |950                     |1       |
-ROW   |951                     |1       |
-ROW   |952                     |1       |
-ROW   |953                     |1       |
-ROW   |954                     |1       |
-ROW   |955                     |1       |
-ROW   |956                     |1       |
-ROW   |957                     |1       |
-ROW   |958                     |1       |
-ROW   |959                     |1       |
-ROW   |960                     |1       |
-ROW   |961                     |1       |
-ROW   |962                     |1       |
-ROW   |963                     |1       |
-ROW   |964                     |1       |
-ROW   |965                     |1       |
-ROW   |966                     |1       |
-ROW   |967                     |1       |
-ROW   |968                     |0       |
-ROW   |969                     |1       |
-ROW   |970                     |1       |
-ROW   |971                     |1       |
-ROW   |972                     |1       |
-ROW   |973                     |1       |
-ROW   |974                     |1       |
-ROW   |975                     |1       |
-ROW   |976                     |1       |
-ROW   |977                     |1       |
-ROW   |978                     |1       |
-ROW   |979                     |1       |
-ROW   |980                     |1       |
-ROW   |981                     |1       |
-ROW   |982                     |1       |
-ROW   |983                     |1       |
-ROW   |984                     |1       |
-ROW   |985                     |1       |
-ROW   |986                     |1       |
-ROW   |987                     |1       |
-ROW   |988                     |1       |
-ROW   |989                     |1       |
-ROW   |990                     |1       |
-ROW   |991                     |1       |
-ROW   |992                     |1       |
-ROW   |993                     |1       |
-ROW   |994                     |1       |
-ROW   |995                     |1       |
-ROW   |996                     |1       |
-ROW   |997                     |1       |
-ROW   |998                     |1       |
-ROW   |999                     |1       |
-ROW   |1000                    |1       |
-ROW   |1001                    |1       |
-ROW   |1002                    |1       |
-ROW   |1003                    |1       |
-ROW   |1004                    |1       |
-ROW   |1005                    |1       |
+ROW   |1006                    |0       |
+ROW   |1007                    |1       |
+ROW   |1008                    |1       |
+ROW   |1009                    |1       |
+ROW   |1010                    |1       |
+ROW   |1011                    |1       |
+ROW   |1012                    |1       |
+ROW   |1013                    |1       |
+ROW   |1014                    |0       |
+ROW   |1015                    |0       |
+ROW   |1016                    |0       |
+ROW   |1017                    |1       |
+ROW   |1018                    |1       |
+ROW   |1019                    |0       |
+ROW   |1020                    |0       |
+ROW   |1021                    |0       |
+ROW   |1022                    |0       |
+ROW   |1023                    |1       |
+ROW   |1024                    |1       |
+ROW   |1025                    |1       |
+ROW   |1026                    |1       |
+ROW   |1027                    |1       |
+ROW   |1028                    |1       |
+ROW   |1029                    |1       |
+ROW   |1030                    |1       |
+ROW   |1031                    |1       |
+ROW   |1032                    |1       |
+ROW   |1033                    |1       |
+ROW   |1034                    |1       |
+ROW   |1035                    |1       |
+ROW   |1036                    |1       |
+ROW   |1037                    |1       |
+ROW   |1038                    |1       |
+ROW   |1039                    |1       |
+ROW   |1040                    |1       |
+ROW   |1041                    |1       |
+ROW   |1042                    |1       |
+ROW   |1043                    |1       |
+ROW   |1044                    |1       |
+ROW   |1045                    |1       |
+ROW   |1046                    |1       |
+ROW   |1047                    |1       |
+ROW   |1048                    |1       |
+ROW   |1049                    |1       |
+ROW   |1050                    |1       |
+ROW   |1051                    |1       |
+ROW   |1052                    |0       |
+ROW   |1053                    |1       |
+ROW   |1054                    |1       |
+ROW   |1055                    |1       |
+ROW   |1056                    |1       |
+ROW   |1057                    |1       |
+ROW   |1058                    |1       |
+ROW   |1059                    |1       |
+ROW   |1060                    |1       |
+ROW   |1061                    |1       |
+ROW   |1062                    |1       |
+ROW   |1063                    |1       |
+ROW   |1064                    |1       |
+ROW   |1065                    |1       |
+ROW   |1066                    |1       |
+ROW   |1067                    |1       |
+ROW   |1068                    |1       |
+ROW   |1069                    |1       |
+ROW   |1070                    |1       |
+ROW   |1071                    |1       |
+ROW   |1072                    |1       |
+ROW   |1073                    |1       |
+ROW   |1074                    |1       |
+ROW   |1075                    |1       |
+ROW   |1076                    |1       |
+ROW   |1077                    |1       |
+ROW   |1078                    |1       |
+ROW   |1079                    |1       |
+ROW   |1080                    |1       |
+ROW   |1081                    |1       |
+ROW   |1082                    |1       |
+ROW   |1083                    |1       |
+ROW   |1084                    |1       |
+ROW   |1085                    |1       |
+ROW   |1086                    |1       |
+ROW   |1087                    |1       |
+ROW   |1088                    |1       |
+ROW   |1089                    |1       |
 
 TABLE |item_parameter
 FIELDS|item_parameterid|itemid|name        |value                   |
@@ -71593,4 +71619,9 @@ ROW   |11774    |39821 |Application |PostgreSQL
 ROW   |11775    |33178 |Application |PostgreSQL: Application {#APPLICATION_NAME}                    |
 ROW   |11776    |33179 |Application |PostgreSQL: Application {#APPLICATION_NAME}                    |
 ROW   |11777    |33180 |Application |PostgreSQL: Application {#APPLICATION_NAME}                    |
+ROW   |11778    |39822 |Application |Zabbix server                                                  |
+ROW   |11779    |39823 |Application |Zabbix server                                                  |
+ROW   |11780    |39824 |Application |Zabbix server                                                  |
+ROW   |11781    |39825 |Application |Zabbix proxy                                                   |
+ROW   |11782    |39826 |Application |Zabbix proxy                                                   |
 
diff --git a/include/version.h b/include/version.h
index ef22e8f1e67..93ed0e31ce8 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		"13 December 2021"
+#define ZABBIX_REVDATE		"11 January 2022"
 #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	"beta2"
+#define ZABBIX_VERSION_RC	"rc1"
 #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/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss b/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss
new file mode 100755
index 00000000000..8f570c1a4f8
--- /dev/null
+++ b/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss
@@ -0,0 +1,10 @@
+// Widget configuration.
+
+.overlay-dialogue.modal-popup {
+	.dashboard-grid-widget-svggraph {
+		.table-forms-container {
+			border: 1px solid $ui-border-color;
+		}
+	}
+}
+
diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss
index e53369f9a5c..535014f4aec 100644
--- a/sass/stylesheets/sass/screen.scss
+++ b/sass/stylesheets/sass/screen.scss
@@ -43,6 +43,7 @@ $browser-sprite-path: '../img/browser-sprite.png?20211222';
 @import "components/z-select";
 
 @import "components/dashboard/widget-slareport";
+@import "components/dashboard/widget-svggraph";
 
 .link-action {
 	border-bottom: 1px dotted;
@@ -3023,7 +3024,7 @@ $form-icon-btn: (
 			overflow: auto;
 			overflow-x: hidden;
 			width: 100%;
-			max-height: calc(100vh - 190px);
+			max-height: calc(100vh - 220px);
 			max-width: inherit;
 			margin: 0 -10px 8px;
 			padding: 2px 10px;
@@ -3089,22 +3090,27 @@ $form-icon-btn: (
 		}
 	}
 
-	&.sticked-to-top {
-		top: 50px;
-	}
-
 	&.modal-popup {
+		top: 50px;
 		max-width: 1024px;
 
+		&.modal-popup-small {
+			max-width: 450px;
+			width: 100%;
+		}
+
 		&.modal-popup-medium {
 			min-width: 450px;
 		}
 
-		&.modal-popup-small {
-			max-width: 450px;
+		&.modal-popup-large {
 			width: 100%;
 		}
 
+		&.modal-popup-generic {
+			min-width: 650px;
+		}
+
 		&.modal-popup-static {
 			max-width: 700px;
 			width: 100%;
@@ -3113,16 +3119,37 @@ $form-icon-btn: (
 		&.modal-popup-preprocessing {
 			max-width: 900px;
 			width: 100%;
-		}
 
-		&.modal-popup-generic {
-			min-width: 650px;
+			.preprocessing-list .step-name {
+				flex: 0 0 180px;
+			}
+
+			.preprocessing-list {
+				min-width: unset;
+				max-width: unset;
+			}
 		}
 
 		&.modal-popup-fullscreen {
 			width: calc(100vw - 40px);
 			max-width: calc(100vw - 40px);
 		}
+
+		.table-forms-container {
+			border: none;
+		}
+
+		.ui-tabs-nav {
+			position: sticky;
+			top: 0;
+			background: $header-bg-color;
+			z-index: 3;
+		}
+
+		.textarea-flexible {
+			max-height: 200px;
+			overflow-y: auto;
+		}
 	}
 
 	.hintbox-wrap {
diff --git a/src/go/pkg/version/version.go b/src/go/pkg/version/version.go
index 5fc56820b79..c1c01da816a 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -26,11 +26,11 @@ import (
 )
 
 const (
-	ZABBIX_REVDATE          = "13 December 2021"
+	ZABBIX_REVDATE          = "11 January 2022"
 	ZABBIX_VERSION_MAJOR    = 6
 	ZABBIX_VERSION_MINOR    = 0
 	ZABBIX_VERSION_PATCH    = 0
-	ZABBIX_VERSION_RC       = "beta2"
+	ZABBIX_VERSION_RC       = "rc1"
 	ZABBIX_VERSION_RC_NUM   = "{ZABBIX_RC_NUM}"
 	ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}"
 	copyrightMessage        = "Copyright (C) 2022 Zabbix SIA\n" +
diff --git a/src/libs/zbxalgo/algodefs.c b/src/libs/zbxalgo/algodefs.c
index 68fb7c7b898..db2c598f90b 100644
--- a/src/libs/zbxalgo/algodefs.c
+++ b/src/libs/zbxalgo/algodefs.c
@@ -387,8 +387,6 @@ int	next_prime(int n)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_isqrt32                                                      *
- *                                                                            *
  * Purpose: calculate integer part of square root of a 32 bit integer value   *
  *                                                                            *
  * Parameters: value     - [IN] the value to calculate square root for        *
@@ -422,8 +420,6 @@ unsigned int	zbx_isqrt32(unsigned int value)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_gen_uuid4                                                    *
- *                                                                            *
  * Purpose: calculate UUID version 4 as string of 32 symbols                  *
  *                                                                            *
  * Parameters: seed    - [IN] string for seed calculation                     *
diff --git a/src/libs/zbxalgo/evaluate.c b/src/libs/zbxalgo/evaluate.c
index 3d9debc271f..b324a818407 100644
--- a/src/libs/zbxalgo/evaluate.c
+++ b/src/libs/zbxalgo/evaluate.c
@@ -178,8 +178,6 @@ static double	evaluate_number(int *unknown_idx)
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_convert_to_double                                        *
- *                                                                            *
  * Purpose: cast string variant to a double variant                           *
  *                                                                            *
  * Parameters: var - [IN/OUT] the variant to cast                             *
@@ -202,8 +200,6 @@ static void	variant_convert_to_double(zbx_variant_t *var)
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_get_double                                               *
- *                                                                            *
  * Purpose: get variant value in double (float64) format                      *
  *                                                                            *
  * Parameters: var - [IN] the input variant                                   *
@@ -1044,8 +1040,6 @@ int	evaluate(double *value, const char *expression, char *error, size_t max_erro
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_unknown                                                 *
- *                                                                            *
  * Purpose: evaluate an expression like "(26.416>10) and not(0=ZBX_UNKNOWN0)" *
  *                                                                            *
  * Parameters: expression    - [IN]  expression to evaluate                   *
@@ -1096,8 +1090,6 @@ int	evaluate_unknown(const char *expression, double *value, char *error, size_t
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_string_to_double                                        *
- *                                                                            *
  * Purpose: cast string to a double, expand suffixes and parse negative sign  *
  *                                                                            *
  * Parameters: in - [IN] the input string                                     *
diff --git a/src/libs/zbxalgo/hashset.c b/src/libs/zbxalgo/hashset.c
index 5c11d48e9bb..26483122770 100644
--- a/src/libs/zbxalgo/hashset.c
+++ b/src/libs/zbxalgo/hashset.c
@@ -126,8 +126,6 @@ void	zbx_hashset_destroy(zbx_hashset_t *hs)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hashset_reserve                                              *
- *                                                                            *
  * Purpose: allocation not less than the required number of slots for hashset *
  *                                                                            *
  * Parameters: hs            - [IN] the destination hashset                   *
diff --git a/src/libs/zbxalgo/int128.c b/src/libs/zbxalgo/int128.c
index 93134b33b8d..c8b32db7cff 100644
--- a/src/libs/zbxalgo/int128.c
+++ b/src/libs/zbxalgo/int128.c
@@ -26,8 +26,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: udec128_128                                                      *
- *                                                                            *
  * Purpose: Decrement of 128 bit unsigned integer by the specified value.     *
  *                                                                            *
  * Parameters: base   - [IN,OUT] the integer to decrement.                    *
@@ -46,8 +44,6 @@ static void	udec128_128(zbx_uint128_t *base, const zbx_uint128_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: ushiftr128                                                       *
- *                                                                            *
  * Purpose: Logical right shift of 128 bit unsigned integer.                  *
  *                                                                            *
  * Parameters: base  - [IN,OUT] the initial value and result                  *
@@ -74,8 +70,6 @@ static void	ushiftr128(zbx_uint128_t *base, unsigned int bits)
 
 /******************************************************************************
  *                                                                            *
- * Function: ushiftl128                                                       *
- *                                                                            *
  * Purpose: Logical left shift of 128 bit unsigned integer.                   *
  *                                                                            *
  * Parameters: base  - [IN,OUT] the initial value and result                  *
@@ -102,8 +96,6 @@ static void	ushiftl128(zbx_uint128_t *base, unsigned int bits)
 
 /******************************************************************************
  *                                                                            *
- * Function: ucmp128_128                                                      *
- *                                                                            *
  * Purpose: Comparison of two 128 bit unsigned integer values.                *
  *                                                                            *
  * Parameters: value1  - [IN] the first value to compare.                     *
@@ -125,8 +117,6 @@ static int	ucmp128_128(const zbx_uint128_t *value1, const zbx_uint128_t *value2)
 
 /******************************************************************************
  *                                                                            *
- * Function: umul64_32_shift                                                  *
- *                                                                            *
  * Purpose: Multiplication of 64 bit unsigned integer with 32 bit unsigned    *
  *          integer value, shifted left by specified number of bits           *
  *                                                                            *
@@ -154,8 +144,6 @@ static void	umul64_32_shift(zbx_uint128_t *base, zbx_uint64_t value, zbx_uint64_
 
 /******************************************************************************
  *                                                                            *
- * Function: uinc128_64                                                       *
- *                                                                            *
  * Purpose: Increment of 128 bit unsigned integer by the specified 64 bit     *
  *          value.                                                            *
  *                                                                            *
@@ -175,8 +163,6 @@ void	uinc128_64(zbx_uint128_t *base, zbx_uint64_t value)
 
 /******************************************************************************
  *                                                                            *
- * Function: uinc128_128                                                      *
- *                                                                            *
  * Purpose: Increment of 128 bit unsigned integer by the specified 128 bit    *
  *          value                                                             *
  *                                                                            *
@@ -197,8 +183,6 @@ void	uinc128_128(zbx_uint128_t *base, const zbx_uint128_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: umul64_64                                                        *
- *                                                                            *
  * Purpose: Multiplication of two 64 bit unsigned integer values.             *
  *                                                                            *
  * Parameters: result - [OUT] the resulting 128 bit unsigned integer value    *
@@ -217,8 +201,6 @@ void	umul64_64(zbx_uint128_t *result, zbx_uint64_t value, zbx_uint64_t factor)
 
 /******************************************************************************
  *                                                                            *
- * Function: udiv128_64                                                       *
- *                                                                            *
  * Purpose: Division of 128 bit unsigned integer by a 64 bit unsigned integer *
  *          value.                                                            *
  *                                                                            *
diff --git a/src/libs/zbxalgo/linked_list.c b/src/libs/zbxalgo/linked_list.c
index a128a403ac6..b75bc1b8132 100644
--- a/src/libs/zbxalgo/linked_list.c
+++ b/src/libs/zbxalgo/linked_list.c
@@ -22,8 +22,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_create_ext                                              *
- *                                                                            *
  * Purpose: create singly linked list (with custom memory functions)          *
  *                                                                            *
  * Parameters: queue           - [IN] the list                                *
@@ -41,8 +39,6 @@ void	zbx_list_create_ext(zbx_list_t *queue, zbx_mem_malloc_func_t mem_malloc_fun
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_create                                                  *
- *                                                                            *
  * Purpose: create singly linked list                                         *
  *                                                                            *
  * Parameters: queue - [IN] the list                                          *
@@ -55,8 +51,6 @@ void	zbx_list_create(zbx_list_t *queue)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_destroy                                                 *
- *                                                                            *
  * Purpose: destroy list                                                      *
  *                                                                            *
  * Parameters: list - [IN] the list                                           *
@@ -70,8 +64,6 @@ void	zbx_list_destroy(zbx_list_t *list)
 
 /******************************************************************************
  *                                                                            *
- * Function: list_create_item                                                 *
- *                                                                            *
  * Purpose: allocate memory and initialize a new list item                    *
  *                                                                            *
  * Parameters: list     - [IN] the list                                       *
@@ -94,8 +86,6 @@ static void	list_create_item(zbx_list_t *list, void *value, zbx_list_item_t **cr
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_insert_after                                            *
- *                                                                            *
  * Purpose: insert value after specified position in the list                 *
  *                                                                            *
  * Parameters: list     - [IN] the list                                       *
@@ -133,8 +123,6 @@ void	zbx_list_insert_after(zbx_list_t *list, zbx_list_item_t *after, void *value
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_append                                                  *
- *                                                                            *
  * Purpose: append value to the end of the list                               *
  *                                                                            *
  * Parameters: list     - [IN] the list                                       *
@@ -149,8 +137,6 @@ void	zbx_list_append(zbx_list_t *list, void *value, zbx_list_item_t **inserted)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_prepend                                                 *
- *                                                                            *
  * Purpose: prepend value to the beginning of the list                        *
  *                                                                            *
  * Parameters: list     - [IN] the list                                       *
@@ -175,8 +161,6 @@ void	zbx_list_prepend(zbx_list_t *list, void *value, zbx_list_item_t **inserted)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_pop                                                     *
- *                                                                            *
  * Purpose: removes a value from the beginning of the list                    *
  *                                                                            *
  * Parameters: list  - [IN]  the list                                         *
@@ -209,8 +193,6 @@ int	zbx_list_pop(zbx_list_t *list, void **value)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_peek                                                    *
- *                                                                            *
  * Purpose: get value from the queue without dequeuing                        *
  *                                                                            *
  * Parameters: list  - [IN]  the list                                         *
@@ -233,8 +215,6 @@ int	zbx_list_peek(const zbx_list_t *list, void **value)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_iterator_init                                           *
- *                                                                            *
  * Purpose: initialize list iterator                                          *
  *                                                                            *
  * Parameters: list     - [IN]  the list                                      *
@@ -250,8 +230,6 @@ void	zbx_list_iterator_init(zbx_list_t *list, zbx_list_iterator_t *iterator)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_iterator_next                                           *
- *                                                                            *
  * Purpose: advance list iterator                                             *
  *                                                                            *
  * Parameters: iterator - [IN] the iterator to be advanced                    *
@@ -275,8 +253,6 @@ int	zbx_list_iterator_next(zbx_list_iterator_t *iterator)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_iterator_peek                                           *
- *                                                                            *
  * Purpose: get value without removing it from list                           *
  *                                                                            *
  * Parameters: iterator - [IN]  initialized list iterator                     *
@@ -299,8 +275,6 @@ int	zbx_list_iterator_peek(const zbx_list_iterator_t *iterator, void **value)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_iterator_clear                                          *
- *                                                                            *
  * Purpose: clears iterator leaving it in uninitialized state                 *
  *                                                                            *
  * Parameters: iterator - [IN]  list iterator                                 *
@@ -313,8 +287,6 @@ void	zbx_list_iterator_clear(zbx_list_iterator_t *iterator)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_iterator_equal                                          *
- *                                                                            *
  * Purpose: tests if two iterators points at the same list item               *
  *                                                                            *
  * Parameters: iterator1 - [IN] first list iterator                           *
@@ -334,8 +306,6 @@ int	zbx_list_iterator_equal(const zbx_list_iterator_t *iterator1, const zbx_list
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_iterator_isset                                          *
- *                                                                            *
  * Purpose: checks if the iterator points at some list item                   *
  *                                                                            *
  * Parameters: iterator - [IN] list iterator                                  *
@@ -350,8 +320,6 @@ int	zbx_list_iterator_isset(const zbx_list_iterator_t *iterator)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_list_iterator_update                                         *
- *                                                                            *
  * Purpose: updates iterator                                                  *
  *                                                                            *
  * Parameters: iterator - [IN] list iterator                                  *
diff --git a/src/libs/zbxalgo/queue.c b/src/libs/zbxalgo/queue.c
index 7ec33ad311f..3ae69e445e4 100644
--- a/src/libs/zbxalgo/queue.c
+++ b/src/libs/zbxalgo/queue.c
@@ -22,8 +22,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_queue_ptr_values_num                                         *
- *                                                                            *
  * Purpose: calculates the number of values in queue                          *
  *                                                                            *
  * Parameters: queue - [IN] the queue                                         *
@@ -44,8 +42,6 @@ int	zbx_queue_ptr_values_num(zbx_queue_ptr_t *queue)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_queue_ptr_reserve                                            *
- *                                                                            *
  * Purpose: reserves space in queue for additional values                     *
  *                                                                            *
  * Parameters: queue - [IN] the queue                                         *
@@ -77,8 +73,6 @@ void	zbx_queue_ptr_reserve(zbx_queue_ptr_t *queue, int num)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_queue_ptr_compact                                            *
- *                                                                            *
  * Purpose: compacts queue by freeing unused space                            *
  *                                                                            *
  * Parameters: queue - [IN] the queue                                         *
@@ -116,8 +110,6 @@ void	zbx_queue_ptr_compact(zbx_queue_ptr_t *queue)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_queue_ptr_create                                             *
- *                                                                            *
  * Purpose: creates queue                                                     *
  *                                                                            *
  * Parameters: queue - [IN] the queue                                         *
@@ -130,8 +122,6 @@ void	zbx_queue_ptr_create(zbx_queue_ptr_t *queue)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_queue_ptr_destroy                                            *
- *                                                                            *
  * Purpose: destroys queue                                                    *
  *                                                                            *
  * Parameters: queue - [IN] the queue                                         *
@@ -144,8 +134,6 @@ void	zbx_queue_ptr_destroy(zbx_queue_ptr_t *queue)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_queue_ptr_push                                               *
- *                                                                            *
  * Purpose: pushes value in the queue                                         *
  *                                                                            *
  * Parameters: queue - [IN] the queue                                         *
@@ -163,8 +151,6 @@ void	zbx_queue_ptr_push(zbx_queue_ptr_t *queue, void *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_queue_ptr_pop                                                *
- *                                                                            *
  * Purpose: pops value in the queue                                           *
  *                                                                            *
  * Parameters: queue - [IN] the queue                                         *
@@ -194,8 +180,6 @@ void	*zbx_queue_ptr_pop(zbx_queue_ptr_t *queue)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_queue_ptr_remove_value                                       *
- *                                                                            *
  * Purpose: removes specified value from queue                                *
  *                                                                            *
  * Parameters: queue - [IN] the queue                                         *
diff --git a/src/libs/zbxalgo/serialize.c b/src/libs/zbxalgo/serialize.c
index c7a7954f59b..9bc16836bcc 100644
--- a/src/libs/zbxalgo/serialize.c
+++ b/src/libs/zbxalgo/serialize.c
@@ -21,8 +21,6 @@
 #include "zbxserialize.h"
 /******************************************************************************
  *                                                                            *
- * Function: zbx_serialize_uint31_compact                                     *
- *                                                                            *
  * Purpose: serialize 31 bit unsigned integer into utf-8 like byte stream     *
  *                                                                            *
  * Parameters: ptr   - [OUT] the output buffer                                *
@@ -63,8 +61,6 @@ zbx_uint32_t	zbx_serialize_uint31_compact(unsigned char *ptr, zbx_uint32_t value
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_deserialize_uint31_compact                                   *
- *                                                                            *
  * Purpose: deserialize 31 bit unsigned integer from utf-8 like byte stream   *
  *                                                                            *
  * Parameters: ptr   - [IN] the byte stream                                   *
diff --git a/src/libs/zbxaudit/audit.c b/src/libs/zbxaudit/audit.c
index ef6fc690885..a6abc11164d 100644
--- a/src/libs/zbxaudit/audit.c
+++ b/src/libs/zbxaudit/audit.c
@@ -160,8 +160,6 @@ static void	delete_json(struct zbx_json *json, const char *audit_op, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_auditlog_global_script                                       *
- *                                                                            *
  * Purpose: record global script execution results into audit log             *
  *                                                                            *
  * Comments: 'hostid' should be always > 0. 'eventid' is > 0 in case of       *
diff --git a/src/libs/zbxaudit/audit_item.c b/src/libs/zbxaudit/audit_item.c
index 46cd0c805bf..07149d1586b 100644
--- a/src/libs/zbxaudit/audit_item.c
+++ b/src/libs/zbxaudit/audit_item.c
@@ -366,8 +366,6 @@ PREPARE_AUDIT_ITEM_UPDATE(key,			const char*,	string)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_audit_item_create_entry_for_delete                           *
- *                                                                            *
  * Parameters: id   - [IN] resource id                                        *
  *             name - [IN] resource name                                      *
  *             flag - [IN] resource flag                                      *
@@ -402,8 +400,6 @@ void	zbx_audit_item_create_entry_for_delete(zbx_uint64_t id, const char *name, i
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_audit_DBselect_delete_for_item                               *
- *                                                                            *
  * Parameters: sql - [IN] sql statement                                       *
  *             ids - [OUT] sorted list of selected uint64 values              *
  *                                                                            *
diff --git a/src/libs/zbxaudit/audit_trigger.c b/src/libs/zbxaudit/audit_trigger.c
index 97a0d2055c4..08227bf9921 100644
--- a/src/libs/zbxaudit/audit_trigger.c
+++ b/src/libs/zbxaudit/audit_trigger.c
@@ -216,8 +216,6 @@ PREPARE_AUDIT_TRIGGER_UPDATE(recovery_expression, const char*, string)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_audit_DBselect_delete_for_trigger                            *
- *                                                                            *
  * Parameters: sql - [IN] sql statement                                       *
  *             ids - [OUT] sorted list of selected uint64 values              *
  *                                                                            *
diff --git a/src/libs/zbxcommon/comms.c b/src/libs/zbxcommon/comms.c
index 08c36f6cd14..ba3277885a4 100644
--- a/src/libs/zbxcommon/comms.c
+++ b/src/libs/zbxcommon/comms.c
@@ -113,14 +113,10 @@ int	comms_parse_response(char *xml, char *host, size_t host_len, char *key, size
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_htole_uint64                                                 *
- *                                                                            *
  * Purpose: convert unsigned integer 64 bit                                   *
  *          from host byte order                                              *
  *          to little-endian byte order format                                *
  *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
  * Return value: unsigned integer 64 bit in little-endian byte order format   *
  *                                                                            *
  ******************************************************************************/
@@ -144,14 +140,10 @@ zbx_uint64_t	zbx_htole_uint64(zbx_uint64_t data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_letoh_uint64                                                 *
- *                                                                            *
  * Purpose: convert unsigned integer 64 bit                                   *
  *          from little-endian byte order format                              *
  *          to host byte order                                                *
  *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
  * Return value: unsigned integer 64 bit in host byte order                   *
  *                                                                            *
  ******************************************************************************/
@@ -175,14 +167,10 @@ zbx_uint64_t	zbx_letoh_uint64(zbx_uint64_t data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_htole_uint32                                                 *
- *                                                                            *
  * Purpose: convert unsigned integer 32 bit                                   *
  *          from host byte order                                              *
  *          to little-endian byte order format                                *
  *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
  * Return value: unsigned integer 32 bit in little-endian byte order format   *
  *                                                                            *
  ******************************************************************************/
@@ -202,14 +190,10 @@ zbx_uint32_t	zbx_htole_uint32(zbx_uint32_t data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_letoh_uint32                                                 *
- *                                                                            *
  * Purpose: convert unsigned integer 32 bit                                   *
  *          from little-endian byte order format                              *
  *          to host byte order                                                *
  *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
  * Return value: unsigned integer 32 bit in host byte order                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxcommon/cuid.c b/src/libs/zbxcommon/cuid.c
index 104cf4f2e3a..acb54446148 100644
--- a/src/libs/zbxcommon/cuid.c
+++ b/src/libs/zbxcommon/cuid.c
@@ -44,8 +44,6 @@ static char	host_block[HOST_TMP_36_BASE_BUF_LEN];
 
 /******************************************************************************
  *                                                                            *
- * Function: pad                                                              *
- *                                                                            *
  * Purpose: modify string in-place to the specified length as required by     *
  *          CUID algorithm                                                    *
  *                                                                            *
@@ -128,8 +126,6 @@ static void	from_decimal(char *res, size_t base, size_t input_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_cuid_init                                                    *
- *                                                                            *
  * Purpose: initializes context for the cuid generation                       *
  *                                                                            *
  ******************************************************************************/
@@ -176,8 +172,6 @@ static size_t	next(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_new_cuid                                                     *
- *                                                                            *
  * Purpose: generates cuid, is based on the go cuid implementation from       *
  *          https://github.com/lucsky/cuid/blob/master/cuid.go                *
  *          consider using mutexes around it if used inside threads           *
diff --git a/src/libs/zbxcommon/file.c b/src/libs/zbxcommon/file.c
index 09bf3af0bd5..334cf488e20 100644
--- a/src/libs/zbxcommon/file.c
+++ b/src/libs/zbxcommon/file.c
@@ -80,8 +80,6 @@ void	find_cr_lf_szbyte(const char *encoding, const char **cr, const char **lf, s
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_read                                                         *
- *                                                                            *
  * Purpose: Read one text line from a file descriptor into buffer             *
  *                                                                            *
  * Parameters: fd       - [IN] file descriptor to read from                   *
@@ -189,8 +187,6 @@ char	*zbx_fgets(char *buffer, int size, FILE *fp)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_write_all                                                    *
- *                                                                            *
  * Purpose: call write in a loop, iterating until all the data is written.    *
  *                                                                            *
  * Parameters: fd      - [IN] descriptor                                      *
diff --git a/src/libs/zbxcommon/iprange.c b/src/libs/zbxcommon/iprange.c
index 3db99bc6748..ba99e1c1f41 100644
--- a/src/libs/zbxcommon/iprange.c
+++ b/src/libs/zbxcommon/iprange.c
@@ -21,8 +21,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: iprange_is_whitespace_character                                  *
- *                                                                            *
  * Purpose: checks if the specified character is allowed whitespace character *
  *          that can be used before or after iprange definition               *
  *                                                                            *
@@ -48,8 +46,6 @@ static int	iprange_is_whitespace_character(unsigned char value)
 
 /******************************************************************************
  *                                                                            *
- * Function: iprange_address_length                                           *
- *                                                                            *
  * Purpose: calculates the length of address data without trailing whitespace *
  *                                                                            *
  ******************************************************************************/
@@ -72,8 +68,6 @@ static size_t	iprange_address_length(const char *address)
 
 /******************************************************************************
  *                                                                            *
- * Function: iprange_apply_mask                                               *
- *                                                                            *
  * Purpose: applies a bit mask to the parsed v4 or v6 IP range                *
  *                                                                            *
  * Parameters: iprange - [IN] the IP range                                    *
@@ -119,8 +113,6 @@ static void	iprange_apply_mask(zbx_iprange_t *iprange, int bits)
 
 /******************************************************************************
  *                                                                            *
- * Function: iprangev4_parse                                                  *
- *                                                                            *
  * Purpose: parse IPv4 address into IP range structure                        *
  *                                                                            *
  * Parameters: iprange - [OUT] the IP range                                   *
@@ -213,8 +205,6 @@ static int	iprangev4_parse(zbx_iprange_t *iprange, const char *address)
 
 /******************************************************************************
  *                                                                            *
- * Function: iprangev6_parse                                                  *
- *                                                                            *
  * Purpose: parse IPv6 address into IP range structure                        *
  *                                                                            *
  * Parameters: iprange - [OUT] the IP range                                   *
@@ -349,8 +339,6 @@ check_fill:
 
 /******************************************************************************
  *                                                                            *
- * Function: iprange_parse                                                    *
- *                                                                            *
  * Purpose: parse IP address (v4 or v6) into IP range structure               *
  *                                                                            *
  * Parameters: iprange - [OUT] the IP range                                   *
@@ -376,8 +364,6 @@ int	iprange_parse(zbx_iprange_t *iprange, const char *address)
 
 /******************************************************************************
  *                                                                            *
- * Function: iprange_first                                                    *
- *                                                                            *
  * Purpose: gets the first IP address from the specified range                *
  *                                                                            *
  * Parameters: iprange - [IN] the IP range                                    *
@@ -403,8 +389,6 @@ void	iprange_first(const zbx_iprange_t *iprange, int *address)
 
 /******************************************************************************
  *                                                                            *
- * Function: iprange_next                                                     *
- *                                                                            *
  * Purpose: gets the next IP address from the specified range                 *
  *                                                                            *
  * Parameters: iprange - [IN] the IP range                                    *
@@ -454,8 +438,6 @@ int	iprange_next(const zbx_iprange_t *iprange, int *address)
 
 /******************************************************************************
  *                                                                            *
- * Function: iprange_validate                                                 *
- *                                                                            *
  * Purpose: checks if the IP address is in specified range                    *
  *                                                                            *
  * Parameters: iprange - [IN] the IP range                                    *
@@ -483,8 +465,6 @@ int	iprange_validate(const zbx_iprange_t *iprange, const int *address)
 
 /******************************************************************************
  *                                                                            *
- * Function: iprange_volume                                                   *
- *                                                                            *
  * Purpose: get the number of addresses covered by the specified IP range     *
  *                                                                            *
  * Parameters: iprange - [IN] the IP range                                    *
diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c
index 4591d082ecf..e44fc1fe0ad 100644
--- a/src/libs/zbxcommon/misc.c
+++ b/src/libs/zbxcommon/misc.c
@@ -126,12 +126,8 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_program_name                                                 *
- *                                                                            *
  * Purpose: return program name without path                                  *
  *                                                                            *
- * Parameters: path                                                           *
- *                                                                            *
  * Return value: program name without path                                    *
  *                                                                            *
  ******************************************************************************/
@@ -150,8 +146,6 @@ const char	*get_program_name(const char *path)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_timespec                                                     *
- *                                                                            *
  * Purpose: Gets the current time.                                            *
  *                                                                            *
  * Comments: Time in seconds since midnight (00:00:00),                       *
@@ -271,8 +265,6 @@ void	zbx_timespec(zbx_timespec_t *ts)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_time                                                         *
- *                                                                            *
  * Purpose: Gets the current time.                                            *
  *                                                                            *
  * Return value: Time in seconds                                              *
@@ -292,8 +284,6 @@ double	zbx_time(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_current_time                                                 *
- *                                                                            *
  * Purpose: Gets the current time including UTC offset                        *
  *                                                                            *
  * Return value: Time in seconds                                              *
@@ -306,8 +296,6 @@ double	zbx_current_time(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_is_leap_year                                                 *
- *                                                                            *
  * Return value:  SUCCEED - year is a leap year                               *
  *                FAIL    - year is not a leap year                           *
  *                                                                            *
@@ -319,8 +307,6 @@ int	zbx_is_leap_year(int year)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_time                                                     *
- *                                                                            *
  * Purpose:                                                                   *
  *     get current time and store it in memory locations provided by caller   *
  *                                                                            *
@@ -370,8 +356,6 @@ void	zbx_get_time(struct tm *tm, long *milliseconds, zbx_timezone_t *tz)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_timezone_offset                                          *
- *                                                                            *
  * Purpose: get time offset from UTC                                          *
  *                                                                            *
  * Parameters: t  - [IN] input time to calculate offset with                  *
@@ -413,8 +397,6 @@ long	zbx_get_timezone_offset(time_t t, struct tm *tm)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_localtime                                                    *
- *                                                                            *
  * Purpose: get broken-down representation of the time in specified time zone *
  *                                                                            *
  * Parameters: time - [IN] input time                                         *
@@ -460,8 +442,6 @@ struct tm	*zbx_localtime(const time_t *time, const char *tz)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_utc_time                                                     *
- *                                                                            *
  * Purpose: get UTC time from time from broken down time elements             *
  *                                                                            *
  * Parameters:                                                                *
@@ -501,12 +481,10 @@ int	zbx_utc_time(int year, int mon, int mday, int hour, int min, int sec, int *t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_day_in_month                                                 *
- *                                                                            *
  * Purpose: returns number of days in a month                                 *
  *                                                                            *
  * Parameters:                                                                *
- *     year  - [IN] year                                                      *
+ *     year  - [IN]                                                           *
  *     mon   - [IN] month (1-12)                                              *
  *                                                                            *
  * Return value: 28-31 depending on number of days in the month, defaults to  *
@@ -526,12 +504,10 @@ int	zbx_day_in_month(int year, int mon)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_duration_ms                                              *
- *                                                                            *
  * Purpose: get duration in milliseconds since time stamp till current time   *
  *                                                                            *
  * Parameters:                                                                *
- *     start_time - [IN] time from when duration should be counted            *
+ *     ts - [IN] time from when duration should be counted                    *
  *                                                                            *
  * Return value: duration in milliseconds since time stamp till current time  *
  *                                                                            *
@@ -547,8 +523,6 @@ zbx_uint64_t	zbx_get_duration_ms(const zbx_timespec_t *ts)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_calloc2                                                      *
- *                                                                            *
  * Purpose: allocates nmemb * size bytes of memory and fills it with zeros    *
  *                                                                            *
  * Return value: returns a pointer to the newly allocated memory              *
@@ -584,8 +558,6 @@ void	*zbx_calloc2(const char *filename, int line, void *old, size_t nmemb, size_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_malloc2                                                      *
- *                                                                            *
  * Purpose: allocates size bytes of memory                                    *
  *                                                                            *
  * Return value: returns a pointer to the newly allocated memory              *
@@ -621,8 +593,6 @@ void	*zbx_malloc2(const char *filename, int line, void *old, size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_realloc2                                                     *
- *                                                                            *
  * Purpose: changes the size of the memory block pointed to by old            *
  *          to size bytes                                                     *
  *                                                                            *
@@ -670,8 +640,6 @@ char	*zbx_strdup2(const char *filename, int line, char *old, const char *str)
 
 /****************************************************************************************
  *                                                                                      *
- * Function: zbx_guaranteed_memset                                                      *
- *                                                                                      *
  * Purpose: For overwriting sensitive data in memory.                                   *
  *          Similar to memset() but should not be optimized out by a compiler.          *
  *                                                                                      *
@@ -693,8 +661,6 @@ void	*zbx_guaranteed_memset(void *v, int c, size_t n)
 
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_zbx_setproctitle                                           *
- *                                                                            *
  * Purpose: set process title                                                 *
  *                                                                            *
  ******************************************************************************/
@@ -720,8 +686,6 @@ void	zbx_setproctitle(const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: check_time_period                                                *
- *                                                                            *
  * Purpose: check if current time is within given period                      *
  *                                                                            *
  * Parameters: period - [IN] preprocessed time period                         *
@@ -743,8 +707,6 @@ static int	check_time_period(const zbx_time_period_t period, struct tm *tm)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_current_delay                                                *
- *                                                                            *
  * Purpose: return delay value that is currently applicable                   *
  *                                                                            *
  * Parameters: default_delay  - [IN] default delay value, can be overridden   *
@@ -775,8 +737,6 @@ static int	get_current_delay(int default_delay, const zbx_flexible_interval_t *f
 
 /******************************************************************************
  *                                                                            *
- * Function: get_next_delay_interval                                          *
- *                                                                            *
  * Purpose: return time when next delay settings take effect                  *
  *                                                                            *
  * Parameters: flex_intervals - [IN] preprocessed flexible intervals          *
@@ -833,8 +793,6 @@ static int	get_next_delay_interval(const zbx_flexible_interval_t *flex_intervals
 
 /******************************************************************************
  *                                                                            *
- * Function: time_parse                                                       *
- *                                                                            *
  * Purpose: parses time of day                                                *
  *                                                                            *
  * Parameters: time       - [OUT] number of seconds since the beginning of    *
@@ -885,8 +843,6 @@ static int	time_parse(int *time, const char *text, int len, int *parsed_len)
 
 /******************************************************************************
  *                                                                            *
- * Function: time_period_parse                                                *
- *                                                                            *
  * Purpose: parses time period                                                *
  *                                                                            *
  * Parameters: period - [OUT] time period structure                           *
@@ -954,8 +910,6 @@ static int	time_period_parse(zbx_time_period_t *period, const char *text, int le
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_time_period                                            *
- *                                                                            *
  * Purpose: validate time period and check if specified time is within it     *
  *                                                                            *
  * Parameters: period - [IN] semicolon-separated list of time periods in one  *
@@ -1002,8 +956,6 @@ int	zbx_check_time_period(const char *period, time_t time, const char *tz, int *
 
 /******************************************************************************
  *                                                                            *
- * Function: flexible_interval_free                                           *
- *                                                                            *
  * Purpose: frees flexible interval                                           *
  *                                                                            *
  * Parameters: interval - [IN] flexible interval                              *
@@ -1022,8 +974,6 @@ static void	flexible_interval_free(zbx_flexible_interval_t *interval)
 
 /******************************************************************************
  *                                                                            *
- * Function: flexible_interval_parse                                          *
- *                                                                            *
  * Purpose: parses flexible interval                                          *
  *                                                                            *
  * Parameters: interval - [IN/OUT] the first interval                         *
@@ -1055,8 +1005,6 @@ static int	flexible_interval_parse(zbx_flexible_interval_t *interval, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: calculate_dayofweek                                              *
- *                                                                            *
  * Purpose: calculates day of week                                            *
  *                                                                            *
  * Parameters: year - [IN] the year (>1752)                                   *
@@ -1078,8 +1026,6 @@ static int	calculate_dayofweek(int year, int mon, int mday)
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_filter_free                                            *
- *                                                                            *
  * Purpose: frees scheduler interval filter                                   *
  *                                                                            *
  * Parameters: filter - [IN] scheduler interval filter                        *
@@ -1098,8 +1044,6 @@ static void	scheduler_filter_free(zbx_scheduler_filter_t *filter)
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_interval_free                                          *
- *                                                                            *
  * Purpose: frees scheduler interval                                          *
  *                                                                            *
  * Parameters: interval - [IN] scheduler interval                             *
@@ -1125,8 +1069,6 @@ static void	scheduler_interval_free(zbx_scheduler_interval_t *interval)
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_parse_filter_r                                         *
- *                                                                            *
  * Purpose: parses text string into scheduler filter                          *
  *                                                                            *
  * Parameters: filter  - [IN/OUT] the first filter                            *
@@ -1249,8 +1191,6 @@ static int	scheduler_parse_filter_r(zbx_scheduler_filter_t **filter, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_parse_filter                                           *
- *                                                                            *
  * Purpose: parses text string into scheduler filter                          *
  *                                                                            *
  * Parameters: filter  - [IN/OUT] the first filter                            *
@@ -1281,8 +1221,6 @@ static int	scheduler_parse_filter(zbx_scheduler_filter_t **filter, const char *t
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_interval_parse                                         *
- *                                                                            *
  * Purpose: parses scheduler interval                                         *
  *                                                                            *
  * Parameters: interval - [IN/OUT] the first interval                         *
@@ -1371,8 +1309,6 @@ static int	scheduler_interval_parse(zbx_scheduler_interval_t *interval, const ch
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_get_nearest_filter_value                               *
- *                                                                            *
  * Purpose: gets the next nearest value that satisfies the filter chain       *
  *                                                                            *
  * Parameters: filter - [IN] the filter chain                                 *
@@ -1424,8 +1360,6 @@ static int	scheduler_get_nearest_filter_value(const zbx_scheduler_filter_t *filt
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_get_wday_nextcheck                                     *
- *                                                                            *
  * Purpose: calculates the next day that satisfies the week day filter        *
  *                                                                            *
  * Parameters: interval - [IN] the scheduler interval                         *
@@ -1469,8 +1403,6 @@ static int	scheduler_get_wday_nextcheck(const zbx_scheduler_interval_t *interval
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_validate_wday_filter                                   *
- *                                                                            *
  * Purpose: checks if the specified date satisfies week day filter            *
  *                                                                            *
  * Parameters: interval - [IN] the scheduler interval                         *
@@ -1513,8 +1445,6 @@ static int	scheduler_validate_wday_filter(const zbx_scheduler_interval_t *interv
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_get_day_nextcheck                                      *
- *                                                                            *
  * Purpose: calculates the next day that satisfies month and week day filters *
  *                                                                            *
  * Parameters: interval - [IN] the scheduler interval                         *
@@ -1561,8 +1491,6 @@ static int	scheduler_get_day_nextcheck(const zbx_scheduler_interval_t *interval,
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_get_filter_nextcheck                                   *
- *                                                                            *
  * Purpose: calculates the time/day that satisfies the specified filter       *
  *                                                                            *
  * Parameters: interval - [IN] the scheduler interval                         *
@@ -1628,8 +1556,6 @@ static int	scheduler_get_filter_nextcheck(const zbx_scheduler_interval_t *interv
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_apply_day_filter                                       *
- *                                                                            *
  * Purpose: applies day filter to the specified time/day calculating the next *
  *          scheduled check                                                   *
  *                                                                            *
@@ -1663,8 +1589,6 @@ static void	scheduler_apply_day_filter(zbx_scheduler_interval_t *interval, struc
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_apply_hour_filter                                      *
- *                                                                            *
  * Purpose: applies hour filter to the specified time/day calculating the     *
  *          next scheduled check                                              *
  *                                                                            *
@@ -1695,8 +1619,6 @@ static void	scheduler_apply_hour_filter(zbx_scheduler_interval_t *interval, stru
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_apply_minute_filter                                    *
- *                                                                            *
  * Purpose: applies minute filter to the specified time/day calculating the   *
  *          next scheduled check                                              *
  *                                                                            *
@@ -1724,8 +1646,6 @@ static void	scheduler_apply_minute_filter(zbx_scheduler_interval_t *interval, st
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_apply_second_filter                                    *
- *                                                                            *
  * Purpose: applies second filter to the specified time/day calculating the   *
  *          next scheduled check                                              *
  *                                                                            *
@@ -1747,8 +1667,6 @@ static void	scheduler_apply_second_filter(zbx_scheduler_interval_t *interval, st
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_find_dst_change                                        *
- *                                                                            *
  * Purpose: finds daylight saving change time inside specified time period    *
  *                                                                            *
  * Parameters: time_start - [IN] the time period start                        *
@@ -1797,8 +1715,6 @@ static time_t	scheduler_find_dst_change(time_t time_start, time_t time_end)
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_tm_inc                                                 *
- *                                                                            *
  * Purpose: increment struct tm value by one second                           *
  *                                                                            *
  * Parameters: tm - [IN/OUT] the tm structure to increment                    *
@@ -1832,8 +1748,6 @@ static void	scheduler_tm_inc(struct tm *tm)
 
 /******************************************************************************
  *                                                                            *
- * Function: scheduler_get_nextcheck                                          *
- *                                                                            *
  * Purpose: finds the next timestamp satisfying one of intervals.             *
  *                                                                            *
  * Parameters: interval - [IN] the scheduler interval                         *
@@ -1892,8 +1806,6 @@ static time_t	scheduler_get_nextcheck(zbx_scheduler_interval_t *interval, time_t
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_user_macro                                                 *
- *                                                                            *
  * Purpose: parses user macro and finds it's length                           *
  *                                                                            *
  * Parameters: str  - [IN] string to check                                    *
@@ -1922,8 +1834,6 @@ static int	parse_user_macro(const char *str, int *len)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_simple_interval                                            *
- *                                                                            *
  * Purpose: parses user macro and finds it's length                           *
  *                                                                            *
  * Parameters: str   - [IN] string to check                                   *
@@ -1954,8 +1864,6 @@ static int	parse_simple_interval(const char *str, int *len, char sep, int *value
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_validate_interval                                            *
- *                                                                            *
  * Purpose: validate update interval, flexible and scheduling intervals       *
  *                                                                            *
  * Parameters: str   - [IN] string to check                                   *
@@ -2075,8 +1983,6 @@ int	zbx_validate_interval(const char *str, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_interval_preproc                                             *
- *                                                                            *
  * Purpose: parses item and low-level discovery rule update intervals         *
  *                                                                            *
  * Parameters: interval_str     - [IN] update interval string to parse        *
@@ -2179,8 +2085,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_custom_interval_free                                         *
- *                                                                            *
  * Purpose: frees custom update intervals                                     *
  *                                                                            *
  * Parameters: custom_intervals - [IN] custom intervals                       *
@@ -2195,8 +2099,6 @@ void	zbx_custom_interval_free(zbx_custom_interval_t *custom_intervals)
 
 /******************************************************************************
  *                                                                            *
- * Function: calculate_item_nextcheck                                         *
- *                                                                            *
  * Purpose: calculate nextcheck timestamp for item                            *
  *                                                                            *
  * Parameters: seed             - [IN] the seed value applied to delay to     *
@@ -2296,8 +2198,6 @@ int	calculate_item_nextcheck(zbx_uint64_t seed, int item_type, int simple_interv
 }
 /******************************************************************************
  *                                                                            *
- * Function: calculate_item_nextcheck_unreachable                             *
- *                                                                            *
  * Purpose: calculate nextcheck timestamp for item on unreachable host        *
  *                                                                            *
  * Parameters: simple_interval  - [IN] default delay value, can be overridden *
@@ -2348,8 +2248,6 @@ int	calculate_item_nextcheck_unreachable(int simple_interval, const zbx_custom_i
 }
 /******************************************************************************
  *                                                                            *
- * Function: calculate_proxy_nextcheck                                        *
- *                                                                            *
  * Purpose: calculate nextcheck timestamp for passive proxy                   *
  *                                                                            *
  * Parameters: hostid - [IN] host identifier from database                    *
@@ -2373,8 +2271,6 @@ time_t	calculate_proxy_nextcheck(zbx_uint64_t hostid, unsigned int delay, time_t
 
 /******************************************************************************
  *                                                                            *
- * Function: is_ip4                                                           *
- *                                                                            *
  * Purpose: is string IPv4 address                                            *
  *                                                                            *
  * Parameters: ip - string                                                    *
@@ -2424,8 +2320,6 @@ int	is_ip4(const char *ip)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_ip6                                                           *
- *                                                                            *
  * Purpose: is string IPv6 address                                            *
  *                                                                            *
  * Parameters: ip - string                                                    *
@@ -2488,8 +2382,6 @@ int	is_ip6(const char *ip)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_supported_ip                                                  *
- *                                                                            *
  * Purpose: is string IP address of supported version                         *
  *                                                                            *
  * Parameters: ip - string                                                    *
@@ -2511,8 +2403,6 @@ int	is_supported_ip(const char *ip)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_ip                                                            *
- *                                                                            *
  * Purpose: is string IP address                                              *
  *                                                                            *
  * Parameters: ip - string                                                    *
@@ -2528,8 +2418,6 @@ int	is_ip(const char *ip)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_validate_hostname                                            *
- *                                                                            *
  * Purpose: check if string is a valid internet hostname                      *
  *                                                                            *
  * Parameters: hostname - [IN] hostname string to be checked                  *
@@ -2573,8 +2461,6 @@ int	zbx_validate_hostname(const char *hostname)
 
 /******************************************************************************
  *                                                                            *
- * Function: ip_in_list                                                       *
- *                                                                            *
  * Purpose: check if ip matches range of ip addresses                         *
  *                                                                            *
  * Parameters: list - [IN] comma-separated list of ip ranges                  *
@@ -2633,8 +2519,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: int_in_list                                                      *
- *                                                                            *
  * Purpose: check if integer matches a list of integers                       *
  *                                                                            *
  * Parameters: list  - integers [i1-i2,i3,i4,i5-i6] (10-25,45,67-699)         *
@@ -2699,8 +2583,6 @@ int	zbx_double_compare(double a, double b)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_double_suffix                                                 *
- *                                                                            *
  * Purpose: check if the string is double                                     *
  *                                                                            *
  * Parameters: str   - string to check                                        *
@@ -2748,8 +2630,6 @@ static int	is_double_valid_syntax(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_double                                                        *
- *                                                                            *
  * Purpose: validate and optionally convert a string to a number of type      *
  *         'double'                                                           *
  *                                                                            *
@@ -2788,8 +2668,6 @@ int	is_double(const char *str, double *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_time_suffix                                                   *
- *                                                                            *
  * Purpose: check if the string is a non-negative integer with or without     *
  *          supported time suffix                                             *
  *                                                                            *
@@ -2888,8 +2766,6 @@ int	_wis_uint(const wchar_t *wide_string)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_uint_n_range                                                  *
- *                                                                            *
  * Purpose: check if the string is unsigned integer within the specified      *
  *          range and optionally store it into value parameter                *
  *                                                                            *
@@ -2948,8 +2824,6 @@ int	is_uint_n_range(const char *str, size_t n, void *value, size_t size, zbx_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: is_hex_n_range                                                   *
- *                                                                            *
  * Purpose: check if the string is unsigned hexadecimal integer within the    *
  *          specified range and optionally store it into value parameter      *
  *                                                                            *
@@ -3012,8 +2886,6 @@ int	is_hex_n_range(const char *str, size_t n, void *value, size_t size, zbx_uint
 
 /******************************************************************************
  *                                                                            *
- * Function: is_boolean                                                       *
- *                                                                            *
  * Purpose: check if the string is boolean                                    *
  *                                                                            *
  * Parameters: str - string to check                                          *
@@ -3052,8 +2924,6 @@ int	is_boolean(const char *str, zbx_uint64_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_uoct                                                          *
- *                                                                            *
  * Purpose: check if the string is unsigned octal                             *
  *                                                                            *
  * Parameters: str - string to check                                          *
@@ -3088,8 +2958,6 @@ int	is_uoct(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_uhex                                                          *
- *                                                                            *
  * Purpose: check if the string is unsigned hexadecimal representation of     *
  *          data in the form "0-9, a-f or A-F"                                *
  *                                                                            *
@@ -3125,8 +2993,6 @@ int	is_uhex(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_hex_string                                                    *
- *                                                                            *
  * Purpose: check if the string is a hexadecimal representation of data in    *
  *          the form "F4 CE 46 01 0C 44 8B F4\nA0 2C 29 74 5D 3F 13 49\n"     *
  *                                                                            *
@@ -3163,8 +3029,6 @@ int	is_hex_string(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_nearestindex                                                 *
- *                                                                            *
  * Purpose: get nearest index position of sorted elements in array            *
  *                                                                            *
  * Parameters: p   - pointer to array of elements                             *
@@ -3210,8 +3074,6 @@ int	get_nearestindex(const void *p, size_t sz, int num, zbx_uint64_t id)
 
 /******************************************************************************
  *                                                                            *
- * Function: uint64_array_add                                                 *
- *                                                                            *
  * Purpose: add uint64 value to dynamic array                                 *
  *                                                                            *
  ******************************************************************************/
@@ -3256,8 +3118,6 @@ int	uint64_array_exists(const zbx_uint64_t *values, int num, zbx_uint64_t value)
 
 /******************************************************************************
  *                                                                            *
- * Function: uint64_array_remove                                              *
- *                                                                            *
  * Purpose: remove uint64 values from array                                   *
  *                                                                            *
  ******************************************************************************/
@@ -3305,8 +3165,6 @@ zbx_uint64_t	suffix2factor(char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: str2uint64                                                       *
- *                                                                            *
  * Purpose: convert string to 64bit unsigned integer                          *
  *                                                                            *
  * Parameters: str   - string to convert                                      *
@@ -3343,8 +3201,6 @@ int	str2uint64(const char *str, const char *suffixes, zbx_uint64_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: str2double                                                       *
- *                                                                            *
  * Purpose: convert string to double                                          *
  *                                                                            *
  * Parameters: str - string to convert                                        *
@@ -3366,8 +3222,6 @@ double	str2double(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_hostname_char                                                 *
- *                                                                            *
  * Return value:  SUCCEED - the char is allowed in the host name              *
  *                FAIL - otherwise                                            *
  *                                                                            *
@@ -3388,8 +3242,6 @@ int	is_hostname_char(unsigned char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_key_char                                                      *
- *                                                                            *
  * Return value:  SUCCEED - the char is allowed in the item key               *
  *                FAIL - otherwise                                            *
  *                                                                            *
@@ -3410,8 +3262,6 @@ int	is_key_char(unsigned char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_function_char                                                 *
- *                                                                            *
  * Return value:  SUCCEED - the char is allowed in the trigger function       *
  *                FAIL - otherwise                                            *
  *                                                                            *
@@ -3429,8 +3279,6 @@ int	is_function_char(unsigned char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_macro_char                                                    *
- *                                                                            *
  * Return value:  SUCCEED - the char is allowed in the macro name             *
  *                FAIL - otherwise                                            *
  *                                                                            *
@@ -3454,8 +3302,6 @@ int	is_macro_char(unsigned char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_discovery_macro                                               *
- *                                                                            *
  * Purpose: checks if the name is a valid discovery macro                     *
  *                                                                            *
  * Return value:  SUCCEED - the name is a valid discovery macro               *
@@ -3482,8 +3328,6 @@ int	is_discovery_macro(const char *name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_function_type                                            *
- *                                                                            *
  * Purpose: Returns function type based on its name                           *
  *                                                                            *
  * Return value:  Function type.                                              *
@@ -3505,8 +3349,6 @@ zbx_function_type_t	zbx_get_function_type(const char *func)
 
 /******************************************************************************
  *                                                                            *
- * Function: make_hostname                                                    *
- *                                                                            *
  * Purpose: replace all not-allowed hostname characters in the string         *
  *                                                                            *
  * Parameters: host - the target C-style string                               *
@@ -3529,12 +3371,6 @@ void	make_hostname(char *host)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_interface_type_by_item_type                                  *
- *                                                                            *
- * Purpose:                                                                   *
- *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
  * Return value: Interface type                                               *
  *                                                                            *
  * Comments: !!! Don't forget to sync the code with PHP !!!                   *
@@ -3567,8 +3403,6 @@ unsigned char	get_interface_type_by_item_type(unsigned char type)
 
 /******************************************************************************
  *                                                                            *
- * Function: calculate_sleeptime                                              *
- *                                                                            *
  * Purpose: calculate sleep time for Zabbix processes                         *
  *                                                                            *
  * Parameters: nextcheck     - [IN] next check or -1 (FAIL) if nothing to do  *
@@ -3597,8 +3431,6 @@ int	calculate_sleeptime(int nextcheck, int max_sleeptime)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_serveractive_element                                       *
- *                                                                            *
  * Purpose: parse a ServerActive element like "IP<:port>" or "[IPv6]<:port>"  *
  *                                                                            *
  ******************************************************************************/
@@ -3700,8 +3532,6 @@ int	zbx_alarm_timed_out(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_create_token                                                 *
- *                                                                            *
  * Purpose: creates semi-unique token based on the seed and current timestamp *
  *                                                                            *
  * Parameters:  seed - [IN] the seed                                          *
@@ -3744,8 +3574,6 @@ char	*zbx_create_token(zbx_uint64_t seed)
 #if !defined(_WINDOWS) && defined(HAVE_RESOLV_H)
 /******************************************************************************
  *                                                                            *
- * Function: update_resolver_conf                                             *
- *                                                                            *
  * Purpose: react to "/etc/resolv.conf" update                                *
  *                                                                            *
  * Comments: it is intended to call this function in the end of each process  *
@@ -3775,8 +3603,6 @@ static void	update_resolver_conf(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_update_env                                                   *
- *                                                                            *
  * Purpose: throttling of update "/etc/resolv.conf" and "stdio" to the new    *
  *          log file after rotation                                           *
  *                                                                            *
@@ -3800,8 +3626,6 @@ void	zbx_update_env(double time_now)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_agent_item_nextcheck                                  *
- *                                                                            *
  * Purpose: calculate item nextcheck for Zabbix agent type items              *
  *                                                                            *
  ******************************************************************************/
@@ -3825,8 +3649,6 @@ int	zbx_get_agent_item_nextcheck(zbx_uint64_t itemid, const char *delay, int now
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_report_nextcheck                                         *
- *                                                                            *
  * Purpose: calculate report nextcheck                                        *
  *                                                                            *
  * Parameters: now        - [IN] the current timestamp                        *
@@ -3905,8 +3727,6 @@ void	zbx_free_tag(zbx_tag_t *tag)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_md5buf2str                                                   *
- *                                                                            *
  * Purpose: get a textual representation of md5 sum                           *
  *                                                                            *
  * Parameters:                                                                *
@@ -3933,8 +3753,6 @@ void	zbx_md5buf2str(const md5_byte_t *md5, char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hex2bin                                                      *
- *                                                                            *
  * Purpose:                                                                   *
  *     convert ASCII hex digit string to a binary representation (byte        *
  *     string)                                                                *
diff --git a/src/libs/zbxcommon/setproctitle.c b/src/libs/zbxcommon/setproctitle.c
index 864ee63ba96..4f0c8b5ed0d 100644
--- a/src/libs/zbxcommon/setproctitle.c
+++ b/src/libs/zbxcommon/setproctitle.c
@@ -50,8 +50,6 @@ static size_t	ps_buf_size = PS_BUF_SIZE, ps_buf_size_msg = PS_BUF_SIZE;
 
 /******************************************************************************
  *                                                                            *
- * Function: setproctitle_save_env                                            *
- *                                                                            *
  * Purpose: prepare for changing process commandline to display status        *
  *          messages with "ps" command on platforms which do not support      *
  *          setproctitle(). Depending on platform:                            *
@@ -180,8 +178,6 @@ char	**setproctitle_save_env(int argc, char **argv)
 
 /******************************************************************************
  *                                                                            *
- * Function: setproctitle_set_status                                          *
- *                                                                            *
  * Purpose: set a process command line displayed by "ps" command.             *
  *                                                                            *
  * Comments: call this function when a process starts some interesting task.  *
@@ -244,8 +240,6 @@ void	setproctitle_set_status(const char *status)
 
 /******************************************************************************
  *                                                                            *
- * Function: setproctitle_free_env                                            *
- *                                                                            *
  * Purpose: release memory allocated in setproctitle_save_env().              *
  *                                                                            *
  * Comments: call this function when process terminates and argv[] and        *
diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c
index c83d3b9776b..6fbc3218b1f 100644
--- a/src/libs/zbxcommon/str.c
+++ b/src/libs/zbxcommon/str.c
@@ -40,8 +40,6 @@ static const char	help_message_footer[] =
 
 /******************************************************************************
  *                                                                            *
- * Function: version                                                          *
- *                                                                            *
  * Purpose: print version and compilation time of application on stdout       *
  *          by application request with parameter '-V'                        *
  *                                                                            *
@@ -62,8 +60,6 @@ void	version(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: usage                                                            *
- *                                                                            *
  * Purpose: print application parameters on stdout with layout suitable for   *
  *          80-column terminal                                                *
  *                                                                            *
@@ -118,8 +114,6 @@ void	usage(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: help                                                             *
- *                                                                            *
  * Purpose: print help of application parameters on stdout by application     *
  *          request with parameter '-h'                                       *
  *                                                                            *
@@ -143,8 +137,6 @@ void	help(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_error                                                        *
- *                                                                            *
  * Purpose: Print error text to the stderr                                    *
  *                                                                            *
  * Parameters: fmt - format of message                                        *
@@ -166,8 +158,6 @@ void	zbx_error(const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_snprintf                                                     *
- *                                                                            *
  * Purpose: Secure version of snprintf function.                              *
  *          Add zero character at the end of string.                          *
  *                                                                            *
@@ -190,8 +180,6 @@ size_t	zbx_snprintf(char *str, size_t count, const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_snprintf_alloc                                               *
- *                                                                            *
  * Purpose: Secure version of snprintf function.                              *
  *          Add zero character at the end of string.                          *
  *          Reallocs memory if not enough.                                    *
@@ -236,8 +224,6 @@ retry:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vsnprintf                                                    *
- *                                                                            *
  * Purpose: Secure version of vsnprintf function.                             *
  *          Add zero character at the end of string.                          *
  *                                                                            *
@@ -267,8 +253,6 @@ size_t	zbx_vsnprintf(char *str, size_t count, const char *fmt, va_list args)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strncpy_alloc, zbx_strcpy_alloc, zbx_chrcpy_alloc            *
- *                                                                            *
  * Purpose: If there is no '\0' byte among the first n bytes of src,          *
  *          then all n bytes will be placed into the dest buffer.             *
  *          In other case only strlen() bytes will be placed there.           *
@@ -440,8 +424,6 @@ char	*string_replace(const char *str, const char *sub_str1, const char *sub_str2
 
 /******************************************************************************
  *                                                                            *
- * Function: del_zeros                                                       *
- *                                                                            *
  * Purpose: delete all right '0' and '.' for the string                       *
  *                                                                            *
  * Parameters: s - string to trim '0'                                         *
@@ -505,8 +487,6 @@ void	del_zeros(char *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rtrim                                                        *
- *                                                                            *
  * Purpose: Strip characters from the end of a string                         *
  *                                                                            *
  * Parameters: str - string for processing                                    *
@@ -534,8 +514,6 @@ int	zbx_rtrim(char *str, const char *charlist)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ltrim                                                        *
- *                                                                            *
  * Purpose: Strip characters from the beginning of a string                   *
  *                                                                            *
  * Parameters: str - string for processing                                    *
@@ -563,8 +541,6 @@ void	zbx_ltrim(char *str, const char *charlist)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_lrtrim                                                       *
- *                                                                            *
  * Purpose: Removes leading and trailing characters from the specified        *
  *          character string                                                  *
  *                                                                            *
@@ -580,8 +556,6 @@ void	zbx_lrtrim(char *str, const char *charlist)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_remove_chars                                                 *
- *                                                                            *
  * Purpose: Remove characters 'charlist' from the whole string                *
  *                                                                            *
  * Parameters: str - string for processing                                    *
@@ -606,8 +580,6 @@ void	zbx_remove_chars(char *str, const char *charlist)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_str_printable_dyn                                            *
- *                                                                            *
  * Purpose: converts text to printable string by converting special           *
  *          characters to escape sequences                                    *
  *                                                                            *
@@ -667,8 +639,6 @@ char	*zbx_str_printable_dyn(const char *text)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strlcpy                                                      *
- *                                                                            *
  * Purpose: Copy src to string dst of size siz. At most siz - 1 characters    *
  *          will be copied. Always null terminates (unless siz == 0).         *
  *                                                                            *
@@ -692,8 +662,6 @@ size_t	zbx_strlcpy(char *dst, const char *src, size_t siz)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strlcat                                                      *
- *                                                                            *
  * Purpose: Appends src to string dst of size siz (unlike strncat, size is    *
  *          the full size of dst, not space left). At most siz - 1 characters *
  *          will be copied. Always null terminates (unless                    *
@@ -713,8 +681,6 @@ void	zbx_strlcat(char *dst, const char *src, size_t siz)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strlcpy_utf8                                                 *
- *                                                                            *
  * Purpose: copies utf-8 string + terminating zero character into specified   *
  *          buffer                                                            *
  *                                                                            *
@@ -737,8 +703,6 @@ size_t	zbx_strlcpy_utf8(char *dst, const char *src, size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dvsprintf                                                    *
- *                                                                            *
  * Purpose: dynamical formatted output conversion                             *
  *                                                                            *
  * Return value: formatted string                                             *
@@ -780,8 +744,6 @@ char	*zbx_dvsprintf(char *dest, const char *f, va_list args)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dsprintf                                                     *
- *                                                                            *
  * Purpose: dynamical formatted output conversion                             *
  *                                                                            *
  * Return value: formatted string                                             *
@@ -805,8 +767,6 @@ char	*zbx_dsprintf(char *dest, const char *f, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strdcat                                                      *
- *                                                                            *
  * Purpose: dynamical cating of strings                                       *
  *                                                                            *
  * Return value: new pointer of string                                        *
@@ -837,8 +797,6 @@ char	*zbx_strdcat(char *dest, const char *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strdcatf                                                     *
- *                                                                            *
  * Purpose: dynamical cating of formatted strings                             *
  *                                                                            *
  * Return value: new pointer of string                                        *
@@ -864,8 +822,6 @@ char	*zbx_strdcatf(char *dest, const char *f, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_hostname                                               *
- *                                                                            *
  * Purpose: check a byte stream for a valid hostname                          *
  *                                                                            *
  * Parameters: hostname - pointer to the first char of hostname               *
@@ -911,8 +867,6 @@ int	zbx_check_hostname(const char *hostname, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_key                                                        *
- *                                                                            *
  * Purpose: advances pointer to first invalid character in string             *
  *          ensuring that everything before it is a valid key                 *
  *                                                                            *
@@ -1031,8 +985,6 @@ succeed:
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_host_key                                                   *
- *                                                                            *
  * Purpose: return hostname and key                                           *
  *          <hostname:>key                                                    *
  *                                                                            *
@@ -1076,8 +1028,6 @@ int	parse_host_key(char *exp, char **host, char **key)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_escape_string_len                                        *
- *                                                                            *
  * Purpose: calculate the required size for the escaped string                *
  *                                                                            *
  * Parameters: src - [IN] null terminated source string                       *
@@ -1101,8 +1051,6 @@ size_t	zbx_get_escape_string_len(const char *src, const char *charlist)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dyn_escape_string                                            *
- *                                                                            *
  * Purpose: escape characters in the source string                            *
  *                                                                            *
  * Parameters: src - [IN] null terminated source string                       *
@@ -1135,8 +1083,6 @@ char	*zbx_dyn_escape_string(const char *src, const char *charlist)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_escape_string                                                *
- *                                                                            *
  * Purpose: escape characters in the source string to fixed output buffer     *
  *                                                                            *
  * Parameters: dst      - [OUT] the output buffer                             *
@@ -1281,8 +1227,6 @@ int	cmp_key_id(const char *key_1, const char *key_2)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_process_type_string                                          *
- *                                                                            *
  * Purpose: Returns process name                                              *
  *                                                                            *
  * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_*              *
@@ -2080,8 +2024,6 @@ char	*zbx_strshift_utf8(char *text, size_t num)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_utf8_char_len                                                *
- *                                                                            *
  * Purpose: Returns the size (in bytes) of an UTF-8 encoded character or 0    *
  *          if the character is not a valid UTF-8.                            *
  *                                                                            *
@@ -2106,8 +2048,6 @@ size_t	zbx_utf8_char_len(const char *text)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strlen_utf8_nchars                                           *
- *                                                                            *
  * Purpose: calculates number of bytes in utf8 text limited by utf8_maxlen    *
  *          characters                                                        *
  *                                                                            *
@@ -2134,8 +2074,6 @@ size_t	zbx_strlen_utf8_nchars(const char *text, size_t utf8_maxlen)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strlen_utf8_nbytes                                           *
- *                                                                            *
  * Purpose: calculates number of bytes in utf8 text limited by maxlen bytes   *
  *                                                                            *
  ******************************************************************************/
@@ -2159,8 +2097,6 @@ size_t	zbx_strlen_utf8_nbytes(const char *text, size_t maxlen)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_charcount_utf8_nbytes                                        *
- *                                                                            *
  * Purpose: calculates number of chars in utf8 text limited by maxlen bytes   *
  *                                                                            *
  ******************************************************************************/
@@ -2183,8 +2119,6 @@ size_t	zbx_charcount_utf8_nbytes(const char *text, size_t maxlen)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_is_utf8                                                      *
- *                                                                            *
  * Purpose: check UTF-8 sequences                                             *
  *                                                                            *
  * Parameters: text - [IN] pointer to the string                              *
@@ -2278,8 +2212,6 @@ int	zbx_is_utf8(const char *text)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_replace_invalid_utf8                                         *
- *                                                                            *
  * Purpose: replace invalid UTF-8 sequences of bytes with '?' character       *
  *                                                                            *
  * Parameters: text - [IN/OUT] pointer to the first char                      *
@@ -2386,8 +2318,6 @@ void	zbx_replace_invalid_utf8(char *text)
 
 /******************************************************************************
  *                                                                            *
- * Function: utf8_decode_3byte_sequence                                       *
- *                                                                            *
  * Purpose: decodes 3-byte utf-8 sequence                                     *
  *                                                                            *
  * Parameters: ptr - [IN] pointer to the 3 byte sequence                      *
@@ -2413,8 +2343,6 @@ static int	utf8_decode_3byte_sequence(const char *ptr, zbx_uint32_t *out)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_cesu8_to_utf8                                                *
- *                                                                            *
  * Purpose: convert cesu8 encoded string to utf8                              *
  *                                                                            *
  * Parameters: cesu8 - [IN] pointer to the first char of NULL terminated CESU8*
@@ -2522,8 +2450,6 @@ int	is_ascii_string(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_linefeed                                                     *
- *                                                                            *
  * Purpose: wrap long string at specified position with linefeeds             *
  *                                                                            *
  * Parameters: src     - input string                                         *
@@ -2590,8 +2516,6 @@ char	*str_linefeed(const char *src, size_t maxline, const char *delim)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strarr_init                                                  *
- *                                                                            *
  * Purpose: initialize dynamic string array                                   *
  *                                                                            *
  * Parameters: arr - a pointer to array of strings                            *
@@ -2607,8 +2531,6 @@ void	zbx_strarr_init(char ***arr)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strarr_add                                                   *
- *                                                                            *
  * Purpose: add a string to dynamic string array                              *
  *                                                                            *
  * Parameters: arr - a pointer to array of strings                            *
@@ -2634,8 +2556,6 @@ void	zbx_strarr_add(char ***arr, const char *entry)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strarr_free                                                  *
- *                                                                            *
  * Purpose: free dynamic string array memory                                  *
  *                                                                            *
  * Parameters: arr - array of strings                                         *
@@ -2652,8 +2572,6 @@ void	zbx_strarr_free(char ***arr)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_replace_string                                               *
- *                                                                            *
  * Purpose: replace data block with 'value'                                   *
  *                                                                            *
  * Parameters: data  - [IN/OUT] pointer to the string                         *
@@ -2691,8 +2609,6 @@ void	zbx_replace_string(char **data, size_t l, size_t *r, const char *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trim_str_list                                                *
- *                                                                            *
  * Purpose: remove whitespace surrounding a string list item delimiters       *
  *                                                                            *
  * Parameters: list      - the list (a string containing items separated by   *
@@ -2733,8 +2649,6 @@ void	zbx_trim_str_list(char *list, char delimiter)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strcmp_null                                                  *
- *                                                                            *
  * Purpose:                                                                   *
  *     compares two strings where any of them can be a NULL pointer           *
  *                                                                            *
@@ -2758,8 +2672,6 @@ int	zbx_strcmp_null(const char *s1, const char *s2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_user_macro_parse                                             *
- *                                                                            *
  * Purpose:                                                                   *
  *     parses user macro and finds its end position and context location      *
  *                                                                            *
@@ -2872,8 +2784,6 @@ int	zbx_user_macro_parse(const char *macro, int *macro_r, int *context_l, int *c
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_user_macro_parse_dyn                                         *
- *                                                                            *
  * Purpose:                                                                   *
  *     parses user macro {$MACRO:<context>} into {$MACRO} and <context>       *
  *     strings                                                                *
@@ -2939,8 +2849,6 @@ int	zbx_user_macro_parse_dyn(const char *macro, char **name, char **context, int
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_user_macro_unquote_context_dyn                               *
- *                                                                            *
  * Purpose:                                                                   *
  *     extracts the macro context unquoting if necessary                      *
  *                                                                            *
@@ -2990,8 +2898,6 @@ char	*zbx_user_macro_unquote_context_dyn(const char *context, int len)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_user_macro_quote_context_dyn                                 *
- *                                                                            *
  * Purpose:                                                                   *
  *     quotes user macro context if necessary                                 *
  *                                                                            *
@@ -3053,8 +2959,6 @@ char	*zbx_user_macro_quote_context_dyn(const char *context, int force_quote, cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dyn_escape_shell_single_quote                                *
- *                                                                            *
  * Purpose: escape single quote in shell command arguments                    *
  *                                                                            *
  * Parameters: arg - [IN] the argument to escape                              *
@@ -3097,8 +3001,6 @@ char	*zbx_dyn_escape_shell_single_quote(const char *arg)
 
 /******************************************************************************
  *                                                                            *
- * Function: function_parse_name                                              *
- *                                                                            *
  * Purpose: parses function name                                              *
  *                                                                            *
  * Parameters: expr     - [IN] the function expression: func(p1, p2,...)      *
@@ -3123,8 +3025,6 @@ static int	function_parse_name(const char *expr, size_t *length)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_function_param_parse                                         *
- *                                                                            *
  * Purpose: parses function parameter                                         *
  *                                                                            *
  * Parameters: expr      - [IN] pre-validated function parameter list         *
@@ -3170,8 +3070,6 @@ void	zbx_function_param_parse(const char *expr, size_t *param_pos, size_t *lengt
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_function_param_unquote_dyn                                   *
- *                                                                            *
  * Purpose: unquotes function parameter                                       *
  *                                                                            *
  * Parameters: param -  [IN] the parameter to unquote                         *
@@ -3217,8 +3115,6 @@ char	*zbx_function_param_unquote_dyn(const char *param, size_t len, int *quoted)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_function_param_quote                                         *
- *                                                                            *
  * Purpose: quotes function parameter                                         *
  *                                                                            *
  * Parameters: param   - [IN/OUT] function parameter                          *
@@ -3266,8 +3162,6 @@ int	zbx_function_param_quote(char **param, int forced)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_function_get_param_dyn                                       *
- *                                                                            *
  * Purpose: return parameter by index (Nparam) from parameter list (params)   *
  *                                                                            *
  * Parameters:                                                                *
@@ -3304,8 +3198,6 @@ char	*zbx_function_get_param_dyn(const char *params, int Nparam)
 
 /******************************************************************************
  *                                                                            *
- * Function: function_validate_parameters                                     *
- *                                                                            *
  * Purpose: validate parameters and give position of terminator if found and  *
  *          not quoted                                                        *
  *                                                                            *
@@ -3398,8 +3290,6 @@ static int	function_validate_parameters(const char *expr, char terminator, size_
 
 /******************************************************************************
  *                                                                            *
- * Function: function_match_parenthesis                                       *
- *                                                                            *
  * Purpose: given the position of opening function parenthesis find the       *
  *          position of a closing one                                         *
  *                                                                            *
@@ -3429,8 +3319,6 @@ static int	function_match_parenthesis(const char *expr, size_t par_l, size_t *pa
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_function_validate_parameters                                 *
- *                                                                            *
  * Purpose: validate parameters that end with '\0'                            *
  *                                                                            *
  * Parameters: expr       - [IN] string to parse that contains parameters     *
@@ -3451,8 +3339,6 @@ int	zbx_function_validate_parameters(const char *expr, size_t *length)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_function_validate                                            *
- *                                                                            *
  * Purpose: check whether expression starts with a valid function             *
  *                                                                            *
  * Parameters: expr          - [IN] string to parse                           *
@@ -3496,8 +3382,6 @@ static int	zbx_function_validate(const char *expr, size_t *par_l, size_t *par_r,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strcmp_natural                                               *
- *                                                                            *
  * Purpose: performs natural comparison of two strings                        *
  *                                                                            *
  * Parameters: s1 - [IN] the first string                                     *
@@ -3542,8 +3426,6 @@ int	zbx_strcmp_natural(const char *s1, const char *s2)
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_user_macro                                           *
- *                                                                            *
  * Purpose: parses user macro token                                           *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -3603,8 +3485,6 @@ static int	token_parse_user_macro(const char *expression, const char *macro, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_lld_macro                                            *
- *                                                                            *
  * Purpose: parses lld macro token                                            *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -3656,8 +3536,6 @@ static int	token_parse_lld_macro(const char *expression, const char *macro, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_expression_macro                                     *
- *                                                                            *
  * Purpose: parses expression macro token                                     *
  *                                                                            *
  * Parameters: expression        - [IN] the expression                        *
@@ -3757,8 +3635,6 @@ static int	token_parse_expression_macro(const char *expression, const char *macr
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_objectid                                             *
- *                                                                            *
  * Purpose: parses object id token                                            *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -3810,8 +3686,6 @@ static int	token_parse_objectid(const char *expression, const char *macro, zbx_t
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_macro_segment                                        *
- *                                                                            *
  * Purpose: parses macro name segment                                         *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -3885,8 +3759,6 @@ static int	token_parse_macro_segment(const char *expression, const char *segment
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_macro_name                                           *
- *                                                                            *
  * Purpose: parses macro name                                                 *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -3926,8 +3798,6 @@ static int	token_parse_macro_name(const char *expression, const char *ptr, zbx_s
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_macro                                                *
- *                                                                            *
  * Purpose: parses normal macro token                                         *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -3967,8 +3837,6 @@ static int	token_parse_macro(const char *expression, const char *macro, zbx_toke
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_function                                             *
- *                                                                            *
  * Purpose: parses function inside token                                      *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -3999,8 +3867,6 @@ static int	token_parse_function(const char *expression, const char *func,
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_func_macro                                           *
- *                                                                            *
  * Purpose: parses function macro token                                       *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -4065,8 +3931,6 @@ static int	token_parse_func_macro(const char *expression, const char *macro, con
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_simple_macro_key                                     *
- *                                                                            *
  * Purpose: parses simple macro token with given key                          *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -4154,8 +4018,6 @@ static int	token_parse_simple_macro_key(const char *expression, const char *macr
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_simple_macro                                         *
- *                                                                            *
  * Purpose: parses simple macro token                                         *
  *                                                                            *
  * Parameters: expression - [IN] the expression                               *
@@ -4199,8 +4061,6 @@ static int	token_parse_simple_macro(const char *expression, const char *macro, z
 
 /******************************************************************************
  *                                                                            *
- * Function: token_parse_nested_macro                                         *
- *                                                                            *
  * Purpose: parses token with nested macros                                   *
  *                                                                            *
  * Parameters: expression        - [IN] the expression                        *
@@ -4296,8 +4156,6 @@ static int	token_parse_nested_macro(const char *expression, const char *macro, i
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_token_find                                                   *
- *                                                                            *
  * Purpose: finds token {} inside expression starting at specified position   *
  *          also searches for reference if requested                          *
  *                                                                            *
@@ -4430,8 +4288,6 @@ int	zbx_token_find(const char *expression, int pos, zbx_token_t *token, zbx_toke
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_token_parse_user_macro                                       *
- *                                                                            *
  * Purpose: public wrapper for token_parse_user_macro() function              *
  *                                                                            *
  ******************************************************************************/
@@ -4442,8 +4298,6 @@ int	zbx_token_parse_user_macro(const char *expression, const char *macro, zbx_to
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_token_parse_macro                                            *
- *                                                                            *
  * Purpose: public wrapper for token_parse_macro() function                   *
  *                                                                            *
  ******************************************************************************/
@@ -4454,8 +4308,6 @@ int	zbx_token_parse_macro(const char *expression, const char *macro, zbx_token_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_token_parse_objectid                                         *
- *                                                                            *
  * Purpose: public wrapper for token_parse_objectid() function                *
  *                                                                            *
  ******************************************************************************/
@@ -4466,8 +4318,6 @@ int	zbx_token_parse_objectid(const char *expression, const char *macro, zbx_toke
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_token_parse_lld_macro                                        *
- *                                                                            *
  * Purpose: public wrapper for token_parse_lld_macro() function               *
  *                                                                            *
  ******************************************************************************/
@@ -4478,8 +4328,6 @@ int	zbx_token_parse_lld_macro(const char *expression, const char *macro, zbx_tok
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_token_parse_nested_macro                                     *
- *                                                                            *
  * Purpose: public wrapper for token_parse_nested_macro() function            *
  *                                                                            *
  ******************************************************************************/
@@ -4491,8 +4339,6 @@ int	zbx_token_parse_nested_macro(const char *expression, const char *macro, int
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_no_function                                                  *
- *                                                                            *
  * Purpose: count calculated item (prototype) formula characters that can be  *
  *          skipped without the risk of missing a function                    *
  *                                                                            *
@@ -4558,8 +4404,6 @@ static size_t	zbx_no_function(const char *expr)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_function_find                                                *
- *                                                                            *
  * Purpose: find the location of the next function and its parameters in      *
  *          calculated item (prototype) formula                               *
  *                                                                            *
@@ -4607,8 +4451,6 @@ int	zbx_function_find(const char *expr, size_t *func_pos, size_t *par_l, size_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strmatch_condition                                           *
- *                                                                            *
  * Purpose: check if pattern matches the specified value                      *
  *                                                                            *
  * Parameters: value    - [IN] the value to match                             *
@@ -4647,8 +4489,6 @@ int	zbx_strmatch_condition(const char *value, const char *pattern, unsigned char
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_number_parse                                                 *
- *                                                                            *
  * Purpose: parse a number like "12.345"                                      *
  *                                                                            *
  * Parameters: number - [IN] start of number                                  *
@@ -4709,8 +4549,6 @@ int	zbx_number_parse(const char *number, int *len)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_suffixed_number_parse                                        *
- *                                                                            *
  * Purpose: parse a suffixed number like "12.345K"                            *
  *                                                                            *
  * Parameters: number - [IN] start of number                                  *
@@ -4737,8 +4575,6 @@ int	zbx_suffixed_number_parse(const char *number, int *len)
 
 /******************************************************************************
  *                                                                            *
- * Function: num_param                                                        *
- *                                                                            *
  * Purpose: find number of parameters in parameter list                       *
  *                                                                            *
  * Parameters:                                                                *
@@ -4835,8 +4671,6 @@ int	num_param(const char *p)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_param                                                        *
- *                                                                            *
  * Purpose: return parameter by index (num) from parameter list (param)       *
  *                                                                            *
  * Parameters:                                                                *
@@ -5004,8 +4838,6 @@ int	get_param(const char *p, int num, char *buf, size_t max_len, zbx_request_par
 
 /******************************************************************************
  *                                                                            *
- * Function: get_param_len                                                    *
- *                                                                            *
  * Purpose: return length of the parameter by index (num)                     *
  *          from parameter list (param)                                       *
  *                                                                            *
@@ -5134,8 +4966,6 @@ static int	get_param_len(const char *p, int num, size_t *sz)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_param_dyn                                                    *
- *                                                                            *
  * Purpose: return parameter by index (num) from parameter list (param)       *
  *                                                                            *
  * Parameters:                                                                *
@@ -5169,8 +4999,6 @@ char	*get_param_dyn(const char *p, int num, zbx_request_parameter_type_t *type)
 
 /******************************************************************************
  *                                                                            *
- * Function: replace_key_param                                                *
- *                                                                            *
  * Purpose: replaces an item key, SNMP OID or their parameters when callback  *
  *          function returns a new string                                     *
  *                                                                            *
@@ -5201,8 +5029,6 @@ static int	replace_key_param(char **data, int key_type, size_t l, size_t *r, int
 
 /******************************************************************************
  *                                                                            *
- * Function: replace_key_params_dyn                                           *
- *                                                                            *
  * Purpose: replaces an item key, SNMP OID or their parameters by using       *
  *          callback function                                                 *
  *                                                                            *
@@ -5366,8 +5192,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: remove_param                                                     *
- *                                                                            *
  * Purpose: remove parameter by index (num) from parameter list (param)       *
  *                                                                            *
  * Parameters:                                                                *
@@ -5413,8 +5237,6 @@ void	remove_param(char *param, int num)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_n_in_list                                                    *
- *                                                                            *
  * Purpose: check if string is contained in a list of delimited strings       *
  *                                                                            *
  * Parameters: list      - [IN] strings a,b,ccc,ddd                           *
@@ -5457,8 +5279,6 @@ int	str_n_in_list(const char *list, const char *value, size_t len, char delimite
 
 /******************************************************************************
  *                                                                            *
- * Function: str_in_list                                                      *
- *                                                                            *
  * Purpose: check if string is contained in a list of delimited strings       *
  *                                                                            *
  * Parameters: list      - strings a,b,ccc,ddd                                *
@@ -5475,8 +5295,6 @@ int	str_in_list(const char *list, const char *value, char delimiter)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_key_param                                                    *
- *                                                                            *
  * Purpose: return parameter by index (num) from parameter list (param)       *
  *          to be used for keys: key[param1,param2]                           *
  *                                                                            *
@@ -5513,8 +5331,6 @@ int	get_key_param(char *param, int num, char *buf, size_t max_len)
 
 /******************************************************************************
  *                                                                            *
- * Function: num_key_param                                                    *
- *                                                                            *
  * Purpose: calculate count of parameters from parameter list (param)         *
  *          to be used for keys: key[param1,param2]                           *
  *                                                                            *
@@ -5549,8 +5365,6 @@ int	num_key_param(char *param)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_replace_mem_dyn                                              *
- *                                                                            *
  * Purpose: to replace memory block and allocate more memory if needed        *
  *                                                                            *
  * Parameters: data       - [IN/OUT] allocated memory                         *
@@ -5594,8 +5408,6 @@ int	zbx_replace_mem_dyn(char **data, size_t *data_alloc, size_t *data_len, size_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strsplit                                                     *
- *                                                                            *
  * Purpose: splits string                                                     *
  *                                                                            *
  * Parameters: src       - [IN] source string                                 *
@@ -5633,8 +5445,6 @@ void	zbx_strsplit(const char *src, char delimiter, char **left, char **right)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trim_number                                                  *
- *                                                                            *
  * Purpose: Removes spaces from both ends of the string, then unquotes it if  *
  *          double quotation mark is present on both ends of the string. If   *
  *          strip_plus_sign is non-zero, then removes single "+" sign from    *
@@ -5704,8 +5514,6 @@ static void	zbx_trim_number(char *str, int strip_plus_sign)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trim_integer                                                 *
- *                                                                            *
  * Purpose: Removes spaces from both ends of the string, then unquotes it if  *
  *          double quotation mark is present on both ends of the string, then *
  *          removes single "+" sign from the beginning of the trimmed and     *
@@ -5726,8 +5534,6 @@ void	zbx_trim_integer(char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trim_float                                                   *
- *                                                                            *
  * Purpose: Removes spaces from both ends of the string, then unquotes it if  *
  *          double quotation mark is present on both ends of the string.      *
  *                                                                            *
@@ -5746,8 +5552,6 @@ void	zbx_trim_float(char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_component_version                                        *
- *                                                                            *
  * Purpose: extracts protocol version from value                              *
  *                                                                            *
  * Parameters:                                                                *
@@ -5774,8 +5578,6 @@ int	zbx_get_component_version(char *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_str_extract                                                  *
- *                                                                            *
  * Purpose: extracts value from a string, unquoting if necessary              *
  *                                                                            *
  * Parameters:                                                                *
@@ -5844,8 +5646,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_truncate_itemkey                                             *
- *                                                                            *
  * Purpose: check the item key characters length and, if the length exceeds   *
  *          max allowable characters length, truncate the item key, while     *
  *          maintaining the right square bracket                              *
@@ -5940,8 +5740,6 @@ const char	*zbx_truncate_itemkey(const char *key, const size_t char_max, char *b
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_truncate_value                                               *
- *                                                                            *
  * Purpose: check the value characters length and, if the length exceeds      *
  *          max allowable characters length, truncate the value               *
  *                                                                            *
@@ -5977,8 +5775,6 @@ const char	*zbx_truncate_value(const char *val, const size_t char_max, char *buf
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_print_double                                                 *
- *                                                                            *
  * Purpose: converts double value to string and truncates insignificant       *
  *          precision                                                         *
  *                                                                            *
@@ -6001,8 +5797,6 @@ const char	*zbx_print_double(char *buffer, size_t size, double val)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_substr_unquote                                               *
- *                                                                            *
  * Purpose: unquotes valid substring at the specified location                *
  *                                                                            *
  * Parameters: src   - [IN] the source string                                 *
@@ -6058,8 +5852,6 @@ char	*zbx_substr_unquote(const char *src, size_t left, size_t right)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_substr                                                       *
- *                                                                            *
  * Purpose: extracts substring at the specified location                      *
  *                                                                            *
  * Parameters: src   - [IN] the source string                                 *
@@ -6082,8 +5874,6 @@ char	*zbx_substr(const char *src, size_t left, size_t right)
 
 /******************************************************************************
  *                                                                            *
- * Function: utf8_chr_next                                                    *
- *                                                                            *
  * Purpose: return pointer to the next utf-8 character                        *
  *                                                                            *
  * Parameters: str  - [IN] the input string                                   *
@@ -6103,8 +5893,6 @@ static const char	*utf8_chr_next(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: utf8_chr_prev                                                    *
- *                                                                            *
  * Purpose: return pointer to the previous utf-8 character                    *
  *                                                                            *
  * Parameters: str   - [IN] the input string                                  *
@@ -6127,8 +5915,6 @@ static char	*utf8_chr_prev(char *str, const char *start)
 
 /******************************************************************************
  *                                                                            *
- * Function: strchr_utf8                                                      *
- *                                                                            *
  * Purpose: checks if string contains utf-8 character                         *
  *                                                                            *
  * Parameters: seq  - [IN] the input string                                   *
@@ -6167,8 +5953,6 @@ static int	strchr_utf8(const char *seq, const char *c)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ltrim_utf8                                                   *
- *                                                                            *
  * Purpose: trim the specified utf-8 characters from the left side of input   *
  *          string                                                            *
  *                                                                            *
@@ -6199,8 +5983,6 @@ void	zbx_ltrim_utf8(char *str, const char *charlist)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rtrim_utf8                                                   *
- *                                                                            *
  * Purpose: trim the specified utf-8 characters from the right side of input  *
  *          string                                                            *
  *                                                                            *
diff --git a/src/libs/zbxcommon/time.c b/src/libs/zbxcommon/time.c
index c91771c08de..cc7d9531f86 100644
--- a/src/libs/zbxcommon/time.c
+++ b/src/libs/zbxcommon/time.c
@@ -50,8 +50,6 @@ zbx_time_unit_t	zbx_tm_str_to_unit(const char *text)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_parse_period                                              *
- *                                                                            *
  * Purpose: parse time period in format <multiplier><time unit>               *
  *                                                                            *
  * Parameters: period     - [IN] the time period                              *
@@ -90,8 +88,6 @@ int	zbx_tm_parse_period(const char *period, size_t *len, int *multiplier, zbx_ti
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_add_seconds                                                   *
- *                                                                            *
  * Purpose: add seconds to the time and adjust result by dst                  *
  *                                                                            *
  * Parameter: tm      - [IN/OUT] the time structure                           *
@@ -125,8 +121,6 @@ static void	tm_add_seconds(struct tm *tm, int seconds)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_add                                                           *
- *                                                                            *
  * Purpose: add time duration without adjusting DST clocks                    *
  *                                                                            *
  * Parameter: tm         - [IN/OUT] the time structure                        *
@@ -181,8 +175,6 @@ static void	tm_add(struct tm *tm, int multiplier, zbx_time_unit_t base)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_add                                                       *
- *                                                                            *
  * Purpose: add time duration                                                 *
  *                                                                            *
  * Parameter: tm         - [IN/OUT] the time structure                        *
@@ -210,8 +202,6 @@ void	zbx_tm_add(struct tm *tm, int multiplier, zbx_time_unit_t base)
 
 /******************************************************************************
  *                                                                            *
- * Function: neg_to_pos_wrap                                                  *
- *                                                                            *
  * Purpose: convert negative number to positive by wrapping around the base   *
  *                                                                            *
  * Parameter: value - [IN/OUT] the value to convert                           *
@@ -227,8 +217,6 @@ static void	neg_to_pos_wrap(int *value, int base)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_sub                                                           *
- *                                                                            *
  * Purpose: subtracts time duration without adjusting DST clocks              *
  *                                                                            *
  * Parameter: tm         - [IN/OUT] the time structure                        *
@@ -294,8 +282,6 @@ static void	tm_sub(struct tm *tm, int multiplier, zbx_time_unit_t base)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_sub                                                       *
- *                                                                            *
  * Purpose: subtracts time duration                                           *
  *                                                                            *
  * Parameter: tm         - [IN/OUT] the time structure                        *
@@ -337,8 +323,6 @@ void	zbx_tm_sub(struct tm *tm, int multiplier, zbx_time_unit_t base)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_round_up                                                  *
- *                                                                            *
  * Purpose: rounds time by the specified unit upwards                         *
  *                                                                            *
  * Parameter: tm         - [IN/OUT] the time structure                        *
@@ -404,8 +388,6 @@ void	zbx_tm_round_up(struct tm *tm, zbx_time_unit_t base)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_round_down                                                *
- *                                                                            *
  * Purpose: rounds time by the specified unit downwards                       *
  *                                                                            *
  * Parameter: tm         - [IN/OUT] the time structure                        *
@@ -476,8 +458,6 @@ static	int	get_week_days(int yday, int wday)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_week_number                                              *
- *                                                                            *
  * Purpose: get ISO 8061 week number (1-53)                                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxcommon/variant.c b/src/libs/zbxcommon/variant.c
index 42fac7de60d..aee2dadd6f5 100644
--- a/src/libs/zbxcommon/variant.c
+++ b/src/libs/zbxcommon/variant.c
@@ -135,8 +135,6 @@ void	zbx_variant_set_dbl_vector(zbx_variant_t *value, zbx_vector_dbl_t *dbl_vect
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_variant_copy                                                 *
- *                                                                            *
  * Purpose: copy variant contents from source to value                        *
  *                                                                            *
  * Comments: String and binary data are cloned, which is different from       *
@@ -412,8 +410,6 @@ int	zbx_validate_value_dbl(double value, int dbl_precision)
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_compare_empty                                            *
- *                                                                            *
  * Purpose: compares two variant values when at least one is empty (having    *
  *          type of ZBX_VARIANT_NONE)                                         *
  *                                                                            *
@@ -433,8 +429,6 @@ static int	variant_compare_empty(const zbx_variant_t *value1, const zbx_variant_
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_compare_bin                                              *
- *                                                                            *
  * Purpose: compare two variant values when at least one contains binary data *
  *                                                                            *
  ******************************************************************************/
@@ -458,8 +452,6 @@ static int	variant_compare_bin(const zbx_variant_t *value1, const zbx_variant_t
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_compare_error                                            *
- *                                                                            *
  * Purpose: compare two variant values when at least one contains error       *
  *                                                                            *
  ******************************************************************************/
@@ -478,8 +470,6 @@ static int	variant_compare_error(const zbx_variant_t *value1, const zbx_variant_
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_compare_dbl_vector                                       *
- *                                                                            *
  * Purpose: compare two variant values when at least one contains error       *
  *                                                                            *
  ******************************************************************************/
@@ -506,8 +496,6 @@ static int	variant_compare_dbl_vector(const zbx_variant_t *value1, const zbx_var
 }
 /******************************************************************************
  *                                                                            *
- * Function: variant_compare_str                                              *
- *                                                                            *
  * Purpose: compare two variant values when at least one is string            *
  *                                                                            *
  ******************************************************************************/
@@ -521,8 +509,6 @@ static int	variant_compare_str(const zbx_variant_t *value1, const zbx_variant_t
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_compare_dbl                                              *
- *                                                                            *
  * Purpose: compare two variant values when at least one is double and the    *
  *          other is double, uint64 or a string representing a valid double   *
  *          value                                                             *
@@ -581,8 +567,6 @@ static int	variant_compare_dbl(const zbx_variant_t *value1, const zbx_variant_t
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_compare_ui64                                             *
- *                                                                            *
  * Purpose: compare two variant values when both are uint64                   *
  *                                                                            *
  ******************************************************************************/
@@ -594,8 +578,6 @@ static int	variant_compare_ui64(const zbx_variant_t *value1, const zbx_variant_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_variant_compare                                              *
- *                                                                            *
  * Purpose: compare two variant values                                        *
  *                                                                            *
  * Parameters: value1 - [IN] the first value                                  *
diff --git a/src/libs/zbxcommon/variant_misc.c b/src/libs/zbxcommon/variant_misc.c
index 15fcbd880d7..f71106afc46 100644
--- a/src/libs/zbxcommon/variant_misc.c
+++ b/src/libs/zbxcommon/variant_misc.c
@@ -22,8 +22,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_variant_to_value_type                                        *
- *                                                                            *
  * Purpose: converts variant value to type compatible with requested value    *
  *          type                                                              *
  *                                                                            *
diff --git a/src/libs/zbxcomms/comms.c b/src/libs/zbxcomms/comms.c
index e8cfa3b60f8..3b0a026c4c8 100644
--- a/src/libs/zbxcomms/comms.c
+++ b/src/libs/zbxcomms/comms.c
@@ -52,8 +52,6 @@ extern int	CONFIG_TCP_MAX_BACKLOG_SIZE;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_strerror                                              *
- *                                                                            *
  * Purpose: return string describing tcp error                                *
  *                                                                            *
  * Return value: pointer to the null terminated string                        *
@@ -84,8 +82,6 @@ static void	zbx_set_socket_strerror(const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_peer_ip_save                                          *
- *                                                                            *
  * Purpose: get peer IP address info from a socket early while it is          *
  *          connected. Connection can be terminated due to various errors at  *
  *          any time and peer IP address will not be available anymore.       *
@@ -127,8 +123,6 @@ static int	zbx_socket_peer_ip_save(zbx_socket_t *s)
 #ifndef _WINDOWS
 /******************************************************************************
  *                                                                            *
- * Function: zbx_gethost_by_ip                                                *
- *                                                                            *
  * Purpose: retrieve 'hostent' by IP address                                  *
  *                                                                            *
  ******************************************************************************/
@@ -183,8 +177,6 @@ void	zbx_gethost_by_ip(const char *ip, char *host, size_t hostlen)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_getip_by_host                                                *
- *                                                                            *
  * Purpose: retrieve IP address by host name                                  *
  *                                                                            *
  ******************************************************************************/
@@ -224,8 +216,6 @@ out:
 #ifdef _WINDOWS
 /******************************************************************************
  *                                                                            *
- * Function: zbx_is_win_ver_or_greater                                        *
- *                                                                            *
  * Purpose: check Windows version                                             *
  *                                                                            *
  * Parameters: major    - [IN] major windows version                          *
@@ -257,8 +247,6 @@ static int zbx_is_win_ver_or_greater(zbx_uint32_t major, zbx_uint32_t minor, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_start                                                 *
- *                                                                            *
  * Purpose: Initialize Windows Sockets APIs                                   *
  *                                                                            *
  * Parameters: error - [OUT] the error message                                *
@@ -284,8 +272,6 @@ int	zbx_socket_start(char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_clean                                                 *
- *                                                                            *
  * Purpose: initialize socket                                                 *
  *                                                                            *
  ******************************************************************************/
@@ -298,8 +284,6 @@ static void	zbx_socket_clean(zbx_socket_t *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_free                                                  *
- *                                                                            *
  * Purpose: free socket's dynamic buffer                                      *
  *                                                                            *
  ******************************************************************************/
@@ -311,8 +295,6 @@ static void	zbx_socket_free(zbx_socket_t *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_timeout_set                                           *
- *                                                                            *
  * Purpose: set timeout for socket operations                                 *
  *                                                                            *
  * Parameters: s       - [IN] socket descriptor                               *
@@ -343,8 +325,6 @@ void	zbx_socket_timeout_set(zbx_socket_t *s, int timeout)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_timeout_cleanup                                       *
- *                                                                            *
  * Purpose: clean up timeout for socket operations                            *
  *                                                                            *
  * Parameters: s - [OUT] socket descriptor                                    *
@@ -363,8 +343,6 @@ static void	zbx_socket_timeout_cleanup(zbx_socket_t *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_connect                                               *
- *                                                                            *
  * Purpose: connect to the specified address with an optional timeout value   *
  *                                                                            *
  * Parameters: s       - [IN] socket descriptor                               *
@@ -474,8 +452,6 @@ static int	zbx_socket_connect(zbx_socket_t *s, const struct sockaddr *addr, sock
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_create                                                *
- *                                                                            *
  * Purpose: connect the socket of the specified type to external host         *
  *                                                                            *
  * Parameters: s - [OUT] socket descriptor                                    *
@@ -777,8 +753,6 @@ static ssize_t	zbx_tcp_write(zbx_socket_t *s, const char *buf, size_t len)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_send_ext                                                 *
- *                                                                            *
  * Purpose: send data                                                         *
  *                                                                            *
  * Return value: SUCCEED - success                                            *
@@ -933,8 +907,6 @@ cleanup:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_close                                                    *
- *                                                                            *
  * Purpose: close open TCP socket                                             *
  *                                                                            *
  ******************************************************************************/
@@ -950,8 +922,6 @@ void	zbx_tcp_close(zbx_socket_t *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_address_family                                               *
- *                                                                            *
  * Purpose: return address family                                             *
  *                                                                            *
  * Parameters: addr - [IN] address or hostname                                *
@@ -999,8 +969,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_listen                                                   *
- *                                                                            *
  * Purpose: create socket for listening                                       *
  *                                                                            *
  * Return value: SUCCEED - success                                            *
@@ -1386,8 +1354,6 @@ void	zbx_tcp_unlisten(zbx_socket_t *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_accept                                                   *
- *                                                                            *
  * Purpose: permits an incoming connection attempt on a socket                *
  *                                                                            *
  * Return value: SUCCEED - success                                            *
@@ -1509,8 +1475,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_unaccept                                                 *
- *                                                                            *
  * Purpose: close accepted connection                                         *
  *                                                                            *
  ******************************************************************************/
@@ -1533,8 +1497,6 @@ void	zbx_tcp_unaccept(zbx_socket_t *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_socket_find_line                                             *
- *                                                                            *
  * Purpose: finds the next line in socket data buffer                         *
  *                                                                            *
  * Parameters: s - [IN] the socket                                            *
@@ -1567,8 +1529,6 @@ static const char	*zbx_socket_find_line(zbx_socket_t *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_recv_line                                                *
- *                                                                            *
  * Purpose: reads next line from a socket                                     *
  *                                                                            *
  * Parameters: s - [IN] the socket                                            *
@@ -1740,8 +1700,6 @@ static ssize_t	zbx_tcp_read(zbx_socket_t *s, char *buf, size_t len)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_recv_ext                                                 *
- *                                                                            *
  * Purpose: receive data                                                      *
  *                                                                            *
  * Return value: number of bytes received - success,                          *
@@ -2005,8 +1963,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_recv_raw_ext                                             *
- *                                                                            *
  * Purpose: receive data till connection is closed                            *
  *                                                                            *
  * Return value: number of bytes received - success,                          *
@@ -2115,8 +2071,6 @@ static int	subnet_match(int af, unsigned int prefix_size, const void *address1,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ip_cmp                                                       *
- *                                                                            *
  * Purpose: check if the address belongs to the given subnet                  *
  *                                                                            *
  * Parameters: prefix_size - [IN] subnet prefix size                          *
@@ -2269,8 +2223,6 @@ int	zbx_validate_peer_list(const char *peer_list, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_check_allowed_peers                                      *
- *                                                                            *
  * Purpose: check if connection initiator is in list of peers                 *
  *                                                                            *
  * Parameters: s         - [IN] socket descriptor                             *
@@ -2351,8 +2303,6 @@ int	zbx_tcp_check_allowed_peers(const zbx_socket_t *s, const char *peer_list)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tcp_connection_type_name                                     *
- *                                                                            *
  * Purpose: translate connection type code to name                            *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxcommshigh/comms.c b/src/libs/zbxcommshigh/comms.c
index 778a03a1613..2ef458d8ea3 100644
--- a/src/libs/zbxcommshigh/comms.c
+++ b/src/libs/zbxcommshigh/comms.c
@@ -137,8 +137,6 @@ void	disconnect_server(zbx_socket_t *sock)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_data_from_server                                             *
- *                                                                            *
  * Purpose: get configuration and other data from server                      *
  *                                                                            *
  * Return value: SUCCEED - processed successfully                             *
@@ -176,8 +174,6 @@ exit:
 
 /******************************************************************************
  *                                                                            *
- * Function: put_data_to_server                                               *
- *                                                                            *
  * Purpose: send data to server                                               *
  *                                                                            *
  * Return value: SUCCEED - processed successfully                             *
@@ -210,8 +206,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_send_response                                                *
- *                                                                            *
  * Purpose: send json SUCCEED or FAIL to socket along with an info message    *
  *                                                                            *
  * Parameters: sock     - [IN] socket descriptor                              *
@@ -264,8 +258,6 @@ int	zbx_send_response_ext(zbx_socket_t *sock, int result, const char *info, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_recv_response                                                *
- *                                                                            *
  * Purpose: read a response message (in JSON format) from socket, optionally  *
  *          extract "info" value.                                             *
  *                                                                            *
diff --git a/src/libs/zbxcompress/compress.c b/src/libs/zbxcompress/compress.c
index 275dbc5d33b..4d8156935f7 100644
--- a/src/libs/zbxcompress/compress.c
+++ b/src/libs/zbxcompress/compress.c
@@ -30,8 +30,6 @@ static int	zbx_zlib_errno = 0;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_compress_strerror                                            *
- *                                                                            *
  * Purpose: returns last conversion error message                             *
  *                                                                            *
  ******************************************************************************/
@@ -63,8 +61,6 @@ const char	*zbx_compress_strerror(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_compress                                                     *
- *                                                                            *
  * Purpose: compress data                                                     *
  *                                                                            *
  * Parameters: in       - [IN] the data to compress                           *
@@ -101,8 +97,6 @@ int	zbx_compress(const char *in, size_t size_in, char **out, size_t *size_out)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_uncompress                                                   *
- *                                                                            *
  * Purpose: uncompress data                                                   *
  *                                                                            *
  * Parameters: in       - [IN] the data to uncompress                         *
diff --git a/src/libs/zbxconf/cfg.c b/src/libs/zbxconf/cfg.c
index 37c5121bc16..515e8459e03 100644
--- a/src/libs/zbxconf/cfg.c
+++ b/src/libs/zbxconf/cfg.c
@@ -38,8 +38,6 @@ static int	__parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int leve
 
 /******************************************************************************
  *                                                                            *
- * Function: match_glob                                                       *
- *                                                                            *
  * Purpose: see whether a file (e.g., "parameter.conf")                       *
  *          matches a pattern (e.g., "p*.conf")                               *
  *                                                                            *
@@ -127,8 +125,6 @@ static int	match_glob(const char *file, const char *pattern)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_glob                                                       *
- *                                                                            *
  * Purpose: parse a glob like "/usr/local/etc/zabbix_agentd.conf.d/p*.conf"   *
  *          into "/usr/local/etc/zabbix_agentd.conf.d" and "p*.conf" parts    *
  *                                                                            *
@@ -199,8 +195,6 @@ trim:
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_cfg_dir                                                    *
- *                                                                            *
  * Purpose: parse directory with configuration files                          *
  *                                                                            *
  * Parameters: path    - full path to directory                               *
@@ -307,8 +301,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_cfg_object                                                 *
- *                                                                            *
  * Purpose: parse "Include=..." line in configuration file                    *
  *                                                                            *
  * Parameters: cfg_file - full name of config file                            *
@@ -358,8 +350,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_cfg_file                                                   *
- *                                                                            *
  * Purpose: parse configuration file                                          *
  *                                                                            *
  * Parameters: cfg_file - full name of config file                            *
@@ -636,8 +626,6 @@ static int	addr_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_set_data_destination_hosts                                   *
- *                                                                            *
  * Purpose: parse "ServerActive' parameter value and set destination servers  *
  *          using a callback function                                         *
  *                                                                            *
diff --git a/src/libs/zbxcrypto/base64.c b/src/libs/zbxcrypto/base64.c
index 4eb719d5456..76bea5a3589 100644
--- a/src/libs/zbxcrypto/base64.c
+++ b/src/libs/zbxcrypto/base64.c
@@ -22,8 +22,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: is_base64                                                        *
- *                                                                            *
  * Purpose: is the character passed in a base64 character?                    *
  *                                                                            *
  * Parameters: c - character to test                                          *
@@ -50,12 +48,9 @@ static int	is_base64(char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: char_base64_encode                                               *
- *                                                                            *
- * Purpose: encode a byte into a base64 character                             *
- *                                                                            *
- * Parameters: uc - character to encode                                       *
+ * Purpose: encode 6 bits into a base64 character                             *
  *                                                                            *
+ * Parameters: uc - character to encode. Its value must be 0 ... 63.          *
  * Return value: byte encoded into a base64 character                         *
  *                                                                            *
  ******************************************************************************/
@@ -68,8 +63,6 @@ static char	char_base64_encode(unsigned char uc)
 
 /******************************************************************************
  *                                                                            *
- * Function: char_base64_decode                                               *
- *                                                                            *
  * Purpose: decode a base64 character into a byte                             *
  *                                                                            *
  * Parameters: c - character to decode                                        *
@@ -104,8 +97,6 @@ static unsigned char	char_base64_decode(char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_base64_encode                                                *
- *                                                                            *
  * Purpose: encode a string into a base64 string                              *
  *                                                                            *
  * Parameters: p_str    - [IN] the string to encode                           *
@@ -170,8 +161,6 @@ void	str_base64_encode(const char *p_str, char *p_b64str, int in_size)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_base64_encode_dyn                                            *
- *                                                                            *
  * Purpose: encode a string into a base64 string                              *
  *          with dynamic memory allocation                                    *
  *                                                                            *
@@ -217,8 +206,6 @@ void	str_base64_encode_dyn(const char *p_str, char **p_b64str, int in_size)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_base64_decode                                                *
- *                                                                            *
  * Purpose: decode a base64 string into a string                              *
  *                                                                            *
  * Parameters: p_b64str   - [IN] the base64 string to decode                  *
diff --git a/src/libs/zbxcrypto/tls.c b/src/libs/zbxcrypto/tls.c
index 1230f35a04f..ee874feac06 100644
--- a/src/libs/zbxcrypto/tls.c
+++ b/src/libs/zbxcrypto/tls.c
@@ -214,8 +214,6 @@ ZBX_THREAD_LOCAL char				info_buf[256];
 #if defined(HAVE_GNUTLS)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_gnutls_debug_cb                                              *
- *                                                                            *
  * Purpose: write a GnuTLS debug message into Zabbix log                      *
  *                                                                            *
  * Comments:                                                                  *
@@ -234,8 +232,6 @@ static void	zbx_gnutls_debug_cb(int level, const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_gnutls_audit_cb                                              *
- *                                                                            *
  * Purpose: write a GnuTLS audit message into Zabbix log                      *
  *                                                                            *
  * Comments:                                                                  *
@@ -259,8 +255,6 @@ static void	zbx_gnutls_audit_cb(gnutls_session_t session, const char *str)
 #if defined(HAVE_OPENSSL)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_openssl_info_cb                                              *
- *                                                                            *
  * Purpose: get state, alert, error information on TLS connection             *
  *                                                                            *
  * Comments:                                                                  *
@@ -313,8 +307,6 @@ static void	zbx_openssl_info_cb(const SSL *ssl, int where, int ret)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_error_msg                                                *
- *                                                                            *
  * Purpose: compose a TLS error message                                       *
  *                                                                            *
  ******************************************************************************/
@@ -342,8 +334,6 @@ void	zbx_tls_error_msg(char **error, size_t *error_alloc, size_t *error_offset)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_parameter_name                                           *
- *                                                                            *
  * Purpose:                                                                   *
  *     return the name of a configuration file or command line parameter that *
  *     the value of the given parameter comes from                            *
@@ -435,8 +425,6 @@ static const char	*zbx_tls_parameter_name(int type, char **param)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_parameter_not_empty                                      *
- *                                                                            *
  * Purpose:                                                                   *
  *     Helper function: check if a configuration parameter is defined it must *
  *     not be empty. Otherwise log error and exit.                            *
@@ -493,8 +481,6 @@ static void	zbx_tls_parameter_not_empty(char **param)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_validation_error                                         *
- *                                                                            *
  * Purpose:                                                                   *
  *     Helper function: log error message depending on program type and exit. *
  *                                                                            *
@@ -628,8 +614,6 @@ static void	zbx_tls_validation_error(int type, char **param1, char **param2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_validation_error2                                        *
- *                                                                            *
  * Purpose:                                                                   *
  *     Helper function: log error message depending on program type and exit  *
  *                                                                            *
@@ -680,8 +664,6 @@ static void	zbx_tls_validation_error2(int type, char **param1, char **param2, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_validate_config                                          *
- *                                                                            *
  * Purpose: check for allowed combinations of TLS configuration parameters    *
  *                                                                            *
  * Comments:                                                                  *
@@ -988,8 +970,6 @@ static void	zbx_psk_warn_misconfig(const char *psk_identity)
 #if defined(HAVE_GNUTLS)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_psk_cb                                                       *
- *                                                                            *
  * Purpose:                                                                   *
  *     find and set the requested pre-shared key upon GnuTLS request          *
  *                                                                            *
@@ -1101,8 +1081,6 @@ static int	zbx_psk_cb(gnutls_session_t session, const char *psk_identity, gnutls
 #elif defined(HAVE_OPENSSL) && defined(HAVE_OPENSSL_WITH_PSK)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_psk_client_cb                                                *
- *                                                                            *
  * Purpose:                                                                   *
  *     set pre-shared key for outgoing TLS connection upon OpenSSL request    *
  *                                                                            *
@@ -1157,8 +1135,6 @@ static unsigned int	zbx_psk_client_cb(SSL *ssl, const char *hint, char *identity
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_psk_server_cb                                                *
- *                                                                            *
  * Purpose:                                                                   *
  *     set pre-shared key for incoming TLS connection upon OpenSSL request    *
  *                                                                            *
@@ -1274,8 +1250,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_psk_identity_len                                       *
- *                                                                            *
  * Purpose: Check PSK identity length. Exit if length exceeds the maximum.    *
  *                                                                            *
  ******************************************************************************/
@@ -1292,8 +1266,6 @@ static void	zbx_check_psk_identity_len(size_t psk_identity_len)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_read_psk_file                                                *
- *                                                                            *
  * Purpose:                                                                   *
  *     read a pre-shared key from a configured file and convert it from       *
  *     textual representation (ASCII hex digit string) to a binary            *
@@ -1379,8 +1351,6 @@ out:
 #if defined(HAVE_GNUTLS)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_log_ciphersuites                                             *
- *                                                                            *
  * Purpose: write names of enabled GnuTLS ciphersuites into Zabbix log for    *
  *          debugging                                                         *
  *                                                                            *
@@ -1425,8 +1395,6 @@ static void	zbx_log_ciphersuites(const char *title1, const char *title2, gnutls_
 #elif defined(HAVE_OPENSSL)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_log_ciphersuites                                             *
- *                                                                            *
  * Purpose: write names of enabled OpenSSL ciphersuites into Zabbix log for   *
  *          debugging                                                         *
  *                                                                            *
@@ -1465,8 +1433,6 @@ static void	zbx_log_ciphersuites(const char *title1, const char *title2, SSL_CTX
 #if defined(HAVE_GNUTLS)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_print_rdn_value                                              *
- *                                                                            *
  * Purpose:                                                                   *
  *     print an RDN (relative distinguished name) value into buffer           *
  *                                                                            *
@@ -1591,8 +1557,6 @@ small_buf:
 #if defined(HAVE_GNUTLS)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_x509_dn_gets                                                 *
- *                                                                            *
  * Purpose:                                                                   *
  *     Print distinguished name (i.e. issuer, subject) into buffer. Intended  *
  *     to use as an alternative to GnuTLS gnutls_x509_crt_get_issuer_dn() and *
@@ -1740,8 +1704,6 @@ small_buf:
 #elif defined(HAVE_OPENSSL)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_x509_dn_gets                                                 *
- *                                                                            *
  * Purpose:                                                                   *
  *     Print distinguished name (i.e. issuer, subject) into buffer. Intended  *
  *     to use as an alternative to OpenSSL X509_NAME_oneline() and to meet    *
@@ -1808,8 +1770,6 @@ out:
 #if defined(HAVE_GNUTLS)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_peer_cert                                                *
- *                                                                            *
  * Purpose: get peer certificate from session                                 *
  *                                                                            *
  * Parameters:                                                                *
@@ -1876,8 +1836,6 @@ static gnutls_x509_crt_t	zbx_get_peer_cert(const gnutls_session_t session, char
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_log_peer_cert                                                *
- *                                                                            *
  * Purpose: write peer certificate information into Zabbix log for debugging  *
  *                                                                            *
  * Parameters:                                                                *
@@ -1945,8 +1903,6 @@ static void	zbx_log_peer_cert(const char *function_name, const zbx_tls_context_t
 #if defined(HAVE_GNUTLS)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_verify_peer_cert                                             *
- *                                                                            *
  * Purpose: basic verification of peer certificate                            *
  *                                                                            *
  * Return value:                                                              *
@@ -1989,8 +1945,6 @@ static int	zbx_verify_peer_cert(const gnutls_session_t session, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_verify_issuer_subject                                        *
- *                                                                            *
  * Purpose:                                                                   *
  *     verify peer certificate issuer and subject of the given TLS context    *
  *                                                                            *
@@ -2107,8 +2061,6 @@ static int	zbx_verify_issuer_subject(const zbx_tls_context_t *tls_ctx, const cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_server_issuer_subject                                  *
- *                                                                            *
  * Purpose:                                                                   *
  *     check server certificate issuer and subject (for passive proxies and   *
  *     agent passive checks)                                                  *
@@ -2152,8 +2104,6 @@ int	zbx_check_server_issuer_subject(zbx_socket_t *sock, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_library_init                                             *
- *                                                                            *
  * Purpose: initialize TLS library, log library version                       *
  *                                                                            *
  * Comments:                                                                  *
@@ -2194,8 +2144,6 @@ static void	zbx_tls_library_init(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_library_deinit                                           *
- *                                                                            *
  * Purpose: deinitialize TLS library                                          *
  *                                                                            *
  ******************************************************************************/
@@ -2218,8 +2166,6 @@ void	zbx_tls_library_deinit(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_init_parent                                              *
- *                                                                            *
  * Purpose: initialize TLS library in a parent process                        *
  *                                                                            *
  ******************************************************************************/
@@ -2232,8 +2178,6 @@ void	zbx_tls_init_parent(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_init_child                                               *
- *                                                                            *
  * Purpose: read available configuration parameters and initialize TLS        *
  *          library in a child process                                        *
  *                                                                            *
@@ -3118,8 +3062,6 @@ out1:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_free_on_signal                                           *
- *                                                                            *
  * Purpose: TLS cleanup for using in signal handlers                          *
  *                                                                            *
  ******************************************************************************/
@@ -3131,8 +3073,6 @@ void	zbx_tls_free_on_signal(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_free                                                     *
- *                                                                            *
  * Purpose: release TLS library resources allocated in zbx_tls_init_parent()  *
  *          and zbx_tls_init_child()                                          *
  *                                                                            *
@@ -3205,8 +3145,6 @@ void	zbx_tls_free(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_connect                                                  *
- *                                                                            *
  * Purpose: establish a TLS connection over an established TCP connection     *
  *                                                                            *
  * Parameters:                                                                *
@@ -3739,8 +3677,6 @@ out1:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_accept                                                   *
- *                                                                            *
  * Purpose: establish a TLS connection over an accepted TCP connection        *
  *                                                                            *
  * Parameters:                                                                *
@@ -4432,8 +4368,6 @@ ssize_t	zbx_tls_read(zbx_socket_t *s, char *buf, size_t len, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_close                                                    *
- *                                                                            *
  * Purpose: close a TLS connection before closing a TCP socket                *
  *                                                                            *
  ******************************************************************************/
@@ -4509,8 +4443,6 @@ void	zbx_tls_close(zbx_socket_t *s)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_get_attr_cert                                            *
- *                                                                            *
  * Purpose: get certificate attributes from the context of established        *
  *          connection                                                        *
  *                                                                            *
@@ -4600,8 +4532,6 @@ int	zbx_tls_get_attr_cert(const zbx_socket_t *s, zbx_tls_conn_attr_t *attr)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_get_attr_psk                                             *
- *                                                                            *
  * Purpose: get PSK attributes from the context of established connection     *
  *                                                                            *
  * Comments:                                                                  *
@@ -4640,8 +4570,6 @@ int	zbx_tls_get_attr_psk(const zbx_socket_t *s, zbx_tls_conn_attr_t *attr)
 #if defined(_WINDOWS)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_pass_vars                                                *
- *                                                                            *
  * Purpose: pass some TLS variables from one thread to other                  *
  *                                                                            *
  * Comments: used in Zabbix sender on MS Windows                              *
@@ -4668,8 +4596,6 @@ void	zbx_tls_pass_vars(ZBX_THREAD_SENDVAL_TLS_ARGS *args)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_take_vars                                                *
- *                                                                            *
  * Purpose: pass some TLS variables from one thread to other                  *
  *                                                                            *
  * Comments: used in Zabbix sender on MS Windows                              *
diff --git a/src/libs/zbxcrypto/tls_version.c b/src/libs/zbxcrypto/tls_version.c
index e70f570b857..114e56f1d19 100644
--- a/src/libs/zbxcrypto/tls_version.c
+++ b/src/libs/zbxcrypto/tls_version.c
@@ -35,8 +35,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tls_version                                                  *
- *                                                                            *
  * Purpose: print tls library version on stdout by application request with   *
  *          parameter '-V'                                                    *
  *                                                                            *
diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c
index 799f4347242..2122f3b7e2e 100644
--- a/src/libs/zbxdb/db.c
+++ b/src/libs/zbxdb/db.c
@@ -167,8 +167,6 @@ static void	zbx_db_errlog(zbx_err_codes_t zbx_errno, int db_errno, const char *d
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_last_strerr                                               *
- *                                                                            *
  * Purpose: get last error set by database                                    *
  *                                                                            *
  * Return value: last database error message                                  *
@@ -181,8 +179,6 @@ const char	*zbx_db_last_strerr(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_last_errcode                                              *
- *                                                                            *
  * Purpose: get last error code returned by database                          *
  *                                                                            *
  * Return value: last database error code                                     *
@@ -238,8 +234,6 @@ static const char	*zbx_oci_error(sword status, sb4 *err)
 
 /******************************************************************************
  *                                                                            *
- * Function: OCI_handle_sql_error                                             *
- *                                                                            *
  * Purpose: handles Oracle prepare/bind/execute/select operation error        *
  *                                                                            *
  * Parameters: zerrcode   - [IN] the Zabbix errorcode for the failed database *
@@ -363,8 +357,6 @@ static int	is_recoverable_postgresql_error(const PGconn *pg_conn, const PGresult
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_init_autoincrement_options                                *
- *                                                                            *
  * Purpose: specify the autoincrement options during db connect               *
  *                                                                            *
  ******************************************************************************/
@@ -375,8 +367,6 @@ void	zbx_db_init_autoincrement_options(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_connect                                                   *
- *                                                                            *
  * Purpose: connect to the database                                           *
  *                                                                            *
  * Return value: ZBX_DB_OK - successfully connected                           *
@@ -1016,8 +1006,6 @@ void	zbx_db_close(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_begin                                                     *
- *                                                                            *
  * Purpose: start transaction                                                 *
  *                                                                            *
  * Comments: do nothing if DB does not support transactions                   *
@@ -1050,8 +1038,6 @@ int	zbx_db_begin(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_commit                                                    *
- *                                                                            *
  * Purpose: commit transaction                                                *
  *                                                                            *
  * Comments: do nothing if DB does not support transactions                   *
@@ -1098,8 +1084,6 @@ int	zbx_db_commit(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_rollback                                                  *
- *                                                                            *
  * Purpose: rollback transaction                                              *
  *                                                                            *
  * Comments: do nothing if DB does not support transactions                   *
@@ -1215,8 +1199,6 @@ int	zbx_db_statement_prepare(const char *sql)
 
 /******************************************************************************
  *                                                                            *
- * Function: db_bind_dynamic_cb                                               *
- *                                                                            *
  * Purpose: callback function used by dynamic parameter binding               *
  *                                                                            *
  ******************************************************************************/
@@ -1270,8 +1252,6 @@ static sb4 db_bind_dynamic_cb(dvoid *ctxp, OCIBind *bindp, ub4 iter, ub4 index,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_bind_parameter_dyn                                        *
- *                                                                            *
  * Purpose: performs dynamic parameter binding, converting value if necessary *
  *                                                                            *
  * Parameters: context  - [OUT] the bind context                              *
@@ -1425,8 +1405,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_vexecute                                                  *
- *                                                                            *
  * Purpose: Execute SQL statement. For non-select statements only.            *
  *                                                                            *
  * Return value: ZBX_DB_FAIL (on error) or ZBX_DB_DOWN (on recoverable error) *
@@ -1607,8 +1585,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_vselect                                                   *
- *                                                                            *
  * Purpose: execute a select statement                                        *
  *                                                                            *
  * Return value: data, NULL (on error) or (DB_RESULT)ZBX_DB_DOWN              *
@@ -1913,8 +1889,6 @@ DB_RESULT	zbx_db_select_n(const char *query, int n)
 #ifdef HAVE_POSTGRESQL
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_bytea_unescape                                            *
- *                                                                            *
  * Purpose: converts the null terminated string into binary buffer            *
  *                                                                            *
  * Transformations:                                                           *
@@ -2247,8 +2221,6 @@ static int	zbx_db_is_escape_sequence(char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_escape_string                                             *
- *                                                                            *
  * Return value: escaped string                                               *
  *                                                                            *
  * Comments: sync changes with 'zbx_db_get_escape_string_len'                 *
@@ -2288,8 +2260,6 @@ static void	zbx_db_escape_string(const char *src, char *dst, size_t len, zbx_esc
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_get_escape_string_len                                     *
- *                                                                            *
  * Purpose: to calculate escaped string length limited by bytes or characters *
  *          whichever is reached first.                                       *
  *                                                                            *
@@ -2335,8 +2305,6 @@ static size_t	zbx_db_get_escape_string_len(const char *s, size_t max_bytes, size
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_dyn_escape_string                                         *
- *                                                                            *
  * Purpose: to escape string limited by bytes or characters, whichever limit  *
  *          is reached first.                                                 *
  *                                                                            *
@@ -2364,8 +2332,6 @@ char	*zbx_db_dyn_escape_string(const char *src, size_t max_bytes, size_t max_cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_get_escape_like_pattern_len                               *
- *                                                                            *
  * Return value: return length of escaped LIKE pattern with terminating '\0'  *
  *                                                                            *
  * Comments: sync changes with 'zbx_db_escape_like_pattern'                   *
@@ -2391,8 +2357,6 @@ static int	zbx_db_get_escape_like_pattern_len(const char *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_escape_like_pattern                                       *
- *                                                                            *
  * Return value: escaped string to be used as pattern in LIKE                 *
  *                                                                            *
  * Comments: sync changes with 'zbx_db_get_escape_like_pattern_len'           *
@@ -2448,8 +2412,6 @@ static void	zbx_db_escape_like_pattern(const char *src, char *dst, int len)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_dyn_escape_like_pattern                                   *
- *                                                                            *
  * Return value: escaped string to be used as pattern in LIKE                 *
  *                                                                            *
  ******************************************************************************/
@@ -2469,8 +2431,6 @@ char	*zbx_db_dyn_escape_like_pattern(const char *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_strlen_n                                                  *
- *                                                                            *
  * Purpose: return the string length to fit into a database field of the      *
  *          specified size                                                    *
  *                                                                            *
@@ -2484,8 +2444,6 @@ int	zbx_db_strlen_n(const char *text_loc, size_t maxlen)
 
 /*********************************************************************************
  *                                                                               *
- * Function: zbx_db_version_check                                                *
- *                                                                               *
  * Purpose: determine if a vendor database(MySQL, MariaDB, PostgreSQL,           *
  *          Oracle, ElasticDB) version satisfies Zabbix requirements             *
  *                                                                               *
@@ -2533,8 +2491,6 @@ int	zbx_db_version_check(const char *database, zbx_uint32_t current_version, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_version_json_create                                       *
- *                                                                            *
  * Purpose: prepare json for front-end with the DB current, minimum and       *
  *          maximum versions and a flag that indicates if the version         *
  *          satisfies the requirements                                        *
@@ -2567,8 +2523,6 @@ void	zbx_db_version_json_create(struct zbx_json *json, struct zbx_db_version_inf
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbms_version_get                                             *
- *                                                                            *
  * Purpose: For PostgreSQL, MySQL and MariaDB:                                *
  *          returns DBMS version as integer: MMmmuu                           *
  *          M = major version part                                            *
@@ -2607,8 +2561,6 @@ zbx_uint32_t	zbx_dbms_version_get(void)
 #ifdef HAVE_MYSQL
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbms_mariadb_used                                            *
- *                                                                            *
  * Purpose: returns flag if the mariadb was detected                          *
  *                                                                            *
  * Return value: ON  - mariadb detected                                       *
@@ -2622,8 +2574,6 @@ int	zbx_dbms_mariadb_used(void)
 
 /***************************************************************************************************************
  *                                                                                                             *
- * Function: zbx_dbms_version_info_extract                                                                     *
- *                                                                                                             *
  * Purpose: retrieves the DB version info, including numeric version value                                     *
  *                                                                                                             *
  *          For PostgreSQL:                                                                                    *
@@ -2840,8 +2790,6 @@ out:
 #if defined(HAVE_POSTGRESQL)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tsdb_get_version                                             *
- *                                                                            *
  * Purpose: returns TimescaleDB (TSDB) version as integer: MMmmuu             *
  *          M = major version part                                            *
  *          m = minor version part                                            *
diff --git a/src/libs/zbxdbcache/dbcache.c b/src/libs/zbxdbcache/dbcache.c
index d2c00608acd..f8949dad1b6 100644
--- a/src/libs/zbxdbcache/dbcache.c
+++ b/src/libs/zbxdbcache/dbcache.c
@@ -197,8 +197,6 @@ ZBX_PTR_VECTOR_IMPL(tags, zbx_tag_t*)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_stats_all                                                  *
- *                                                                            *
  * Purpose: retrieves all internal metrics of the database cache              *
  *                                                                            *
  * Parameters: stats - [OUT] write cache metrics                              *
@@ -225,8 +223,6 @@ void	DCget_stats_all(zbx_wcache_info_t *wcache_info)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_stats                                                      *
- *                                                                            *
  * Purpose: get statistics of the database cache                              *
  *                                                                            *
  ******************************************************************************/
@@ -341,8 +337,6 @@ void	*DCget_stats(int request)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_trend                                                      *
- *                                                                            *
  * Purpose: find existing or add new structure and return pointer             *
  *                                                                            *
  * Return value: pointer to a trend structure                                 *
@@ -363,8 +357,6 @@ static ZBX_DC_TREND	*DCget_trend(zbx_uint64_t itemid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCupdate_trends                                                  *
- *                                                                            *
  * Purpose: apply disable_from changes to cache                               *
  *                                                                            *
  ******************************************************************************/
@@ -391,8 +383,6 @@ static void	DCupdate_trends(zbx_vector_uint64_pair_t *trends_diff)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_insert_trends_in_db                                           *
- *                                                                            *
  * Purpose: helper function for DCflush trends                                *
  *                                                                            *
  ******************************************************************************/
@@ -441,8 +431,6 @@ static void	dc_insert_trends_in_db(ZBX_DC_TREND *trends, int trends_num, unsigne
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_remove_updated_trends                                         *
- *                                                                            *
  * Purpose: Update trends disable_until for items without trends data past or *
  *          equal the specified clock                                         *
  *                                                                            *
@@ -514,8 +502,6 @@ static void	dc_remove_updated_trends(ZBX_DC_TREND *trends, int trends_num, const
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trends_update_float                                           *
- *                                                                            *
  * Purpose: helper function for DCflush trends                                *
  *                                                                            *
  ******************************************************************************/
@@ -547,8 +533,6 @@ static void	dc_trends_update_float(ZBX_DC_TREND *trend, DB_ROW row, int num, siz
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trends_update_uint                                            *
- *                                                                            *
  * Purpose: helper function for DCflush trends                                *
  *                                                                            *
  ******************************************************************************/
@@ -587,8 +571,6 @@ static void	dc_trends_update_uint(ZBX_DC_TREND *trend, DB_ROW row, int num, size
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trends_fetch_and_update                                       *
- *                                                                            *
  * Purpose: helper function for DCflush trends                                *
  *                                                                            *
  ******************************************************************************/
@@ -665,8 +647,6 @@ static void	dc_trends_fetch_and_update(ZBX_DC_TREND *trends, int trends_num, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: DBflush_trends                                                   *
- *                                                                            *
  * Purpose: flush trend to the database                                       *
  *                                                                            *
  ******************************************************************************/
@@ -787,8 +767,6 @@ static void	DBflush_trends(ZBX_DC_TREND *trends, int *trends_num, zbx_vector_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: DCflush_trend                                                    *
- *                                                                            *
  * Purpose: move trend to the array of trends for flushing to DB              *
  *                                                                            *
  ******************************************************************************/
@@ -812,8 +790,6 @@ static void	DCflush_trend(ZBX_DC_TREND *trend, ZBX_DC_TREND **trends, int *trend
 
 /******************************************************************************
  *                                                                            *
- * Function: DCadd_trend                                                      *
- *                                                                            *
  * Purpose: add new value to the trends                                       *
  *                                                                            *
  ******************************************************************************/
@@ -858,8 +834,6 @@ static void	DCadd_trend(const ZBX_DC_HISTORY *history, ZBX_DC_TREND **trends, in
 
 /******************************************************************************
  *                                                                            *
- * Function: DCmass_update_trends                                             *
- *                                                                            *
  * Purpose: update trends cache and get list of trends to flush into database *
  *                                                                            *
  * Parameters: history         - [IN]  array of history data                  *
@@ -943,8 +917,6 @@ static int	zbx_trend_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBmass_update_trends                                             *
- *                                                                            *
  * Purpose: prepare history data using items from configuration cache         *
  *                                                                            *
  * Parameters: trends      - [IN] trends from cache to be added to database   *
@@ -979,8 +951,6 @@ zbx_host_info_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_host_info_clean                                              *
- *                                                                            *
  * Purpose: frees resources allocated to store host groups names              *
  *                                                                            *
  * Parameters: host_info - [IN] host information                              *
@@ -994,8 +964,6 @@ static void	zbx_host_info_clean(zbx_host_info_t *host_info)
 
 /******************************************************************************
  *                                                                            *
- * Function: db_get_hosts_info_by_hostid                                      *
- *                                                                            *
  * Purpose: get hosts groups names                                            *
  *                                                                            *
  * Parameters: hosts_info - [IN/OUT] output names of host groups for a host   *
@@ -1056,8 +1024,6 @@ zbx_item_info_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: db_get_items_info_by_itemid                                      *
- *                                                                            *
  * Purpose: get items name and item tags                                      *
  *                                                                            *
  * Parameters: items_info - [IN/OUT] output item name and item tags           *
@@ -1123,8 +1089,6 @@ static void	db_get_items_info_by_itemid(zbx_hashset_t *items_info, const zbx_vec
 
 /******************************************************************************
  *                                                                            *
- * Function: item_tag_free                                                    *
- *                                                                            *
  * Purpose: frees resources allocated to store item tag                       *
  *                                                                            *
  * Parameters: item_tag - [IN] item tag                                       *
@@ -1138,8 +1102,6 @@ static void	item_tag_free(zbx_tag_t item_tag)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_item_info_clean                                              *
- *                                                                            *
  * Purpose: frees resources allocated to store item tags and name             *
  *                                                                            *
  * Parameters: item_info - [IN] item information                              *
@@ -1154,8 +1116,6 @@ static void	zbx_item_info_clean(zbx_item_info_t *item_info)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCexport_trends                                                  *
- *                                                                            *
  * Purpose: export trends                                                     *
  *                                                                            *
  * Parameters: trends     - [IN] trends from cache                            *
@@ -1254,8 +1214,6 @@ static void	DCexport_trends(const ZBX_DC_TREND *trends, int trends_num, zbx_hash
 
 /******************************************************************************
  *                                                                            *
- * Function: DCexport_history                                                 *
- *                                                                            *
  * Purpose: export history                                                    *
  *                                                                            *
  * Parameters: history     - [IN/OUT] array of history data                   *
@@ -1369,8 +1327,6 @@ static void	DCexport_history(const ZBX_DC_HISTORY *history, int history_num, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: DCexport_history_and_trends                                      *
- *                                                                            *
  * Purpose: export history and trends                                         *
  *                                                                            *
  * Parameters: history     - [IN/OUT] array of history data                   *
@@ -1490,8 +1446,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: DCexport_all_trends                                              *
- *                                                                            *
  * Purpose: export all trends                                                 *
  *                                                                            *
  * Parameters: trends     - [IN] trends from cache                            *
@@ -1539,8 +1493,6 @@ static void	DCexport_all_trends(const ZBX_DC_TREND *trends, int trends_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_trends                                                    *
- *                                                                            *
  * Purpose: flush all trends to the database                                  *
  *                                                                            *
  ******************************************************************************/
@@ -1590,8 +1542,6 @@ static void	DCsync_trends(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: recalculate_triggers                                             *
- *                                                                            *
  * Purpose: re-calculate and update values of triggers related to the items   *
  *                                                                            *
  * Parameters: history           - [IN] array of history data                 *
@@ -1766,8 +1716,6 @@ static void	DCinventory_value_free(zbx_inventory_value_t *inventory_value)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_history_clean_value                                           *
- *                                                                            *
  * Purpose: frees resources allocated to store str/text/log value             *
  *                                                                            *
  * Parameters: history     - [IN] the history data                            *
@@ -1801,8 +1749,6 @@ static void	dc_history_clean_value(ZBX_DC_HISTORY *history)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_free_item_values                                              *
- *                                                                            *
  * Purpose: frees resources allocated to store str/text/log values            *
  *                                                                            *
  * Parameters: history     - [IN] the history data                            *
@@ -1819,8 +1765,6 @@ static void	hc_free_item_values(ZBX_DC_HISTORY *history, int history_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_history_set_error                                             *
- *                                                                            *
  * Purpose: sets history data to notsupported                                 *
  *                                                                            *
  * Parameters: history  - [IN] the history data                               *
@@ -1840,8 +1784,6 @@ static void	dc_history_set_error(ZBX_DC_HISTORY *hdata, char *errmsg)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_history_set_value                                             *
- *                                                                            *
  * Purpose: sets history data value                                           *
  *                                                                            *
  * Parameters: hdata      - [IN/OUT] the history data                         *
@@ -1896,8 +1838,6 @@ static void	dc_history_set_value(ZBX_DC_HISTORY *hdata, unsigned char value_type
 
 /******************************************************************************
  *                                                                            *
- * Function: normalize_item_value                                             *
- *                                                                            *
  * Purpose: normalize item value by performing truncation of long text        *
  *          values and changes value format according to the item value type  *
  *                                                                            *
@@ -1973,8 +1913,6 @@ static void	normalize_item_value(const DC_ITEM *item, ZBX_DC_HISTORY *hdata)
 
 /******************************************************************************
  *                                                                            *
- * Function: calculate_item_update                                            *
- *                                                                            *
  * Purpose: calculates what item fields must be updated                       *
  *                                                                            *
  * Parameters: item      - [IN] the item                                      *
@@ -2066,8 +2004,6 @@ static zbx_item_diff_t	*calculate_item_update(DC_ITEM *item, const ZBX_DC_HISTOR
 
 /******************************************************************************
  *                                                                            *
- * Function: DBmass_update_items                                              *
- *                                                                            *
  * Purpose: update item data and inventory in database                        *
  *                                                                            *
  * Parameters: item_diff        - item changes                                *
@@ -2116,8 +2052,6 @@ static void	DBmass_update_items(const zbx_vector_ptr_t *item_diff, const zbx_vec
 
 /******************************************************************************
  *                                                                            *
- * Function: DCmass_proxy_prepare_itemdiff                                    *
- *                                                                            *
  * Purpose: prepare itemdiff after receiving new values                       *
  *                                                                            *
  * Parameters: history     - array of history data                            *
@@ -2156,8 +2090,6 @@ static void	DCmass_proxy_prepare_itemdiff(ZBX_DC_HISTORY *history, int history_n
 
 /******************************************************************************
  *                                                                            *
- * Function: DCmass_proxy_update_items                                        *
- *                                                                            *
  * Purpose: update items info after new value is received                     *
  *                                                                            *
  * Parameters: item_diff - diff of items to be updated                        *
@@ -2347,8 +2279,6 @@ static int	add_history(ZBX_DC_HISTORY *history, int history_num, zbx_vector_ptr_
 
 /******************************************************************************
  *                                                                            *
- * Function: DBmass_add_history                                               *
- *                                                                            *
  * Purpose: inserting new history data after new value is received            *
  *                                                                            *
  * Parameters: history     - array of history data                            *
@@ -2385,8 +2315,6 @@ static int	DBmass_add_history(ZBX_DC_HISTORY *history, int history_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_add_proxy_history                                             *
- *                                                                            *
  * Purpose: helper function for DCmass_proxy_add_history()                    *
  *                                                                            *
  * Comment: this function is meant for items with value_type other other than *
@@ -2454,8 +2382,6 @@ static void	dc_add_proxy_history(ZBX_DC_HISTORY *history, int history_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_add_proxy_history_meta                                        *
- *                                                                            *
  * Purpose: helper function for DCmass_proxy_add_history()                    *
  *                                                                            *
  * Comment: this function is meant for items with value_type other other than *
@@ -2524,8 +2450,6 @@ static void	dc_add_proxy_history_meta(ZBX_DC_HISTORY *history, int history_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_add_proxy_history_log                                         *
- *                                                                            *
  * Purpose: helper function for DCmass_proxy_add_history()                    *
  *                                                                            *
  * Comment: this function is meant for items with value_type                  *
@@ -2595,8 +2519,6 @@ static void	dc_add_proxy_history_log(ZBX_DC_HISTORY *history, int history_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_add_proxy_history_notsupported                                *
- *                                                                            *
  * Purpose: helper function for DCmass_proxy_add_history()                    *
  *                                                                            *
  ******************************************************************************/
@@ -2626,8 +2548,6 @@ static void	dc_add_proxy_history_notsupported(ZBX_DC_HISTORY *history, int histo
 
 /******************************************************************************
  *                                                                            *
- * Function: DCmass_proxy_add_history                                         *
- *                                                                            *
  * Purpose: inserting new history data after new value is received            *
  *                                                                            *
  * Parameters: history     - array of history data                            *
@@ -2689,8 +2609,6 @@ static void	DBmass_proxy_add_history(ZBX_DC_HISTORY *history, int history_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCmass_prepare_history                                           *
- *                                                                            *
  * Purpose: prepare history data using items from configuration cache and     *
  *          generate item changes to be applied and host inventory values to  *
  *          be added                                                          *
@@ -2814,8 +2732,6 @@ static void	DCmass_prepare_history(ZBX_DC_HISTORY *history, const zbx_vector_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: DCmodule_prepare_history                                         *
- *                                                                            *
  * Purpose: prepare history data to share them with loadable modules, sort    *
  *          data by type skipping low-level discovery data, meta information  *
  *          updates and notsupported items                                    *
@@ -3001,8 +2917,6 @@ static void	DCmodule_sync_history(int history_float_num, int history_integer_num
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_prepare_history                                            *
- *                                                                            *
  * Purpose: prepares history update by checking which values must be stored   *
  *                                                                            *
  * Parameters: history     - [IN/OUT] the history values                      *
@@ -3146,8 +3060,6 @@ static void	sync_proxy_history(int *total_num, int *more)
 
 /******************************************************************************
  *                                                                            *
- * Function: sync_server_history                                              *
- *                                                                            *
  * Purpose: flush history cache to database, process triggers of flushed      *
  *          and timer triggers from timer queue                               *
  *                                                                            *
@@ -3483,8 +3395,6 @@ static void	sync_server_history(int *values_num, int *triggers_num, int *more)
 
 /******************************************************************************
  *                                                                            *
- * Function: sync_history_cache_full                                          *
- *                                                                            *
  * Purpose: writes updates and new data from history cache to database        *
  *                                                                            *
  * Comments: This function is used to flush history cache at server/proxy     *
@@ -3561,8 +3471,6 @@ static void	sync_history_cache_full(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_log_sync_history_cache_progress                              *
- *                                                                            *
  * Purpose: log progress of syncing history data                              *
  *                                                                            *
  ******************************************************************************/
@@ -3612,8 +3520,6 @@ void	zbx_log_sync_history_cache_progress(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_sync_history_cache                                           *
- *                                                                            *
  * Purpose: writes updates and new data from history cache to database        *
  *                                                                            *
  * Parameters: values_num - [OUT] the number of synced values                  *
@@ -3869,8 +3775,6 @@ static void	dc_local_add_history_empty(zbx_uint64_t itemid, unsigned char item_v
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_add_history                                                   *
- *                                                                            *
  * Purpose: add new value to the cache                                        *
  *                                                                            *
  * Parameters:  itemid          - [IN] the itemid                             *
@@ -4012,8 +3916,6 @@ ZBX_MEM_FUNC_IMPL(__hc, hc_mem)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_queue_elem_compare_func                                       *
- *                                                                            *
  * Purpose: compares history queue elements                                   *
  *                                                                            *
  ******************************************************************************/
@@ -4031,8 +3933,6 @@ static int	hc_queue_elem_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_free_data                                                     *
- *                                                                            *
  * Purpose: free history item data allocated in history cache                 *
  *                                                                            *
  * Parameters: data - [IN] history item data                                  *
@@ -4071,8 +3971,6 @@ static void	hc_free_data(zbx_hc_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_queue_item                                                    *
- *                                                                            *
  * Purpose: put back item into history queue                                  *
  *                                                                            *
  * Parameters: data - [IN] history item data                                  *
@@ -4087,8 +3985,6 @@ static void	hc_queue_item(zbx_hc_item_t *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_get_item                                                      *
- *                                                                            *
  * Purpose: returns history item by itemid                                    *
  *                                                                            *
  * Parameters: itemid - [IN] the item id                                      *
@@ -4104,8 +4000,6 @@ static zbx_hc_item_t	*hc_get_item(zbx_uint64_t itemid)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_add_item                                                      *
- *                                                                            *
  * Purpose: adds a new item to history cache                                  *
  *                                                                            *
  * Parameters: itemid - [IN] the item id                                      *
@@ -4123,8 +4017,6 @@ static zbx_hc_item_t	*hc_add_item(zbx_uint64_t itemid, zbx_hc_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_mem_value_str_dup                                             *
- *                                                                            *
  * Purpose: copies string value to history cache                              *
  *                                                                            *
  * Parameters: str - [IN] the string value                                    *
@@ -4147,8 +4039,6 @@ static char	*hc_mem_value_str_dup(const dc_value_str_t *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_clone_history_str_data                                        *
- *                                                                            *
  * Purpose: clones string value into history data memory                      *
  *                                                                            *
  * Parameters: dst - [IN/OUT] a reference to the cloned value                 *
@@ -4179,8 +4069,6 @@ static int	hc_clone_history_str_data(char **dst, const dc_value_str_t *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_clone_history_log_data                                        *
- *                                                                            *
  * Purpose: clones log value into history data memory                         *
  *                                                                            *
  * Parameters: dst        - [IN/OUT] a reference to the cloned value          *
@@ -4219,8 +4107,6 @@ static int	hc_clone_history_log_data(zbx_log_value_t **dst, const dc_item_value_
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_clone_history_data                                            *
- *                                                                            *
  * Purpose: clones item value from local cache into history cache             *
  *                                                                            *
  * Parameters: data       - [IN/OUT] a reference to the cloned value          *
@@ -4336,8 +4222,6 @@ static int	hc_clone_history_data(zbx_hc_data_t **data, const dc_item_value_t *it
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_add_item_values                                               *
- *                                                                            *
  * Purpose: adds item values to the history cache                             *
  *                                                                            *
  * Parameters: values     - [IN] the item values to add                       *
@@ -4409,8 +4293,6 @@ static void	hc_add_item_values(dc_item_value_t *values, int values_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_copy_history_data                                             *
- *                                                                            *
  * Purpose: copies item value from history cache into the specified history   *
  *          value                                                             *
  *                                                                            *
@@ -4473,8 +4355,6 @@ static void	hc_copy_history_data(ZBX_DC_HISTORY *history, zbx_uint64_t itemid, z
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_pop_items                                                     *
- *                                                                            *
  * Purpose: pops the next batch of history items from cache for processing    *
  *                                                                            *
  * Parameters: history_items - [OUT] the locked history items                 *
@@ -4500,8 +4380,6 @@ static void	hc_pop_items(zbx_vector_ptr_t *history_items)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_get_item_values                                               *
- *                                                                            *
  * Purpose: gets item history values                                          *
  *                                                                            *
  * Parameters: history       - [OUT] the history valeus                       *
@@ -4528,8 +4406,6 @@ static void	hc_get_item_values(ZBX_DC_HISTORY *history, zbx_vector_ptr_t *histor
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_push_processed_items                                          *
- *                                                                            *
  * Purpose: push back the processed history items into history cache          *
  *                                                                            *
  * Parameters: history_items - [IN] the history items containing processed    *
@@ -4573,8 +4449,6 @@ void	hc_push_items(zbx_vector_ptr_t *history_items)
 
 /******************************************************************************
  *                                                                            *
- * Function: hc_queue_get_size                                                *
- *                                                                            *
  * Purpose: retrieve the size of history queue                                *
  *                                                                            *
  ******************************************************************************/
@@ -4606,8 +4480,6 @@ int	hc_get_history_compression_age(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: init_trend_cache                                                 *
- *                                                                            *
  * Purpose: Allocate shared memory for trend cache (part of database cache)   *
  *                                                                            *
  * Comments: Is optionally called from init_database_cache()                  *
@@ -4655,8 +4527,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: init_database_cache                                              *
- *                                                                            *
  * Purpose: Allocate shared memory for database cache                         *
  *                                                                            *
  ******************************************************************************/
@@ -4732,8 +4602,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_all                                                       *
- *                                                                            *
  * Purpose: writes updates and new data from pool and cache data to database  *
  *                                                                            *
  ******************************************************************************/
@@ -4750,8 +4618,6 @@ static void	DCsync_all(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: free_database_cache                                              *
- *                                                                            *
  * Purpose: Free memory allocated for database cache                          *
  *                                                                            *
  ******************************************************************************/
@@ -4784,8 +4650,6 @@ void	free_database_cache(int sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_nextid                                                     *
- *                                                                            *
  * Purpose: Return next id for requested table                                *
  *                                                                            *
  ******************************************************************************/
@@ -4862,8 +4726,6 @@ zbx_uint64_t	DCget_nextid(const char *table_name, int num)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCupdate_interfaces_availability                                 *
- *                                                                            *
  * Purpose: performs interface availability reset for hosts with              *
  *          availability set on interfaces without enabled items              *
  *                                                                            *
@@ -4889,8 +4751,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_get_diag_stats                                            *
- *                                                                            *
  * Purpose: get history cache diagnostics statistics                          *
  *                                                                            *
  ******************************************************************************/
@@ -4906,8 +4766,6 @@ void	zbx_hc_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_get_mem_stats                                             *
- *                                                                            *
  * Purpose: get shared memory allocator statistics                            *
  *                                                                            *
  ******************************************************************************/
@@ -4926,8 +4784,6 @@ void	zbx_hc_get_mem_stats(zbx_mem_stats_t *data, zbx_mem_stats_t *index)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_get_items                                                 *
- *                                                                            *
  * Purpose: get statistics of cached items                                    *
  *                                                                            *
  ******************************************************************************/
@@ -4952,8 +4808,6 @@ void	zbx_hc_get_items(zbx_vector_uint64_pair_t *items)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_queue_locked                                      *
- *                                                                            *
  * Purpose: checks if database trigger queue table is locked                  *
  *                                                                            *
  ******************************************************************************/
@@ -4964,8 +4818,6 @@ int	zbx_db_trigger_queue_locked(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_queue_unlock                                      *
- *                                                                            *
  * Purpose: unlocks database trigger queue table                              *
  *                                                                            *
  ******************************************************************************/
@@ -4976,8 +4828,6 @@ void	zbx_db_trigger_queue_unlock(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_proxyqueue_peek                                           *
- *                                                                            *
  * Purpose: return first proxy in a queue, function assumes that a queue is   *
  *          not empty                                                         *
  *                                                                            *
@@ -4998,8 +4848,6 @@ static zbx_uint64_t	zbx_hc_proxyqueue_peek(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_proxyqueue_enqueue                                        *
- *                                                                            *
  * Purpose: add new proxyid to a queue                                        *
  *                                                                            *
  * Parameters: proxyid   - [IN] the proxy id                                  *
@@ -5018,8 +4866,6 @@ static void	zbx_hc_proxyqueue_enqueue(zbx_uint64_t proxyid)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_proxyqueue_dequeue                                        *
- *                                                                            *
  * Purpose: try to dequeue proxyid from a proxy queue                         *
  *                                                                            *
  * Parameters: chk_proxyid  - [IN] the proxyid                                *
@@ -5048,8 +4894,6 @@ static int	zbx_hc_proxyqueue_dequeue(zbx_uint64_t proxyid)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_proxyqueue_clear                                          *
- *                                                                            *
  * Purpose: remove all proxies from proxy priority queue                      *
  *                                                                            *
  ******************************************************************************/
@@ -5061,8 +4905,6 @@ static void	zbx_hc_proxyqueue_clear(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_check_proxy                                               *
- *                                                                            *
  * Purpose: check status of a history cache usage, enqueue/dequeue proxy      *
  *          from priority list and accordingly enable or disable wait mode    *
  *                                                                            *
diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c
index 77b63445b5d..8f2183133c7 100644
--- a/src/libs/zbxdbcache/dbconfig.c
+++ b/src/libs/zbxdbcache/dbconfig.c
@@ -78,8 +78,6 @@ int	sync_in_progress = 0;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_value_validator_func_t                                       *
- *                                                                            *
  * Purpose: validate macro value when expanding user macros                   *
  *                                                                            *
  * Parameters: macro   - [IN] the user macro                                  *
@@ -109,8 +107,6 @@ extern char		*CONFIG_VAULTDBPATH;
 extern char		*CONFIG_VAULTTOKEN;
 /******************************************************************************
  *                                                                            *
- * Function: dc_strdup                                                        *
- *                                                                            *
  * Purpose: copies string into configuration cache shared memory              *
  *                                                                            *
  ******************************************************************************/
@@ -127,8 +123,6 @@ static char	*dc_strdup(const char *source)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_item_processed_by_server                                      *
- *                                                                            *
  * Parameters: type - [IN] item type [ITEM_TYPE_* flag]                       *
  *             key  - [IN] item key                                           *
  *                                                                            *
@@ -254,8 +248,6 @@ static unsigned char	poller_by_item(unsigned char type, const char *key)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_is_counted_in_item_queue                                     *
- *                                                                            *
  * Purpose: determine whether the given item type is counted in item queue    *
  *                                                                            *
  * Return value: SUCCEED if item is counted in the queue, FAIL otherwise      *
@@ -286,8 +278,6 @@ int	zbx_is_counted_in_item_queue(unsigned char type, const char *key)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_item_nextcheck_seed                                          *
- *                                                                            *
  * Purpose: get the seed value to be used for item nextcheck calculations     *
  *                                                                            *
  * Return value: the seed for nextcheck calculations                          *
@@ -442,8 +432,6 @@ static void	DCincrease_disable_until(ZBX_DC_INTERFACE *interface, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCfind_id                                                        *
- *                                                                            *
  * Purpose: Find an element in a hashset by its 'id' or create the element if *
  *          it does not exist                                                 *
  *                                                                            *
@@ -504,8 +492,6 @@ static ZBX_DC_HOST	*DCfind_host(const char *host)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCfind_proxy                                                     *
- *                                                                            *
  * Purpose: Find a record with proxy details in configuration cache using the *
  *          proxy name                                                        *
  *                                                                            *
@@ -652,8 +638,6 @@ static void	DCupdate_proxy_queue(ZBX_DC_PROXY *proxy)
 
 /******************************************************************************
  *                                                                            *
- * Function: config_gmacro_add_index                                          *
- *                                                                            *
  * Purpose: adds global macro index                                           *
  *                                                                            *
  * Parameters: gmacro_index - [IN/OUT] a global macro index hashset           *
@@ -683,8 +667,6 @@ static ZBX_DC_GMACRO_M	*config_gmacro_add_index(zbx_hashset_t *gmacro_index, ZBX
 
 /******************************************************************************
  *                                                                            *
- * Function: config_gmacro_remove_index                                       *
- *                                                                            *
  * Purpose: removes global macro index                                        *
  *                                                                            *
  * Parameters: gmacro_index - [IN/OUT] a global macro index hashset           *
@@ -708,8 +690,6 @@ static ZBX_DC_GMACRO_M	*config_gmacro_remove_index(zbx_hashset_t *gmacro_index,
 
 /******************************************************************************
  *                                                                            *
- * Function: config_gmacro_context_compare                                    *
- *                                                                            *
  * Purpose: comparison function to sort global macro vector by context        *
  *          operator, value and macro name                                    *
  *                                                                            *
@@ -734,8 +714,6 @@ static int	config_gmacro_context_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: config_hmacro_add_index                                          *
- *                                                                            *
  * Purpose: adds host macro index                                             *
  *                                                                            *
  * Parameters: hmacro_index - [IN/OUT] a host macro index hashset             *
@@ -764,8 +742,6 @@ static ZBX_DC_HMACRO_HM	*config_hmacro_add_index(zbx_hashset_t *hmacro_index, ZB
 
 /******************************************************************************
  *                                                                            *
- * Function: config_hmacro_remove_index                                       *
- *                                                                            *
  * Purpose: removes host macro index                                          *
  *                                                                            *
  * Parameters: hmacro_index - [IN/OUT] a host macro index hashset             *
@@ -790,8 +766,6 @@ static ZBX_DC_HMACRO_HM	*config_hmacro_remove_index(zbx_hashset_t *hmacro_index,
 
 /******************************************************************************
  *                                                                            *
- * Function: config_hmacro_context_compare                                    *
- *                                                                            *
  * Purpose: comparison function to sort host macro vector by context          *
  *          operator, value and macro name                                    *
  *                                                                            *
@@ -910,8 +884,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: set_hk_opt                                                       *
- *                                                                            *
  * Purpose: sets and validates global housekeeping option                     *
  *                                                                            *
  * Parameters: value     - [OUT] housekeeping setting                         *
@@ -2234,8 +2206,6 @@ void	DCsync_kvs_paths(const struct zbx_json_parse *jp_kvs_paths)
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_host_interface_macros                                 *
- *                                                                            *
  * Purpose: trying to resolve the macros in host interface                    *
  *                                                                            *
  ******************************************************************************/
@@ -2276,11 +2246,9 @@ static void	substitute_host_interface_macros(ZBX_DC_INTERFACE *interface)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_interface_snmpaddrs_remove                                    *
- *                                                                            *
  * Purpose: remove interface from SNMP address -> interfaceid index           *
  *                                                                            *
- * Parameters: interface - [IN] the interface                                 *
+ * Parameters: interface - [IN]                                               *
  *                                                                            *
  ******************************************************************************/
 static void	dc_interface_snmpaddrs_remove(ZBX_DC_INTERFACE *interface)
@@ -2314,13 +2282,11 @@ static void	dc_interface_snmpaddrs_remove(ZBX_DC_INTERFACE *interface)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_interface_snmp_set                                            *
- *                                                                            *
  * Purpose: setup SNMP attributes for interface with interfaceid index        *
  *                                                                            *
- * Parameters: interface - [IN] the interface                                 *
- *             row       - [IN] the row data from DB                          *
- *
+ * Parameters: interfaceid  - [IN]                                            *
+ *             row          - [IN] the row data from DB                       *
+ *             bulk_changed - [IN]                                            *
  *                                                                            *
  ******************************************************************************/
 static ZBX_DC_SNMPINTERFACE	*dc_interface_snmp_set(zbx_uint64_t interfaceid, const char **row,
@@ -2360,11 +2326,9 @@ static ZBX_DC_SNMPINTERFACE	*dc_interface_snmp_set(zbx_uint64_t interfaceid, con
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_interface_snmp_remove                                    *
- *                                                                            *
  * Purpose: remove interface from SNMP address -> interfaceid index           *
  *                                                                            *
- * Parameters: interface - [IN] the interface                                 *
+ * Parameters: interfaceid - [IN]                                             *
  *                                                                            *
  ******************************************************************************/
 static void	dc_interface_snmp_remove(zbx_uint64_t interfaceid)
@@ -2632,8 +2596,6 @@ static void	DCsync_interfaces(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_interface_snmpitems_remove                                    *
- *                                                                            *
  * Purpose: remove item from interfaceid -> itemid index                      *
  *                                                                            *
  * Parameters: interface - [IN] the item                                      *
@@ -2665,8 +2627,6 @@ static void	dc_interface_snmpitems_remove(ZBX_DC_ITEM *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_masteritem_remove_depitem                                     *
- *                                                                            *
  * Purpose: remove itemid from master item dependent itemid vector            *
  *                                                                            *
  * Parameters: master_itemid - [IN] the master item identifier                *
@@ -2700,8 +2660,6 @@ static void	dc_masteritem_remove_depitem(zbx_uint64_t master_itemid, zbx_uint64_
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_interface_update_agent_stats                                  *
- *                                                                            *
  * Purpose: update number of items per agent statistics                       *
  *                                                                            *
  * Parameters: interface - [IN/OUT] the interface                             *
@@ -3791,8 +3749,6 @@ static void	DCconfig_sort_triggers_topologically(void);
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_deplist_release                                       *
- *                                                                            *
  * Purpose: releases trigger dependency list, removing it if necessary        *
  *                                                                            *
  ******************************************************************************/
@@ -3810,8 +3766,6 @@ static int	dc_trigger_deplist_release(ZBX_DC_TRIGGER_DEPLIST *trigdep)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_deplist_init                                          *
- *                                                                            *
  * Purpose: initializes trigger dependency list                               *
  *                                                                            *
  ******************************************************************************/
@@ -3825,8 +3779,6 @@ static void	dc_trigger_deplist_init(ZBX_DC_TRIGGER_DEPLIST *trigdep, ZBX_DC_TRIG
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_deplist_reset                                         *
- *                                                                            *
  * Purpose: resets trigger dependency list to release memory allocated by     *
  *          dependencies vector                                               *
  *                                                                            *
@@ -4021,8 +3973,6 @@ static int	dc_function_calculate_nextcheck(const zbx_trigger_timer_t *timer, tim
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_function_timer_create                                 *
- *                                                                            *
  * Purpose: create trigger timer based on the trend function                  *
  *                                                                            *
  * Return value:  Created timer or NULL in the case of error.                 *
@@ -4074,8 +4024,6 @@ static zbx_trigger_timer_t	*dc_trigger_function_timer_create(ZBX_DC_FUNCTION *fu
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_timer_create                                          *
- *                                                                            *
  * Purpose: create trigger timer based on the specified trigger               *
  *                                                                            *
  * Return value:  Created timer or NULL in the case of error.                 *
@@ -4101,8 +4049,6 @@ static zbx_trigger_timer_t	*dc_trigger_timer_create(ZBX_DC_TRIGGER *trigger)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_timer_free                                            *
- *                                                                            *
  * Purpose: free trigger timer                                                *
  *                                                                            *
  ******************************************************************************/
@@ -4116,8 +4062,6 @@ static void	dc_trigger_timer_free(zbx_trigger_timer_t *timer)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_schedule_trigger_timer                                        *
- *                                                                            *
  * Purpose: schedule trigger timer to be executed at the specified time       *
  *                                                                            *
  * Parameter: timer   - [IN] the timer to schedule                            *
@@ -4145,8 +4089,6 @@ static void	dc_schedule_trigger_timer(zbx_trigger_timer_t *timer, const zbx_time
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_schedule_new_trigger_timers                                   *
- *                                                                            *
  * Purpose: set timer schedule and evaluation times based on functions and    *
  *          old trend function queue                                          *
  *                                                                            *
@@ -4324,8 +4266,6 @@ static void	DCsync_functions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_regexp_remove_expression                                      *
- *                                                                            *
  * Purpose: removes expression from regexp                                    *
  *                                                                            *
  ******************************************************************************/
@@ -4352,8 +4292,6 @@ static ZBX_DC_REGEXP	*dc_regexp_remove_expression(const char *regexp_name, zbx_u
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_expressions                                               *
- *                                                                            *
  * Purpose: Updates expressions configuration cache                           *
  *                                                                            *
  * Parameters: result - [IN] the result of expressions database select        *
@@ -4445,8 +4383,6 @@ static void	DCsync_expressions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_actions                                                   *
- *                                                                            *
  * Purpose: Updates actions configuration cache                               *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -4517,8 +4453,6 @@ static void	DCsync_actions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_action_ops                                                *
- *                                                                            *
  * Purpose: Updates action operation class flags in configuration cache       *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -4553,8 +4487,6 @@ static void	DCsync_action_ops(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_compare_action_conditions_by_type                             *
- *                                                                            *
  * Purpose: compare two action conditions by their type                       *
  *                                                                            *
  * Comments: This function is used to sort action conditions by type.         *
@@ -4572,8 +4504,6 @@ static int	dc_compare_action_conditions_by_type(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_action_conditions                                         *
- *                                                                            *
  * Purpose: Updates action conditions configuration cache                     *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -4677,8 +4607,6 @@ static void	DCsync_action_conditions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_correlations                                              *
- *                                                                            *
  * Purpose: Updates correlations configuration cache                          *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -4747,15 +4675,11 @@ static void	DCsync_correlations(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_corr_condition_get_size                                       *
- *                                                                            *
  * Purpose: get the actual size of correlation condition data depending on    *
  *          its type                                                          *
  *                                                                            *
  * Parameters: type - [IN] the condition type                                 *
  *                                                                            *
- * Return value: the size                                                     *
- *                                                                            *
  ******************************************************************************/
 static size_t	dc_corr_condition_get_size(unsigned char type)
 {
@@ -4781,8 +4705,6 @@ static size_t	dc_corr_condition_get_size(unsigned char type)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_corr_condition_init_data                                      *
- *                                                                            *
  * Purpose: initializes correlation condition data from database row          *
  *                                                                            *
  * Parameters: condition - [IN] the condition to initialize                   *
@@ -4830,8 +4752,6 @@ static void	dc_corr_condition_init_data(zbx_dc_corr_condition_t *condition, int
 
 /******************************************************************************
  *                                                                            *
- * Function: corr_condition_free_data                                         *
- *                                                                            *
  * Purpose: frees correlation condition data                                  *
  *                                                                            *
  * Parameters: condition - [IN] the condition                                 *
@@ -4861,8 +4781,6 @@ static void	corr_condition_free_data(zbx_dc_corr_condition_t *condition)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_compare_corr_conditions_by_type                               *
- *                                                                            *
  * Purpose: compare two correlation conditions by their type                  *
  *                                                                            *
  * Comments: This function is used to sort correlation conditions by type.    *
@@ -4880,8 +4798,6 @@ static int	dc_compare_corr_conditions_by_type(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_corr_conditions                                           *
- *                                                                            *
  * Purpose: Updates correlation conditions configuration cache                *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -4989,8 +4905,6 @@ static void	DCsync_corr_conditions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_corr_operations                                           *
- *                                                                            *
  * Purpose: Updates correlation operations configuration cache                *
  *                                                                            *
  * Parameters: result - [IN] the result of correlation operations database    *
@@ -5073,8 +4987,6 @@ static int	dc_compare_hgroups(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_hostgroups                                                *
- *                                                                            *
  * Purpose: Updates host groups configuration cache                           *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -5141,8 +5053,6 @@ static void	DCsync_hostgroups(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_trigger_tags                                              *
- *                                                                            *
  * Purpose: Updates trigger tags in configuration cache                       *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -5226,8 +5136,6 @@ static void	DCsync_trigger_tags(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_item_tags                                                 *
- *                                                                            *
  * Purpose: Updates item tags in configuration cache                          *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -5311,8 +5219,6 @@ static void	DCsync_item_tags(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_host_tags                                                 *
- *                                                                            *
  * Purpose: Updates host tags in configuration cache                          *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -5409,8 +5315,6 @@ static void	DCsync_host_tags(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_compare_itemscript_param                                      *
- *                                                                            *
  * Purpose: compare two item script parameters                                *
  *                                                                            *
  ******************************************************************************/
@@ -5427,8 +5331,6 @@ static int	dc_compare_itemscript_param(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_compare_item_preproc_by_step                                  *
- *                                                                            *
  * Purpose: compare two item preprocessing operations by step                 *
  *                                                                            *
  * Comments: This function is used to sort correlation conditions by type.    *
@@ -5452,8 +5354,6 @@ static int	dc_compare_preprocops_by_step(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_item_preproc                                              *
- *                                                                            *
  * Purpose: Updates item preprocessing steps in configuration cache           *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -5572,8 +5472,6 @@ static void	DCsync_item_preproc(zbx_dbsync_t *sync, int timestamp)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_itemscript_param                                          *
- *                                                                            *
  * Purpose: Updates item script parameters in configuration cache             *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -5682,8 +5580,6 @@ static void	DCsync_itemscript_param(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_hostgroup_hosts                                           *
- *                                                                            *
  * Purpose: Updates group hosts in configuration cache                        *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -5746,8 +5642,6 @@ static void	DCsync_hostgroup_hosts(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_update_topology                                       *
- *                                                                            *
  * Purpose: updates trigger topology after trigger dependency changes         *
  *                                                                            *
  ******************************************************************************/
@@ -5776,8 +5670,6 @@ static int	zbx_default_ptr_pair_ptr_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_update_cache                                          *
- *                                                                            *
  * Purpose: updates trigger related cache data;                               *
  *              1) time triggers assigned to timer processes                  *
  *              2) trigger functionality (if it uses contain disabled         *
@@ -5862,8 +5754,6 @@ static void	dc_trigger_update_cache(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_hostgroups_update_cache                                       *
- *                                                                            *
  * Purpose: updates hostgroup name index and resets nested group lists        *
  *                                                                            *
  ******************************************************************************/
@@ -5887,8 +5777,6 @@ static void	dc_hostgroups_update_cache(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_load_trigger_queue                                            *
- *                                                                            *
  * Purpose: load trigger queue from database                                  *
  *                                                                            *
  * Comments: This function is called when syncing configuration cache for the *
@@ -5929,8 +5817,6 @@ static void	dc_load_trigger_queue(zbx_hashset_t *trend_functions)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_configuration                                             *
- *                                                                            *
  * Purpose: Synchronize configuration data from database                      *
  *                                                                            *
  ******************************************************************************/
@@ -6992,8 +6878,6 @@ static int	__config_data_session_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: init_configuration_cache                                         *
- *                                                                            *
  * Purpose: Allocate shared memory for configuration cache                    *
  *                                                                            *
  ******************************************************************************/
@@ -7187,8 +7071,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: free_configuration_cache                                         *
- *                                                                            *
  * Purpose: Free memory allocated for configuration cache                     *
  *                                                                            *
  ******************************************************************************/
@@ -7211,8 +7093,6 @@ void	free_configuration_cache(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: in_maintenance_without_data_collection                           *
- *                                                                            *
  * Parameters: maintenance_status - [IN] maintenance status                   *
  *                                       HOST_MAINTENANCE_STATUS_* flag       *
  *             maintenance_type   - [IN] maintenance type                     *
@@ -7306,8 +7186,6 @@ static void	DCget_host(DC_HOST *dst_host, const ZBX_DC_HOST *src_host, unsigned
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_host_by_hostid                                             *
- *                                                                            *
  * Purpose: Locate host in configuration cache                                *
  *                                                                            *
  * Parameters: host - [OUT] pointer to DC_HOST structure                      *
@@ -7336,8 +7214,6 @@ int	DCget_host_by_hostid(DC_HOST *host, zbx_uint64_t hostid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCcheck_proxy_permissions                                        *
- *                                                                            *
  * Purpose:                                                                   *
  *     Check access rights for an active proxy and get the proxy ID           *
  *                                                                            *
@@ -7465,8 +7341,6 @@ int	DCcheck_proxy_permissions(const char *host, const zbx_socket_t *sock, zbx_ui
 #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
 /******************************************************************************
  *                                                                            *
- * Function: DCget_psk_by_identity                                            *
- *                                                                            *
  * Purpose:                                                                   *
  *     Find PSK with the specified identity in configuration cache            *
  *                                                                            *
@@ -7543,8 +7417,6 @@ size_t	DCget_psk_by_identity(const unsigned char *psk_identity, unsigned char *p
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_autoregistration_psk                                       *
- *                                                                            *
  * Purpose:                                                                   *
  *     Copy autoregistration PSK identity and value from configuration cache  *
  *     into caller's buffers                                                  *
@@ -8093,8 +7965,6 @@ static void	DCclean_trigger(DC_TRIGGER *trigger)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_items_by_keys                                       *
- *                                                                            *
  * Purpose: locate item in configuration cache by host and key                *
  *                                                                            *
  * Parameters: items    - [OUT] pointer to array of DC_ITEM structures        *
@@ -8150,8 +8020,6 @@ int	DCconfig_get_hostid_by_name(const char *host, zbx_uint64_t *hostid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_items_by_itemids                                    *
- *                                                                            *
  * Purpose: Get item with specified ID                                        *
  *                                                                            *
  * Parameters: items    - [OUT] pointer to DC_ITEM structures                 *
@@ -8241,8 +8109,6 @@ void	DCconfig_get_items_by_itemids_partial(DC_ITEM *items, const zbx_uint64_t *i
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_preproc_item_init                                             *
- *                                                                            *
  * Purpose: initialize new preprocessor item from configuration cache         *
  *                                                                            *
  * Parameters: item   - [OUT] the item to initialize                          *
@@ -8286,8 +8152,6 @@ static int	dc_preproc_item_init(zbx_preproc_item_t *item, zbx_uint64_t itemid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_preprocessable_items                                *
- *                                                                            *
  * Purpose: get preprocessable items:                                         *
  *              * items with preprocessing steps                              *
  *              * items with dependent items                                  *
@@ -8452,8 +8316,6 @@ void	DCconfig_get_triggers_by_triggerids(DC_TRIGGER *triggers, const zbx_uint64_
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_functions_by_functionids                            *
- *                                                                            *
  * Purpose: Get functions by IDs                                              *
  *                                                                            *
  * Parameters: functions   - [OUT] pointer to DC_FUNCTION structures          *
@@ -8485,11 +8347,6 @@ void	DCconfig_get_functions_by_functionids(DC_FUNCTION *functions, zbx_uint64_t
 	UNLOCK_CACHE;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: DCconfig_clean_functions                                         *
- *                                                                            *
- ******************************************************************************/
 void	DCconfig_clean_functions(DC_FUNCTION *functions, int *errcodes, size_t num)
 {
 	size_t	i;
@@ -8518,8 +8375,6 @@ void	DCconfig_clean_triggers(DC_TRIGGER *triggers, int *errcodes, size_t num)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_lock_triggers_by_history_items                          *
- *                                                                            *
  * Purpose: Lock triggers for specified items so that multiple processes do   *
  *          not process one trigger simultaneously. Otherwise, this leads to  *
  *          problems like multiple successive OK events or escalations being  *
@@ -8603,8 +8458,6 @@ next:;
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_lock_triggers_by_triggerids                             *
- *                                                                            *
  * Purpose: Lock triggers so that multiple processes do not process one       *
  *          trigger simultaneously.                                           *
  *                                                                            *
@@ -8637,11 +8490,6 @@ void	DCconfig_lock_triggers_by_triggerids(zbx_vector_uint64_t *triggerids_in, zb
 	UNLOCK_CACHE;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: DCconfig_unlock_triggers                                         *
- *                                                                            *
- ******************************************************************************/
 void	DCconfig_unlock_triggers(const zbx_vector_uint64_t *triggerids)
 {
 	int		i;
@@ -8663,8 +8511,6 @@ void	DCconfig_unlock_triggers(const zbx_vector_uint64_t *triggerids)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_unlock_all_triggers                                     *
- *                                                                            *
  * Purpose: Unlocks all locked triggers before doing full history sync at     *
  *          program exit                                                      *
  *                                                                            *
@@ -8686,8 +8532,6 @@ void	DCconfig_unlock_all_triggers(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_triggers_by_itemids                                 *
- *                                                                            *
  * Purpose: get enabled triggers for specified items                          *
  *                                                                            *
  ******************************************************************************/
@@ -8743,8 +8587,6 @@ void	DCconfig_get_triggers_by_itemids(zbx_hashset_t *trigger_info, zbx_vector_pt
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_find_active_time_function                               *
- *                                                                            *
  * Purpose: check if the expression contains time based functions             *
  *                                                                            *
  * Parameters: expression    - [IN] the original expression                   *
@@ -8795,8 +8637,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_triggers_by_timers                                    *
- *                                                                            *
  * Purpose: gets timer triggers from cache                                    *
  *                                                                            *
  * Parameters: trigger_info  - [IN/OUT] triggers                              *
@@ -8864,8 +8704,6 @@ void	zbx_dc_get_triggers_by_timers(zbx_hashset_t *trigger_info, zbx_vector_ptr_t
 
 /******************************************************************************
  *                                                                            *
- * Function: trigger_timer_validate                                           *
- *                                                                            *
  * Purpose: validate trigger timer                                            *
  *                                                                            *
  * Parameters: timer      - [IN] trigger timer                                *
@@ -8916,8 +8754,6 @@ static int	trigger_timer_validate(zbx_trigger_timer_t *timer, ZBX_DC_TRIGGER **d
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_trigger_timers                                        *
- *                                                                            *
  * Purpose: gets timers from trigger queue                                    *
  *                                                                            *
  * Parameters: timers     - [OUT] the timer triggers that must be processed   *
@@ -9019,8 +8855,6 @@ void	zbx_dc_get_trigger_timers(zbx_vector_ptr_t *timers, int now, int soft_limit
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_reschedule_trigger_timers                                     *
- *                                                                            *
  * Purpose: reschedule trigger timers                                         *
  *                                                                            *
  * Comments: Triggers are unlocked by DCconfig_unlock_triggers()              *
@@ -9068,8 +8902,6 @@ static void	dc_reschedule_trigger_timers(zbx_vector_ptr_t *timers)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_reschedule_trigger_timers                                 *
- *                                                                            *
  * Purpose: reschedule trigger timers while locking configuration cache       *
  *                                                                            *
  * Comments: Triggers are unlocked by DCconfig_unlock_triggers()              *
@@ -9099,8 +8931,6 @@ void	zbx_dc_reschedule_trigger_timers(zbx_vector_ptr_t *timers, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_timer_queue                                           *
- *                                                                            *
  * Purpose: clears timer trigger queue                                        *
  *                                                                            *
  ******************************************************************************/
@@ -9133,11 +8963,6 @@ void	zbx_dc_clear_timer_queue(zbx_vector_ptr_t *timers)
 	UNLOCK_CACHE;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_dc_free_timers                                               *
- *                                                                            *
- ******************************************************************************/
 void	zbx_dc_free_timers(zbx_vector_ptr_t *timers)
 {
 	int	i;
@@ -9248,8 +9073,6 @@ static int	dc_get_interface_by_type(DC_INTERFACE *interface, zbx_uint64_t hostid
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_interface_by_type                                   *
- *                                                                            *
  * Purpose: Locate main interface of specified type in configuration cache    *
  *                                                                            *
  * Parameters: interface - [OUT] pointer to DC_INTERFACE structure            *
@@ -9274,8 +9097,6 @@ int	DCconfig_get_interface_by_type(DC_INTERFACE *interface, zbx_uint64_t hostid,
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_interface                                           *
- *                                                                            *
  * Purpose: Locate interface in configuration cache                           *
  *                                                                            *
  * Parameters: interface - [OUT] pointer to DC_INTERFACE structure            *
@@ -9331,11 +9152,9 @@ unlock:
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_config_get_queue_nextcheck                                    *
- *                                                                            *
  * Purpose: Get nextcheck for selected queue                                  *
  *                                                                            *
- * Parameters: queue - [IN] the queue                                         *
+ * Parameters: queue - [IN]                                                   *
  *                                                                            *
  * Return value: nextcheck or FAIL if no items for the specified queue        *
  *                                                                            *
@@ -9361,8 +9180,6 @@ static int	dc_config_get_queue_nextcheck(zbx_binary_heap_t *queue)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_poller_nextcheck                                    *
- *                                                                            *
  * Purpose: Get nextcheck for selected poller                                 *
  *                                                                            *
  * Parameters: poller_type - [IN] poller type (ZBX_POLLER_TYPE_...)           *
@@ -9407,8 +9224,6 @@ static void	dc_requeue_item(ZBX_DC_ITEM *dc_item, const ZBX_DC_HOST *dc_host, co
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_requeue_item_at                                               *
- *                                                                            *
  * Purpose: requeues items at the specified time                              *
  *                                                                            *
  * Parameters: dc_item   - [IN] the item to reque                             *
@@ -9434,8 +9249,6 @@ static void	dc_requeue_item_at(ZBX_DC_ITEM *dc_item, ZBX_DC_HOST *dc_host, int n
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_poller_items                                        *
- *                                                                            *
  * Purpose: Get array of items for selected poller                            *
  *                                                                            *
  * Parameters: poller_type - [IN] poller type (ZBX_POLLER_TYPE_...)           *
@@ -9592,8 +9405,6 @@ int	DCconfig_get_poller_items(unsigned char poller_type, DC_ITEM **items)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_ipmi_poller_items                                   *
- *                                                                            *
  * Purpose: Get array of items for IPMI poller                                *
  *                                                                            *
  * Parameters: now       - [IN] current timestamp                             *
@@ -9687,8 +9498,6 @@ int	DCconfig_get_ipmi_poller_items(int now, DC_ITEM *items, int items_num, int *
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_snmp_interfaceids_by_addr                           *
- *                                                                            *
  * Purpose: get array of interface IDs for the specified address              *
  *                                                                            *
  * Return value: number of interface IDs returned                             *
@@ -9725,8 +9534,6 @@ unlock:
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_snmp_items_by_interfaceid                           *
- *                                                                            *
  * Purpose: get array of snmp trap items for the specified interfaceid        *
  *                                                                            *
  * Return value: number of items returned                                     *
@@ -9865,8 +9672,6 @@ void	DCpoller_requeue_items(const zbx_uint64_t *itemids, const int *lastclocks,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_requeue_unreachable_items                                 *
- *                                                                            *
  * Purpose: requeue unreachable items                                         *
  *                                                                            *
  * Parameters: itemids     - [IN] the item id array                           *
@@ -9916,8 +9721,6 @@ void	zbx_dc_requeue_unreachable_items(zbx_uint64_t *itemids, size_t itemids_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCinterface_get_agent_availability                               *
- *                                                                            *
  * Purpose: get interface availability data for the specified agent           *
  *                                                                            *
  * Parameters: dc_interface - [IN] the interface                              *
@@ -9970,8 +9773,6 @@ static void	DCagent_set_availability(zbx_agent_availability_t *av,  unsigned cha
 
 /******************************************************************************
  *                                                                            *
- * Function: DCinterface_set_agent_availability                               *
- *                                                                            *
  * Purpose: set interface availability data in configuration cache            *
  *                                                                            *
  * Parameters: dc_interface - [OUT] the interface                             *
@@ -10004,8 +9805,6 @@ static int	DCinterface_set_agent_availability(ZBX_DC_INTERFACE *dc_interface, in
 
 /******************************************************************************
  *                                                                            *
- * Function: DCinterface_set_availability                                     *
- *                                                                            *
  * Purpose: set interface availability data in configuration cache            *
  *                                                                            *
  * Parameters: dc_interface - [OUT] the interface                             *
@@ -10040,12 +9839,10 @@ static int	DCinterface_set_availability(ZBX_DC_INTERFACE *dc_interface, int now,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_interface_availability_init                                  *
- *                                                                            *
  * Purpose: initializes interface availability data                           *
  *                                                                            *
  * Parameters: availability - [IN/OUT] interface availability data            *
- *             interfaceid  - [IN] interface id                               *
+ *             interfaceid  - [IN]                                            *
  *                                                                            *
  ******************************************************************************/
 void	zbx_interface_availability_init(zbx_interface_availability_t *availability, zbx_uint64_t interfaceid)
@@ -10056,8 +9853,6 @@ void	zbx_interface_availability_init(zbx_interface_availability_t *availability,
 
 /********************************************************************************
  *                                                                              *
- * Function: zbx_interface_availability_clean                                   *
- *                                                                              *
  * Purpose: releases resources allocated to store interface availability data   *
  *                                                                              *
  * Parameters: ia - [IN] interface availability data                            *
@@ -10070,8 +9865,6 @@ void	zbx_interface_availability_clean(zbx_interface_availability_t *ia)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_interface_availability_free                                  *
- *                                                                            *
  * Purpose: frees interface availability data                                 *
  *                                                                            *
  * Parameters: availability - [IN] interface availability data                *
@@ -10086,8 +9879,6 @@ void	zbx_interface_availability_free(zbx_interface_availability_t *availability)
 ZBX_PTR_VECTOR_IMPL(availability_ptr, zbx_interface_availability_t *)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_agent_availability_init                                      *
- *                                                                            *
  * Purpose: initializes agent availability with the specified data            *
  *                                                                            *
  * Parameters: agent         - [IN/OUT] agent availability data               *
@@ -10109,8 +9900,6 @@ static void	zbx_agent_availability_init(zbx_agent_availability_t *agent, unsigne
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_interface_availability_is_set                                *
- *                                                                            *
  * Purpose: checks interface availability if agent availability field is set  *
  *                                                                            *
  * Parameters: ia - [IN] interface availability data                          *
@@ -10168,8 +9957,6 @@ int	zbx_interface_availability_is_set(const zbx_interface_availability_t *ia)
 
 /*******************************************************************************
  *                                                                             *
- * Function: DCinterface_activate                                              *
- *                                                                             *
  * Purpose: set interface as available based on the agent availability data    *
  *                                                                             *
  * Parameters: interfaceid - [IN] the interface identifier                     *
@@ -10231,8 +10018,6 @@ out:
 
 /************************************************************************************
  *                                                                                  *
- * Function: DCinterface_deactivate                                                 *
- *                                                                                  *
  * Purpose: attempt to set interface as unavailable based on agent availability     *
  *                                                                                  *
  * Parameters: interfaceid - [IN] the interface identifier                          *
@@ -10333,8 +10118,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DCset_interfaces_availability                                    *
- *                                                                            *
  * Purpose: update availability of interfaces in configuration cache and      *
  *          return the updated field flags                                    *
  *                                                                            *
@@ -10454,8 +10237,6 @@ static int	DCconfig_check_trigger_dependencies_rec(const ZBX_DC_TRIGGER_DEPLIST
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_check_trigger_dependencies                              *
- *                                                                            *
  * Purpose: check whether any of trigger dependencies have value PROBLEM      *
  *                                                                            *
  * Return value: SUCCEED - trigger can change its value                       *
@@ -10527,8 +10308,6 @@ exit:
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_sort_triggers_topologically                             *
- *                                                                            *
  * Purpose: assign each trigger an index based on trigger dependency topology *
  *                                                                            *
  ******************************************************************************/
@@ -10553,8 +10332,6 @@ static void	DCconfig_sort_triggers_topologically(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_triggers_apply_changes                                  *
- *                                                                            *
  * Purpose: apply trigger value,state,lastchange or error changes to          *
  *          configuration cache after committed to database                   *
  *                                                                            *
@@ -10595,8 +10372,6 @@ void	DCconfig_triggers_apply_changes(zbx_vector_ptr_t *trigger_diff)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_stats                                               *
- *                                                                            *
  * Purpose: get statistics of the database cache                              *
  *                                                                            *
  ******************************************************************************/
@@ -10707,8 +10482,6 @@ int	DCconfig_get_last_sync_time(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_proxypoller_hosts                                   *
- *                                                                            *
  * Purpose: Get array of proxies for proxy poller                             *
  *                                                                            *
  * Parameters: hosts - [OUT] array of hosts                                   *
@@ -10760,8 +10533,6 @@ int	DCconfig_get_proxypoller_hosts(DC_PROXY *proxies, int max_hosts)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_get_proxypoller_nextcheck                               *
- *                                                                            *
  * Purpose: Get nextcheck for passive proxies                                 *
  *                                                                            *
  * Return value: nextcheck or FAIL if no passive proxies in queue             *
@@ -11050,8 +10821,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_expand_user_macros                                            *
- *                                                                            *
  * Purpose: expand user macros in the specified text value                    *
  *                                                                            *
  * Parameters: text         - [IN] the text value to expand                   *
@@ -11134,8 +10903,6 @@ int	dc_expand_user_macros_len(const char *text, size_t text_len, zbx_uint64_t *h
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_expand_user_macros_len                                    *
- *                                                                            *
  * Purpose: expand user macros in the specified text                          *
  *                                                                            *
  * Parameters: text         - [IN] the text value to expand                   *
@@ -11170,8 +10937,6 @@ int	zbx_dc_expand_user_macros_len(const char *text, size_t text_len, zbx_uint64_
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_expand_user_macros                                            *
- *                                                                            *
  * Purpose: expand user macros in the specified text value                    *
  * WARNING - DO NOT USE FOR TRIGGERS, for triggers use the dedicated function *
  *                                                                            *
@@ -11233,8 +10998,6 @@ char	*dc_expand_user_macros(const char *text, zbx_uint64_t *hostids, int hostids
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_expand_user_macros                                        *
- *                                                                            *
  * Purpose: expand user macros in the specified text value                    *
  *                                                                            *
  * Parameters: text           - [IN] the text value to expand                 *
@@ -11259,8 +11022,6 @@ char	*zbx_dc_expand_user_macros(const char *text, zbx_uint64_t hostid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCfree_item_queue                                                *
- *                                                                            *
  * Purpose: frees the item queue data vector created by DCget_item_queue()    *
  *                                                                            *
  * Parameters: queue - [IN] the item queue data vector to free                *
@@ -11276,8 +11037,6 @@ void	DCfree_item_queue(zbx_vector_ptr_t *queue)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_item_queue                                                 *
- *                                                                            *
  * Purpose: retrieves vector of delayed items                                 *
  *                                                                            *
  * Parameters: queue - [OUT] the vector of delayed items (optional)           *
@@ -11370,8 +11129,6 @@ int	DCget_item_queue(zbx_vector_ptr_t *queue, int from, int to)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_trigger_items_hosts_enabled                                   *
- *                                                                            *
  * Purpose: check that functionids in trigger (recovery) expression           *
  *                                                                            *
  * Parameters: expression - [IN] trigger (recovery) expression                *
@@ -11423,8 +11180,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_status_update                                                 *
- *                                                                            *
  * Purpose: check when status information stored in configuration cache was   *
  *          updated last time and update it if necessary                      *
  *                                                                            *
@@ -11632,8 +11387,6 @@ static void	dc_status_update(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_item_count                                                 *
- *                                                                            *
  * Purpose: return the number of active items                                 *
  *                                                                            *
  * Parameters: hostid - [IN] the host id, pass 0 to specify all hosts         *
@@ -11664,8 +11417,6 @@ zbx_uint64_t	DCget_item_count(zbx_uint64_t hostid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_item_unsupported_count                                     *
- *                                                                            *
  * Purpose: return the number of active unsupported items                     *
  *                                                                            *
  * Parameters: hostid - [IN] the host id, pass 0 to specify all hosts         *
@@ -11696,8 +11447,6 @@ zbx_uint64_t	DCget_item_unsupported_count(zbx_uint64_t hostid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_trigger_count                                              *
- *                                                                            *
  * Purpose: count active triggers                                             *
  *                                                                            *
  ******************************************************************************/
@@ -11718,8 +11467,6 @@ zbx_uint64_t	DCget_trigger_count(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_host_count                                                 *
- *                                                                            *
  * Purpose: count monitored and not monitored hosts                           *
  *                                                                            *
  ******************************************************************************/
@@ -11740,8 +11487,6 @@ zbx_uint64_t	DCget_host_count(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_required_performance                                       *
- *                                                                            *
  * Return value: the required nvps number                                     *
  *                                                                            *
  ******************************************************************************/
@@ -11762,8 +11507,6 @@ double	DCget_required_performance(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_count_stats_all                                            *
- *                                                                            *
  * Purpose: retrieves all internal metrics of the configuration cache         *
  *                                                                            *
  * Parameters: stats - [OUT] the configuration cache statistics               *
@@ -11851,8 +11594,6 @@ void	DCget_status(zbx_vector_ptr_t *hosts_monitored, zbx_vector_ptr_t *hosts_not
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_expressions_by_names                                       *
- *                                                                            *
  * Purpose: retrieves global expression data from cache                       *
  *                                                                            *
  * Parameters: expressions  - [OUT] a vector of expression data pointers      *
@@ -11903,8 +11644,6 @@ void	DCget_expressions_by_names(zbx_vector_ptr_t *expressions, const char * cons
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_expression                                                 *
- *                                                                            *
  * Purpose: retrieves regular expression data from cache                      *
  *                                                                            *
  * Parameters: expressions  - [OUT] a vector of expression data pointers      *
@@ -11921,13 +11660,11 @@ void	DCget_expressions_by_name(zbx_vector_ptr_t *expressions, const char *name)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_data_expected_from                                         *
- *                                                                            *
  * Purpose: Returns time since which data is expected for the given item. We  *
  *          would not mind not having data for the item before that time, but *
  *          since that time we expect data to be coming.                      *
  *                                                                            *
- * Parameters: itemid  - [IN] the item id                                     *
+ * Parameters: itemid  - [IN]                                                 *
  *             seconds - [OUT] the time data is expected as a Unix timestamp  *
  *                                                                            *
  ******************************************************************************/
@@ -11962,13 +11699,11 @@ unlock:
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_get_hostids_by_functionids                                    *
- *                                                                            *
  * Purpose: get host identifiers for the specified list of functions          *
  *                                                                            *
- * Parameters: functionids     - [IN] the function ids                        *
- *             functionids_num - [IN] the number of function ids              *
- *             hostids         - [OUT] the host ids                           *
+ * Parameters: functionids     - [IN]                                         *
+ *             functionids_num - [IN]                                         *
+ *             hostids         - [OUT]                                        *
  *                                                                            *
  * Comments: this function must be used only by configuration syncer          *
  *                                                                            *
@@ -11995,12 +11730,10 @@ void	dc_get_hostids_by_functionids(const zbx_uint64_t *functionids, int function
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_hostids_by_functionids                                     *
- *                                                                            *
  * Purpose: get function host ids grouped by an object (trigger) id           *
  *                                                                            *
- * Parameters: functionids - [IN] the function ids                            *
- *             hostids     - [OUT] the host ids                               *
+ * Parameters: functionids - [IN]                                             *
+ *             hostids     - [OUT]                                            *
  *                                                                            *
  ******************************************************************************/
 void	DCget_hostids_by_functionids(zbx_vector_uint64_t *functionids, zbx_vector_uint64_t *hostids)
@@ -12018,13 +11751,11 @@ void	DCget_hostids_by_functionids(zbx_vector_uint64_t *functionids, zbx_vector_u
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_get_hosts_by_functionids                                      *
- *                                                                            *
  * Purpose: get hosts for the specified list of functions                     *
  *                                                                            *
- * Parameters: functionids     - [IN] the function ids                        *
- *             functionids_num - [IN] the number of function ids              *
- *             hosts           - [OUT] hosts                                  *
+ * Parameters: functionids     - [IN]                                         *
+ *             functionids_num - [IN]                                         *
+ *             hosts           - [OUT]                                        *
  *                                                                            *
  ******************************************************************************/
 static void	dc_get_hosts_by_functionids(const zbx_uint64_t *functionids, int functionids_num, zbx_hashset_t *hosts)
@@ -12053,12 +11784,10 @@ static void	dc_get_hosts_by_functionids(const zbx_uint64_t *functionids, int fun
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_hosts_by_functionids                                       *
- *                                                                            *
  * Purpose: get hosts for the specified list of functions                     *
  *                                                                            *
- * Parameters: functionids - [IN] the function ids                            *
- *             hosts       - [OUT] hosts                                      *
+ * Parameters: functionids - [IN]                                             *
+ *             hosts       - [OUT]                                            *
  *                                                                            *
  ******************************************************************************/
 void	DCget_hosts_by_functionids(const zbx_vector_uint64_t *functionids, zbx_hashset_t *hosts)
@@ -12076,8 +11805,6 @@ void	DCget_hosts_by_functionids(const zbx_vector_uint64_t *functionids, zbx_hash
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_internal_action_count                                      *
- *                                                                            *
  * Purpose: get number of enabled internal actions                            *
  *                                                                            *
  * Return value: number of enabled internal actions                           *
@@ -12098,8 +11825,6 @@ unsigned int	DCget_internal_action_count(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_config_get                                                   *
- *                                                                            *
  * Purpose: get global configuration data                                     *
  *                                                                            *
  * Parameters: cfg   - [OUT] the global configuration data                    *
@@ -12160,8 +11885,6 @@ void	zbx_config_get(zbx_config_t *cfg, zbx_uint64_t flags)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_config_get_hk_mode                                           *
- *                                                                            *
  * Purpose: get housekeeping mode for history and trends tables               *
  *                                                                            *
  * Parameters: history_mode - [OUT] history housekeeping mode, can be either  *
@@ -12180,8 +11903,6 @@ void	zbx_config_get_hk_mode(unsigned char *history_mode, unsigned char *trends_m
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_config_clean                                                 *
- *                                                                            *
  * Purpose: cleans global configuration data structure filled                 *
  *          by zbx_config_get() function                                      *
  *                                                                            *
@@ -12209,8 +11930,6 @@ void	zbx_config_clean(zbx_config_t *cfg)
 
 /*********************************************************************************
  *                                                                               *
- * Function: DCreset_interfaces_availability                                     *
- *                                                                               *
  * Purpose: resets interfaces availability for disabled hosts and hosts          *
  *          without enabled items for the corresponding interface                *
  *                                                                               *
@@ -12306,8 +12025,6 @@ int	DCreset_interfaces_availability(zbx_vector_availability_ptr_t *interfaces)
 
 /*******************************************************************************
  *                                                                             *
- * Function: DCget_interfaces_availability                                     *
- *                                                                             *
  * Purpose: gets availability data for interfaces with availability data       *
  *          changed in period from last availability update to the specified   *
  *          timestamp                                                          *
@@ -12358,8 +12075,6 @@ int	DCget_interfaces_availability(zbx_vector_ptr_t *interfaces, int *ts)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCtouch_interfaces_availability                                  *
- *                                                                            *
  * Purpose: sets availability timestamp to current time for the specified     *
  *          interfaces                                                        *
  *                                                                            *
@@ -12390,8 +12105,6 @@ void	DCtouch_interfaces_availability(const zbx_vector_uint64_t *interfaceids)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_action_copy_conditions                                        *
- *                                                                            *
  * Purpose: copies configuration cache action conditions to the specified     *
  *          vector                                                            *
  *                                                                            *
@@ -12427,8 +12140,6 @@ static void	dc_action_copy_conditions(const zbx_dc_action_t *dc_action, zbx_vect
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_action_eval_create                                            *
- *                                                                            *
  * Purpose: creates action evaluation data from configuration cache action    *
  *                                                                            *
  * Parameters: dc_action - [IN] the source action                             *
@@ -12459,8 +12170,6 @@ static zbx_action_eval_t	*dc_action_eval_create(const zbx_dc_action_t *dc_action
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_actions_eval                                          *
- *                                                                            *
  * Purpose: gets action evaluation data                                       *
  *                                                                            *
  * Parameters: actions         - [OUT] the action evaluation data             *
@@ -12498,8 +12207,6 @@ void	zbx_dc_get_actions_eval(zbx_vector_ptr_t *actions, unsigned char opflags)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_set_availability_update_ts                                   *
- *                                                                            *
  * Purpose: sets timestamp of the last availability update                    *
  *                                                                            *
  * Parameter: ts - [IN] the last availability update timestamp                *
@@ -12516,8 +12223,6 @@ void	zbx_set_availability_diff_ts(int ts)
 
 /******************************************************************************
  *                                                                            *
- * Function: corr_condition_clean                                             *
- *                                                                            *
  * Purpose: frees correlation condition                                       *
  *                                                                            *
  * Parameter: condition - [IN] the condition to free                          *
@@ -12547,8 +12252,6 @@ static void	corr_condition_clean(zbx_corr_condition_t *condition)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_correlation_free                                              *
- *                                                                            *
  * Purpose: frees global correlation rule                                     *
  *                                                                            *
  * Parameter: condition - [IN] the condition to free                          *
@@ -12568,8 +12271,6 @@ static void	dc_correlation_free(zbx_correlation_t *correlation)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_corr_condition_copy                                           *
- *                                                                            *
  * Purpose: copies cached correlation condition to memory                     *
  *                                                                            *
  * Parameter: dc_condition - [IN] the condition to copy                       *
@@ -12609,8 +12310,6 @@ static void	dc_corr_condition_copy(const zbx_dc_corr_condition_t *dc_condition,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_corr_operation_dup                                        *
- *                                                                            *
  * Purpose: clones cached correlation operation to memory                     *
  *                                                                            *
  * Parameter: operation - [IN] the operation to clone                         *
@@ -12630,8 +12329,6 @@ static zbx_corr_operation_t	*zbx_dc_corr_operation_dup(const zbx_dc_corr_operati
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_correlation_formula_dup                                       *
- *                                                                            *
  * Purpose: clones cached correlation formula, generating it if necessary     *
  *                                                                            *
  * Parameter: correlation - [IN] the correlation                              *
@@ -12752,8 +12449,6 @@ void	zbx_dc_correlation_rules_free(zbx_correlation_rules_t *rules)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_correlation_get_rules                                     *
- *                                                                            *
  * Purpose: gets correlation rules from configuration cache                   *
  *                                                                            *
  * Parameter: rules   - [IN/OUT] the correlation rules                        *
@@ -12819,8 +12514,6 @@ void	zbx_dc_correlation_rules_get(zbx_correlation_rules_t *rules)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_hostgroup_cache_nested_groupids                               *
- *                                                                            *
  * Purpose: cache nested group identifiers                                    *
  *                                                                            *
  ******************************************************************************/
@@ -12855,8 +12548,6 @@ void	dc_hostgroup_cache_nested_groupids(zbx_dc_hostgroup_t *parent_group)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_maintenance_precache_nested_groups                            *
- *                                                                            *
  * Purpose: pre-caches nested groups for groups used in running maintenances  *
  *                                                                            *
  ******************************************************************************/
@@ -12899,8 +12590,6 @@ static void	dc_maintenance_precache_nested_groups(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_get_nested_hostgroupids                                       *
- *                                                                            *
  * Purpose: gets nested group ids for the specified host group                *
  *          (including the target group id)                                   *
  *                                                                            *
@@ -12933,8 +12622,6 @@ void	dc_get_nested_hostgroupids(zbx_uint64_t groupid, zbx_vector_uint64_t *neste
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_nested_hostgroupids                                   *
- *                                                                            *
  * Purpose: gets nested group ids for the specified host groups               *
  *                                                                            *
  * Parameter: groupids        - [IN] the parent group identifiers             *
@@ -12959,8 +12646,6 @@ void	zbx_dc_get_nested_hostgroupids(zbx_uint64_t *groupids, int groupids_num, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_hostids_by_group_name                                 *
- *                                                                            *
  * Purpose: gets hostids belonging to the group and its nested groups         *
  *                                                                            *
  * Parameter: name    - [IN] the group name                                   *
@@ -13019,8 +12704,6 @@ void	zbx_dc_get_hostids_by_group_name(const char *name, zbx_vector_uint64_t *hos
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_active_proxy_by_name                                  *
- *                                                                            *
  * Purpose: gets active proxy data by its name from configuration cache       *
  *                                                                            *
  * Parameters:                                                                *
@@ -13069,8 +12752,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_items_update_nextcheck                                    *
- *                                                                            *
  * Purpose: updates item nextcheck values in configuration cache              *
  *                                                                            *
  * Parameters: items      - [IN] the items to update                          *
@@ -13126,8 +12807,6 @@ void	zbx_dc_items_update_nextcheck(DC_ITEM *items, zbx_agent_value_t *values, in
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_host_interfaces                                       *
- *                                                                            *
  * Purpose: get data of all network interfaces for a host in configuration    *
  *          cache                                                             *
  *                                                                            *
@@ -13205,8 +12884,6 @@ unlock:
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_items_apply_changes                                     *
- *                                                                            *
  * Purpose: apply item state, error, mtime, lastlogsize changes to            *
  *          configuration cache                                               *
  *                                                                            *
@@ -13247,8 +12924,6 @@ void	DCconfig_items_apply_changes(const zbx_vector_ptr_t *item_diff)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCconfig_update_inventory_values                                 *
- *                                                                            *
  * Purpose: update automatic inventory in configuration cache                 *
  *                                                                            *
  ******************************************************************************/
@@ -13282,8 +12957,6 @@ void	DCconfig_update_inventory_values(const zbx_vector_ptr_t *inventory_values)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_get_host_inventory_value_by_hostid                            *
- *                                                                            *
  * Purpose: find inventory value in automatically populated cache, if not     *
  *          found then look in main inventory cache                           *
  *                                                                            *
@@ -13314,8 +12987,6 @@ static int	dc_get_host_inventory_value_by_hostid(zbx_uint64_t hostid, char **rep
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_host_inventory_value_by_itemid                             *
- *                                                                            *
  * Purpose: find inventory value in automatically populated cache, if not     *
  *          found then look in main inventory cache                           *
  *                                                                            *
@@ -13337,8 +13008,6 @@ int	DCget_host_inventory_value_by_itemid(zbx_uint64_t itemid, char **replace_to,
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_host_inventory_value_by_hostid                             *
- *                                                                            *
  * Purpose: find inventory value in automatically populated cache, if not     *
  *          found then look in main inventory cache                           *
  *                                                                            *
@@ -13358,8 +13027,6 @@ int	DCget_host_inventory_value_by_hostid(zbx_uint64_t hostid, char **replace_to,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_trigger_dependencies                                  *
- *                                                                            *
  * Purpose: checks/returns trigger dependencies for a set of triggers         *
  *                                                                            *
  * Parameter: triggerids  - [IN] the currently processing trigger ids         *
@@ -13423,8 +13090,6 @@ void	zbx_dc_get_trigger_dependencies(const zbx_vector_uint64_t *triggerids, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_reschedule_items                                          *
- *                                                                            *
  * Purpose: reschedules items that are processed by the target daemon         *
  *                                                                            *
  * Parameter: itemids       - [IN] the item identifiers                       *
@@ -13479,8 +13144,6 @@ void	zbx_dc_reschedule_items(const zbx_vector_uint64_t *itemids, int nextcheck,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_proxy_update_nodata                                       *
- *                                                                            *
  * Purpose: stop suppress mode of the nodata() trigger                        *
  *                                                                            *
  * Parameter: subscriptions - [IN] the array of trigger id and time of values *
@@ -13528,8 +13191,6 @@ void	zbx_dc_proxy_update_nodata(zbx_vector_uint64_pair_t *subscriptions)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_update_proxy                                              *
- *                                                                            *
  * Purpose: updates changed proxy data in configuration cache and updates     *
  *          diff flags to reflect the updated data                            *
  *                                                                            *
@@ -13619,8 +13280,6 @@ void	zbx_dc_update_proxy(zbx_proxy_diff_t *diff)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_proxy_lastaccess                                      *
- *                                                                            *
  * Purpose: returns proxy lastaccess changes since last lastaccess request    *
  *                                                                            *
  * Parameter: lastaccess - [OUT] last access updates for proxies that need    *
@@ -13661,8 +13320,6 @@ void	zbx_dc_get_proxy_lastaccess(zbx_vector_uint64_pair_t *lastaccess)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_session_token                                         *
- *                                                                            *
  * Purpose: returns session token                                             *
  *                                                                            *
  * Return value: pointer to session token (NULL for server).                  *
@@ -13679,8 +13336,6 @@ const char	*zbx_dc_get_session_token(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_or_create_data_session                                *
- *                                                                            *
  * Purpose: returns data session, creates a new session if none found         *
  *                                                                            *
  * Parameter: hostid - [IN] the host (proxy) identifier                       *
@@ -13725,8 +13380,6 @@ zbx_data_session_t	*zbx_dc_get_or_create_data_session(zbx_uint64_t hostid, const
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_cleanup_data_sessions                                     *
- *                                                                            *
  * Purpose: removes data sessions not accessed for 24 hours                   *
  *                                                                            *
  ******************************************************************************/
@@ -13874,8 +13527,6 @@ void	zbx_dc_get_item_tags_by_functionids(const zbx_uint64_t *functionids, size_t
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_proxy_nodata_win                                           *
- *                                                                            *
  * Purpose: retrieves proxy suppress window data from the cache               *
  *                                                                            *
  * Parameters: hostid     - [IN] proxy host id                                *
@@ -13914,8 +13565,6 @@ int	DCget_proxy_nodata_win(zbx_uint64_t hostid, zbx_proxy_suppress_t *nodata_win
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_proxy_delay                                                *
- *                                                                            *
  * Purpose: retrieves proxy delay from the cache                              *
  *                                                                            *
  * Parameters: hostid - [IN] proxy host id                                    *
@@ -13948,13 +13597,11 @@ int	DCget_proxy_delay(zbx_uint64_t hostid, int *delay)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCget_proxy_delay_by_name                                        *
- *                                                                            *
  * Purpose: retrieves proxy delay from the cache                              *
  *                                                                            *
  * Parameters: name  - [IN] proxy host name                                   *
  *             delay - [OUT] proxy delay                                      *
- *             error - [OUT] error                                            *
+ *             error - [OUT]                                                  *
  *                                                                            *
  * Return value: SUCCEED - proxy delay is retrieved                           *
  *               FAIL    - proxy delay cannot be retrieved                    *
@@ -13985,8 +13632,6 @@ int	DCget_proxy_delay_by_name(const char *name, int *delay, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_set_macro_env                                             *
- *                                                                            *
  * Purpose: sets user macro environment security level                        *
  *                                                                            *
  * Parameter: env - [IN] the security level (see ZBX_MACRO_ENV_* defines)     *
@@ -14004,8 +13649,6 @@ unsigned char	zbx_dc_set_macro_env(unsigned char env)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_instanceid                                            *
- *                                                                            *
  * Purpose: returns server/proxy instance id                                  *
  *                                                                            *
  * Return value: the instance id                                              *
@@ -14020,10 +13663,6 @@ const char	*zbx_dc_get_instanceid(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_expand_user_macros_in_func_params                             *
- *                                                                            *
- * Purpose: expand user macros in trigger function parameters                 *
- *                                                                            *
  * Parameters: params - [IN] the function parameters                          *
  *             hostid - [IN] host of the item used in function                *
  *                                                                            *
@@ -14071,11 +13710,7 @@ char	*dc_expand_user_macros_in_func_params(const char *params, zbx_uint64_t host
 
 /*********************************************************************************
  *                                                                               *
- * Function: zbx_get_host_interfaces_availability                                *
- *                                                                               *
- * Purpose: get host interfaces availability                                     *
- *                                                                               *
- * Parameters: hostid               - [IN] the host id                           *
+ * Parameters: hostid               - [IN]                                       *
  *             agents               - [OUT] Zabbix agent availability            *
  *                                                                               *
  ********************************************************************************/
@@ -14121,8 +13756,6 @@ void	zbx_get_host_interfaces_availability(zbx_uint64_t hostid, zbx_agent_availab
 
 /*********************************************************************************
  *                                                                               *
- * Function: zbx_dc_eval_expand_user_macros                                      *
- *                                                                               *
  * Purpose: resolve user macros in parsed expression                             *
  *                                                                               *
  * Parameters: ctx - [IN] the expression evaluation context                      *
diff --git a/src/libs/zbxdbcache/dbconfig_maintenance.c b/src/libs/zbxdbcache/dbconfig_maintenance.c
index 827af4f96b3..11818338dbf 100644
--- a/src/libs/zbxdbcache/dbconfig_maintenance.c
+++ b/src/libs/zbxdbcache/dbconfig_maintenance.c
@@ -46,8 +46,6 @@ zbx_host_event_maintenance_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_maintenances                                              *
- *                                                                            *
  * Purpose: Updates maintenances in configuration cache                       *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -126,8 +124,6 @@ void	DCsync_maintenances(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_compare_maintenance_tags                                      *
- *                                                                            *
  * Purpose: compare maintenance tags by tag name for sorting                  *
  *                                                                            *
  ******************************************************************************/
@@ -141,8 +137,6 @@ static int	dc_compare_maintenance_tags(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_maintenance_tags                                          *
- *                                                                            *
  * Purpose: Updates maintenance tags in configuration cache                   *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -246,8 +240,6 @@ void	DCsync_maintenance_tags(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_maintenance_periods                                       *
- *                                                                            *
  * Purpose: Updates maintenance period in configuration cache                 *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -338,8 +330,6 @@ void	DCsync_maintenance_periods(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_maintenance_groups                                        *
- *                                                                            *
  * Purpose: Updates maintenance groups in configuration cache                 *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -411,8 +401,6 @@ void	DCsync_maintenance_groups(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: DCsync_maintenance_hosts                                         *
- *                                                                            *
  * Purpose: Updates maintenance hosts in configuration cache                  *
  *                                                                            *
  * Parameters: sync - [IN] the db synchronization data                        *
@@ -500,8 +488,6 @@ void	DCsync_maintenance_hosts(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_subtract_time                                                 *
- *                                                                            *
  * Purpose: subtract two local times with DST correction                      *
  *                                                                            *
  * Parameter: minuend       - [IN] the minuend time                           *
@@ -525,8 +511,6 @@ static time_t dc_subtract_time(time_t minuend, int subtrahend, struct tm *tm)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_calculate_maintenance_period                                  *
- *                                                                            *
  * Purpose: calculate start time for the specified maintenance period         *
  *                                                                            *
  * Parameter: maintenance   - [IN] the maintenance                            *
@@ -651,8 +635,6 @@ static int	dc_calculate_maintenance_period(const zbx_dc_maintenance_t *maintenan
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_check_maintenance_period                                      *
- *                                                                            *
  * Purpose: calculates start time for the specified maintenance period and    *
  *          checks if we are inside the maintenance period                    *
  *                                                                            *
@@ -703,8 +685,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_maintenance_set_update_flags                              *
- *                                                                            *
  * Purpose: sets maintenance update flags for all timers                      *
  *                                                                            *
  ******************************************************************************/
@@ -724,8 +704,6 @@ void	zbx_dc_maintenance_set_update_flags(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_maintenance_reset_update_flag                             *
- *                                                                            *
  * Purpose: resets maintenance update flags for the specified timer           *
  *                                                                            *
  * Parameters: timer - [IN] the timer process number                          *
@@ -751,8 +729,6 @@ void	zbx_dc_maintenance_reset_update_flag(int timer)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_maintenance_check_update_flag                             *
- *                                                                            *
  * Purpose: checks if the maintenance update flag is set for the specified    *
  *          timer                                                             *
  *                                                                            *
@@ -783,8 +759,6 @@ int	zbx_dc_maintenance_check_update_flag(int timer)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_maintenance_check_update_flags                            *
- *                                                                            *
  * Purpose: checks if at least one maintenance update flag is set             *
  *                                                                            *
  * Return value: SUCCEED - a maintenance update flag is set                   *
@@ -815,8 +789,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_update_maintenances                                       *
- *                                                                            *
  * Purpose: update maintenance state depending on maintenance periods         *
  *                                                                            *
  * Return value: SUCCEED - maintenance status was changed, host/event update  *
@@ -930,8 +902,6 @@ int	zbx_dc_update_maintenances(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_assign_maintenance_to_host                                    *
- *                                                                            *
  * Purpose: assign maintenance to a host, host can only be in one maintenance *
  *                                                                            *
  * Parameters: host_maintenances - [OUT] host with maintenance                *
@@ -960,8 +930,6 @@ static void	dc_assign_maintenance_to_host(zbx_hashset_t *host_maintenances, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_assign_event_maintenance_to_host                              *
- *                                                                            *
  * Purpose: assign maintenance to a host that event belongs to, events can be *
  *          in multiple maintenances at a time                                *
  *                                                                            *
@@ -995,8 +963,6 @@ typedef void	(*assign_maintenance_to_host_f)(zbx_hashset_t *host_maintenances,
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_get_host_maintenances_by_ids                                  *
- *                                                                            *
  * Purpose: get hosts and their maintenances                                  *
  *                                                                            *
  * Parameters: maintenanceids    - [IN] the maintenance ids                   *
@@ -1060,8 +1026,6 @@ static void	dc_get_host_maintenances_by_ids(const zbx_vector_uint64_t *maintenan
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_get_host_maintenance_updates                                  *
- *                                                                            *
  * Purpose: gets maintenance updates for all hosts                            *
  *                                                                            *
  * Parameters: host_maintenances - [IN] the maintenances running on hosts     *
@@ -1130,8 +1094,6 @@ static void	dc_get_host_maintenance_updates(zbx_hashset_t *host_maintenances, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_flush_host_maintenance_updates                            *
- *                                                                            *
  * Purpose: flush host maintenance updates to configuration cache             *
  *                                                                            *
  * Parameters: updates - [IN] the updates to flush                            *
@@ -1190,8 +1152,6 @@ void	zbx_dc_flush_host_maintenance_updates(const zbx_vector_ptr_t *updates)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_host_maintenance_updates                              *
- *                                                                            *
  * Purpose: calculates required host maintenance updates based on specified   *
  *          maintenances                                                      *
  *                                                                            *
@@ -1232,8 +1192,6 @@ void	zbx_dc_get_host_maintenance_updates(const zbx_vector_uint64_t *maintenancei
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_maintenance_tag_match                                         *
- *                                                                            *
  * Purpose: perform maintenance tag comparison using maintenance tag operator *
  *                                                                            *
  ******************************************************************************/
@@ -1253,8 +1211,6 @@ static int	dc_maintenance_tag_value_match(const zbx_dc_maintenance_tag_t *mt, co
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_maintenance_match_tag_range                                   *
- *                                                                            *
  * Purpose: matches tags with [*mt_pos] maintenance tag name                  *
  *                                                                            *
  * Parameters: mtags    - [IN] the maintenance tags, sorted by tag names      *
@@ -1349,8 +1305,6 @@ static int	dc_maintenance_match_tag_range(const zbx_vector_ptr_t *mtags, const z
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_maintenance_match_tags_or                                     *
- *                                                                            *
  * Purpose: matches maintenance and event tags using OR eval type             *
  *                                                                            *
  * Parameters: mtags    - [IN] the maintenance tags, sorted by tag names      *
@@ -1375,8 +1329,6 @@ static int	dc_maintenance_match_tags_or(const zbx_dc_maintenance_t *maintenance,
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_maintenance_match_tags_andor                                  *
- *                                                                            *
  * Purpose: matches maintenance and event tags using AND/OR eval type         *
  *                                                                            *
  * Parameters: mtags    - [IN] the maintenance tags, sorted by tag names      *
@@ -1404,8 +1356,6 @@ static int	dc_maintenance_match_tags_andor(const zbx_dc_maintenance_t *maintenan
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_maintenance_match_tags                                        *
- *                                                                            *
  * Purpose: check if the tags must be processed by the specified maintenance  *
  *                                                                            *
  * Parameters: maintenance - [IN] the maintenance                             *
@@ -1441,8 +1391,6 @@ static int	dc_maintenance_match_tags(const zbx_dc_maintenance_t *maintenance, co
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_compare_tags                                                  *
- *                                                                            *
  * Purpose: compare maintenance tags by tag name for sorting                  *
  *                                                                            *
  ******************************************************************************/
@@ -1461,8 +1409,6 @@ static void	host_event_maintenance_clean(zbx_host_event_maintenance_t *host_even
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_event_maintenances                                    *
- *                                                                            *
  * Purpose: get maintenance data for events                                   *
  *                                                                            *
  * Parameters: event_queries -  [IN/OUT] in - event data                      *
@@ -1620,8 +1566,6 @@ unlock:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_event_suppress_query_free                                    *
- *                                                                            *
  * Purpose: free event suppress query structure                               *
  *                                                                            *
  ******************************************************************************/
@@ -1636,8 +1580,6 @@ void	zbx_event_suppress_query_free(zbx_event_suppress_query_t *query)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dc_get_running_maintenanceids                                *
- *                                                                            *
  * Purpose: get identifiers of the running maintenances                       *
  *                                                                            *
  * Return value: SUCCEED - at least one running maintenance was found         *
diff --git a/src/libs/zbxdbcache/dbsync.c b/src/libs/zbxdbcache/dbsync.c
index a3b192e8f49..90e9eaf3ea4 100644
--- a/src/libs/zbxdbcache/dbsync.c
+++ b/src/libs/zbxdbcache/dbsync.c
@@ -85,8 +85,6 @@ static void	dbsync_strfree(char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_uint64                                            *
- *                                                                            *
  * Purpose: compares 64 bit unsigned integer with a raw database value        *
  *                                                                            *
  ******************************************************************************/
@@ -101,8 +99,6 @@ static int	dbsync_compare_uint64(const char *value_raw, zbx_uint64_t value)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_int                                               *
- *                                                                            *
  * Purpose: compares 32 bit signed integer with a raw database value          *
  *                                                                            *
  ******************************************************************************/
@@ -113,8 +109,6 @@ static int	dbsync_compare_int(const char *value_raw, int value)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_uchar                                             *
- *                                                                            *
  * Purpose: compares unsigned character with a raw database value             *
  *                                                                            *
  ******************************************************************************/
@@ -129,8 +123,6 @@ static int	dbsync_compare_uchar(const char *value_raw, unsigned char value)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_str                                               *
- *                                                                            *
  * Purpose: compares string with a raw database value                         *
  *                                                                            *
  ******************************************************************************/
@@ -142,8 +134,6 @@ static int	dbsync_compare_str(const char *value_raw, const char *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_add_row                                                   *
- *                                                                            *
  * Purpose: adds a new row to the changeset                                   *
  *                                                                            *
  * Parameter: sync  - [IN] the changeset                                      *
@@ -191,8 +181,6 @@ static void	dbsync_add_row(zbx_dbsync_t *sync, zbx_uint64_t rowid, unsigned char
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_prepare                                                   *
- *                                                                            *
  * Purpose: prepares changeset                                                *
  *                                                                            *
  * Parameter: sync             - [IN] the changeset                           *
@@ -214,8 +202,6 @@ static void	dbsync_prepare(zbx_dbsync_t *sync, int columns_num, zbx_dbsync_prepr
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_check_row_macros                                          *
- *                                                                            *
  * Purpose: checks if the specified column in the row contains user macros    *
  *                                                                            *
  * Parameter: row    - [IN] the row to check                                  *
@@ -235,8 +221,6 @@ static int	dbsync_check_row_macros(char **row, int column)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_preproc_row                                               *
- *                                                                            *
  * Purpose: applies necessary pre-processing before row is compared/used      *
  *                                                                            *
  * Parameter: sync - [IN] the changeset                                       *
@@ -269,22 +253,12 @@ static char	**dbsync_preproc_row(zbx_dbsync_t *sync, char **row)
 	return sync->row;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_dbsync_init_env                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_dbsync_init_env(ZBX_DC_CONFIG *cache)
 {
 	dbsync_env.cache = cache;
 	zbx_hashset_create(&dbsync_env.strpool, 100, dbsync_strpool_hash_func, dbsync_strpool_compare_func);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: dbsync_env_release                                               *
- *                                                                            *
- ******************************************************************************/
 void	zbx_dbsync_free_env(void)
 {
 	zbx_hashset_destroy(&dbsync_env.strpool);
@@ -292,8 +266,6 @@ void	zbx_dbsync_free_env(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_init                                                  *
- *                                                                            *
  * Purpose: initializes changeset                                             *
  *                                                                            *
  ******************************************************************************/
@@ -321,8 +293,6 @@ void	zbx_dbsync_init(zbx_dbsync_t *sync, unsigned char mode)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_clear                                                 *
- *                                                                            *
  * Purpose: frees resources allocated by changeset                            *
  *                                                                            *
  ******************************************************************************/
@@ -365,8 +335,6 @@ void	zbx_dbsync_clear(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_next                                                  *
- *                                                                            *
  * Purpose: gets the next row from the changeset                              *
  *                                                                            *
  * Parameters: sync  - [IN] the changeset                                     *
@@ -419,8 +387,6 @@ int	zbx_dbsync_next(zbx_dbsync_t *sync, zbx_uint64_t *rowid, char ***row, unsign
 
 /******************************************************************************
  *                                                                            *
- * Function: encode_expression                                                *
- *                                                                            *
  * Purpose: encode serialized expression to be returned as db field           *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -444,8 +410,6 @@ static char	*encode_expression(const zbx_eval_context_t *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_serialized_expression                             *
- *                                                                            *
  * Purpose: compare serialized expression                                     *
  *                                                                            *
  * Parameter: col   - [IN] the base64 encoded expression                      *
@@ -494,8 +458,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_config                                        *
- *                                                                            *
  * Purpose: compares config table with cached configuration data              *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -546,8 +508,6 @@ int	zbx_dbsync_compare_config(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_autoreg_psk                                   *
- *                                                                            *
  * Purpose: compares 'config_autoreg_tls' table with cached configuration     *
  *          data                                                              *
  *                                                                            *
@@ -623,8 +583,6 @@ int	zbx_dbsync_compare_autoreg_psk(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_host                                              *
- *                                                                            *
  * Purpose: compares hosts table row with cached configuration data           *
  *                                                                            *
  * Parameter: host  - [IN] the cached host                                    *
@@ -736,8 +694,6 @@ static int	dbsync_compare_host(ZBX_DC_HOST *host, const DB_ROW dbrow)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_hosts                                         *
- *                                                                            *
  * Purpose: compares hosts table with cached configuration data               *
  *          and populates the changeset                                       *
  *                                                                            *
@@ -832,8 +788,6 @@ int	zbx_dbsync_compare_hosts(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_host_inventory                                    *
- *                                                                            *
  * Purpose: compares host inventory table row with cached configuration data  *
  *                                                                            *
  * Parameter: hi    - [IN] the cached host inventory data                     *
@@ -861,8 +815,6 @@ static int	dbsync_compare_host_inventory(const ZBX_DC_HOST_INVENTORY *hi, const
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_host_inventory                                *
- *                                                                            *
  * Purpose: compares host_inventory table with cached configuration data      *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -943,8 +895,6 @@ int	zbx_dbsync_compare_host_inventory(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_host_templates                                *
- *                                                                            *
  * Purpose: compares hosts_templates table with cached configuration data     *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -1025,8 +975,6 @@ int	zbx_dbsync_compare_host_templates(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_global_macro                                      *
- *                                                                            *
  * Purpose: compares global macro table row with cached configuration data    *
  *                                                                            *
  * Parameter: gmacro - [IN] the cached global macro data                      *
@@ -1076,8 +1024,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_global_macros                                 *
- *                                                                            *
  * Purpose: compares global macros table with cached configuration data       *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -1144,8 +1090,6 @@ int	zbx_dbsync_compare_global_macros(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_host_macro                                        *
- *                                                                            *
  * Purpose: compares host macro table row with cached configuration data      *
  *                                                                            *
  * Parameter: hmacro - [IN] the cached host macro data                        *
@@ -1198,8 +1142,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_host_macros                                   *
- *                                                                            *
  * Purpose: compares global macros table with cached configuration data       *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -1268,8 +1210,6 @@ int	zbx_dbsync_compare_host_macros(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_interface                                         *
- *                                                                            *
  * Purpose: compares interface table row with cached configuration data       *
  *                                                                            *
  * Parameter: interface - [IN] the cached interface data                      *
@@ -1372,8 +1312,6 @@ static int	dbsync_compare_interface(const ZBX_DC_INTERFACE *interface, const DB_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_interfaces                                    *
- *                                                                            *
  * Purpose: compares interfaces table with cached configuration data          *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -1444,8 +1382,6 @@ int	zbx_dbsync_compare_interfaces(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_item                                              *
- *                                                                            *
  * Purpose: compares items table row with cached configuration data           *
  *                                                                            *
  * Parameter: item  - [IN] the cached item                                    *
@@ -1825,8 +1761,6 @@ static int	dbsync_compare_item(const ZBX_DC_ITEM *item, const DB_ROW dbrow)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_item_preproc_row                                          *
- *                                                                            *
  * Purpose: applies necessary preprocessing before row is compared/used       *
  *                                                                            *
  * Parameter: row - [IN] the row to preprocess                                *
@@ -1913,8 +1847,6 @@ static char	**dbsync_item_preproc_row(char **row)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_items                                         *
- *                                                                            *
  * Purpose: compares items table with cached configuration data               *
  *                                                                            *
  * Return value: SUCCEED - the changeset was successfully calculated          *
@@ -2006,8 +1938,6 @@ static int	dbsync_compare_template_item(const ZBX_DC_TEMPLATE_ITEM *item, const
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_template_items                                *
- *                                                                            *
  * Purpose: compares items that belong to templates with configuration cache  *
  *                                                                            *
  * Return value: SUCCEED - the changeset was successfully calculated          *
@@ -2089,8 +2019,6 @@ static int	dbsync_compare_prototype_item(const ZBX_DC_PROTOTYPE_ITEM *item, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_prototype_items                               *
- *                                                                            *
  * Purpose: compares lld item prototypes with configuration cache             *
  *                                                                            *
  * Return value: SUCCEED - the changeset was successfully calculated          *
@@ -2161,8 +2089,6 @@ int	zbx_dbsync_compare_prototype_items(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_trigger                                           *
- *                                                                            *
  * Purpose: compares triggers table row with cached configuration data        *
  *                                                                            *
  * Parameter: trigger - [IN] the cached trigger                               *
@@ -2221,8 +2147,6 @@ static int	dbsync_compare_trigger(const ZBX_DC_TRIGGER *trigger, const DB_ROW db
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_trigger_preproc_row                                       *
- *                                                                            *
  * Purpose: applies necessary preprocessing before row is compared/used       *
  *                                                                            *
  * Parameter: row - [IN] the row to preprocess                                *
@@ -2324,8 +2248,6 @@ static char	**dbsync_trigger_preproc_row(char **row)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_triggers                                      *
- *                                                                            *
  * Purpose: compares triggers table with cached configuration data            *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -2411,8 +2333,6 @@ int	zbx_dbsync_compare_triggers(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_trigger_dependency                            *
- *                                                                            *
  * Purpose: compares trigger_depends table with cached configuration data     *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -2500,8 +2420,6 @@ int	zbx_dbsync_compare_trigger_dependency(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_function                                          *
- *                                                                            *
  * Purpose: compares functions table row with cached configuration data       *
  *                                                                            *
  * Parameter: function - [IN] the cached function                             *
@@ -2530,8 +2448,6 @@ static int	dbsync_compare_function(const ZBX_DC_FUNCTION *function, const DB_ROW
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_function_preproc_row                                      *
- *                                                                            *
  * Purpose: applies necessary preprocessing before row is compared/used       *
  *                                                                            *
  * Parameter: row - [IN] the row to preprocess                                *
@@ -2569,8 +2485,6 @@ static char	**dbsync_function_preproc_row(char **row)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_functions                                     *
- *                                                                            *
  * Purpose: compares functions table with cached configuration data           *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -2647,8 +2561,6 @@ int	zbx_dbsync_compare_functions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_expression                                        *
- *                                                                            *
  * Purpose: compares expressions table row with cached configuration data     *
  *                                                                            *
  * Parameter: expression - [IN] the cached expression                         *
@@ -2680,8 +2592,6 @@ static int	dbsync_compare_expression(const ZBX_DC_EXPRESSION *expression, const
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_exprssions                                    *
- *                                                                            *
  * Purpose: compares expressions, regexps tables with cached configuration    *
  *          data                                                              *
  *                                                                            *
@@ -2753,8 +2663,6 @@ int	zbx_dbsync_compare_expressions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_action                                            *
- *                                                                            *
  * Purpose: compares actions table row with cached configuration data         *
  *                                                                            *
  * Parameter: action - [IN] the cached action                                 *
@@ -2781,8 +2689,6 @@ static int	dbsync_compare_action(const zbx_dc_action_t *action, const DB_ROW dbr
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_actions                                       *
- *                                                                            *
  * Purpose: compares actions table with cached configuration data             *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -2852,8 +2758,6 @@ int	zbx_dbsync_compare_actions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_action_op                                         *
- *                                                                            *
  * Purpose: compares action operation class and flushes update row if         *
  *          necessary                                                         *
  *                                                                            *
@@ -2884,8 +2788,6 @@ static void	dbsync_compare_action_op(zbx_dbsync_t *sync, zbx_uint64_t actionid,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_action_ops                                    *
- *                                                                            *
  * Purpose: compares actions by operation class                               *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -2953,8 +2855,6 @@ int	zbx_dbsync_compare_action_ops(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_action_condition                                  *
- *                                                                            *
  * Purpose: compares conditions table row with cached configuration data      *
  *                                                                            *
  * Parameter: condition - [IN] the cached action condition                    *
@@ -2983,8 +2883,6 @@ static int	dbsync_compare_action_condition(const zbx_dc_action_condition_t *cond
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_action_conditions                             *
- *                                                                            *
  * Purpose: compares conditions table with cached configuration data          *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -3057,8 +2955,6 @@ int	zbx_dbsync_compare_action_conditions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_trigger_tag                                       *
- *                                                                            *
  * Purpose: compares trigger tags table row with cached configuration data    *
  *                                                                            *
  * Parameter: tag   - [IN] the cached trigger tag                             *
@@ -3084,8 +2980,6 @@ static int	dbsync_compare_trigger_tag(const zbx_dc_trigger_tag_t *tag, const DB_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_trigger_tags                                  *
- *                                                                            *
  * Purpose: compares trigger tags table with cached configuration data        *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -3162,8 +3056,6 @@ int	zbx_dbsync_compare_trigger_tags(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_item_tag                                          *
- *                                                                            *
  * Purpose: compares item tags table row with cached configuration data       *
  *                                                                            *
  * Parameter: tag   - [IN] the cached item tag                                *
@@ -3189,8 +3081,6 @@ static int	dbsync_compare_item_tag(const zbx_dc_item_tag_t *tag, const DB_ROW db
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_item_tags                                     *
- *                                                                            *
  * Purpose: compares item tags table with cached configuration data           *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -3266,8 +3156,6 @@ int	zbx_dbsync_compare_item_tags(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_host_tag                                          *
- *                                                                            *
  * Purpose: compares host tags table row with cached configuration data       *
  *                                                                            *
  * Parameter: tag   - [IN] the cached host tag                                *
@@ -3293,8 +3181,6 @@ static int	dbsync_compare_host_tag(const zbx_dc_host_tag_t *tag, const DB_ROW db
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_host_tags                                     *
- *                                                                            *
  * Purpose: compares host tags table with cached configuration data           *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -3364,8 +3250,6 @@ int	zbx_dbsync_compare_host_tags(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_correlation                                       *
- *                                                                            *
  * Purpose: compares correlation table row with cached configuration data     *
  *                                                                            *
  * Parameter: correlation - [IN] the cached correlation rule                  *
@@ -3391,8 +3275,6 @@ static int	dbsync_compare_correlation(const zbx_dc_correlation_t *correlation, c
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_correlations                                  *
- *                                                                            *
  * Purpose: compares correlation table with cached configuration data         *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -3464,8 +3346,6 @@ int	zbx_dbsync_compare_correlations(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_corr_condition                                    *
- *                                                                            *
  * Purpose: compares correlation condition tables dbrow with cached             *
  *          configuration data                                                *
  *                                                                            *
@@ -3520,8 +3400,6 @@ static int	dbsync_compare_corr_condition(const zbx_dc_corr_condition_t *corr_con
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_corr_conditions                               *
- *                                                                            *
  * Purpose: compares correlation condition tables with cached configuration   *
  *          data                                                              *
  *                                                                            *
@@ -3604,8 +3482,6 @@ int	zbx_dbsync_compare_corr_conditions(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_corr_operation                                    *
- *                                                                            *
  * Purpose: compares correlation operation tables dbrow with cached             *
  *          configuration data                                                *
  *                                                                            *
@@ -3629,8 +3505,6 @@ static int	dbsync_compare_corr_operation(const zbx_dc_corr_operation_t *corr_ope
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_corr_operations                               *
- *                                                                            *
  * Purpose: compares correlation operation tables with cached configuration   *
  *          data                                                              *
  *                                                                            *
@@ -3704,8 +3578,6 @@ int	zbx_dbsync_compare_corr_operations(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_host_group                                        *
- *                                                                            *
  * Purpose: compares host group table row with cached configuration data      *
  *                                                                            *
  * Parameter: group - [IN] the cached host group                              *
@@ -3725,8 +3597,6 @@ static int	dbsync_compare_host_group(const zbx_dc_hostgroup_t *group, const DB_R
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_host_groups                                   *
- *                                                                            *
  * Purpose: compares host groups table with cached configuration data         *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -3789,8 +3659,6 @@ int	zbx_dbsync_compare_host_groups(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_item_pp_preproc_row                                       *
- *                                                                            *
  * Purpose: applies necessary preprocessing before row is compared/used       *
  *                                                                            *
  * Parameter: row - [IN] the row to preprocess                                *
@@ -3834,8 +3702,6 @@ static char	**dbsync_item_pp_preproc_row(char **row)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_item_preproc                                      *
- *                                                                            *
  * Purpose: compares item preproc table row with cached configuration data    *
  *                                                                            *
  * Parameter: preproc - [IN] the cached item preprocessing operation          *
@@ -3870,8 +3736,6 @@ static int	dbsync_compare_item_preproc(const zbx_dc_preproc_op_t *preproc, const
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_item_preprocessing                            *
- *                                                                            *
  * Purpose: compares item preproc tables with cached configuration data       *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -3967,8 +3831,6 @@ int	zbx_dbsync_compare_item_preprocs(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_maintenance                                       *
- *                                                                            *
  * Purpose: compares maintenance table row with cached configuration data     *
  *                                                                            *
  * Parameter: maintenance - [IN] the cached maintenance data                  *
@@ -3997,8 +3859,6 @@ static int	dbsync_compare_maintenance(const zbx_dc_maintenance_t *maintenance, c
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_itemscript_param                                  *
- *                                                                            *
  * Purpose: compares item script params table row with cached configuration   *
  *          data                                                              *
  *                                                                            *
@@ -4025,8 +3885,6 @@ static int	dbsync_compare_itemscript_param(const zbx_dc_scriptitem_param_t *scri
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_item_script_param                             *
- *                                                                            *
  * Purpose: compares item_parameter table with cached configuration data      *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -4109,8 +3967,6 @@ int	zbx_dbsync_compare_item_script_param(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_maintenances                                  *
- *                                                                            *
  * Purpose: compares maintenances table with cached configuration data        *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -4178,8 +4034,6 @@ int	zbx_dbsync_compare_maintenances(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_maintenance_tag                                   *
- *                                                                            *
  * Purpose: compares maintenance_tag table row with cached configuration data *
  *                                                                            *
  * Parameter: maintenance_tag - [IN] the cached maintenance tag               *
@@ -4205,8 +4059,6 @@ static int	dbsync_compare_maintenance_tag(const zbx_dc_maintenance_tag_t *mainte
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_maintenance_tags                              *
- *                                                                            *
  * Purpose: compares maintenances table with cached configuration data        *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -4275,8 +4127,6 @@ int	zbx_dbsync_compare_maintenance_tags(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbsync_compare_maintenance_period                                *
- *                                                                            *
  * Purpose: compares maintenance_period table row with cached configuration   *
  *          dat                                                               *
  *                                                                            *
@@ -4318,8 +4168,6 @@ static int	dbsync_compare_maintenance_period(const zbx_dc_maintenance_period_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_maintenance_periods                           *
- *                                                                            *
  * Purpose: compares timeperiods table with cached configuration data         *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -4390,8 +4238,6 @@ int	zbx_dbsync_compare_maintenance_periods(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_maintenance_groups                            *
- *                                                                            *
  * Purpose: compares maintenances_groups table with cached configuration data *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -4467,8 +4313,6 @@ int	zbx_dbsync_compare_maintenance_groups(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_maintenance_hosts                             *
- *                                                                            *
  * Purpose: compares maintenances_hosts table with cached configuration data  *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
@@ -4544,8 +4388,6 @@ int	zbx_dbsync_compare_maintenance_hosts(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_compare_host_group_hosts                              *
- *                                                                            *
  * Purpose: compares hosts_groups table with cached configuration data        *
  *                                                                            *
  * Parameter: sync - [OUT] the changeset                                      *
diff --git a/src/libs/zbxdbcache/dbsync.h b/src/libs/zbxdbcache/dbsync.h
index b37079ba985..8f69ed9df08 100644
--- a/src/libs/zbxdbcache/dbsync.h
+++ b/src/libs/zbxdbcache/dbsync.h
@@ -49,8 +49,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dbsync_preproc_row_func_t                                    *
- *                                                                            *
  * Purpose: applies necessary preprocessing before row is compared/used       *
  *                                                                            *
  * Parameter: row - [IN] the row to preprocess                                *
@@ -60,7 +58,6 @@
  * Comments: The row preprocessing can be used to expand user macros in       *
  *           some columns.                                                    *
  *                                                                            *
- *                                                                            *
  ******************************************************************************/
 typedef char **(*zbx_dbsync_preproc_row_func_t)(char **row);
 
diff --git a/src/libs/zbxdbcache/valuecache.c b/src/libs/zbxdbcache/valuecache.c
index b28ea403aa1..16fdfc9b0d0 100644
--- a/src/libs/zbxdbcache/valuecache.c
+++ b/src/libs/zbxdbcache/valuecache.c
@@ -293,8 +293,6 @@ static void	vch_item_clean_cache(zbx_vc_item_t *item);
 
 /*********************************************************************************
  *                                                                               *
- * Function: vc_db_read_values_by_time                                           *
- *                                                                               *
  * Purpose: reads item history data from database                                *
  *                                                                               *
  * Parameters:  itemid        - [IN] the itemid                                  *
@@ -322,8 +320,6 @@ static int	vc_db_read_values_by_time(zbx_uint64_t itemid, int value_type, zbx_ve
 
 /************************************************************************************
  *                                                                                  *
- * Function: vc_db_read_values_by_time_and_count                                    *
- *                                                                                  *
  * Purpose: reads item history data from database                                   *
  *                                                                                  *
  * Parameters:  itemid      - [IN] the itemid                                       *
@@ -442,8 +438,6 @@ static int	vc_db_read_values_by_time_and_count(zbx_uint64_t itemid, int value_ty
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_db_get_values                                                 *
- *                                                                            *
  * Purpose: get item history data for the specified time period directly from *
  *          database                                                          *
  *                                                                            *
@@ -561,8 +555,6 @@ static int	vc_strpool_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_item_weight_compare_func                                      *
- *                                                                            *
  * Purpose: compares two item weight data structures by their 'weight'        *
  *                                                                            *
  * Parameters: d1   - [IN] the first item weight data structure               *
@@ -578,8 +570,6 @@ static int	vc_item_weight_compare_func(const zbx_vc_item_weight_t *d1, const zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_history_logfree                                               *
- *                                                                            *
  * Purpose: frees history log and all resources allocated for it              *
  *                                                                            *
  * Parameters: log   - [IN] the history log to free                           *
@@ -594,8 +584,6 @@ static void	vc_history_logfree(zbx_log_value_t *log)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_history_logdup                                                *
- *                                                                            *
  * Purpose: duplicates history log by allocating necessary resources and      *
  *          copying the target log values.                                    *
  *                                                                            *
@@ -621,8 +609,6 @@ static zbx_log_value_t	*vc_history_logdup(const zbx_log_value_t *log)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_history_record_vector_clean                                   *
- *                                                                            *
  * Purpose: releases resources allocated to store history records             *
  *                                                                            *
  * Parameters: vector      - [IN] the history record vector                   *
@@ -651,8 +637,6 @@ static void	vc_history_record_vector_clean(zbx_vector_history_record_t *vector,
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_update_statistics                                             *
- *                                                                            *
  * Purpose: updates cache and item statistics                                 *
  *                                                                            *
  * Parameters: item    - [IN] the item (optional)                             *
@@ -693,8 +677,6 @@ static void	vc_update_statistics(zbx_vc_item_t *item, int hits, int misses, int
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_compare_items_by_total_values                                 *
- *                                                                            *
  * Purpose: is used to sort items by value count in descending order          *
  *                                                                            *
  ******************************************************************************/
@@ -710,8 +692,6 @@ static int	vc_compare_items_by_total_values(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_dump_items_statistics                                         *
- *                                                                            *
  * Purpose: find out items responsible for low memory                         *
  *                                                                            *
  ******************************************************************************/
@@ -752,8 +732,6 @@ static void	vc_dump_items_statistics(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_warn_low_memory                                               *
- *                                                                            *
  * Purpose: logs low memory warning                                           *
  *                                                                            *
  * Comments: The low memory warning is written to log every 5 minutes when    *
@@ -786,8 +764,6 @@ static void	vc_warn_low_memory(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_release_unused_items                                          *
- *                                                                            *
  * Purpose: frees space in cache by dropping items not accessed for more than *
  *          24 hours                                                          *
  *                                                                            *
@@ -825,8 +801,6 @@ static size_t	vc_release_unused_items(const zbx_vc_item_t *source_item)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_housekeeping_value_cache                                  *
- *                                                                            *
  * Purpose: release unused items from value cache                             *
  *                                                                            *
  * Comments: If unused items are not cleared from value cache periodically    *
@@ -846,8 +820,6 @@ void	zbx_vc_housekeeping_value_cache(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_release_space                                                 *
- *                                                                            *
  * Purpose: frees space in cache to store the specified number of bytes by    *
  *          dropping the least accessed items                                 *
  *                                                                            *
@@ -917,8 +889,6 @@ static void	vc_release_space(zbx_vc_item_t *source_item, size_t space)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_history_record_copy                                           *
- *                                                                            *
  * Purpose: copies history value                                              *
  *                                                                            *
  * Parameters: dst        - [OUT] a pointer to the destination value          *
@@ -949,8 +919,6 @@ static void	vc_history_record_copy(zbx_history_record_t *dst, const zbx_history_
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_history_record_vector_append                                  *
- *                                                                            *
  * Purpose: appends the specified value to value vector                       *
  *                                                                            *
  * Parameters: vector     - [IN/OUT] the value vector                         *
@@ -972,8 +940,6 @@ static void	vc_history_record_vector_append(zbx_vector_history_record_t *vector,
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_item_malloc                                                   *
- *                                                                            *
  * Purpose: allocate cache memory to store item's resources                   *
  *                                                                            *
  * Parameters: item   - [IN] the item                                         *
@@ -1005,8 +971,6 @@ static void	*vc_item_malloc(zbx_vc_item_t *item, size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_item_strdup                                                   *
- *                                                                            *
  * Purpose: copies string to the cache memory                                 *
  *                                                                            *
  * Parameters: item  - [IN] the item                                          *
@@ -1058,8 +1022,6 @@ static char	*vc_item_strdup(zbx_vc_item_t *item, const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_item_strfree                                                  *
- *                                                                            *
  * Purpose: removes string from cache string pool                             *
  *                                                                            *
  * Parameters: str   - [IN] the string to remove                              *
@@ -1093,8 +1055,6 @@ static size_t	vc_item_strfree(char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_item_logdup                                                   *
- *                                                                            *
  * Purpose: copies log value to the cache memory                              *
  *                                                                            *
  * Parameters: item  - [IN] the item                                          *
@@ -1142,8 +1102,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_item_logfree                                                  *
- *                                                                            *
  * Purpose: removes log resource from cache memory                            *
  *                                                                            *
  * Parameters: str   - [IN] the log to remove                                 *
@@ -1172,8 +1130,6 @@ static size_t	vc_item_logfree(zbx_log_value_t *log)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_item_free_values                                              *
- *                                                                            *
  * Purpose: frees cache resources of the specified item value range           *
  *                                                                            *
  * Parameters: item    - [IN] the item                                        *
@@ -1209,8 +1165,6 @@ static size_t	vc_item_free_values(zbx_vc_item_t *item, zbx_history_record_t *val
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_remove_item                                                   *
- *                                                                            *
  * Purpose: removes item from cache and frees resources allocated for it      *
  *                                                                            *
  * Parameters: item    - [IN] the item                                        *
@@ -1224,8 +1178,6 @@ static void	vc_remove_item(zbx_vc_item_t *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_remove_item_by_id                                             *
- *                                                                            *
  * Purpose: removes item from cache and frees resources allocated for it      *
  *                                                                            *
  * Parameters: itemid - [IN] the item identifier                              *
@@ -1243,8 +1195,6 @@ static void	vc_remove_item_by_id(zbx_uint64_t itemid)
 }
 /******************************************************************************
  *                                                                            *
- * Function: vc_item_update_db_cached_from                                    *
- *                                                                            *
  * Purpose: updates the timestamp from which the item is being cached         *
  *                                                                            *
  * Parameters: item      - [IN] the item                                      *
@@ -1301,8 +1251,6 @@ static void	vc_item_update_db_cached_from(zbx_vc_item_t *item, int timestamp)
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_update_range                                            *
- *                                                                            *
  * Purpose: updates item range with current request range                     *
  *                                                                            *
  * Parameters: item   - [IN] the item                                         *
@@ -1335,8 +1283,6 @@ static void	vch_item_update_range(zbx_vc_item_t *item, int range, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_chunk_slot_count                                        *
- *                                                                            *
  * Purpose: calculates optimal number of slots for an item data chunk         *
  *                                                                            *
  * Parameters:  item        - [IN] the item                                   *
@@ -1372,8 +1318,6 @@ static int	vch_item_chunk_slot_count(zbx_vc_item_t *item, int values_new)
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_add_chunk                                               *
- *                                                                            *
  * Purpose: adds a new data chunk at the end of item's history data list      *
  *                                                                            *
  * Parameters: item          - [IN/OUT] the item to add chunk to              *
@@ -1429,8 +1373,6 @@ static int	vch_item_add_chunk(zbx_vc_item_t *item, int nslots, zbx_vc_chunk_t *i
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_chunk_find_last_value_before                                 *
- *                                                                            *
  * Purpose: find the index of the last value in chunk with timestamp less or  *
  *          equal to the specified timestamp.                                 *
  *                                                                            *
@@ -1480,8 +1422,6 @@ static int	vch_chunk_find_last_value_before(const zbx_vc_chunk_t *chunk, const z
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_get_last_value                                          *
- *                                                                            *
  * Purpose: gets the chunk and index of the last value with a timestamp less  *
  *          or equal to the specified timestamp                               *
  *                                                                            *
@@ -1530,8 +1470,6 @@ static int	vch_item_get_last_value(const zbx_vc_item_t *item, const zbx_timespec
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_copy_value                                              *
- *                                                                            *
  * Purpose: copies value in the specified item's chunk slot                   *
  *                                                                            *
  * Parameters: chunk        - [IN/OUT] the target chunk                       *
@@ -1577,8 +1515,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_copy_values_at_tail                                     *
- *                                                                            *
  * Purpose: copies values at the beginning of item tail chunk                 *
  *                                                                            *
  * Parameters: item       - [IN/OUT] the target item                          *
@@ -1642,8 +1578,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_free_chunk                                              *
- *                                                                            *
  * Purpose: frees chunk and all resources allocated to store its values       *
  *                                                                            *
  * Parameters: item    - [IN] the chunk owner item                            *
@@ -1666,8 +1600,6 @@ static size_t	vch_item_free_chunk(zbx_vc_item_t *item, zbx_vc_chunk_t *chunk)
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_remove_chunk                                            *
- *                                                                            *
  * Purpose: removes item history data chunk                                   *
  *                                                                            *
  * Parameters: item    - [IN ] the chunk owner item                           *
@@ -1693,8 +1625,6 @@ static void	vch_item_remove_chunk(zbx_vc_item_t *item, zbx_vc_chunk_t *chunk)
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_clean_cache                                             *
- *                                                                            *
  * Purpose: removes item history data that are outside (older) the maximum    *
  *          request range                                                     *
  *                                                                            *
@@ -1756,8 +1686,6 @@ static void	vch_item_clean_cache(zbx_vc_item_t *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_remove_values                                           *
- *                                                                            *
  * Purpose: removes item history data that are older than the specified       *
  *          timestamp                                                         *
  *                                                                            *
@@ -1800,8 +1728,6 @@ static void	vch_item_remove_values(zbx_vc_item_t *item, int timestamp)
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_add_value_at_head                                       *
- *                                                                            *
  * Purpose: adds one item history value at the end of current item's history  *
  *          data                                                              *
  *                                                                            *
@@ -1912,8 +1838,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_add_values_at_tail                                      *
- *                                                                            *
  * Purpose: adds item history values at the beginning of current item's       *
  *          history data                                                      *
  *                                                                            *
@@ -1976,8 +1900,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_cache_values_by_time                                    *
- *                                                                            *
  * Purpose: cache item history data for the specified time period             *
  *                                                                            *
  * Parameters: item        - [IN] the item                                    *
@@ -2062,8 +1984,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_cache_values_by_time_and_count                          *
- *                                                                            *
  * Purpose: cache the specified number of history data values for time period *
  *          since timestamp                                                   *
  *                                                                            *
@@ -2184,8 +2104,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_get_values_by_time                                      *
- *                                                                            *
  * Purpose: retrieves item history data from cache                            *
  *                                                                            *
  * Parameters: item      - [IN] the item                                      *
@@ -2234,8 +2152,6 @@ static void	vch_item_get_values_by_time(const zbx_vc_item_t *item, zbx_vector_hi
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_get_values_by_time_and_count                            *
- *                                                                            *
  * Purpose: retrieves item history data from cache                            *
  *                                                                            *
  * Parameters: item      - [IN] the item                                      *
@@ -2314,8 +2230,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_get_value_range                                         *
- *                                                                            *
  * Purpose: get item values for the specified range                           *
  *                                                                            *
  * Parameters: item      - [IN] the item                                      *
@@ -2389,8 +2303,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vch_item_free_cache                                              *
- *                                                                            *
  * Purpose: frees resources allocated for item history data                   *
  *                                                                            *
  * Parameters: item    - [IN] the item                                        *
@@ -2426,8 +2338,6 @@ static size_t	vch_item_free_cache(zbx_vc_item_t *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_init                                                      *
- *                                                                            *
  * Purpose: initializes value cache                                           *
  *                                                                            *
  ******************************************************************************/
@@ -2499,8 +2409,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_destroy                                                   *
- *                                                                            *
  * Purpose: destroys value cache                                              *
  *                                                                            *
  ******************************************************************************/
@@ -2528,8 +2436,6 @@ void	zbx_vc_destroy(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_reset                                                     *
- *                                                                            *
  * Purpose: resets value cache                                                *
  *                                                                            *
  * Comments: All items and their historical data are removed,                 *
@@ -2569,8 +2475,6 @@ void	zbx_vc_reset(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_add_values                                                *
- *                                                                            *
  * Purpose: adds item values to the history and value cache                   *
  *                                                                            *
  * Parameters: history - [IN] item history values                             *
@@ -2632,8 +2536,6 @@ int	zbx_vc_add_values(zbx_vector_ptr_t *history, int *ret_flush)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_get_values                                                *
- *                                                                            *
  * Purpose: get item history data for the specified time period               *
  *                                                                            *
  * Parameters: itemid     - [IN] the item id                                  *
@@ -2712,8 +2614,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_get_value                                                 *
- *                                                                            *
  * Purpose: get the last history value with a timestamp less or equal to the  *
  *          target timestamp                                                  *
  *                                                                            *
@@ -2754,8 +2654,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_get_statistics                                            *
- *                                                                            *
  * Purpose: retrieves usage cache statistics                                  *
  *                                                                            *
  * Parameters: stats     - [OUT] the cache usage statistics                   *
@@ -2786,8 +2684,6 @@ int	zbx_vc_get_statistics(zbx_vc_stats_t *stats)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_enable                                                    *
- *                                                                            *
  * Purpose: enables value caching for current process                         *
  *                                                                            *
  ******************************************************************************/
@@ -2799,8 +2695,6 @@ void	zbx_vc_enable(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_disable                                                   *
- *                                                                            *
  * Purpose: disables value caching for current process                        *
  *                                                                            *
  ******************************************************************************/
@@ -2811,8 +2705,6 @@ void	zbx_vc_disable(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_get_diag_stats                                            *
- *                                                                            *
  * Purpose: get value cache diagnostic statistics                             *
  *                                                                            *
  ******************************************************************************/
@@ -2844,8 +2736,6 @@ void	zbx_vc_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num, in
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hc_get_mem_stats                                             *
- *                                                                            *
  * Purpose: get value cache shared memory statistics                          *
  *                                                                            *
  ******************************************************************************/
@@ -2864,8 +2754,6 @@ void	zbx_vc_get_mem_stats(zbx_mem_stats_t *mem)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_get_item_stats                                            *
- *                                                                            *
  * Purpose: get statistics of cached items                                    *
  *                                                                            *
  ******************************************************************************/
@@ -2897,8 +2785,6 @@ void	zbx_vc_get_item_stats(zbx_vector_ptr_t *stats)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vc_flush_stats                                               *
- *                                                                            *
  * Purpose: flush locally cached statistics                                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c
index 98e9591a828..5d9eaa31f01 100644
--- a/src/libs/zbxdbhigh/db.c
+++ b/src/libs/zbxdbhigh/db.c
@@ -157,8 +157,6 @@ void	zbx_db_validate_config(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBinit_autoincrement_options                                     *
- *                                                                            *
  * Purpose: specify the autoincrement options when connecting to the database *
  *                                                                            *
  ******************************************************************************/
@@ -169,8 +167,6 @@ void	DBinit_autoincrement_options(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBconnect                                                        *
- *                                                                            *
  * Purpose: connect to the database                                           *
  *                                                                            *
  * Parameters: flag - ZBX_DB_CONNECT_ONCE (try once and return the result),   *
@@ -216,11 +212,6 @@ int	DBconnect(int flag)
 	return err;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: DBinit                                                           *
- *                                                                            *
- ******************************************************************************/
 int	DBinit(char **error)
 {
 	return zbx_db_init(CONFIG_DBNAME, db_schema, error);
@@ -233,8 +224,6 @@ void	DBdeinit(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBtxn_operation                                                  *
- *                                                                            *
  * Purpose: helper function to loop transaction operation while DB is down    *
  *                                                                            *
  ******************************************************************************/
@@ -260,8 +249,6 @@ static void	DBtxn_operation(int (*txn_operation)(void))
 
 /******************************************************************************
  *                                                                            *
- * Function: DBbegin                                                          *
- *                                                                            *
  * Purpose: start a transaction                                               *
  *                                                                            *
  * Comments: do nothing if DB does not support transactions                   *
@@ -274,8 +261,6 @@ void	DBbegin(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBcommit                                                         *
- *                                                                            *
  * Purpose: commit a transaction                                              *
  *                                                                            *
  * Comments: do nothing if DB does not support transactions                   *
@@ -294,8 +279,6 @@ int	DBcommit(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBrollback                                                       *
- *                                                                            *
  * Purpose: rollback a transaction                                            *
  *                                                                            *
  * Comments: do nothing if DB does not support transactions                   *
@@ -314,8 +297,6 @@ void	DBrollback(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBend                                                            *
- *                                                                            *
  * Purpose: commit or rollback a transaction depending on a parameter value   *
  *                                                                            *
  * Comments: do nothing if DB does not support transactions                   *
@@ -334,8 +315,6 @@ int	DBend(int ret)
 #ifdef HAVE_ORACLE
 /******************************************************************************
  *                                                                            *
- * Function: DBstatement_prepare                                              *
- *                                                                            *
  * Purpose: prepares a SQL statement for execution                            *
  *                                                                            *
  * Comments: retry until DB is up                                             *
@@ -364,8 +343,6 @@ void	DBstatement_prepare(const char *sql)
 
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_DBexecute                                                  *
- *                                                                            *
  * Purpose: execute a non-select statement                                    *
  *                                                                            *
  * Comments: retry until DB is up                                             *
@@ -400,8 +377,6 @@ int	DBexecute(const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_DBexecute_once                                             *
- *                                                                            *
  * Purpose: execute a non-select statement                                    *
  *                                                                            *
  * Comments: don't retry if DB is down                                        *
@@ -423,8 +398,6 @@ int	DBexecute_once(const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBis_null                                                        *
- *                                                                            *
  * Purpose: check if numeric field value is null                              *
  *                                                                            *
  * Parameters: field - [IN] field value to be checked                         *
@@ -449,8 +422,6 @@ DB_ROW	DBfetch(DB_RESULT result)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBselect_once                                                    *
- *                                                                            *
  * Purpose: execute a select statement                                        *
  *                                                                            *
  ******************************************************************************/
@@ -470,8 +441,6 @@ DB_RESULT	DBselect_once(const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBselect                                                         *
- *                                                                            *
  * Purpose: execute a select statement                                        *
  *                                                                            *
  * Comments: retry until DB is up                                             *
@@ -506,8 +475,6 @@ DB_RESULT	DBselect(const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBselectN                                                        *
- *                                                                            *
  * Purpose: execute a select statement and get the first N entries            *
  *                                                                            *
  * Comments: retry until DB is up                                             *
@@ -620,31 +587,16 @@ static size_t	get_string_field_size(unsigned char type)
 }
 #endif
 
-/******************************************************************************
- *                                                                            *
- * Function: DBdyn_escape_string_len                                          *
- *                                                                            *
- ******************************************************************************/
 char	*DBdyn_escape_string_len(const char *src, size_t length)
 {
 	return zbx_db_dyn_escape_string(src, ZBX_SIZE_T_MAX, length, ESCAPE_SEQUENCE_ON);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: DBdyn_escape_string                                              *
- *                                                                            *
- ******************************************************************************/
 char	*DBdyn_escape_string(const char *src)
 {
 	return zbx_db_dyn_escape_string(src, ZBX_SIZE_T_MAX, ZBX_SIZE_T_MAX, ESCAPE_SEQUENCE_ON);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: DBdyn_escape_field_len                                           *
- *                                                                            *
- ******************************************************************************/
 static char	*DBdyn_escape_field_len(const ZBX_FIELD *field, const char *src, zbx_escape_sequence_t flag)
 {
 	size_t	length;
@@ -663,11 +615,6 @@ static char	*DBdyn_escape_field_len(const ZBX_FIELD *field, const char *src, zbx
 #endif
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: DBdyn_escape_field                                               *
- *                                                                            *
- ******************************************************************************/
 char	*DBdyn_escape_field(const char *table_name, const char *field_name, const char *src)
 {
 	const ZBX_TABLE	*table;
@@ -682,11 +629,6 @@ char	*DBdyn_escape_field(const char *table_name, const char *field_name, const c
 	return DBdyn_escape_field_len(field, src, ESCAPE_SEQUENCE_ON);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: DBdyn_escape_like_pattern                                        *
- *                                                                            *
- ******************************************************************************/
 char	*DBdyn_escape_like_pattern(const char *src)
 {
 	return zbx_db_dyn_escape_like_pattern(src);
@@ -720,8 +662,6 @@ const ZBX_FIELD	*DBget_field(const ZBX_TABLE *table, const char *fieldname)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_nextid                                                     *
- *                                                                            *
  * Purpose: gets a new identifier(s) for a specified table                    *
  *                                                                            *
  * Parameters: tablename - [IN] the name of a table                           *
@@ -855,8 +795,6 @@ zbx_uint64_t	DBget_maxid_num(const char *tablename, int num)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBextract_version_info                                           *
- *                                                                            *
  * Purpose: connects to DB and tries to detect DB version                     *
  *                                                                            *
  ******************************************************************************/
@@ -869,8 +807,6 @@ void	DBextract_version_info(struct zbx_db_version_info_t *version_info)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBflush_version_requirements                                     *
- *                                                                            *
  * Purpose: writes a json entry in DB with the result for the front-end       *
  *                                                                            *
  * Parameters: version - [IN] entry of DB versions                            *
@@ -888,8 +824,6 @@ void	DBflush_version_requirements(const char *version)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBcheck_capabilities                                             *
- *                                                                            *
  * Purpose: checks DBMS for optional features and exit if is not suitable     *
  *                                                                            *
  * Parameters: db_version - [IN] version of DB                                *
@@ -966,8 +900,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBadd_condition_alloc_btw                                        *
- *                                                                            *
  * Purpose: Takes an initial part of SQL query and appends a generated        *
  *          WHERE condition. The WHERE condition is generated from the given  *
  *          list of values as a mix of <fieldname> BETWEEN <id1> AND <idN>"   *
@@ -1050,8 +982,6 @@ static void	DBadd_condition_alloc_btw(char **sql, size_t *sql_alloc, size_t *sql
 
 /******************************************************************************
  *                                                                            *
- * Function: DBadd_condition_alloc                                            *
- *                                                                            *
  * Purpose: Takes an initial part of SQL query and appends a generated        *
  *          WHERE condition. The WHERE condition is generated from the given  *
  *          list of values as a mix of <fieldname> BETWEEN <id1> AND <idN>"   *
@@ -1195,8 +1125,6 @@ void	DBadd_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, co
 
 /******************************************************************************
  *                                                                            *
- * Function: DBadd_str_condition_alloc                                        *
- *                                                                            *
  * Purpose: This function is similar to DBadd_condition_alloc(), except it is *
  *          designed for generating WHERE conditions for strings. Hence, this *
  *          function is simpler, because only IN condition is possible.       *
@@ -1303,8 +1231,6 @@ static char	buf_string[640];
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_host_string                                                  *
- *                                                                            *
  * Return value: <host> or "???" if host not found                            *
  *                                                                            *
  ******************************************************************************/
@@ -1331,8 +1257,6 @@ const char	*zbx_host_string(zbx_uint64_t hostid)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_host_key_string                                              *
- *                                                                            *
  * Return value: <host>:<key> or "???" if item not found                      *
  *                                                                            *
  ******************************************************************************/
@@ -1360,8 +1284,6 @@ const char	*zbx_host_key_string(zbx_uint64_t itemid)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_user_permissions                                       *
- *                                                                            *
  * Purpose: check if user has access rights to information - full name,       *
  *          alias, Email, SMS, etc                                            *
  *                                                                            *
@@ -1429,8 +1351,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_user_string                                                  *
- *                                                                            *
  * Return value: "Name Surname (Alias)" or "unknown" if user not found        *
  *                                                                            *
  ******************************************************************************/
@@ -1453,8 +1373,6 @@ const char	*zbx_user_string(zbx_uint64_t userid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_user_names                                                 *
- *                                                                            *
  * Purpose: get user username, name and surname                               *
  *                                                                            *
  * Parameters: userid     - [IN] user id                                      *
@@ -1495,8 +1413,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBsql_id_cmp                                                     *
- *                                                                            *
  * Purpose: construct where condition                                         *
  *                                                                            *
  * Return value: "=<id>" if id not equal zero,                                *
@@ -1520,8 +1436,6 @@ const char	*DBsql_id_cmp(zbx_uint64_t id)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBregister_host                                                  *
- *                                                                            *
  * Purpose: register unknown host and generate event                          *
  *                                                                            *
  * Parameters: host - host name                                               *
@@ -1863,8 +1777,6 @@ void	DBregister_host_clean(zbx_vector_ptr_t *autoreg_hosts)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBproxy_register_host                                            *
- *                                                                            *
  * Purpose: register unknown host                                             *
  *                                                                            *
  * Parameters: host - host name                                               *
@@ -1895,8 +1807,6 @@ void	DBproxy_register_host(const char *host, const char *ip, const char *dns, un
 
 /******************************************************************************
  *                                                                            *
- * Function: DBexecute_overflowed_sql                                         *
- *                                                                            *
  * Purpose: execute a set of SQL statements IF it is big enough               *
  *                                                                            *
  ******************************************************************************/
@@ -1942,8 +1852,6 @@ int	DBexecute_overflowed_sql(char **sql, size_t *sql_alloc, size_t *sql_offset)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_unique_hostname_by_sample                                  *
- *                                                                            *
  * Purpose: construct a unique host name by the given sample                  *
  *                                                                            *
  * Parameters: host_name_sample - a host name to start constructing from      *
@@ -2042,8 +1950,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBsql_id_ins                                                     *
- *                                                                            *
  * Purpose: construct insert statement                                        *
  *                                                                            *
  * Return value: "<id>" if id not equal zero,                                 *
@@ -2068,8 +1974,6 @@ const char	*DBsql_id_ins(zbx_uint64_t id)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_inventory_field                                            *
- *                                                                            *
  * Purpose: get corresponding host_inventory field name                       *
  *                                                                            *
  * Parameters: inventory_link - [IN] field link 1..HOST_INVENTORY_FIELD_COUNT *
@@ -2321,8 +2225,6 @@ int	DBpk_exists(const char *table_name)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBselect_uint64                                                  *
- *                                                                            *
  * Parameters: sql - [IN] sql statement                                       *
  *             ids - [OUT] sorted list of selected uint64 values              *
  *                                                                            *
@@ -2651,8 +2553,6 @@ out:
 #ifdef HAVE_ORACLE
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_format_values                                             *
- *                                                                            *
  * Purpose: format bulk operation (insert, update) value list                 *
  *                                                                            *
  * Parameters: fields     - [IN] the field list                               *
@@ -2710,8 +2610,6 @@ static char	*zbx_db_format_values(ZBX_FIELD **fields, const zbx_db_value_t *valu
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_insert_clean                                              *
- *                                                                            *
  * Purpose: releases resources allocated by bulk insert operations            *
  *                                                                            *
  * Parameters: self        - [IN] the bulk insert data                        *
@@ -2750,8 +2648,6 @@ void	zbx_db_insert_clean(zbx_db_insert_t *self)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_insert_prepare_dyn                                        *
- *                                                                            *
  * Purpose: prepare for database bulk insert operation                        *
  *                                                                            *
  * Parameters: self        - [IN] the bulk insert data                        *
@@ -2796,8 +2692,6 @@ void	zbx_db_insert_prepare_dyn(zbx_db_insert_t *self, const ZBX_TABLE *table, co
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_insert_prepare                                            *
- *                                                                            *
  * Purpose: prepare for database bulk insert operation                        *
  *                                                                            *
  * Parameters: self  - [IN] the bulk insert data                              *
@@ -2849,8 +2743,6 @@ void	zbx_db_insert_prepare(zbx_db_insert_t *self, const char *table, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_insert_add_values_dyn                                     *
- *                                                                            *
  * Purpose: adds row values for database bulk insert operation                *
  *                                                                            *
  * Parameters: self        - [IN] the bulk insert data                        *
@@ -2903,8 +2795,6 @@ void	zbx_db_insert_add_values_dyn(zbx_db_insert_t *self, const zbx_db_value_t **
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_insert_add_values                                         *
- *                                                                            *
  * Purpose: adds row values for database bulk insert operation                *
  *                                                                            *
  * Parameters: self - [IN] the bulk insert data                               *
@@ -2971,8 +2861,6 @@ void	zbx_db_insert_add_values(zbx_db_insert_t *self, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_insert_execute                                            *
- *                                                                            *
  * Purpose: executes the prepared database bulk insert operation              *
  *                                                                            *
  * Parameters: self - [IN] the bulk insert data                               *
@@ -3220,8 +3108,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_insert_autoincrement                                      *
- *                                                                            *
  * Purpose: executes the prepared database bulk insert operation              *
  *                                                                            *
  * Parameters: self - [IN] the bulk insert data                               *
@@ -3248,8 +3134,6 @@ void	zbx_db_insert_autoincrement(zbx_db_insert_t *self, const char *field_name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_get_database_type                                         *
- *                                                                            *
  * Purpose: determine is it a server or a proxy database                      *
  *                                                                            *
  * Return value: ZBX_DB_SERVER - server database                              *
@@ -3308,8 +3192,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBlock_record                                                    *
- *                                                                            *
  * Purpose: locks a record in a table by its primary key and an optional      *
  *          constraint field                                                  *
  *                                                                            *
@@ -3359,8 +3241,6 @@ int	DBlock_record(const char *table, zbx_uint64_t id, const char *add_field, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: DBlock_records                                                   *
- *                                                                            *
  * Purpose: locks a records in a table by its primary key                     *
  *                                                                            *
  * Parameters: table     - [IN] the target table                              *
@@ -3408,8 +3288,6 @@ int	DBlock_records(const char *table, const zbx_vector_uint64_t *ids)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBlock_ids                                                       *
- *                                                                            *
  * Purpose: locks a records in a table by field name                          *
  *                                                                            *
  * Parameters: table      - [IN] the target table                             *
@@ -3457,8 +3335,6 @@ int	DBlock_ids(const char *table_name, const char *field_name, zbx_vector_uint64
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_sql_add_interface_availability                               *
- *                                                                            *
  * Purpose: adds interface availability update to sql statement               *
  *                                                                            *
  * Parameters: ia           [IN] the interface availability data              *
@@ -3514,8 +3390,6 @@ static int	zbx_sql_add_interface_availability(const zbx_interface_availability_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_update_interface_availabilities                           *
- *                                                                            *
  * Purpose: sync interface availabilities updates into database               *
  *                                                                            *
  * Parameters: interface_availabilities [IN] the interface availability data  *
@@ -3563,8 +3437,6 @@ void	zbx_db_update_interface_availabilities(const zbx_vector_availability_ptr_t
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_user_by_active_session                                     *
- *                                                                            *
  * Purpose: validate that session is active and get associated user data      *
  *                                                                            *
  * Parameters: sessionid - [IN] the session id to validate                    *
@@ -3617,8 +3489,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_user_by_auth_token                                         *
- *                                                                            *
  * Purpose: validate that token is not expired and is active and then get     *
  *          associated user data                                              *
  *                                                                            *
@@ -3688,8 +3558,6 @@ void	zbx_user_free(zbx_user_t *user)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_mock_field_init                                           *
- *                                                                            *
  * Purpose: initializes mock field                                            *
  *                                                                            *
  * Parameters: field      - [OUT] the field data                              *
@@ -3720,8 +3588,6 @@ void	zbx_db_mock_field_init(zbx_db_mock_field_t *field, int field_type, int fiel
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_mock_field_append                                         *
- *                                                                            *
  * Purpose: 'appends' text to the field, if successful the character/byte     *
  *           limits are updated                                               *
  *                                                                            *
@@ -3762,8 +3628,6 @@ int	zbx_db_mock_field_append(zbx_db_mock_field_t *field, const char *text)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_check_instanceid                                          *
- *                                                                            *
  * Purpose: checks instanceid value in config table and generates new         *
  *          instance id if its empty                                          *
  *                                                                            *
@@ -3811,8 +3675,6 @@ int	zbx_db_check_instanceid(void)
 #if defined(HAVE_POSTGRESQL)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_get_schema_esc                                            *
- *                                                                            *
  * Purpose: returns escaped DB schema name                                    *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxdbhigh/discovery.c b/src/libs/zbxdbhigh/discovery.c
index a8daed210ff..1bd61ea75c2 100644
--- a/src/libs/zbxdbhigh/discovery.c
+++ b/src/libs/zbxdbhigh/discovery.c
@@ -68,8 +68,6 @@ static DB_RESULT	discovery_get_dhost_by_ip_port(zbx_uint64_t druleid, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_separate_host                                          *
- *                                                                            *
  * Purpose: separate multiple-IP hosts                                        *
  *                                                                            *
  * Parameters: host ip address                                                *
@@ -123,8 +121,6 @@ static void	discovery_separate_host(const DB_DRULE *drule, DB_DHOST *dhost, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_register_host                                          *
- *                                                                            *
  * Purpose: register host if one does not exist                               *
  *                                                                            *
  * Parameters: host ip address                                                *
@@ -195,8 +191,6 @@ static void	discovery_register_host(const DB_DRULE *drule, zbx_uint64_t dcheckid
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_register_service                                       *
- *                                                                            *
  * Purpose: register service if one does not exist                            *
  *                                                                            *
  * Parameters: host ip address                                                *
@@ -287,8 +281,6 @@ static void	discovery_register_service(zbx_uint64_t dcheckid, DB_DHOST *dhost, D
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_update_dservice                                        *
- *                                                                            *
  * Purpose: update discovered service details                                 *
  *                                                                            *
  ******************************************************************************/
@@ -307,8 +299,6 @@ static void	discovery_update_dservice(zbx_uint64_t dserviceid, int status, int l
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_update_dservice_value                                  *
- *                                                                            *
  * Purpose: update discovered service details                                 *
  *                                                                            *
  ******************************************************************************/
@@ -325,8 +315,6 @@ static void	discovery_update_dservice_value(zbx_uint64_t dserviceid, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_update_dhost                                           *
- *                                                                            *
  * Purpose: update discovered host details                                    *
  *                                                                            *
  ******************************************************************************/
@@ -338,8 +326,6 @@ static void	discovery_update_dhost(const DB_DHOST *dhost)
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_update_service_status                                  *
- *                                                                            *
  * Purpose: process and update the new service status                         *
  *                                                                            *
  ******************************************************************************/
@@ -401,8 +387,6 @@ static void	discovery_update_service_status(DB_DHOST *dhost, const DB_DSERVICE *
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_update_host_status                                     *
- *                                                                            *
  * Purpose: update new host status                                            *
  *                                                                            *
  ******************************************************************************/
@@ -448,8 +432,6 @@ static void	discovery_update_host_status(DB_DHOST *dhost, int status, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_update_host                                            *
- *                                                                            *
  * Purpose: process new host status                                           *
  *                                                                            *
  * Parameters: host - host info                                               *
@@ -467,8 +449,6 @@ void	discovery_update_host(DB_DHOST *dhost, int status, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_update_service                                         *
- *                                                                            *
  * Purpose: process new service status                                        *
  *                                                                            *
  * Parameters: service - service info                                         *
diff --git a/src/libs/zbxdbhigh/event.c b/src/libs/zbxdbhigh/event.c
index efdd7c85375..51248d29bb6 100644
--- a/src/libs/zbxdbhigh/event.c
+++ b/src/libs/zbxdbhigh/event.c
@@ -24,8 +24,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_get_events_by_eventids                                    *
- *                                                                            *
  * Purpose: get events and flags that indicate what was filled in DB_EVENT    *
  *          structure                                                         *
  *                                                                            *
@@ -217,8 +215,6 @@ void	zbx_db_get_events_by_eventids(zbx_vector_uint64_t *eventids, zbx_vector_ptr
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_free_event                                                *
- *                                                                            *
  * Purpose: free the event with it's resources                                *
  *                                                                            *
  * Parameters: event - [IN] event data                                        *
@@ -242,8 +238,6 @@ void	zbx_db_free_event(DB_EVENT *event)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_db_eventid_r_eventid_pairs                                   *
- *                                                                            *
  * Purpose: get recovery event IDs by event IDs then map them together also   *
  *          additional create a separate array of recovery event IDs          *
  *                                                                            *
diff --git a/src/libs/zbxdbhigh/export.c b/src/libs/zbxdbhigh/export.c
index de329ca2659..bc1e3deb027 100644
--- a/src/libs/zbxdbhigh/export.c
+++ b/src/libs/zbxdbhigh/export.c
@@ -45,8 +45,6 @@ static char	*export_dir;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_validate_export_type                                         *
- *                                                                            *
  * Purpose: validate export type                                              *
  *                                                                            *
  * Parameters:  export_type - [in] list of export types                       *
@@ -114,8 +112,6 @@ int	zbx_validate_export_type(char *export_type, uint32_t *export_mask)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_is_export_enabled                                            *
- *                                                                            *
  * Purpose: checks if export is enabled for given type(s)                     *
  *                                                                            *
  * Parameters: flag - ZBX_FLAG_EXPTYPE_EVENTS events are enabled              *
diff --git a/src/libs/zbxdbhigh/graph_linking.c b/src/libs/zbxdbhigh/graph_linking.c
index dac01da4e4d..6589677a60d 100644
--- a/src/libs/zbxdbhigh/graph_linking.c
+++ b/src/libs/zbxdbhigh/graph_linking.c
@@ -867,8 +867,6 @@ static void	prepare_graph_for_insert(graphs_items_entry_t *graphs_items_template
 
 /************************************************************************************
  *                                                                                  *
- * Function: process_template_graph                                                 *
- *                                                                                  *
  * Description: 1) gets a template graph and host graph and compares them           *
  *              2) if they are the same (they have same names and all of            *
  *                 their items keys are the same) and checks which fields           *
@@ -946,8 +944,6 @@ static int	process_template_graph(zbx_uint64_t host_graphid, zbx_hashset_t *host
 
 /************************************************************************************
  *                                                                                  *
- * Function: process_graphs                                                         *
- *                                                                                  *
  * Description: 1) gets a list graph from the templates                             *
  *              2) gets a list of graphs_items for that graph                       *
  *              3) gets all the current host graphs (with names that match any of   *
@@ -1464,8 +1460,6 @@ static int	execute_graphs_inserts(zbx_vector_graphs_copies_t *graphs_copies_inse
 
 /******************************************************************************
  *                                                                            *
- * Function: DBcopy_template_graphs                                           *
- *                                                                            *
  * Purpose: copy graphs from template to host                                 *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c
index 38df5275e32..315e46885e1 100644
--- a/src/libs/zbxdbhigh/host.c
+++ b/src/libs/zbxdbhigh/host.c
@@ -59,8 +59,6 @@ static int	zbx_ids_names_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBselect_ids_names                                               *
- *                                                                            *
  * Parameters: sql   - [IN] sql statement                                     *
  *             ids   - [OUT] sorted list of selected uint64 values            *
  *             names - [OUT] list of names of the requested resource, order   *
@@ -171,8 +169,6 @@ static char	*get_template_names(const zbx_vector_uint64_t *templateids)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_profiles_by_source_idxs_values                             *
- *                                                                            *
  * Description: gets a vector of profile identifiers used with the specified  *
  *              source, indexes and value identifiers                         *
  *                                                                            *
@@ -211,8 +207,6 @@ static void	DBget_profiles_by_source_idxs_values(zbx_vector_uint64_t *profileids
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_sysmapelements_by_element_type_ids                         *
- *                                                                            *
  * Description: gets a vector of sysmap element identifiers used with the     *
  *              specified element type and identifiers                        *
  *                                                                            *
@@ -244,8 +238,6 @@ static void	DBget_sysmapelements_by_element_type_ids(zbx_vector_uint64_t *seleme
 
 /******************************************************************************
  *                                                                            *
- * Function: validate_linked_templates                                        *
- *                                                                            *
  * Description: Check collisions between linked templates                     *
  *                                                                            *
  * Parameters: templateids - [IN] array of template IDs                       *
@@ -446,8 +438,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: validate_inventory_links                                         *
- *                                                                            *
  * Description: Check collisions in item inventory links                      *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -535,8 +525,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: validate_httptests                                               *
- *                                                                            *
  * Description: checking collisions on linking of web scenarios               *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -636,8 +624,6 @@ static void	zbx_graph_valid_free(zbx_template_graph_valid_t *graph)
 
 /******************************************************************************
  *                                                                            *
- * Function: validate_host                                                    *
- *                                                                            *
  * Description: Check collisions between host and linked template             *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -892,8 +878,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_action_conditions                                       *
- *                                                                            *
  * Purpose: delete action conditions by condition type and id                 *
  *                                                                            *
  ******************************************************************************/
@@ -962,8 +946,6 @@ static void	DBdelete_action_conditions(int conditiontype, zbx_uint64_t elementid
 
 /******************************************************************************
  *                                                                            *
- * Function: DBadd_to_housekeeper                                             *
- *                                                                            *
  * Purpose:  adds table and field with specific id to housekeeper list        *
  *                                                                            *
  * Parameters: ids       - [IN] identifiers for data removal                  *
@@ -1004,8 +986,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_triggers                                                *
- *                                                                            *
  * Purpose: delete trigger from database                                      *
  *                                                                            *
  * Parameters: triggerids - [IN] trigger identifiers from database            *
@@ -1061,8 +1041,6 @@ void	DBdelete_triggers(zbx_vector_uint64_t *triggerids)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_trigger_hierarchy                                       *
- *                                                                            *
  * Purpose: delete parent triggers and auto-created children from database    *
  *                                                                            *
  * Parameters: triggerids - [IN] trigger identifiers from database            *
@@ -1103,8 +1081,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_triggers_by_itemids                                     *
- *                                                                            *
  * Purpose: delete triggers by itemid                                         *
  *                                                                            *
  * Parameters: itemids - [IN] item identifiers from database                  *
@@ -1140,8 +1116,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_graphs                                                  *
- *                                                                            *
  * Purpose: delete graph from database                                        *
  *                                                                            *
  * Parameters: graphids - [IN] array of graph id's from database              *
@@ -1193,8 +1167,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_graph_hierarchy                                         *
- *                                                                            *
  * Purpose: delete parent graphs and auto-created children from database      *
  *                                                                            *
  * Parameters: graphids - [IN] array of graph id's from database              *
@@ -1235,8 +1207,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_graphs_by_itemids                                       *
- *                                                                            *
  * Parameters: itemids - [IN] item identifiers from database                  *
  *                                                                            *
  ******************************************************************************/
@@ -1298,8 +1268,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_items                                                   *
- *                                                                            *
  * Purpose: delete items from database                                        *
  *                                                                            *
  * Parameters: itemids - [IN] array of item identifiers from database         *
@@ -1401,8 +1369,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_httptests                                               *
- *                                                                            *
  * Purpose: delete web tests from database                                    *
  *                                                                            *
  * Parameters: httptestids - [IN] array of httptest id's from database        *
@@ -1460,8 +1426,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBgroup_prototypes_delete                                        *
- *                                                                            *
  * Parameters: del_group_prototypeids - [IN] list of group_prototypeids which *
  *                                      will be deleted                       *
  *                                                                            *
@@ -1503,8 +1467,6 @@ static void	DBgroup_prototypes_delete(const zbx_vector_uint64_t *del_group_proto
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_host_prototypes                                         *
- *                                                                            *
  * Purpose: deletes host prototypes from database                             *
  *                                                                            *
  * Parameters: host_prototype_ids   - [IN] list of host prototype ids         *
@@ -1576,8 +1538,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_template_httptests                                      *
- *                                                                            *
  * Purpose: delete template web scenatios from host                           *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -1617,8 +1577,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_template_graphs                                         *
- *                                                                            *
  * Purpose: delete template graphs from host                                  *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -1660,8 +1618,6 @@ static void	DBdelete_template_graphs(zbx_uint64_t hostid, const zbx_vector_uint6
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_template_triggers                                       *
- *                                                                            *
  * Purpose: delete template triggers from host                                *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -1702,8 +1658,6 @@ static void	DBdelete_template_triggers(zbx_uint64_t hostid, const zbx_vector_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_template_host_prototypes                                *
- *                                                                            *
  * Purpose: delete template host prototypes from host                         *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -1748,8 +1702,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_template_items                                          *
- *                                                                            *
  * Purpose: delete template items from host                                   *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -1790,8 +1742,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_templates_by_hostid                                          *
- *                                                                            *
  * Description: Retrieve already linked templates for specified host          *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -1822,8 +1772,6 @@ static void	get_templates_by_hostid(zbx_uint64_t hostid, zbx_vector_uint64_t *te
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_template_elements                                       *
- *                                                                            *
  * Parameters: hostid          - [IN] host identifier from database           *
  *             hostname        - [IN] name of the host                        *
  *             del_templateids - [IN] array of template IDs                   *
@@ -2173,8 +2121,6 @@ static void	DBhost_prototypes_clean(zbx_vector_ptr_t *host_prototypes)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBis_regular_host                                                *
- *                                                                            *
  * Comments: auxiliary function for DBcopy_template_host_prototypes()         *
  *                                                                            *
  ******************************************************************************/
@@ -2198,8 +2144,6 @@ static int	DBis_regular_host(zbx_uint64_t hostid)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_make                                           *
- *                                                                            *
  * Comments: auxiliary function for DBcopy_template_host_prototypes()         *
  *                                                                            *
  ******************************************************************************/
@@ -2366,8 +2310,6 @@ static void	DBhost_prototypes_make(zbx_uint64_t hostid, zbx_vector_uint64_t *tem
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_templates_make                                 *
- *                                                                            *
  * Parameters: host_prototypes     - [IN/OUT] list of host prototypes         *
  *                                   should be sorted by templateid           *
  *             del_hosttemplateids - [OUT] list of hosttemplateids which      *
@@ -2500,8 +2442,6 @@ static void	DBhost_prototypes_templates_make(zbx_vector_ptr_t *host_prototypes,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_groups_make                                    *
- *                                                                            *
  * Parameters: host_prototypes        - [IN/OUT] list of host prototypes      *
  *                                      should be sorted by templateid        *
  *             del_group_prototypeids - [OUT] sorted list of                  *
@@ -2649,8 +2589,6 @@ static void	DBhost_prototypes_groups_make(zbx_vector_ptr_t *host_prototypes,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_macro_make                                     *
- *                                                                            *
  * Purpose: validate hostmacros value changes                                 *
  *                                                                            *
  * Parameters: hostmacros  - [IN/OUT] list of hostmacros                      *
@@ -2705,8 +2643,6 @@ static int	DBhost_prototypes_macro_make(zbx_vector_macros_t *hostmacros, zbx_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_interface_make                                 *
- *                                                                            *
  * Purpose: fill empty value in interfaces with input parameters              *
  *                                                                            *
  * Parameters: interfaces     - [IN/OUT] list of host interfaces              *
@@ -2869,8 +2805,6 @@ static int	DBhost_prototypes_interface_make(zbx_vector_interfaces_t *interfaces,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_macros_make                                    *
- *                                                                            *
  * Parameters: host_prototypes - [IN/OUT] list of host prototypes             *
  *                                   should be sorted by templateid           *
  *             del_macroids    - [OUT] sorted list of host macroids which     *
@@ -3018,8 +2952,6 @@ static void	DBhost_prototypes_macros_make(zbx_vector_ptr_t *host_prototypes, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_tags_make                                      *
- *                                                                            *
  * Parameters: host_prototypes - [IN/OUT] list of host prototypes             *
  *                                   should be sorted by templateid           *
  *             del_tagids      - [OUT] list of host tagids which              *
@@ -3169,10 +3101,6 @@ static void	DBhost_prototypes_tags_make(zbx_vector_ptr_t *host_prototypes, zbx_v
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_save                                           *
- *                                                                            *
- * Function: DBhost_prototypes_interfaces_make                                *
- *                                                                            *
  * Purpose: prepare interfaces to be added, updated or removed from DB        *
  * Parameters: host_prototypes       - [IN/OUT] list of host prototypes       *
  *                                         should be sorted by templateid     *
@@ -3418,8 +3346,6 @@ static void	DBhost_prototypes_interfaces_make(zbx_vector_ptr_t *host_prototypes,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_interface_snmp_prepare_sql                     *
- *                                                                            *
  * Purpose: prepare sql for update record of interface_snmp table             *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier                             *
@@ -3544,8 +3470,6 @@ static void	DBhost_prototypes_interface_snmp_prepare_sql(zbx_uint64_t hostid, co
 
 /******************************************************************************
  *                                                                            *
- * Function: DBhost_prototypes_save                                           *
- *                                                                            *
  * Purpose: auxiliary function for DBcopy_template_host_prototypes()          *
  *                                                                            *
  * Parameters: host_prototypes      - [IN] vector of host prototypes          *
@@ -4292,8 +4216,6 @@ static void	DBhost_prototypes_save(const zbx_vector_ptr_t *host_prototypes,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBcopy_template_host_prototypes                                  *
- *                                                                            *
  * Purpose: copy host prototypes from templates and create links between      *
  *          them and discovery rules                                          *
  *                                                                            *
@@ -4491,11 +4413,6 @@ typedef struct
 }
 httpfield_t;
 
-/******************************************************************************
- *                                                                            *
- * Function: DBget_httptests                                                  *
- *                                                                            *
- ******************************************************************************/
 static void	DBget_httptests(const zbx_uint64_t hostid, const zbx_vector_uint64_t *templateids,
 		zbx_vector_ptr_t *httptests)
 {
@@ -5040,11 +4957,6 @@ static void	DBget_httptests(const zbx_uint64_t hostid, const zbx_vector_uint64_t
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: DBsave_httptests                                                 *
- *                                                                            *
- ******************************************************************************/
 static void	DBsave_httptests(zbx_uint64_t hostid, const zbx_vector_ptr_t *httptests)
 {
 	char			*sql;
@@ -5585,11 +5497,6 @@ static void	DBsave_httptests(zbx_uint64_t hostid, const zbx_vector_ptr_t *httpte
 	zbx_vector_uint64_destroy(&deletetagids);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: clean_httptests                                                  *
- *                                                                            *
- ******************************************************************************/
 static void	clean_httptests(zbx_vector_ptr_t *httptests)
 {
 	httptest_t	*httptest;
@@ -5693,8 +5600,6 @@ static void	clean_httptests(zbx_vector_ptr_t *httptests)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBcopy_template_httptests                                        *
- *                                                                            *
  * Purpose: copy web scenarios from template to host                          *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier from database               *
@@ -5720,8 +5625,6 @@ static void	DBcopy_template_httptests(zbx_uint64_t hostid, const zbx_vector_uint
 
 /******************************************************************************
  *                                                                            *
- * Function: DBcopy_template_elements                                         *
- *                                                                            *
  * Purpose: copy elements from specified template                             *
  *                                                                            *
  * Parameters: hostid          - [IN] host identifier from database           *
@@ -5818,8 +5721,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_hosts                                                   *
- *                                                                            *
  * Purpose: delete hosts from database with all elements                      *
  *                                                                            *
  * Parameters: hostids   - [IN] host identifiers from database                *
@@ -5910,8 +5811,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_hosts_with_prototypes                                   *
- *                                                                            *
  * Purpose: delete hosts from database, check if there are any host           *
  *          prototypes and delete them first                                  *
  *                                                                            *
@@ -5954,8 +5853,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBadd_interface                                                  *
- *                                                                            *
  * Purpose: add new interface to specified host                               *
  *                                                                            *
  * Parameters: hostid - [IN] host identifier from database                    *
@@ -6097,8 +5994,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBadd_interface_snmp                                             *
- *                                                                            *
  * Purpose: add new or update interface options to specified interface        *
  *                                                                            *
  * Parameters: interfaceid    - [IN] interface id from database               *
@@ -6240,8 +6135,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_groups_validate                                         *
- *                                                                            *
  * Purpose: removes the groupids from the list which cannot be deleted        *
  *          (host or template can remain without groups or it's an internal   *
  *          group or it's used by a host prototype)                           *
@@ -6369,8 +6262,6 @@ static void	DBdelete_groups_validate(zbx_vector_uint64_t *groupids)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_groups                                                  *
- *                                                                            *
  * Purpose: delete host groups from database                                  *
  *                                                                            *
  * Parameters: groupids - [IN] array of group identifiers from database       *
@@ -6427,8 +6318,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBadd_host_inventory                                             *
- *                                                                            *
  * Purpose: adds host inventory to the host                                   *
  *                                                                            *
  * Parameters: hostid         - [IN] host identifier                          *
@@ -6448,8 +6337,6 @@ void	DBadd_host_inventory(zbx_uint64_t hostid, int inventory_mode)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBset_host_inventory                                             *
- *                                                                            *
  * Purpose: sets host inventory mode for the specified host                   *
  *                                                                            *
  * Parameters: hostid         - [IN] host identifier                          *
diff --git a/src/libs/zbxdbhigh/item.c b/src/libs/zbxdbhigh/item.c
index b7c586a06a0..52365a95b1d 100644
--- a/src/libs/zbxdbhigh/item.c
+++ b/src/libs/zbxdbhigh/item.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_save_item_changes                                         *
- *                                                                            *
  * Purpose: save item state, error, mtime, lastlogsize changes to             *
  *          database                                                          *
  *                                                                            *
diff --git a/src/libs/zbxdbhigh/lld_macro.c b/src/libs/zbxdbhigh/lld_macro.c
index 85fc876b7c1..3b3572499bf 100644
--- a/src/libs/zbxdbhigh/lld_macro.c
+++ b/src/libs/zbxdbhigh/lld_macro.c
@@ -24,8 +24,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_macro_paths_compare                                          *
- *                                                                            *
  * Purpose: sorting function to sort LLD macros by unique name                *
  *                                                                            *
  ******************************************************************************/
@@ -39,8 +37,6 @@ int	zbx_lld_macro_paths_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_macro_paths_get                                              *
- *                                                                            *
  * Purpose: retrieve list of LLD macros                                       *
  *                                                                            *
  * Parameters: lld_ruleid      - [IN] LLD id                                  *
@@ -93,8 +89,6 @@ int	zbx_lld_macro_paths_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t *lld_macro
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_macro_path_free                                              *
- *                                                                            *
  * Purpose: release resources allocated by lld macro path                     *
  *                                                                            *
  * Parameters: lld_macro_path - [IN] json path to extract from lld_row        *
@@ -109,8 +103,6 @@ void	zbx_lld_macro_path_free(zbx_lld_macro_path_t *lld_macro_path)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_lld_macro_value_by_name                                      *
- *                                                                            *
  * Purpose: get value of LLD macro using json path if available or by         *
  *          searching for such key in key value pairs of array entry          *
  *                                                                            *
diff --git a/src/libs/zbxdbhigh/lld_override.c b/src/libs/zbxdbhigh/lld_override.c
index 787a1f513c1..d1226793cde 100644
--- a/src/libs/zbxdbhigh/lld_override.c
+++ b/src/libs/zbxdbhigh/lld_override.c
@@ -38,8 +38,6 @@ void	zbx_lld_override_operation_free(zbx_lld_override_operation_t *override_oper
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_override_operations_load_tags                                *
- *                                                                            *
  * Purpose: load tag override operations from database                        *
  *                                                                            *
  * Parameters: overrideids - [IN] the lld overrideids, sorted                 *
@@ -101,8 +99,6 @@ static void	lld_override_operations_load_tags(const zbx_vector_uint64_t *overrid
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_override_operations_load_templates                           *
- *                                                                            *
  * Purpose: load template lld override operations from database               *
  *                                                                            *
  * Parameters: overrideids - [IN] the lld overrideids, sorted                 *
@@ -162,8 +158,6 @@ static void	lld_override_operations_load_templates(const zbx_vector_uint64_t *ov
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_load_lld_override_operations                                 *
- *                                                                            *
  * Purpose: load lld override operations from database                        *
  *                                                                            *
  * Parameters: overrideids - [IN] the lld overrideids, sorted                 *
diff --git a/src/libs/zbxdbhigh/maintenance.c b/src/libs/zbxdbhigh/maintenance.c
index d3c9895c09a..abd468ec189 100644
--- a/src/libs/zbxdbhigh/maintenance.c
+++ b/src/libs/zbxdbhigh/maintenance.c
@@ -22,8 +22,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_lock_maintenanceids                                       *
- *                                                                            *
  * Purpose: lock maintenances in database                                     *
  *                                                                            *
  * Parameters: maintenanceids - [IN/OUT] a vector of unique maintenance ids   *
diff --git a/src/libs/zbxdbhigh/proxy.c b/src/libs/zbxdbhigh/proxy.c
index 8d797fb0b31..71e0d2b621e 100644
--- a/src/libs/zbxdbhigh/proxy.c
+++ b/src/libs/zbxdbhigh/proxy.c
@@ -135,8 +135,6 @@ zbx_keys_path_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proxy_check_permissions                                      *
- *                                                                            *
  * Purpose: check proxy connection permissions (encryption configuration and  *
  *          if peer proxy address is allowed)                                 *
  *                                                                            *
@@ -230,8 +228,6 @@ int	zbx_proxy_check_permissions(const DC_PROXY *proxy, const zbx_socket_t *sock,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_host_check_permissions                                       *
- *                                                                            *
  * Purpose: checks host connection permissions (encryption configuration)     *
  *                                                                            *
  * Parameters:                                                                *
@@ -317,8 +313,6 @@ static int	zbx_host_check_permissions(const DC_HOST *host, const zbx_socket_t *s
 
 /******************************************************************************
  *                                                                            *
- * Function: get_active_proxy_from_request                                    *
- *                                                                            *
  * Purpose:                                                                   *
  *     Extract a proxy name from JSON and find the proxy ID in configuration  *
  *     cache, and check access rights. The proxy must be configured in active *
@@ -357,8 +351,6 @@ int	get_active_proxy_from_request(struct zbx_json_parse *jp, DC_PROXY *proxy, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: check_access_passive_proxy                                       *
- *                                                                            *
  * Purpose:                                                                   *
  *     Check access rights to a passive proxy for the given connection and    *
  *     send a response if denied.                                             *
@@ -438,8 +430,6 @@ int	check_access_passive_proxy(zbx_socket_t *sock, int send_response, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: proxyconfig_add_row                                              *
- *                                                                            *
  * Purpose: add database row to the proxy config json data                    *
  *                                                                            *
  * Parameters: j     - [OUT] the output json                                  *
@@ -486,8 +476,6 @@ zbx_proxy_item_config_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_proxyconfig_table_items                                      *
- *                                                                            *
  * Purpose: prepare items table proxy configuration data                      *
  *                                                                            *
  ******************************************************************************/
@@ -654,8 +642,6 @@ skip_data:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_proxyconfig_table_items                                      *
- *                                                                            *
  * Purpose: prepare items table proxy configuration data                      *
  *                                                                            *
  ******************************************************************************/
@@ -774,8 +760,6 @@ static void	key_path_free(void *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_proxyconfig_table                                            *
- *                                                                            *
  * Purpose: prepare proxy configuration data                                  *
  *                                                                            *
  ******************************************************************************/
@@ -1098,8 +1082,6 @@ static void	get_macro_secrets(const zbx_vector_ptr_t *keys_paths, struct zbx_jso
 
 /******************************************************************************
  *                                                                            *
- * Function: get_proxyconfig_data                                             *
- *                                                                            *
  * Purpose: prepare proxy configuration data                                  *
  *                                                                            *
  ******************************************************************************/
@@ -1192,8 +1174,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: remember_record                                                  *
- *                                                                            *
  * Purpose: A record is stored as a sequence of fields and flag bytes for     *
  *          handling NULL values. A field is stored as a null-terminated      *
  *          string to preserve field boundaries. If a field value can be NULL *
@@ -1252,8 +1232,6 @@ static int	id_offset_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: find_field_by_name                                               *
- *                                                                            *
  * Purpose: find a number of the field                                        *
  *                                                                            *
  ******************************************************************************/
@@ -1272,8 +1250,6 @@ static int	find_field_by_name(const ZBX_FIELD **fields, int fields_count, const
 
 /******************************************************************************
  *                                                                            *
- * Function: compare_nth_field                                                *
- *                                                                            *
  * Purpose: This function compares a value from JSON record with the value    *
  *          of the n-th field of DB record. For description how DB record is  *
  *          stored in memory see comments in function remember_record().      *
@@ -1353,8 +1329,6 @@ static int	compare_nth_field(const ZBX_FIELD **fields, const char *rec_data, int
 
 /******************************************************************************
  *                                                                            *
- * Function: process_proxyconfig_table                                        *
- *                                                                            *
  * Purpose: update configuration table                                        *
  *                                                                            *
  * Parameters: ...                                                            *
@@ -1981,8 +1955,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_proxyconfig                                              *
- *                                                                            *
  * Purpose: update configuration                                              *
  *                                                                            *
  ******************************************************************************/
@@ -2100,8 +2072,6 @@ int	process_proxyconfig(struct zbx_json_parse *jp_data, struct zbx_json_parse *j
 
 /******************************************************************************
  *                                                                            *
- * Function: get_interface_availability_data                                  *
- *                                                                            *
  * Return value:  SUCCEED - processed successfully                            *
  *                FAIL - no interface availability has been changed           *
  *                                                                            *
@@ -2148,8 +2118,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_interfaces_availability_contents                         *
- *                                                                            *
  * Purpose: parses interfaces availability data contents and processes it     *
  *                                                                            *
  * Return value:  SUCCEED - processed successfully                            *
@@ -2231,11 +2199,6 @@ out:
 	return ret;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: proxy_get_lastid                                                 *
- *                                                                            *
- ******************************************************************************/
 static void	proxy_get_lastid(const char *table_name, const char *lastidfield, zbx_uint64_t *lastid)
 {
 	DB_RESULT	result;
@@ -2255,11 +2218,6 @@ static void	proxy_get_lastid(const char *table_name, const char *lastidfield, zb
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():" ZBX_FS_UI64,	__func__, *lastid);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: proxy_set_lastid                                                 *
- *                                                                            *
- ******************************************************************************/
 static void	proxy_set_lastid(const char *table_name, const char *lastidfield, const zbx_uint64_t lastid)
 {
 	DB_RESULT	result;
@@ -2326,8 +2284,6 @@ int	proxy_get_delay(const zbx_uint64_t lastid)
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_get_history_data_simple                                    *
- *                                                                            *
  * Purpose: Get history data from the database.                               *
  *                                                                            *
  ******************************************************************************/
@@ -2436,8 +2392,6 @@ zbx_history_data_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_get_history_data                                           *
- *                                                                            *
  * Purpose: read proxy history data from the database                         *
  *                                                                            *
  * Parameters: lastid             - [IN] the id of last processed proxy       *
@@ -2580,8 +2534,6 @@ try_again:
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_add_hist_data                                              *
- *                                                                            *
  * Purpose: add history records to output json                                *
  *                                                                            *
  * Parameters: j             - [IN] the json output buffer                    *
@@ -2888,8 +2840,6 @@ void	calc_timestamp(const char *line, int *timestamp, const char *format)
 
 /******************************************************************************
  *                                                                            *
- * Function: process_item_value                                               *
- *                                                                            *
  * Purpose: processes item value depending on proxy/flags settings            *
  *                                                                            *
  * Parameters: item    - [IN] the item to process                             *
@@ -2927,8 +2877,6 @@ static void	process_item_value(const DC_ITEM *item, AGENT_RESULT *result, zbx_ti
 
 /******************************************************************************
  *                                                                            *
- * Function: process_history_data_value                                       *
- *                                                                            *
  * Purpose: process single value from incoming history data                   *
  *                                                                            *
  * Parameters: item    - [IN] the item to process                             *
@@ -3027,8 +2975,6 @@ static int	process_history_data_value(DC_ITEM *item, zbx_agent_value_t *value, i
 
 /******************************************************************************
  *                                                                            *
- * Function: process_history_data                                             *
- *                                                                            *
  * Purpose: process new item values                                           *
  *                                                                            *
  * Parameters: items    - [IN] the items to process                           *
@@ -3099,8 +3045,6 @@ int	process_history_data(DC_ITEM *items, zbx_agent_value_t *values, int *errcode
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_agent_values_clean                                           *
- *                                                                            *
  * Purpose: frees resources allocated to store agent values                   *
  *                                                                            *
  * Parameters: values     - [IN] the values to clean                          *
@@ -3120,8 +3064,6 @@ static void	zbx_agent_values_clean(zbx_agent_value_t *values, size_t values_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: log_client_timediff                                              *
- *                                                                            *
  * Purpose: calculates difference between server and client (proxy, active    *
  *          agent or sender) time and log it                                  *
  *                                                                            *
@@ -3174,8 +3116,6 @@ static void	log_client_timediff(int level, struct zbx_json_parse *jp, const zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_history_data_row_value                                     *
- *                                                                            *
  * Purpose: parses agent value from history data json row                     *
  *                                                                            *
  * Parameters: jp_row       - [IN] JSON with history data row                 *
@@ -3274,8 +3214,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_history_data_row_itemid                                    *
- *                                                                            *
  * Purpose: parses item identifier from history data json row                 *
  *                                                                            *
  * Parameters: jp_row - [IN] JSON with history data row                       *
@@ -3299,8 +3237,6 @@ static int	parse_history_data_row_itemid(const struct zbx_json_parse *jp_row, zb
 }
 /******************************************************************************
  *                                                                            *
- * Function: parse_history_data_row_hostkey                                   *
- *                                                                            *
  * Purpose: parses host,key pair from history data json row                   *
  *                                                                            *
  * Parameters: jp_row - [IN] JSON with history data row                       *
@@ -3334,8 +3270,6 @@ static int	parse_history_data_row_hostkey(const struct zbx_json_parse *jp_row, z
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_history_data                                               *
- *                                                                            *
  * Purpose: parses up to ZBX_HISTORY_VALUES_MAX item values and host,key      *
  *          pairs from history data json                                      *
  *                                                                            *
@@ -3405,8 +3339,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_history_data_by_itemids                                    *
- *                                                                            *
  * Purpose: parses up to ZBX_HISTORY_VALUES_MAX item values and item          *
  *          identifiers from history data json                                *
  *                                                                            *
@@ -3482,8 +3414,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_item_validator                                             *
- *                                                                            *
  * Purpose: validates item received from proxy                                *
  *                                                                            *
  * Parameters: item  - [IN/OUT] the item data                                 *
@@ -3515,8 +3445,6 @@ static int	proxy_item_validator(DC_ITEM *item, zbx_socket_t *sock, void *args, c
 
 /******************************************************************************
  *                                                                            *
- * Function: process_history_data_by_itemids                                  *
- *                                                                            *
  * Purpose: parses history data array and process the data                    *
  *                                                                            *
  * Parameters: proxy      - [IN] the proxy                                    *
@@ -3623,8 +3551,6 @@ static int	process_history_data_by_itemids(zbx_socket_t *sock, zbx_client_item_v
 
 /******************************************************************************
  *                                                                            *
- * Function: agent_item_validator                                             *
- *                                                                            *
  * Purpose: validates item received from active agent                         *
  *                                                                            *
  * Parameters: item  - [IN] the item data                                     *
@@ -3657,8 +3583,6 @@ static int	agent_item_validator(DC_ITEM *item, zbx_socket_t *sock, void *args, c
 
 /******************************************************************************
  *                                                                            *
- * Function: sender_item_validator                                            *
- *                                                                            *
  * Purpose: validates item received from sender                               *
  *                                                                            *
  * Parameters: item  - [IN] the item data                                     *
@@ -3827,8 +3751,6 @@ static void	process_history_data_by_keys(zbx_socket_t *sock, zbx_client_item_val
 
 /******************************************************************************
  *                                                                            *
- * Function: process_client_history_data                                      *
- *                                                                            *
  * Purpose: process history data sent by proxy/agent/sender                   *
  *                                                                            *
  * Parameters: sock           - [IN] the connection socket                    *
@@ -3918,8 +3840,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_agent_history_data                                       *
- *                                                                            *
  * Purpose: process history data received from Zabbix active agent            *
  *                                                                            *
  * Parameters: sock         - [IN] the connection socket                      *
@@ -3941,8 +3861,6 @@ int	process_agent_history_data(zbx_socket_t *sock, struct zbx_json_parse *jp, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: process_sender_history_data                                      *
- *                                                                            *
  * Purpose: process history data received from Zabbix sender                  *
  *                                                                            *
  * Parameters: sock         - [IN] the connection socket                      *
@@ -3979,8 +3897,6 @@ static void	zbx_drule_free(zbx_drule_t *drule)
 
 /******************************************************************************
  *                                                                            *
- * Function: process_services                                                 *
- *                                                                            *
  * Purpose: process services discovered on IP address                         *
  *                                                                            *
  * Parameters: drule_ptr         - [IN] discovery rule structure              *
@@ -4154,8 +4070,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_discovery_data_contents                                  *
- *                                                                            *
  * Purpose: parse discovery data contents and process it                      *
  *                                                                            *
  * Parameters: jp_data         - [IN] JSON with discovery data                *
@@ -4341,8 +4255,6 @@ json_parse_return:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_autoregistration_contents                                *
- *                                                                            *
  * Purpose: parse autoregistration data contents and process it               *
  *                                                                            *
  * Parameters: jp_data         - [IN] JSON with autoregistration data         *
@@ -4493,8 +4405,6 @@ static int	process_autoregistration_contents(struct zbx_json_parse *jp_data, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_get_history_count                                          *
- *                                                                            *
  * Purpose: get the number of values waiting to be sent to the sever          *
  *                                                                            *
  * Return value: the number of history values                                 *
@@ -4525,8 +4435,6 @@ int	proxy_get_history_count(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_proxy_protocol_version                                   *
- *                                                                            *
  * Purpose: extracts protocol version from json data                          *
  *                                                                            *
  * Parameters:                                                                *
@@ -4553,8 +4461,6 @@ int	zbx_get_proxy_protocol_version(struct zbx_json_parse *jp)
 
 /******************************************************************************
  *                                                                            *
- * Function: process_tasks_contents                                           *
- *                                                                            *
  * Purpose: parse tasks contents and saves the received tasks                 *
  *                                                                            *
  * Parameters: jp_tasks - [IN] JSON with tasks data                           *
@@ -4578,8 +4484,6 @@ static void	process_tasks_contents(struct zbx_json_parse *jp_tasks)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strcatnl_alloc                                               *
- *                                                                            *
  * Purpose: appends text to the string on a new line                          *
  *                                                                            *
  ******************************************************************************/
@@ -4593,8 +4497,6 @@ static void	zbx_strcatnl_alloc(char **info, size_t *info_alloc, size_t *info_off
 
 /******************************************************************************
  *                                                                            *
- * Function: check_proxy_nodata                                               *
- *                                                                            *
  * Purpose: detect lost connection with proxy and calculate suppression       *
  *          window if possible                                                *
  *                                                                            *
@@ -4629,8 +4531,6 @@ static void	check_proxy_nodata(zbx_timespec_t *ts, unsigned char proxy_status, z
 
 /******************************************************************************
  *                                                                            *
- * Function: check_proxy_nodata_empty                                         *
- *                                                                            *
  * Purpose: detect lack of data during lost connectivity                      *
  *                                                                            *
  * Parameters: ts          - [IN] timestamp when the proxy connection was     *
@@ -4661,8 +4561,6 @@ static void	check_proxy_nodata_empty(zbx_timespec_t *ts, unsigned char proxy_sta
 
 /******************************************************************************
  *                                                                            *
- * Function: process_proxy_data                                               *
- *                                                                            *
  * Purpose: process 'proxy data' request                                      *
  *                                                                            *
  * Parameters: proxy        - [IN] the source proxy                           *
@@ -4800,8 +4698,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_flush_proxy_lastaccess                                    *
- *                                                                            *
  * Purpose: flushes lastaccess changes for proxies every                      *
  *          ZBX_PROXY_LASTACCESS_UPDATE_FREQUENCY seconds                     *
  *                                                                            *
@@ -4852,8 +4748,6 @@ static void	zbx_db_flush_proxy_lastaccess(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_update_proxy_data                                            *
- *                                                                            *
  * Purpose: updates proxy runtime properties in cache and database.           *
  *                                                                            *
  * Parameters: proxy      - [IN/OUT] the proxy                                *
@@ -4898,8 +4792,6 @@ void	zbx_update_proxy_data(DC_PROXY *proxy, int version, int lastaccess, int com
 }
 /******************************************************************************
  *                                                                            *
- * Function: zbx_update_proxy_lasterror                                       *
- *                                                                            *
  * Purpose: flushes last_version_error_time changes runtime                   *
  *          variable for proxies structures                                   *
  *                                                                            *
@@ -4917,8 +4809,6 @@ static void	zbx_update_proxy_lasterror(DC_PROXY *proxy)
 }
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_protocol_version                                       *
- *                                                                            *
  * Purpose: check server and proxy versions and compatibility rules           *
  *                                                                            *
  * Parameters:                                                                *
diff --git a/src/libs/zbxdbhigh/template_item.c b/src/libs/zbxdbhigh/template_item.c
index 88c88b602dd..6f3b9276b57 100644
--- a/src/libs/zbxdbhigh/template_item.c
+++ b/src/libs/zbxdbhigh/template_item.c
@@ -188,8 +188,6 @@ static void	DBget_interfaces_by_hostid(zbx_uint64_t hostid, zbx_uint64_t *interf
 
 /******************************************************************************
  *                                                                            *
- * Function: get_template_items                                               *
- *                                                                            *
  * Purpose: read template items from database                                 *
  *                                                                            *
  * Parameters: hostid      - [IN] host id                                     *
@@ -525,8 +523,6 @@ static void	get_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *t
 
 /******************************************************************************
  *                                                                            *
- * Function: get_template_lld_rule_map                                        *
- *                                                                            *
  * Purpose: reads template lld rule conditions and host lld_rule identifiers  *
  *          from database                                                     *
  *                                                                            *
@@ -672,8 +668,6 @@ static void	get_template_lld_rule_map(const zbx_vector_ptr_t *items, zbx_vector_
 
 /******************************************************************************
  *                                                                            *
- * Function: calculate_template_lld_rule_conditionids                         *
- *                                                                            *
  * Purpose: calculate identifiers for new item conditions                     *
  *                                                                            *
  * Parameters: rules - [IN] the lld rule mapping                              *
@@ -735,8 +729,6 @@ static void	update_template_lld_formula(char **formula, zbx_uint64_t id_proto, z
 
 /******************************************************************************
  *                                                                            *
- * Function: update_template_lld_rule_formulas                                *
- *                                                                            *
  * Purpose: translate template item condition identifiers in expression type  *
  *          discovery rule formulas to refer the host item condition          *
  *          identifiers instead.                                              *
@@ -794,8 +786,6 @@ static void	update_template_lld_rule_formulas(zbx_vector_ptr_t *items, zbx_vecto
 
 /******************************************************************************
  *                                                                            *
- * Function: save_template_item                                               *
- *                                                                            *
  * Purpose: save (insert or update) template item                             *
  *                                                                            *
  * Parameters: hostid            - [IN] parent host id                        *
@@ -977,8 +967,6 @@ dependent:
 
 /******************************************************************************
  *                                                                            *
- * Function: save_template_items                                              *
- *                                                                            *
  * Purpose: saves template items to the target host in database               *
  *                                                                            *
  * Parameters:  hostid - [IN] the target host                                 *
@@ -1065,8 +1053,6 @@ static void	save_template_items(zbx_uint64_t hostid, zbx_vector_ptr_t *items)
 
 /******************************************************************************
  *                                                                            *
- * Function: save_template_lld_rules                                          *
- *                                                                            *
  * Purpose: saves template lld rule item conditions to the target host in     *
  *          database                                                          *
  *                                                                            *
@@ -1249,8 +1235,6 @@ static void	save_template_lld_rules(zbx_vector_ptr_t *items, zbx_vector_ptr_t *r
 
 /******************************************************************************
  *                                                                            *
- * Function: save_template_discovery_prototypes                               *
- *                                                                            *
  * Purpose: saves host item prototypes in database                            *
  *                                                                            *
  * Parameters:  hostid  - [IN] the target host                                *
@@ -1406,8 +1390,6 @@ static void	zbx_lld_macros_free(zbx_template_lld_macro_t *macro)
 
 /******************************************************************************
  *                                                                            *
- * Function: free_template_item                                               *
- *                                                                            *
  * Purpose: frees template item                                               *
  *                                                                            *
  * Parameters:  item  - [IN] the template item                                *
@@ -1476,8 +1458,6 @@ static void	free_template_item(zbx_template_item_t *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: free_lld_rule_condition                                          *
- *                                                                            *
  * Purpose: frees lld rule condition                                          *
  *                                                                            *
  * Parameters:  item  - [IN] the lld rule condition                           *
@@ -1496,8 +1476,6 @@ static void	free_lld_rule_condition(zbx_lld_rule_condition_t *condition)
 
 /******************************************************************************
  *                                                                            *
- * Function: free_lld_rule_map                                                *
- *                                                                            *
  * Purpose: frees lld rule mapping                                            *
  *                                                                            *
  * Parameters:  item  - [IN] the lld rule mapping                             *
@@ -1531,8 +1509,6 @@ static int	template_item_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: copy_template_items_preproc                                      *
- *                                                                            *
  * Purpose: copy template item preprocessing options                          *
  *                                                                            *
  * Parameters: items       - [IN] vector of new/updated items                 *
@@ -1713,8 +1689,6 @@ static void	copy_template_items_preproc(const zbx_vector_ptr_t *items)
 
 /******************************************************************************
  *                                                                            *
- * Function: copy_template_item_tags                                          *
- *                                                                            *
  * Purpose: copy template item tags                                           *
  *                                                                            *
  * Parameters: items       - [IN] vector of new/updated items                 *
@@ -1865,8 +1839,6 @@ static void	copy_template_item_tags(const zbx_vector_ptr_t *items)
 
 /******************************************************************************
  *                                                                            *
- * Function: copy_template_item_script_params                                 *
- *                                                                            *
  * Purpose: copy template item script parameters                              *
  *                                                                            *
  * Parameters: items       - [IN] vector of new/updated items                 *
@@ -2020,8 +1992,6 @@ static void	copy_template_item_script_params(const zbx_vector_ptr_t *items)
 
 /******************************************************************************
  *                                                                            *
- * Function: copy_template_lld_macro_paths                                    *
- *                                                                            *
  * Purpose: copy template discovery item lld macro paths                      *
  *                                                                            *
  * Parameters: items       - [IN] vector of new/updated items                 *
@@ -2630,8 +2600,6 @@ static void	copy_template_lld_overrides(const zbx_vector_uint64_t *templateids,
 
 /******************************************************************************
  *                                                                            *
- * Function: compare_template_items                                           *
- *                                                                            *
  * Purpose: compare templateid of two template items                          *
  *                                                                            *
  * Parameters: d1 - [IN] first template item                                  *
@@ -2650,8 +2618,6 @@ static int	compare_template_items(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: link_template_dependent_items                                    *
- *                                                                            *
  * Purpose: create dependent item index in master item data                   *
  *                                                                            *
  * Parameters: items       - [IN/OUT] the template items                      *
@@ -2727,8 +2693,6 @@ static int	template_lld_macro_sort_by_macro(const void *d1, const void *d2)
 }
 /******************************************************************************
  *                                                                            *
- * Function: link_template_items_preproc                                      *
- *                                                                            *
  * Purpose: create item_preproc vectors in item data                          *
  *                                                                            *
  * Parameters: templateids - [IN] vector of template IDs                      *
@@ -2907,8 +2871,6 @@ static void	link_template_items_preproc(const zbx_vector_uint64_t *templateids,
 
 /******************************************************************************
  *                                                                            *
- * Function: link_template_items_tag                                          *
- *                                                                            *
  * Purpose: create item_tags vectors in item data                             *
  *                                                                            *
  * Parameters: templateids - [IN] vector of template IDs                      *
@@ -3070,8 +3032,6 @@ static void	link_template_items_tag(const zbx_vector_uint64_t *templateids, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: link_template_items_param                                        *
- *                                                                            *
  * Purpose: create item_params vectors in item data                           *
  *                                                                            *
  * Parameters: templateids - [IN] vector of template IDs                      *
@@ -3248,8 +3208,6 @@ static void	link_template_items_param(const zbx_vector_uint64_t *templateids, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: link_template_lld_macro_paths                                    *
- *                                                                            *
  * Purpose: create lld_macro vectors in item data                             *
  *                                                                            *
  * Parameters: templateids - [IN] vector of template IDs                      *
@@ -3411,8 +3369,6 @@ static void	link_template_lld_macro_paths(const zbx_vector_uint64_t *templateids
 }
 /******************************************************************************
  *                                                                            *
- * Function: prepare_lld_items                                                *
- *                                                                            *
  * Purpose: prepare lld items by indexing them and scanning for already       *
  *          existing items                                                    *
  *                                                                            *
@@ -3445,8 +3401,6 @@ static void	prepare_lld_items(const zbx_vector_ptr_t *items, zbx_vector_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: DBcopy_template_items                                            *
- *                                                                            *
  * Purpose: copy template items to host                                       *
  *                                                                            *
  * Parameters: hostid      - [IN] host id                                     *
diff --git a/src/libs/zbxdbhigh/trigger.c b/src/libs/zbxdbhigh/trigger.c
index 318d4331518..a95317c2e1d 100644
--- a/src/libs/zbxdbhigh/trigger.c
+++ b/src/libs/zbxdbhigh/trigger.c
@@ -34,8 +34,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_process_trigger                                              *
- *                                                                            *
  * Purpose: 1) calculate changeset of trigger fields to be updated            *
  *          2) generate events                                                *
  *                                                                            *
@@ -145,8 +143,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_save_trigger_changes                                      *
- *                                                                            *
  * Purpose: save the trigger changes to database                              *
  *                                                                            *
  * Parameters: trigger_diff - [IN] the trigger changeset                      *
@@ -218,8 +214,6 @@ void	zbx_db_save_trigger_changes(const zbx_vector_ptr_t *trigger_diff)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trigger_diff_free                                            *
- *                                                                            *
  * Purpose: frees trigger changeset                                           *
  *                                                                            *
  ******************************************************************************/
@@ -246,8 +240,6 @@ static int	zbx_trigger_topoindex_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_process_triggers                                             *
- *                                                                            *
  * Purpose: process triggers - calculates property changeset and generates    *
  *          events                                                            *
  *                                                                            *
@@ -280,8 +272,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_append_trigger_diff                                          *
- *                                                                            *
  * Purpose: Adds a new trigger diff to trigger changeset vector               *
  *                                                                            *
  ******************************************************************************/
@@ -327,8 +317,6 @@ zbx_trigger_cache_state_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: db_trigger_get_cache                                             *
- *                                                                            *
  * Purpose: get trigger cache with the requested data cached                  *
  *                                                                            *
  * Parameters: trigger - [IN] the trigger                                     *
@@ -403,8 +391,6 @@ static zbx_trigger_cache_t	*db_trigger_get_cache(const DB_TRIGGER *trigger, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: trigger_cache_free                                               *
- *                                                                            *
  * Purpose: free trigger cache                                                *
  *                                                                            *
  * Parameters: cache - [IN] the trigger cache                                 *
@@ -426,8 +412,6 @@ static void	trigger_cache_free(zbx_trigger_cache_t *cache)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_get_all_functionids                               *
- *                                                                            *
  * Purpose: get functionids from trigger expression and recovery expression   *
  *                                                                            *
  * Parameters: trigger     - [IN] the trigger                                 *
@@ -452,8 +436,6 @@ void	zbx_db_trigger_get_all_functionids(const DB_TRIGGER *trigger, zbx_vector_ui
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_get_functionids                                   *
- *                                                                            *
  * Purpose: get functionids from trigger expression                           *
  *                                                                            *
  * Parameters: trigger     - [IN] the trigger                                 *
@@ -474,8 +456,6 @@ void	zbx_db_trigger_get_functionids(const DB_TRIGGER *trigger, zbx_vector_uint64
 }
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_get_constant                                      *
- *                                                                            *
  * Purpose: get trigger expression constant at the specified location         *
  *                                                                            *
  * Parameters: trigger - [IN] the trigger                                     *
@@ -503,8 +483,6 @@ int	zbx_db_trigger_get_constant(const DB_TRIGGER *trigger, int index, char **out
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_get_itemid                                        *
- *                                                                            *
  * Purpose: get the Nth function item from trigger expression                 *
  *                                                                            *
  * Parameters: trigger - [IN] the trigger                                     *
@@ -567,8 +545,6 @@ int	zbx_db_trigger_get_itemid(const DB_TRIGGER *trigger, int index, zbx_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_get_itemids                                       *
- *                                                                            *
  * Purpose: get unique itemids of trigger functions in the order at they are  *
  *          written in expression                                             *
  *                                                                            *
@@ -636,8 +612,6 @@ void	zbx_db_trigger_get_itemids(const DB_TRIGGER *trigger, zbx_vector_uint64_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_get_all_hostids                                   *
- *                                                                            *
  * Purpose: get hostids from trigger expression and recovery expression       *
  *                                                                            *
  * Parameters: trigger - [IN] the trigger                                     *
@@ -662,8 +636,6 @@ int	zbx_db_trigger_get_all_hostids(const DB_TRIGGER *trigger, const zbx_vector_u
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_clean                                             *
- *                                                                            *
  * Purpose: frees resources allocated to store trigger data                   *
  *                                                                            *
  * Parameters: trigger -                                                      *
@@ -685,8 +657,6 @@ void	zbx_db_trigger_clean(DB_TRIGGER *trigger)
 
 /******************************************************************************
  *                                                                            *
- * Function: db_trigger_get_expression                                        *
- *                                                                            *
  * Purpose: get original trigger expression/recovery expression with expanded *
  *          functions                                                         *
  *                                                                            *
@@ -780,8 +750,6 @@ static void	db_trigger_get_expression(const zbx_eval_context_t *ctx, char **expr
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_get_expression                                    *
- *                                                                            *
  * Purpose: get original trigger expression with expanded functions           *
  *                                                                            *
  * Parameters: trigger    - [IN] the trigger                                  *
@@ -800,8 +768,6 @@ void	zbx_db_trigger_get_expression(const DB_TRIGGER *trigger, char **expression)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_trigger_get_recovery_expression                           *
- *                                                                            *
  * Purpose: get original trigger recovery expression with expanded functions  *
  *                                                                            *
  * Parameters: trigger    - [IN] the trigger                                  *
diff --git a/src/libs/zbxdbhigh/trigger_dep_linking.c b/src/libs/zbxdbhigh/trigger_dep_linking.c
index 0ca8917ba39..db1806e2cf8 100644
--- a/src/libs/zbxdbhigh/trigger_dep_linking.c
+++ b/src/libs/zbxdbhigh/trigger_dep_linking.c
@@ -110,8 +110,6 @@ static void	zbx_triggers_dep_entries_clean(zbx_hashset_t *h)
 
 /*********************************************************************************
  *                                                                               *
- * Function: DBresolve_template_trigger_dependencies                             *
- *                                                                               *
  * Purpose: resolves trigger dependencies for the specified triggers based on    *
  *          host and linked templates                                            *
  *                                                                               *
@@ -270,8 +268,6 @@ clean:
 
 /**********************************************************************************************************
  *                                                                                                        *
- * 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     *
@@ -521,8 +517,6 @@ clean:
 
 /********************************************************************************
  *                                                                              *
- * Function: DBsync_template_dependencies_for_triggers                          *
- *                                                                              *
  * Purpose: update trigger dependencies for specified host                      *
  *                                                                              *
  * Parameters: hostid    - [IN] host identifier from database                   *
diff --git a/src/libs/zbxdbhigh/trigger_linking.c b/src/libs/zbxdbhigh/trigger_linking.c
index 5a8fccfd2ae..4d7547939b8 100644
--- a/src/libs/zbxdbhigh/trigger_linking.c
+++ b/src/libs/zbxdbhigh/trigger_linking.c
@@ -290,8 +290,6 @@ static void	trigger_tag_insert_temp_free(zbx_trigger_tag_insert_temp_t *trigger_
 
 /********************************************************************************
  *                                                                              *
- * Function: DBcopy_template_trigger_tags                                       *
- *                                                                              *
  * Purpose: copies tags from template triggers to created/linked triggers       *
  *                                                                              *
  * Parameters: new_triggerids - the created trigger ids                         *
@@ -1364,8 +1362,6 @@ static void	trigger_copies_free(zbx_trigger_copy_t *trigger_copy)
 
 /********************************************************************************
  *                                                                              *
- * Function: DBcopy_template_triggers                                           *
- *                                                                              *
  * Purpose: Copy template triggers to host                                      *
  *                                                                              *
  * Parameters: hostid      - [IN] host identifier from database                 *
diff --git a/src/libs/zbxdbupgrade/dbupgrade.c b/src/libs/zbxdbupgrade/dbupgrade.c
index e636777f06e..0b894ffcddb 100644
--- a/src/libs/zbxdbupgrade/dbupgrade.c
+++ b/src/libs/zbxdbupgrade/dbupgrade.c
@@ -136,8 +136,6 @@ zbx_oracle_column_type_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_oracle_column_type                                           *
- *                                                                            *
  * Purpose: determine whether column type is character or numeric             *
  *                                                                            *
  * Parameters: field_type - [IN] column type in Zabbix definitions            *
diff --git a/src/libs/zbxdbupgrade/dbupgrade_2010.c b/src/libs/zbxdbupgrade/dbupgrade_2010.c
index 33932a85cf3..512ea165c2c 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_2010.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_2010.c
@@ -44,8 +44,6 @@ static int	DBmodify_proxy_table_id_field(const char *table_name)
 
 /*********************************************************************************
  *                                                                               *
- * Function: parse_db_monitor_item_params                                        *
- *                                                                               *
  * Purpose: parse database monitor item params string "user=<user> password=     *
  *          <passsword> DSN=<dsn> sql=<sql>" into parameter values.              *
  *                                                                               *
@@ -1669,8 +1667,6 @@ static int	DBpatch_2010194(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_2010195_replace_key_param_cb                             *
- *                                                                            *
  * Comments: auxiliary function for DBpatch_2010195()                         *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxdbupgrade/dbupgrade_2030.c b/src/libs/zbxdbupgrade/dbupgrade_2030.c
index da53789fc39..769c42020eb 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_2030.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_2030.c
@@ -971,8 +971,6 @@ static int	DBpatch_2030094(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_function                                                   *
- *                                                                            *
  * Purpose: return function and function parameters                           *
  *          func(param,...)                                                   *
  *                                                                            *
diff --git a/src/libs/zbxdbupgrade/dbupgrade_3010.c b/src/libs/zbxdbupgrade/dbupgrade_3010.c
index f235525f63e..ed304125e0e 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_3010.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_3010.c
@@ -242,8 +242,6 @@ static int	DBpatch_3010021_trigger_events_compare_func(const void *d1, const voi
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010021_update_event_recovery                            *
- *                                                                            *
  * Purpose: set events.r_eventid field with corresponding recovery event id   *
  *                                                                            *
  * Parameters: events   - [IN/OUT] unrecovered events indexed by triggerid    *
@@ -446,8 +444,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010024_validate_action                                  *
- *                                                                            *
  * Purpose: checks if the action must be disabled or its operations converted *
  *          to recovery operations                                            *
  *                                                                            *
@@ -676,8 +672,6 @@ static int	DBpatch_3010025(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010026_get_conditionids                                 *
- *                                                                            *
  * Purpose: get success condition identifiers                                 *
  *                                                                            *
  * Parameters: actionid     - [IN] the action identifier                      *
@@ -757,8 +751,6 @@ static void	DBpatch_3010026_get_conditionids(zbx_uint64_t actionid, const char *
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010026_expression_skip_whitespace                       *
- *                                                                            *
  * Purpose: skips whitespace characters                                       *
  *                                                                            *
  * Parameters: expression - [IN] the expression to process                    *
@@ -777,8 +769,6 @@ static size_t	DBpatch_3010026_expression_skip_whitespace(const char *expression,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010026_expression_get_token                             *
- *                                                                            *
  * Purpose: gets the next expression token starting with offset               *
  *                                                                            *
  * Parameters: expression - [IN] the expression to process                    *
@@ -841,8 +831,6 @@ static int	DBpatch_3010026_expression_get_token(const char *expression, int offs
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010026_expression_validate_value                        *
- *                                                                            *
  * Purpose: checks if the value does not match any filter value               *
  *                                                                            *
  * Parameters: expression - [IN] the expression to process                    *
@@ -869,8 +857,6 @@ static int	DBpatch_3010026_expression_validate_value(const char *expression, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010026_expression_cut_substring                         *
- *                                                                            *
  * Purpose: cuts substring from the expression                                *
  *                                                                            *
  * Parameters: expression - [IN] the expression to process                    *
@@ -885,8 +871,6 @@ static void	DBpatch_3010026_expression_cut_substring(char *expression, zbx_strlo
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010026_expression_move_location                         *
- *                                                                            *
  * Purpose: location by the specified offset                                  *
  *                                                                            *
  * Parameters: location  - [IN] the location to adjust                        *
@@ -901,8 +885,6 @@ static void	DBpatch_3010026_expression_move_location(zbx_strloc_t *location, int
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010026_expression_remove_values_impl                    *
- *                                                                            *
  * Purpose: removes values specified in filter from the location              *
  *                                                                            *
  * Parameters: expression - [IN] the expression to process                    *
@@ -1014,8 +996,6 @@ static int	DBpatch_3010026_expression_remove_values_impl(char *expression, zbx_s
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_3010026_expression_remove_values                         *
- *                                                                            *
  * Purpose: removes values specified in filter from the location              *
  *                                                                            *
  * Parameters: expression - [IN] the expression to process                    *
diff --git a/src/libs/zbxdbupgrade/dbupgrade_4050.c b/src/libs/zbxdbupgrade/dbupgrade_4050.c
index acd7a01306f..56e0e8f7511 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_4050.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_4050.c
@@ -813,8 +813,6 @@ static int	db_snmp_new_if_find(const dbu_snmp_if_t *snmp, const zbx_vector_dbu_s
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_load_data                                                *
- *                                                                            *
  * Purpose: loading a set of unique combination of snmp data within a single  *
  *          interface and associated interface data                           *
  *                                                                            *
@@ -1141,8 +1139,6 @@ static int	DBpatch_items_type_update(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_4050046                                                  *
- *                                                                            *
  * Purpose: migration snmp data from 'items' table to 'interface_snmp' new    *
  *          table linked with 'interface' table, except interface links for   *
  *          discovered hosts and parent host interface                        *
@@ -1252,8 +1248,6 @@ static void	db_if_link(zbx_uint64_t if_slave, zbx_uint64_t if_master, zbx_vector
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_if_load_data                                             *
- *                                                                            *
  * Purpose: loading all unlinked interfaces, snmp data and hostid of host     *
  *          prototype for discovered hosts                                    *
  *                                                                            *
@@ -1384,8 +1378,6 @@ static int	DBpatch_interface_discovery_save(zbx_vector_uint64_pair_t *if_links)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_4050047                                                  *
- *                                                                            *
  * Purpose: recovery links between the interfaceid of discovered host and     *
  *          parent interfaceid from parent host                               *
  *                                                                            *
diff --git a/src/libs/zbxdbupgrade/dbupgrade_5030.c b/src/libs/zbxdbupgrade/dbupgrade_5030.c
index 6373e151a60..d523c48c0be 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_5030.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_5030.c
@@ -1067,8 +1067,6 @@ static int	DBpatch_5030065(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_5030066 (part of ZBXNEXT-6368)                           *
- *                                                                            *
  * Purpose: set value for 'scripts' table column 'scope' for existing global  *
  *          scripts                                                           *
  *                                                                            *
@@ -1120,8 +1118,6 @@ static char	*zbx_rename_host_macros(const char *command)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_5030067 (part of ZBXNEXT-6368)                           *
- *                                                                            *
  * Purpose: rename some {HOST.*} macros to {HOST.TARGET.*} in existing global *
  *          scripts which are used in actions                                 *
  *                                                                            *
@@ -1171,8 +1167,6 @@ static int	DBpatch_5030067(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_split_name  (part of ZBXNEXT-6368)                           *
- *                                                                            *
  * Purpose: helper function to split script name into menu_path and name      *
  *                                                                            *
  * Parameters:                                                                *
@@ -1201,8 +1195,6 @@ static void	zbx_split_name(const char *name, char **menu_path, const char **name
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_make_script_name_unique  (part of ZBXNEXT-6368)              *
- *                                                                            *
  * Purpose: helper function to assist in making unique script names           *
  *                                                                            *
  * Parameters:                                                                *
@@ -1264,8 +1256,6 @@ static int	zbx_make_script_name_unique(const char *name, int *suffix, char **uni
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_5030068 (part of ZBXNEXT-6368)                           *
- *                                                                            *
  * Purpose: split script name between 'menu_path' and 'name' columns for      *
  *          existing global scripts                                           *
  *                                                                            *
@@ -1359,8 +1349,6 @@ ZBX_VECTOR_IMPL(opcommands, zbx_opcommand_rec_t)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_pack_record (part of ZBXNEXT-6368)                           *
- *                                                                            *
  * Purpose: helper function, packs parts of remote command into one memory    *
  *          chunk for efficient storing and comparing                         *
  *                                                                            *
@@ -1400,8 +1388,6 @@ static size_t	zbx_pack_record(const zbx_opcommand_parts_t *parts, char **packed_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_duplicate (part of ZBXNEXT-6368)                       *
- *                                                                            *
  * Purpose: checking if this remote command is a new one or a duplicate one   *
  *          and storing the assigned new global script id                     *
  *                                                                            *
@@ -1451,8 +1437,6 @@ static int	zbx_check_duplicate(zbx_vector_opcommands_t *opcommands,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_5030069   (part of ZBXNEXT-6368)                         *
- *                                                                            *
  * Purpose: migrate remote commands from table 'opcommand' to table 'scripts' *
  *          and convert them into global scripts                              *
  *                                                                            *
@@ -4530,8 +4514,6 @@ static void	dbpatch_trigger_clear(zbx_dbpatch_trigger_t *trigger)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_update_expression                                        *
- *                                                                            *
  * Purpose: replace {functionid} occurrences in expression with the specified *
  *          replacement string                                                *
  *                                                                            *
@@ -4585,8 +4567,6 @@ static int	dbpatch_update_expression(char **expression, zbx_uint64_t functionid,
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_update_trigger                                           *
- *                                                                            *
  * Purpose: replace {functionid} occurrences in trigger expression and        *
  *          recovery expression with the specified replacement string         *
  *                                                                            *
@@ -4608,8 +4588,6 @@ static void	dbpatch_update_trigger(zbx_dbpatch_trigger_t *trigger, zbx_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_find_function                                            *
- *                                                                            *
  * Purpose: check if the expression contains specified functionid             *
  *                                                                            *
  ******************************************************************************/
@@ -4646,8 +4624,6 @@ static int	dbpatch_find_function(const char *expression, zbx_uint64_t functionid
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_get_function_location                                    *
- *                                                                            *
  * Purpose: return function location mask (expression | recovery expression)  *
  *                                                                            *
  ******************************************************************************/
@@ -4669,8 +4645,6 @@ static unsigned char	dbpatch_get_function_location(const zbx_dbpatch_trigger_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_convert_trigger                                          *
- *                                                                            *
  * Purpose: convert trigger and its functions to use new expression syntax    *
  *                                                                            *
  * Parameters: trigger   - [IN/OUT] the trigger data/updates                  *
@@ -4992,8 +4966,6 @@ static int	DBpatch_5030166(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_convert_expression_macro                                 *
- *                                                                            *
  * Purpose: convert simple macros in expression macro {? } to function calls  *
  *          using new expression syntax                                       *
  *                                                                            *
diff --git a/src/libs/zbxdbupgrade/dbupgrade_5050.c b/src/libs/zbxdbupgrade/dbupgrade_5050.c
index fb79f31c064..97e4c5758f5 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_5050.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_5050.c
@@ -660,8 +660,6 @@ static int	DBpatch_5050067(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBpatch_5050068_calc_services_write_value                        *
- *                                                                            *
  * Purpose: calculate services.write value for the specified role             *
  *                                                                            *
  * Parameters: roleid - [IN] the role identifier                              *
diff --git a/src/libs/zbxdbupgrade/dbupgrade_macros.c b/src/libs/zbxdbupgrade/dbupgrade_macros.c
index e075535c2af..baca0fca23d 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_macros.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_macros.c
@@ -48,8 +48,6 @@ ZBX_VECTOR_IMPL(strloc, zbx_strloc_t)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_rename_macro                                                 *
- *                                                                            *
  * Purpose: rename macros in the string                                       *
  *                                                                            *
  * Parameters: in        - [IN] the input string                              *
@@ -103,8 +101,6 @@ static int	str_rename_macro(const char *in, const char *oldmacro, const char *ne
 
 /******************************************************************************
  *                                                                            *
- * Function: db_rename_macro                                                  *
- *                                                                            *
  * Purpose: rename macro in the specified database fields                     *
  *                                                                            *
  * Parameters: result     - [IN] database query with fields to replace. First *
@@ -358,8 +354,6 @@ static void	dbpatch_update_func_bitand(zbx_dbpatch_function_t *function, const z
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_strcpy_alloc_quoted                                      *
- *                                                                            *
  * Purpose: quote and text to a buffer                                        *
  *                                                                            *
  * Parameters: str        - [OUT] the output buffer                           *
@@ -384,8 +378,6 @@ void	dbpatch_strcpy_alloc_quoted(char **str, size_t *str_alloc, size_t *str_offs
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_is_composite_constant                                    *
- *                                                                            *
  * Purpose: check for composite (consisting of macro(s) + text) constant      *
  *                                                                            *
  * Parameters: str - [IN] the text to check                                   *
@@ -412,8 +404,6 @@ int	dbpatch_is_composite_constant(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_convert_params                                           *
- *                                                                            *
  * Purpose: convert function parameters into new syntax                       *
  *                                                                            *
  * Parameters: out       - [OUT] the converted parameter string               *
@@ -577,8 +567,6 @@ void	dbpatch_convert_params(char **out, const char *parameter, const zbx_vector_
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_parse_function_params                                    *
- *                                                                            *
  * Purpose: parse function parameter string into parameter location vector    *
  *                                                                            *
  ******************************************************************************/
@@ -614,8 +602,6 @@ static void	dbpatch_parse_function_params(const char *parameter, zbx_vector_strl
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_convert_function                                         *
- *                                                                            *
  * Purpose: convert function to new parameter syntax/order                    *
  *                                                                            *
  * Parameters: function   - [IN/OUT] the function to convert                  *
@@ -838,8 +824,6 @@ void	dbpatch_convert_function(zbx_dbpatch_function_t *function, char **replace,
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_replace_functionids                                      *
- *                                                                            *
  * Purpose: replace functionids {<index in functions vector>} in expression   *
  *          with their string format                                          *
  *                                                                            *
@@ -900,8 +884,6 @@ static void	dbpatch_replace_functionids(char **expression, const zbx_vector_ptr_
 
 /******************************************************************************
  *                                                                            *
- * Function: dbpatch_convert_simple_macro                                     *
- *                                                                            *
  * Purpose: convert simple macro {host.key:func(params)} to the new syntax    *
  *          func(/host/key,params)                                            *
  *                                                                            *
diff --git a/src/libs/zbxdiag/diag.c b/src/libs/zbxdiag/diag.c
index 88827c67c0d..f3e7e7fa050 100644
--- a/src/libs/zbxdiag/diag.c
+++ b/src/libs/zbxdiag/diag.c
@@ -33,8 +33,6 @@ void	diag_map_free(zbx_diag_map_t *map)
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_parse_request                                               *
- *                                                                            *
  * Purpose: parse diagnostic section request having json format               *
  *          {"stats":[<field1>,<field2>,...], "top":{<field1>:<limit1>,...}}  *
  *                                                                            *
@@ -133,8 +131,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_mem_stats                                               *
- *                                                                            *
  * Purpose: add memory statistics to the json data                            *
  *                                                                            *
  * Parameters: json  - [IN/OUT] the json to update                            *
@@ -185,8 +181,6 @@ void	diag_add_mem_stats(struct zbx_json *json, const char *name, const zbx_mem_s
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_compare_pair_second_desc                                    *
- *                                                                            *
  * Purpose: compare uint64 pairs by second value for descending sorting       *
  *                                                                            *
  ******************************************************************************/
@@ -204,8 +198,6 @@ static int	diag_compare_pair_second_desc(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_historycahe_add_items                                       *
- *                                                                            *
  * Purpose: add history cache items diagnostic statistics to json             *
  *                                                                            *
  ******************************************************************************/
@@ -229,8 +221,6 @@ static void	diag_historycache_add_items(struct zbx_json *json, const char *field
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_historycache_info                                       *
- *                                                                            *
  * Purpose: add requested history cache diagnostic information to json data   *
  *                                                                            *
  * Parameters: jp    - [IN] the request                                       *
@@ -349,8 +339,6 @@ int	diag_add_historycache_info(const struct zbx_json_parse *jp, struct zbx_json
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_preproc_items                                           *
- *                                                                            *
  * Purpose: add item top list to output json                                  *
  *                                                                            *
  * Parameters: json  - [OUT] the output json                                  *
@@ -380,8 +368,6 @@ static void	diag_add_preproc_items(struct zbx_json *json, const char *field, con
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_preproc_info                                            *
- *                                                                            *
  * Purpose: add requested preprocessing diagnostic information to json data   *
  *                                                                            *
  * Parameters: jp    - [IN] the request                                       *
@@ -503,8 +489,6 @@ static void	zbx_json_addhex(struct zbx_json *j, const char *name, zbx_uint64_t v
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_locks_info                                              *
- *                                                                            *
  * Purpose: add requested locks diagnostic information to json data           *
  *                                                                            *
  * Parameters: json  - [IN/OUT] the json to update                            *
@@ -547,8 +531,6 @@ void	diag_add_locks_info(struct zbx_json *json)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_diag_get_info                                                *
- *                                                                            *
  * Purpose: get diagnostic information                                        *
  *                                                                            *
  * Parameters: jp   - [IN] the request                                        *
@@ -592,8 +574,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_section_request                                         *
- *                                                                            *
  * Purpose: add default diagnostic section request                            *
  *                                                                            *
  * Parameters: j       - [OUT] the request json                               *
@@ -624,8 +604,6 @@ static void	diag_add_section_request(struct zbx_json *j, const char *section, ..
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_prepare_default_request                                     *
- *                                                                            *
  * Purpose: prepare default diagnostic request for all sections               *
  *                                                                            *
  ******************************************************************************/
@@ -652,8 +630,6 @@ static void	diag_prepare_default_request(struct zbx_json *j, unsigned int flags)
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_get_simple_values                                           *
- *                                                                            *
  * Purpose: extract simple values in format <key1>:<value1> <key2>:<value2>...*
  *          from the specified json location                                  *
  *                                                                            *
@@ -688,8 +664,6 @@ static void	diag_get_simple_values(const struct zbx_json_parse *jp, char **msg)
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_log_memory_info                                             *
- *                                                                            *
  * Purpose: log shared memory information                                     *
  *                                                                            *
  * Parameters: jp    - [IN] the section json                                  *
@@ -744,8 +718,6 @@ static void	diag_log_memory_info(struct zbx_json_parse *jp, const char *field, c
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_log_top_view                                                *
- *                                                                            *
  * Purpose: log top view                                                      *
  *                                                                            *
  * Parameters: jp         - [IN] the section json                             *
@@ -785,8 +757,6 @@ static void	diag_log_top_view(struct zbx_json_parse *jp, const char *field, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_log_history_cache                                           *
- *                                                                            *
  * Purpose: log history cache diagnostic information                          *
  *                                                                            *
  ******************************************************************************/
@@ -810,8 +780,6 @@ static void	diag_log_history_cache(struct zbx_json_parse *jp, char **out, size_t
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_log_value_cache                                             *
- *                                                                            *
  * Purpose: log value cache diagnostic information                            *
  *                                                                            *
  ******************************************************************************/
@@ -835,8 +803,6 @@ static void	diag_log_value_cache(struct zbx_json_parse *jp, char **out, size_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_log_preprocessing                                           *
- *                                                                            *
  * Purpose: log preprocessing diagnostic information                          *
  *                                                                            *
  ******************************************************************************/
@@ -858,8 +824,6 @@ static void	diag_log_preprocessing(struct zbx_json_parse *jp, char **out, size_t
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_log_lld                                                     *
- *                                                                            *
  * Purpose: log LLD diagnostic information                                    *
  *                                                                            *
  ******************************************************************************/
@@ -881,8 +845,6 @@ static void	diag_log_lld(struct zbx_json_parse *jp, char **out, size_t *out_allo
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_log_alerting                                                *
- *                                                                            *
  * Purpose: log alerting diagnostic information                               *
  *                                                                            *
  ******************************************************************************/
@@ -904,8 +866,6 @@ static void	diag_log_alerting(struct zbx_json_parse *jp, char **out, size_t *out
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_diag_log_info                                                *
- *                                                                            *
  * Purpose: log diagnostic information                                        *
  *                                                                            *
  * Parameters: flags - [IN] flags describing section to log                   *
diff --git a/src/libs/zbxdiag/diag_proxy.c b/src/libs/zbxdiag/diag_proxy.c
index 3df3ab15c59..d059e8d4f2f 100644
--- a/src/libs/zbxdiag/diag_proxy.c
+++ b/src/libs/zbxdiag/diag_proxy.c
@@ -24,8 +24,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_section_info                                            *
- *                                                                            *
  * Purpose: add requested section diagnostic information                      *
  *                                                                            *
  * Parameters: section - [IN] the section name                                *
diff --git a/src/libs/zbxdiag/diag_server.c b/src/libs/zbxdiag/diag_server.c
index 76fede05f7e..832c88f4a84 100644
--- a/src/libs/zbxdiag/diag_server.c
+++ b/src/libs/zbxdiag/diag_server.c
@@ -29,8 +29,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_historycache_item_compare_values                            *
- *                                                                            *
  * Purpose: sort itemid,values_num pair by values_num in descending order     *
  *                                                                            *
  ******************************************************************************/
@@ -44,8 +42,6 @@ static int	diag_valuecache_item_compare_values(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_valuecache_item_compare_hourly                              *
- *                                                                            *
  * Purpose: sort itemid,values_num pair by hourly_num in descending order     *
  *                                                                            *
  ******************************************************************************/
@@ -59,8 +55,6 @@ static int	diag_valuecache_item_compare_hourly(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_valuecache_add_items                                        *
- *                                                                            *
  * Purpose: add valuecache items diagnostic statistics to json                *
  *                                                                            *
  ******************************************************************************/
@@ -84,8 +78,6 @@ static void	diag_valuecache_add_items(struct zbx_json *json, const char *field,
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_valuecache_info                                         *
- *                                                                            *
  * Purpose: add requested value cache diagnostic information to json data     *
  *                                                                            *
  * Parameters: jp    - [IN] the request                                       *
@@ -203,8 +195,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_lld_items                                               *
- *                                                                            *
  * Purpose: add lld item top list to output json                              *
  *                                                                            *
  ******************************************************************************/
@@ -227,8 +217,6 @@ static void	diag_add_lld_items(struct zbx_json *json, const char *field, const z
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_lld_info                                                *
- *                                                                            *
  * Purpose: add requested lld manager diagnostic information to json data     *
  *                                                                            *
  * Parameters: jp    - [IN] the request                                       *
@@ -325,8 +313,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_alerting_mediatypes                                     *
- *                                                                            *
  * Purpose: add mediatype top list to output json                             *
  *                                                                            *
  * Parameters: json  - [OUT] the output json                                  *
@@ -355,8 +341,6 @@ static void	diag_add_alerting_mediatypes(struct zbx_json *json, const char *fiel
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_alerting_sources                                        *
- *                                                                            *
  * Purpose: add alert source top list to output json                          *
  *                                                                            *
  * Parameters: json  - [OUT] the output json                                  *
@@ -388,8 +372,6 @@ static void	diag_add_alerting_sources(struct zbx_json *json, const char *field,
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_alerting_info                                           *
- *                                                                            *
  * Purpose: add requested alert manager diagnostic information to json data   *
  *                                                                            *
  * Parameters: jp    - [IN] the request                                       *
@@ -504,8 +486,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: diag_add_section_info                                            *
- *                                                                            *
  * Purpose: add requested section diagnostic information                      *
  *                                                                            *
  * Parameters: section - [IN] the section name                                *
diff --git a/src/libs/zbxembed/console.c b/src/libs/zbxembed/console.c
index c733487ea98..869f0d158c4 100644
--- a/src/libs/zbxembed/console.c
+++ b/src/libs/zbxembed/console.c
@@ -27,8 +27,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: es_console_dtor                                                  *
- *                                                                            *
  * Purpose: console destructor                                                *
  *                                                                            *
  ******************************************************************************/
@@ -41,8 +39,6 @@ static duk_ret_t	es_console_dtor(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_console_ctor                                                  *
- *                                                                            *
  * Purpose: console constructor                                               *
  *                                                                            *
  ******************************************************************************/
@@ -61,8 +57,6 @@ static duk_ret_t	es_console_ctor(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_log_message                                                   *
- *                                                                            *
  * Purpose: Write message to centralized Zabbix log                           *
  *                                                                            *
  ******************************************************************************/
@@ -121,8 +115,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: es_console_log                                                   *
- *                                                                            *
  * Purpose: console.log method                                                *
  *                                                                            *
  ******************************************************************************/
@@ -133,8 +125,6 @@ static duk_ret_t	es_console_log(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_console_warn                                                  *
- *                                                                            *
  * Purpose: console.warn method                                               *
  *                                                                            *
  ******************************************************************************/
@@ -145,8 +135,6 @@ static duk_ret_t	es_console_warn(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_console_error                                                 *
- *                                                                            *
  * Purpose: console.error method                                              *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxembed/embed.c b/src/libs/zbxembed/embed.c
index 34d8d1864cc..4d6475bfc59 100644
--- a/src/libs/zbxembed/embed.c
+++ b/src/libs/zbxembed/embed.c
@@ -40,8 +40,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: es_handle_error                                                  *
- *                                                                            *
  * Purpose: fatal error handler                                               *
  *                                                                            *
  ******************************************************************************/
@@ -123,8 +121,6 @@ static void	es_free(void *udata, void *ptr)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_check_timeout                                             *
- *                                                                            *
  * Purpose: timeout checking callback                                         *
  *                                                                            *
  ******************************************************************************/
@@ -140,8 +136,6 @@ int	zbx_es_check_timeout(void *udata)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_init                                                      *
- *                                                                            *
  * Purpose: initializes embedded scripting engine                             *
  *                                                                            *
  ******************************************************************************/
@@ -152,8 +146,6 @@ void	zbx_es_init(zbx_es_t *es)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_destroy                                                   *
- *                                                                            *
  * Purpose: destroys embedded scripting engine                                *
  *                                                                            *
  ******************************************************************************/
@@ -169,8 +161,6 @@ void	zbx_es_destroy(zbx_es_t *es)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_init_env                                                  *
- *                                                                            *
  * Purpose: initializes embedded scripting engine environment                 *
  *                                                                            *
  * Parameters: es    - [IN] the embedded scripting engine                     *
@@ -249,8 +239,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_destroy_env                                               *
- *                                                                            *
  * Purpose: destroys initialized embedded scripting engine environment        *
  *                                                                            *
  * Parameters: es    - [IN] the embedded scripting engine                     *
@@ -288,8 +276,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_ready                                                     *
- *                                                                            *
  * Purpose: checks if the scripting engine environment is initialized         *
  *                                                                            *
  * Parameters: es    - [IN] the embedded scripting engine                     *
@@ -305,8 +291,6 @@ int	zbx_es_is_env_initialized(zbx_es_t *es)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_fatal_error                                               *
- *                                                                            *
  * Purpose: checks if fatal error has occurred                                *
  *                                                                            *
  * Comments: Fatal error may put the scripting engine in unknown state, it's  *
@@ -330,8 +314,6 @@ int	zbx_es_fatal_error(zbx_es_t *es)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_compile                                                   *
- *                                                                            *
  * Purpose: compiles script into bytecode                                     *
  *                                                                            *
  * Parameters: es     - [IN] the embedded scripting engine                    *
@@ -414,8 +396,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_execute                                                   *
- *                                                                            *
  * Purpose: executes script                                                   *
  *                                                                            *
  * Parameters: es         - [IN] the embedded scripting engine                *
@@ -553,8 +533,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_set_timeout                                               *
- *                                                                            *
  * Purpose: sets script execution timeout                                     *
  *                                                                            *
  * Parameters: es      - [IN] the embedded scripting engine                   *
@@ -594,8 +572,6 @@ void	zbx_es_debug_disable(zbx_es_t *es)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_execute_command                                           *
- *                                                                            *
  * Purpose: executes command (script in form of a text)                       *
  *                                                                            *
  * Parameters: command       - [IN] the command in form of a text             *
diff --git a/src/libs/zbxembed/global.c b/src/libs/zbxembed/global.c
index 7529d5ed5e3..65025c5f37d 100644
--- a/src/libs/zbxembed/global.c
+++ b/src/libs/zbxembed/global.c
@@ -27,8 +27,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: es_btoa                                                          *
- *                                                                            *
  * Purpose: encodes parameter to base64 string                                *
  *                                                                            *
  * Parameters: ctx - [IN] pointer to duk_context                              *
@@ -54,8 +52,6 @@ static duk_ret_t	es_btoa(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_atob                                                          *
- *                                                                            *
  * Purpose: decodes base64 string                                             *
  *                                                                            *
  * Parameters: ctx - [IN] pointer to duk_context                              *
@@ -84,8 +80,6 @@ static duk_ret_t	es_atob(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_md5                                                           *
- *                                                                            *
  * Purpose: compute a md5 checksum                                            *
  *                                                                            *
  * Parameters: ctx - [IN] pointer to duk_context                              *
@@ -128,8 +122,6 @@ static duk_ret_t	es_md5(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_sha256                                                        *
- *                                                                            *
  * Purpose: compute a sha256 checksum                                         *
  *                                                                            *
  * Parameters: ctx - [IN] pointer to duk_context                              *
@@ -167,8 +159,6 @@ static duk_ret_t	es_sha256(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_init_global_functions                                         *
- *                                                                            *
  * Purpose: initializes additional global functions                           *
  *                                                                            *
  * Parameters: es - [IN] the embedded scripting engine                        *
diff --git a/src/libs/zbxembed/httprequest.c b/src/libs/zbxembed/httprequest.c
index d6cdefa990f..80186c18db8 100644
--- a/src/libs/zbxembed/httprequest.c
+++ b/src/libs/zbxembed/httprequest.c
@@ -89,8 +89,6 @@ static size_t	curl_header_cb(void *ptr, size_t size, size_t nmemb, void *userdat
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest                                                   *
- *                                                                            *
  * Purpose: return backing C structure embedded in CurlHttpRequest object     *
  *                                                                            *
  ******************************************************************************/
@@ -108,8 +106,6 @@ static zbx_es_httprequest_t *es_httprequest(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_dtor                                              *
- *                                                                            *
  * Purpose: CurlHttpRequest destructor                                        *
  *                                                                            *
  ******************************************************************************/
@@ -138,8 +134,6 @@ static duk_ret_t	es_httprequest_dtor(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_ctor                                              *
- *                                                                            *
  * Purpose: CurlHttpRequest constructor                                       *
  *                                                                            *
  ******************************************************************************/
@@ -194,8 +188,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_add_header                                        *
- *                                                                            *
  * Purpose: CurlHttpRequest.SetHeader method                                  *
  *                                                                            *
  ******************************************************************************/
@@ -229,8 +221,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_clear_header                                      *
- *                                                                            *
  * Purpose: CurlHttpRequest.ClearHeader method                                *
  *                                                                            *
  ******************************************************************************/
@@ -250,8 +240,6 @@ static duk_ret_t	es_httprequest_clear_header(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_query                                             *
- *                                                                            *
  * Purpose: CurlHttpRequest HTTP request implementation                       *
  *                                                                            *
  * Parameters: ctx          - [IN] the scripting engine context               *
@@ -351,8 +339,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_get                                               *
- *                                                                            *
  * Purpose: HttpRequest.Get / CurlHttpRequest.Get method                      *
  *                                                                            *
  ******************************************************************************/
@@ -363,8 +349,6 @@ static duk_ret_t	es_httprequest_get(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_put                                               *
- *                                                                            *
  * Purpose: HttpRequest.Put / CurlHttpRequest.Put method                      *
  *                                                                            *
  ******************************************************************************/
@@ -375,8 +359,6 @@ static duk_ret_t	es_httprequest_put(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_post                                              *
- *                                                                            *
  * Purpose: HttpRequest.Post / CurlHttpRequest.Post method                    *
  *                                                                            *
  ******************************************************************************/
@@ -387,8 +369,6 @@ static duk_ret_t	es_httprequest_post(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_delete                                            *
- *                                                                            *
  * Purpose: HttpRequest.Delete / CurlHttpRequest.Delete method                *
  *                                                                            *
  ******************************************************************************/
@@ -399,8 +379,6 @@ static duk_ret_t	es_httprequest_delete(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_head                                              *
- *                                                                            *
  * Purpose: HttpRequest.head method                                           *
  *                                                                            *
  ******************************************************************************/
@@ -411,8 +389,6 @@ static duk_ret_t	es_httprequest_head(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_patch                                             *
- *                                                                            *
  * Purpose: HttpRequest.patch method                                          *
  *                                                                            *
  ******************************************************************************/
@@ -423,8 +399,6 @@ static duk_ret_t	es_httprequest_patch(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_options                                           *
- *                                                                            *
  * Purpose: HttpRequest.options method                                        *
  *                                                                            *
  ******************************************************************************/
@@ -435,8 +409,6 @@ static duk_ret_t	es_httprequest_options(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_trace                                             *
- *                                                                            *
  * Purpose: HttpRequest.trace method                                          *
  *                                                                            *
  ******************************************************************************/
@@ -447,8 +419,6 @@ static duk_ret_t	es_httprequest_trace(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_connect                                           *
- *                                                                            *
  * Purpose: HttpRequest.connect method                                        *
  *                                                                            *
  ******************************************************************************/
@@ -459,8 +429,6 @@ static duk_ret_t	es_httprequest_connect(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_customrequest                                     *
- *                                                                            *
  * Purpose: HttpRequest.customRequest method                                  *
  *                                                                            *
  ******************************************************************************/
@@ -479,8 +447,6 @@ static duk_ret_t	es_httprequest_customrequest(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_set_proxy                                         *
- *                                                                            *
  * Purpose: CurlHttpRequest.SetProxy method                                   *
  *                                                                            *
  ******************************************************************************/
@@ -503,8 +469,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_status                                            *
- *                                                                            *
  * Purpose: CurlHttpRequest.Status method                                     *
  *                                                                            *
  ******************************************************************************/
@@ -527,8 +491,6 @@ static duk_ret_t	es_httprequest_status(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_header                                                     *
- *                                                                            *
  * Purpose: retrieves value of a header                                       *
  *                                                                            *
  * Parameters: header    - [IN] the http header to extract value from         *
@@ -553,8 +515,6 @@ static int	parse_header(char *header, char **value_out)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_obj_put_http_header                                           *
- *                                                                            *
  * Purpose: puts http header <field>: <value> as object property/value        *
  *                                                                            *
  * Parameters: ctx    - [IN] the duktape context                              *
@@ -577,8 +537,6 @@ static void	es_put_header(duk_context *ctx, int idx, char *header)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_headers_as_strings                                           *
- *                                                                            *
  * Purpose: retrieve headers from request in form of strings                  *
  *                                                                            *
  * Parameters: ctx     - [IN] the duktape context                             *
@@ -621,8 +579,6 @@ static void	cached_headers_free(zbx_cached_header_t *header)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_headers_as_arrays                                            *
- *                                                                            *
  * Purpose: retrieve headers from request in form of arrays                   *
  *                                                                            *
  * Parameters: ctx     - [IN] the duktape context                             *
@@ -704,8 +660,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_get_headers                                       *
- *                                                                            *
  * Purpose: HttpRequest.getHeaders / CurlHttpRequest.GetHeaders method        *
  *                                                                            *
  ******************************************************************************/
@@ -731,8 +685,6 @@ static duk_ret_t	es_httprequest_get_headers(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_httprequest_set_httpauth                                      *
- *                                                                            *
  * Purpose: CurlHttpRequest.SetHttpAuth method                                *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxembed/xml.c b/src/libs/zbxembed/xml.c
index 631d3aef8a9..c055dd4b393 100644
--- a/src/libs/zbxembed/xml.c
+++ b/src/libs/zbxembed/xml.c
@@ -25,8 +25,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: es_xml_ctor                                                      *
- *                                                                            *
  * Purpose: XML constructor                                                   *
  *                                                                            *
  ******************************************************************************/
@@ -44,8 +42,6 @@ static duk_ret_t	es_xml_ctor(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_xml_query                                                     *
- *                                                                            *
  * Purpose: XML.query method                                                  *
  *                                                                            *
  ******************************************************************************/
@@ -81,8 +77,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: es_xml_from_json                                                 *
- *                                                                            *
  * Purpose: XML.fromJson method                                               *
  *                                                                            *
  ******************************************************************************/
@@ -115,8 +109,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: es_xml_to_json                                                   *
- *                                                                            *
  * Purpose: XML.toJson method                                                 *
  *                                                                            *
  ******************************************************************************/
@@ -174,8 +166,6 @@ static int	es_xml_create_object(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_es_init_xml                                                  *
- *                                                                            *
  * Purpose: init XML object                                                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxembed/zabbix.c b/src/libs/zbxembed/zabbix.c
index 1daaa58bcaa..6791cd8b8c0 100644
--- a/src/libs/zbxembed/zabbix.c
+++ b/src/libs/zbxembed/zabbix.c
@@ -27,8 +27,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: es_zabbix_dtor                                                   *
- *                                                                            *
  * Purpose: Zabbix destructor                                                 *
  *                                                                            *
  ******************************************************************************/
@@ -41,8 +39,6 @@ static duk_ret_t	es_zabbix_dtor(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_zabbix_ctor                                                   *
- *                                                                            *
  * Purpose: Zabbix constructor                                                *
  *                                                                            *
  ******************************************************************************/
@@ -61,8 +57,6 @@ static duk_ret_t	es_zabbix_ctor(duk_context *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: es_zabbix_status                                                 *
- *                                                                            *
  * Purpose: Zabbix.Status method                                              *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxeval/calc.c b/src/libs/zbxeval/calc.c
index 2727be92c5a..4f27ef40c3f 100644
--- a/src/libs/zbxeval/calc.c
+++ b/src/libs/zbxeval/calc.c
@@ -42,8 +42,6 @@ static int	zbx_is_normal_double(double dbl)
 
 /******************************************************************************
  *                                                                            *
- * Function: calc_arithmetic_mean                                             *
- *                                                                            *
  * Purpose: calculate arithmetic mean (i.e. average)                          *
  *                                                                            *
  * Parameters: v - [IN] non-empty vector with input data                      *
@@ -64,8 +62,6 @@ static double	calc_arithmetic_mean(const zbx_vector_dbl_t *v)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_kurtosis                                           *
- *                                                                            *
  * Purpose: evaluate function 'kurtosis'                                      *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -123,8 +119,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: find_median                                                      *
- *                                                                            *
  * Purpose: find median (helper function)                                     *
  *                                                                            *
  * Parameters: v - [IN/OUT] non-empty vector with input data.                 *
@@ -145,8 +139,6 @@ static double	find_median(zbx_vector_dbl_t *v)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_mad                                                *
- *                                                                            *
  * Purpose: calculate 'median absolute deviation'                             *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data.                *
@@ -192,8 +184,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_skewness                                           *
- *                                                                            *
  * Purpose: evaluate 'skewness' function                                      *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -245,8 +235,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_stddevpop                                          *
- *                                                                            *
  * Purpose: evaluate function 'stdevpop' (population standard deviation)      *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -297,8 +285,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_stddevsamp                                         *
- *                                                                            *
  * Purpose: evaluate function 'stddevsamp' (sample standard deviation)        *
  *                                                                            *
  * Parameters: values - [IN] vector with input data with at least 2 elements  *
@@ -355,8 +341,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_sumofsquares                                       *
- *                                                                            *
  * Purpose: calculate sum of squares                                          *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -388,8 +372,6 @@ int	zbx_eval_calc_sumofsquares(zbx_vector_dbl_t *values, double *result, char **
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_varpop                                             *
- *                                                                            *
  * Purpose: evaluate function 'varpop' (population variance)                  *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -439,8 +421,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_varsamp                                            *
- *                                                                            *
  * Purpose: evaluate function 'varsamp' (sample variance)                     *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -537,8 +517,6 @@ static void	ensure_histogram_monotonic(zbx_vector_histogram_t *h)
 
 /******************************************************************************
  *                                                                            *
- * 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    *
  *                                                                            *
@@ -660,8 +638,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_avg                                                *
- *                                                                            *
  * Purpose: evaluate function avg                                             *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -687,8 +663,6 @@ int	zbx_eval_calc_avg(zbx_vector_dbl_t *values, double *result, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_min                                                *
- *                                                                            *
  * Purpose: evaluate function min                                             *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -725,8 +699,6 @@ int	zbx_eval_calc_min(zbx_vector_dbl_t *values, double *result, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_max                                                *
- *                                                                            *
  * Purpose: evaluate function max                                             *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
@@ -763,8 +735,6 @@ int	zbx_eval_calc_max(zbx_vector_dbl_t *values, double *result, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_calc_sum                                                *
- *                                                                            *
  * Purpose: evaluate function sum                                             *
  *                                                                            *
  * Parameters: values - [IN] non-empty vector with input data                 *
diff --git a/src/libs/zbxeval/execute.c b/src/libs/zbxeval/execute.c
index 9d35c6ce022..7b0d9652ccd 100644
--- a/src/libs/zbxeval/execute.c
+++ b/src/libs/zbxeval/execute.c
@@ -48,8 +48,6 @@ zbx_function_trim_optype_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: variant_convert_suffixed_num                                     *
- *                                                                            *
  * Purpose: convert variant string value containing suffixed number to        *
  *          floating point variant value                                      *
  *                                                                            *
@@ -83,8 +81,6 @@ static int	variant_convert_suffixed_num(zbx_variant_t *value, const zbx_variant_
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_op_unary                                            *
- *                                                                            *
  * Purpose: evaluate unary operator                                           *
  *                                                                            *
  * Parameters: ctx      - [IN] the evaluation context                         *
@@ -151,8 +147,6 @@ static int	eval_execute_op_unary(const zbx_eval_context_t *ctx, const zbx_eval_t
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_op_logic_err                                        *
- *                                                                            *
  * Purpose: evaluate logical or/and operator with one operand being error     *
  *                                                                            *
  * Parameters: token  - [IN] the operator token                               *
@@ -200,8 +194,6 @@ static int	eval_execute_op_logic_err(const zbx_eval_token_t *token, const zbx_va
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_variant_compare                                             *
- *                                                                            *
  * Purpose: compare two variant values supporting suffixed numbers            *
  *                                                                            *
  * Return value: <0 - the first value is less than the second                 *
@@ -233,8 +225,6 @@ static int	eval_variant_compare(const zbx_variant_t *left, const zbx_variant_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_op_binary                                           *
- *                                                                            *
  * Purpose: evaluate binary operator                                          *
  *                                                                            *
  * Parameters: ctx      - [IN] the evaluation context                         *
@@ -408,8 +398,6 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_suffixed_number_parse                                       *
- *                                                                            *
  * Purpose: check if the value is suffixed number and return the suffix if    *
  *          exists                                                            *
  *                                                                            *
@@ -441,8 +429,6 @@ int	 eval_suffixed_number_parse(const char *value, char *suffix)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_push_value                                          *
- *                                                                            *
  * Purpose: push value in output stack                                        *
  *                                                                            *
  * Parameters: ctx      - [IN] the evaluation context                         *
@@ -527,8 +513,6 @@ static int	eval_execute_push_value(const zbx_eval_context_t *ctx, const zbx_eval
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_push_null                                           *
- *                                                                            *
  * Purpose: push null value in output stack                                   *
  *                                                                            *
  * Parameters: output   - [IN/OUT] the output value stack                     *
@@ -544,8 +528,6 @@ static void	eval_execute_push_null(zbx_vector_var_t *output)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_compare_token                                               *
- *                                                                            *
  * Purpose: check if expression fragment matches the specified text           *
  *                                                                            *
  * Parameters: ctx  - [IN] the evaluation context                             *
@@ -571,8 +553,6 @@ int	eval_compare_token(const zbx_eval_context_t *ctx, const zbx_strloc_t *loc, c
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_function_return                                             *
- *                                                                            *
  * Purpose: handle function return                                            *
  *                                                                            *
  * Parameters: args_num - [IN] the number of function arguments               *
@@ -597,8 +577,6 @@ static void	eval_function_return(zbx_uint32_t args_num, zbx_variant_t *value, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_validate_function_args                                      *
- *                                                                            *
  * Purpose: validate function arguments                                       *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -661,8 +639,6 @@ static const char	*eval_type_desc(unsigned char type)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_convert_function_arg                                        *
- *                                                                            *
  * Purpose: convert function argument to the specified type                   *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -698,8 +674,6 @@ static int	eval_convert_function_arg(const zbx_eval_context_t *ctx, const zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_prepare_math_function_args                                  *
- *                                                                            *
  * Purpose: validate and prepare (convert to floating values) math function   *
  *          arguments                                                         *
  *                                                                            *
@@ -767,8 +741,6 @@ static int	eval_prepare_math_function_args(const zbx_eval_context_t *ctx, const
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_min                                        *
- *                                                                            *
  * Purpose: evaluate min() function                                           *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -823,8 +795,6 @@ static int	eval_execute_function_min(const zbx_eval_context_t *ctx, const zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_max                                        *
- *                                                                            *
  * Purpose: evaluate max() function                                           *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -879,8 +849,6 @@ static int	eval_execute_function_max(const zbx_eval_context_t *ctx, const zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_sum                                        *
- *                                                                            *
  * Purpose: evaluate sum() function                                           *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -925,8 +893,6 @@ static int	eval_execute_function_sum(const zbx_eval_context_t *ctx, const zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_avg                                        *
- *                                                                            *
  * Purpose: evaluate avg() function                                           *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -975,8 +941,6 @@ static int	eval_execute_function_avg(const zbx_eval_context_t *ctx, const zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_abs                                     *
- *                                                                            *
  * Purpose: evaluate abs() function                                        *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1013,8 +977,6 @@ static int	eval_execute_function_abs(const zbx_eval_context_t *ctx, const zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_length                                     *
- *                                                                            *
  * Purpose: evaluate length() function                                        *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1055,8 +1017,6 @@ static int	eval_execute_function_length(const zbx_eval_context_t *ctx, const zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_date                                       *
- *                                                                            *
  * Purpose: evaluate date() function                                          *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1097,8 +1057,6 @@ static int	eval_execute_function_date(const zbx_eval_context_t *ctx, const zbx_e
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_time                                       *
- *                                                                            *
  * Purpose: evaluate time() function                                          *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1138,8 +1096,6 @@ static int	eval_execute_function_time(const zbx_eval_context_t *ctx, const zbx_e
 }
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_now                                        *
- *                                                                            *
  * Purpose: evaluate now() function                                           *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1170,8 +1126,6 @@ static int	eval_execute_function_now(const zbx_eval_context_t *ctx, const zbx_ev
 }
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_dayofweek                                  *
- *                                                                            *
  * Purpose: evaluate dayofweek() function                                     *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1212,8 +1166,6 @@ static int	eval_execute_function_dayofweek(const zbx_eval_context_t *ctx, const
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_dayofmonth                                 *
- *                                                                            *
  * Purpose: evaluate dayofmonth() function                                    *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1254,8 +1206,6 @@ static int	eval_execute_function_dayofmonth(const zbx_eval_context_t *ctx, const
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_bitwise                                    *
- *                                                                            *
  * Purpose: evaluate bitand(), bitor(), bitxor(), bitlshift(),                *
  *          bitrshift() functions                                             *
  *                                                                            *
@@ -1319,8 +1269,6 @@ static int	eval_execute_function_bitwise(const zbx_eval_context_t *ctx, const zb
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_bitnot                                     *
- *                                                                            *
  * Purpose: evaluate bitnot() function                                        *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1361,8 +1309,6 @@ static int	eval_execute_function_bitnot(const zbx_eval_context_t *ctx, const zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_left                                       *
- *                                                                            *
  * Purpose: evaluate left() function                                          *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1447,8 +1393,6 @@ static int	eval_validate_statistical_function_args(const zbx_eval_context_t *ctx
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_statistical_function                                *
- *                                                                            *
  * Purpose: common operations for aggregate function calculation              *
  *                                                                            *
  * Parameters: ctx       - [IN] the evaluation context                        *
@@ -1485,8 +1429,6 @@ static int	eval_execute_statistical_function(const zbx_eval_context_t *ctx, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_right                                      *
- *                                                                            *
  * Purpose: evaluate right() function                                         *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1545,8 +1487,6 @@ static int	eval_execute_function_right(const zbx_eval_context_t *ctx, const zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_mid                                        *
- *                                                                            *
  * Purpose: evaluate mid() function                                           *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1615,8 +1555,6 @@ static int	eval_execute_function_mid(const zbx_eval_context_t *ctx, const zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_trim                                       *
- *                                                                            *
  * Purpose: evaluate trim(), rtrim(), ltrim() functions                       *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1688,8 +1626,6 @@ static int	eval_execute_function_trim(const zbx_eval_context_t *ctx, const zbx_e
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_concat                                     *
- *                                                                            *
  * Purpose: evaluate concat() function                                        *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1736,8 +1672,6 @@ static int	eval_execute_function_concat(const zbx_eval_context_t *ctx, const zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_insert                                     *
- *                                                                            *
  * Purpose: evaluate insert() function                                        *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1812,8 +1746,6 @@ static int	eval_execute_function_insert(const zbx_eval_context_t *ctx, const zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_replace                                    *
- *                                                                            *
  * Purpose: evaluate replace() function                                       *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1879,8 +1811,6 @@ static int	eval_execute_function_replace(const zbx_eval_context_t *ctx, const zb
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_repeat                                     *
- *                                                                            *
  * Purpose: evaluate repeat() function                                        *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -1943,8 +1873,6 @@ static int	eval_execute_function_repeat(const zbx_eval_context_t *ctx, const zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_bytelength                                 *
- *                                                                            *
  * Purpose: evaluate bytelength() function                                    *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2004,8 +1932,6 @@ static int	eval_execute_function_bytelength(const zbx_eval_context_t *ctx, const
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_bitlength                                  *
- *                                                                            *
  * Purpose: evaluate bitlength() function                                     *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2064,8 +1990,6 @@ static int	eval_execute_function_bitlength(const zbx_eval_context_t *ctx, const
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_char                                       *
- *                                                                            *
  * Purpose: evaluate char() function                                          *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2113,8 +2037,6 @@ static int	eval_execute_function_char(const zbx_eval_context_t *ctx, const zbx_e
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_ascii                                      *
- *                                                                            *
  * Purpose: evaluate ascii() function                                         *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2158,8 +2080,6 @@ static int	eval_execute_function_ascii(const zbx_eval_context_t *ctx, const zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_between                                    *
- *                                                                            *
  * Purpose: evaluate between() function                                       *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2203,8 +2123,6 @@ static int	eval_execute_function_between(const zbx_eval_context_t *ctx, const zb
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_in                                         *
- *                                                                            *
  * Purpose: evaluate in() function                                            *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2295,8 +2213,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_function_histogram_quantile                         *
- *                                                                            *
  * Purpose: evaluate histogram_quantile() function                            *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2425,8 +2341,6 @@ static int	eval_execute_function_histogram_quantile(const zbx_eval_context_t *ct
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_cb_function                                         *
- *                                                                            *
  * Purpose: evaluate function by calling custom callback (if configured)      *
  *                                                                            *
  * Parameters: ctx         - [IN] the evaluation context                      *
@@ -2497,8 +2411,6 @@ static double	eval_math_func_signum(double x)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_math_function_single_param                          *
- *                                                                            *
  * Purpose: evaluate mathematical function by calling passed function         *
  *          with 1 double argument                                            *
  *                                                                            *
@@ -2580,8 +2492,6 @@ static double	eval_math_func_truncate(double n, double decimal_points)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_math_function_double_param                          *
- *                                                                            *
  * Purpose: evaluate mathematical function by calling passed function         *
  *          with 2 double arguments                                           *
  *                                                                            *
@@ -2650,8 +2560,6 @@ static int	eval_execute_math_function_double_param(const zbx_eval_context_t *ctx
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_math_function_return_value                          *
- *                                                                            *
  * Purpose: evaluate mathematical function that returns constant value        *
  *                                                                            *
  * Parameters: ctx        - [IN] the evaluation context                       *
@@ -2727,8 +2635,6 @@ static int	eval_execute_function_count(const zbx_eval_context_t *ctx, const zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_common_function                                     *
- *                                                                            *
  * Purpose: evaluate common function                                          *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2902,8 +2808,6 @@ static int	eval_execute_common_function(const zbx_eval_context_t *ctx, const zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute_history_function                                    *
- *                                                                            *
  * Purpose: evaluate history function                                         *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -2934,8 +2838,6 @@ static int	eval_execute_history_function(const zbx_eval_context_t *ctx, const zb
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_throw_exception                                             *
- *                                                                            *
  * Purpose: throw exception by returning the specified error                  *
  *                                                                            *
  * Parameters: output - [IN/OUT] the output value stack                       *
@@ -2960,8 +2862,6 @@ static void	eval_throw_exception(zbx_vector_var_t *output, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_execute                                                     *
- *                                                                            *
  * Purpose: evaluate pre-parsed expression                                    *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -3082,8 +2982,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_init_execute_context                                        *
- *                                                                            *
  * Purpose: initialize execution context                                      *
  *                                                                            *
  * Parameters: ctx             - [IN] the evaluation context                  *
@@ -3109,8 +3007,6 @@ static void	eval_init_execute_context(zbx_eval_context_t *ctx, const zbx_timespe
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_execute                                                 *
- *                                                                            *
  * Purpose: evaluate parsed expression                                        *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -3131,8 +3027,6 @@ int	zbx_eval_execute(zbx_eval_context_t *ctx, const zbx_timespec_t *ts, zbx_vari
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_execute_ext                                             *
- *                                                                            *
  * Purpose: evaluate parsed expression with callback for custom function      *
  *          processing                                                        *
  *                                                                            *
diff --git a/src/libs/zbxeval/misc.c b/src/libs/zbxeval/misc.c
index 3e92d2cba67..5701876a6a3 100644
--- a/src/libs/zbxeval/misc.c
+++ b/src/libs/zbxeval/misc.c
@@ -31,8 +31,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: reserve_buffer                                                   *
- *                                                                            *
  * Purpose: reserve number of bytes in the specified buffer, reallocating if  *
  *          necessary                                                         *
  *                                                                            *
@@ -145,8 +143,6 @@ static zbx_uint32_t	deserialize_variant(const unsigned char *ptr,  zbx_variant_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_serialize                                               *
- *                                                                            *
  * Purpose: serialize evaluation context into buffer                          *
  *                                                                            *
  * Parameters: ctx         - [IN] the evaluation context                      *
@@ -209,8 +205,6 @@ size_t	zbx_eval_serialize(const zbx_eval_context_t *ctx, zbx_mem_malloc_func_t m
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_deserialize                                             *
- *                                                                            *
  * Purpose: deserialize evaluation context from buffer                        *
  *                                                                            *
  * Parameters: ctx        - [OUT] the evaluation context                      *
@@ -262,8 +256,6 @@ static int	compare_tokens_by_loc(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_token_print_alloc                                           *
- *                                                                            *
  * Purpose: print token into string quoting/escaping if necessary             *
  *                                                                            *
  * Parameters: ctx        - [IN] the evaluation context                       *
@@ -349,8 +341,6 @@ static void	eval_token_print_alloc(const zbx_eval_context_t *ctx, char **str, si
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_compose_expression                                      *
- *                                                                            *
  * Purpose: compose expression by replacing processed tokens (with values) in *
  *          the original expression                                           *
  *                                                                            *
@@ -406,8 +396,6 @@ void	zbx_eval_compose_expression(const zbx_eval_context_t *ctx, char **expressio
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_has_usermacro                                               *
- *                                                                            *
  * Purpose: check if string has possible user macro                           *
  *                                                                            *
  * Parameters: str - [IN] the string to check                                 *
@@ -440,8 +428,6 @@ static int	eval_has_usermacro(const char *str, size_t len)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_query_expand_user_macros                                    *
- *                                                                            *
  * Purpose: expand user macros in item query                                  *
  *                                                                            *
  * Parameters: itemquery   - [IN] the evaluation context                      *
@@ -541,8 +527,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_expand_user_macros                                      *
- *                                                                            *
  * Purpose: expand user macros in parsed expression                           *
  *                                                                            *
  * Parameters: ctx         - [IN] the evaluation context                      *
@@ -612,8 +596,6 @@ int	zbx_eval_expand_user_macros(const zbx_eval_context_t *ctx, zbx_uint64_t *hos
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_set_exception                                           *
- *                                                                            *
  * Purpose: set eval context to exception that will be returned when executed *
  *                                                                            *
  * Parameters: ctx     - [IN] the evaluation context                          *
@@ -639,8 +621,6 @@ void	zbx_eval_set_exception(zbx_eval_context_t *ctx, char *message)
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_extract_functionid                                    *
- *                                                                            *
  * Purpose: extract functionid from token                                     *
  *                                                                            *
  * Parameters: expression - [IN] the original expression                      *
@@ -681,8 +661,6 @@ static int	expression_extract_functionid(const char *expression, zbx_eval_token_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_deserialize_dyn                                         *
- *                                                                            *
  * Purpose: deserialize expression and extract specified tokens into values   *
  *                                                                            *
  * Parameters: data       - [IN] the serialized expression                    *
@@ -738,8 +716,6 @@ zbx_eval_context_t	*zbx_eval_deserialize_dyn(const unsigned char *data, const ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_get_functionids                                         *
- *                                                                            *
  * Purpose: get functionids from parsed expression                            *
  *                                                                            *
  * Parameters: ctx         - [IN] the evaluation context                      *
@@ -762,8 +738,6 @@ void	zbx_eval_get_functionids(zbx_eval_context_t *ctx, zbx_vector_uint64_t *func
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_get_functionids_ordered                                 *
- *                                                                            *
  * Purpose: get functionids from parsed expression in the order they are      *
  *          written                                                           *
  *                                                                            *
@@ -800,8 +774,6 @@ void	zbx_eval_get_functionids_ordered(zbx_eval_context_t *ctx, zbx_vector_uint64
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_check_timer_functions                                   *
- *                                                                            *
  * Purpose: check if expression contains timer function calls (date, time,    *
  *          now, dayofweek, dayofmonth)                                       *
  *                                                                            *
@@ -839,8 +811,6 @@ int	zbx_eval_check_timer_functions(const zbx_eval_context_t *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_serialized_expression_functionids                        *
- *                                                                            *
  * Purpose: extract functionids from serialized expression                    *
  *                                                                            *
  * Parameters: expression  - [IN] the original expression                     *
@@ -901,8 +871,6 @@ void	zbx_get_serialized_expression_functionids(const char *expression, const uns
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_get_constant                                            *
- *                                                                            *
  * Purpose: the Nth constant in expression                                    *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -939,8 +907,6 @@ void	zbx_eval_get_constant(const zbx_eval_context_t *ctx, int index, char **valu
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_replace_functionid                                      *
- *                                                                            *
  * Purpose: replace functionid in parsed expression with new functionid macro *
  *                                                                            *
  * Parameters: ctx            - [IN] the evaluation context                   *
@@ -986,8 +952,6 @@ void	zbx_eval_replace_functionid(zbx_eval_context_t *ctx, zbx_uint64_t old_funct
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_validate_replaced_functionids                           *
- *                                                                            *
  * Purpose: validate parsed expression to check if all functionids were       *
  *          replaced                                                          *
  *                                                                            *
@@ -1019,8 +983,6 @@ int	zbx_eval_validate_replaced_functionids(zbx_eval_context_t *ctx, char **error
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_copy                                                    *
- *                                                                            *
  * Purpose: copy parsed expression                                            *
  *                                                                            *
  * Parameters: dst        - [OUT] the destination evaluation context          *
@@ -1047,8 +1009,6 @@ void	zbx_eval_copy(zbx_eval_context_t *dst, const zbx_eval_context_t *src, const
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_format_function_error                                   *
- *                                                                            *
  * Purpose: format function evaluation error message                          *
  *                                                                            *
  * Parameters: function  - [IN] the function name                             *
@@ -1084,8 +1044,6 @@ char	*zbx_eval_format_function_error(const char *function, const char *host, con
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_extract_history_queries                                 *
- *                                                                            *
  * Purpose: copy history query into vector and replace it with vector index   *
  *                                                                            *
  * Parameters: ctx  - [IN] the evaluation context                             *
diff --git a/src/libs/zbxeval/parse.c b/src/libs/zbxeval/parse.c
index d15f05c7c41..0e25209f36b 100644
--- a/src/libs/zbxeval/parse.c
+++ b/src/libs/zbxeval/parse.c
@@ -36,8 +36,6 @@ static int	is_whitespace(char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_get_whitespace_len                                          *
- *                                                                            *
  * Purpose: find the number of following whitespace characters                *
  *                                                                            *
  * Parameters: ctx - [IN] the evaluation context                              *
@@ -58,8 +56,6 @@ static size_t	eval_get_whitespace_len(zbx_eval_context_t *ctx, size_t pos)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_update_const_variable                                       *
- *                                                                            *
  * Purpose: update constant variable index in the trigger expression          *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -89,8 +85,6 @@ static void	eval_update_const_variable(zbx_eval_context_t *ctx, zbx_eval_token_t
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_is_compound_number_char                                     *
- *                                                                            *
  * Purpose: check if the character can be a part of a compound number         *
  *          following a macro                                                 *
  *                                                                            *
@@ -115,8 +109,6 @@ static int	eval_is_compound_number_char(char c, int pos)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_functionid                                            *
- *                                                                            *
  * Purpose: parse functionid token ({<functionid>})                           *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -144,8 +136,6 @@ static int	eval_parse_functionid(zbx_eval_context_t *ctx, size_t pos, zbx_eval_t
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_macro                                                 *
- *                                                                            *
  * Purpose: parse macro                                                       *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -184,8 +174,6 @@ static int	eval_parse_macro(zbx_eval_context_t *ctx, int pos, zbx_token_t *tok)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_number                                                *
- *                                                                            *
  * Purpose: parse numeric value                                               *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -221,8 +209,6 @@ static int	eval_parse_number(zbx_eval_context_t *ctx, size_t pos, size_t *pos_r)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_constant                                              *
- *                                                                            *
  * Purpose: parse constant value                                              *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -326,8 +312,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_character_token                                       *
- *                                                                            *
  * Purpose: parse single character token                                      *
  *                                                                            *
  * Parameters: pos   - [IN] the starting position                             *
@@ -344,8 +328,6 @@ static void	eval_parse_character_token(size_t pos, zbx_token_type_t type, zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_less_character_token                                  *
- *                                                                            *
  * Purpose: parse token starting with  '<'                                    *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -386,8 +368,6 @@ static int	eval_parse_less_character_token(zbx_eval_context_t *ctx, size_t pos,
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_greater_character_token                               *
- *                                                                            *
  * Purpose: parse token starting with  '>'                                    *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -411,8 +391,6 @@ static void	eval_parse_greater_character_token(zbx_eval_context_t *ctx, size_t p
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_string_token                                          *
- *                                                                            *
  * Purpose: parse string variable token                                       *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -459,8 +437,6 @@ static int	eval_parse_string_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_number_token                                          *
- *                                                                            *
  * Purpose: parse numeric variable token                                      *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -502,8 +478,6 @@ static int	eval_parse_number_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_logic_token                                           *
- *                                                                            *
  * Purpose: parse logical operation token                                     *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -548,8 +522,6 @@ static int	eval_parse_logic_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval_
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_function_token                                        *
- *                                                                            *
  * Purpose: parse function token                                              *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -583,8 +555,6 @@ static int	eval_parse_function_token(zbx_eval_context_t *ctx, size_t pos, zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_query_filter                                          *
- *                                                                            *
  * Purpose: parse item query filter (?[group="xyz"])                          *
  *                                                                            *
  * Parameters: ptr - [IN] - the filter to parse                               *
@@ -629,8 +599,6 @@ static int	eval_parse_query_filter(const char **ptr)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_query                                                 *
- *                                                                            *
  * Purpose: parse item query /host/key?[filter] into host, key and filter     *
  *          components                                                        *
  *                                                                            *
@@ -714,8 +682,6 @@ size_t	eval_parse_query(const char *str, const char **phost, const char **pkey,
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_query_token                                           *
- *                                                                            *
  * Purpose: parse history query token                                         *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -749,8 +715,6 @@ static int	eval_parse_query_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval_
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_time_token                                            *
- *                                                                            *
  * Purpose: parse time period token                                           *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -798,8 +762,6 @@ static int	eval_parse_period_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_property_token                                        *
- *                                                                            *
  * Purpose: parse property token                                              *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -835,8 +797,6 @@ static int	eval_parse_property_token(zbx_eval_context_t *ctx, size_t pos, zbx_ev
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_token                                                 *
- *                                                                            *
  * Purpose: parse token                                                       *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -1036,8 +996,6 @@ static int	eval_parse_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval_token_
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_append_operator                                             *
- *                                                                            *
  * Purpose: add operator/function token to evaluation stack                   *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -1124,8 +1082,6 @@ static int	eval_append_operator(zbx_eval_context_t *ctx, zbx_eval_token_t *token
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_append_operand                                              *
- *                                                                            *
  * Purpose: add operand token to evaluation stack                             *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -1184,8 +1140,6 @@ static int	eval_append_operand(zbx_eval_context_t *ctx, zbx_eval_token_t *token,
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_append_arg_null                                             *
- *                                                                            *
  * Purpose: add null argument token to evaluation stack                       *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -1200,8 +1154,6 @@ static void	eval_append_arg_null(zbx_eval_context_t *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_clear                                                       *
- *                                                                            *
  * Purpose: free resources allocated by evaluation context                    *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -1222,8 +1174,6 @@ static void	eval_clear(zbx_eval_context_t *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_parse_expression                                            *
- *                                                                            *
  * Purpose: parse expression into tokens in postfix notation order            *
  *                                                                            *
  * Parameters: ctx        - [OUT] the evaluation context                      *
@@ -1481,8 +1431,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_parse_expression                                        *
- *                                                                            *
  * Purpose: parse expression into tokens in postfix notation order            *
  *                                                                            *
  * Parameters: ctx        - [OUT] the evaluation context                      *
@@ -1501,8 +1449,6 @@ int	zbx_eval_parse_expression(zbx_eval_context_t *ctx, const char *expression, z
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_init                                                    *
- *                                                                            *
  * Purpose: initialize context so it can be cleared without parsing           *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -1515,8 +1461,6 @@ void	zbx_eval_init(zbx_eval_context_t *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_clear                                                   *
- *                                                                            *
  * Purpose: free resources allocated by evaluation context                    *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -1529,8 +1473,6 @@ void	zbx_eval_clear(zbx_eval_context_t *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_status                                                  *
- *                                                                            *
  * Purpose: return evaluation context status                                  *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
diff --git a/src/libs/zbxeval/query.c b/src/libs/zbxeval/query.c
index fbc0e7776f2..4ba226852e5 100644
--- a/src/libs/zbxeval/query.c
+++ b/src/libs/zbxeval/query.c
@@ -29,8 +29,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_parse_query                                             *
- *                                                                            *
  * Purpose: parse item query /host/key?[filter] into host, key and filter     *
  *          components                                                        *
  *                                                                            *
@@ -67,8 +65,6 @@ size_t	zbx_eval_parse_query(const char *str, size_t len, zbx_item_query_t *query
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_clear_filter                                            *
- *                                                                            *
  * Purpose: frees resources allocated by item reference                       *
  *                                                                            *
  ******************************************************************************/
@@ -81,8 +77,6 @@ void	zbx_eval_clear_query(zbx_item_query_t *query)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_prepare_filter                                          *
- *                                                                            *
  * Purpose: prepare filter expression by converting property comparisons      *
  *          prop =/<> "value" to prop("value")/not prop("value") function     *
  *          calls.                                                            *
@@ -136,8 +130,6 @@ void	zbx_eval_prepare_filter(zbx_eval_context_t *ctx)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_filter_apply_op2                                            *
- *                                                                            *
  * Purpose: apply binary operation to stack                                   *
  *                                                                            *
  * Parameters: token - [IN] the operation token                               *
@@ -185,8 +177,6 @@ static void	eval_filter_apply_op2(zbx_eval_token_t *token, zbx_vector_eval_token
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_filter_apply_op1                                            *
- *                                                                            *
  * Purpose: apply unary operation to stack                                    *
  *                                                                            *
  * Parameters: token - [IN] the operation token                               *
@@ -209,8 +199,6 @@ static void	eval_filter_apply_op1(zbx_eval_token_t *token, zbx_vector_eval_token
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_filter_apply_func                                           *
- *                                                                            *
  * Purpose: apply function to stack                                           *
  *                                                                            *
  * Parameters: ctx   - [IN] the evaluation context                            *
@@ -240,8 +228,6 @@ static void	eval_filter_apply_func(zbx_eval_context_t *ctx, zbx_eval_token_t *to
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_op_str                                                      *
- *                                                                            *
  * Purpose: get operator in text format                                       *
  *                                                                            *
  * Parameters: op - [IN] the operator type                                    *
@@ -275,8 +261,6 @@ static const char	*eval_op_str(zbx_token_type_t op)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_unquote_str                                                 *
- *                                                                            *
  * Purpose: unquote string                                                    *
  *                                                                            *
  * Parameters: str - [IN] the string to unquote                               *
@@ -315,8 +299,6 @@ static char	*eval_unquote_str(char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: eval_generate_filter                                             *
- *                                                                            *
  * Purpose: generate filter expression from the specified stack               *
  *                                                                            *
  * Parameters: ctx    - [IN] the evaluation context                           *
@@ -418,8 +400,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_eval_get_group_filter                                        *
- *                                                                            *
  * Purpose: generate group SQL filter expression from item filter             *
  *                                                                            *
  * Parameters: ctx    - [IN] the filter expression evaluation context         *
diff --git a/src/libs/zbxexec/execute.c b/src/libs/zbxexec/execute.c
index aa47f7a9cea..53f0799faf2 100644
--- a/src/libs/zbxexec/execute.c
+++ b/src/libs/zbxexec/execute.c
@@ -29,8 +29,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_timediff_ms                                              *
- *                                                                            *
  * Purpose: considers a difference between times in milliseconds              *
  *                                                                            *
  * Parameters: time1         - [IN] first time point                          *
@@ -54,8 +52,6 @@ static int	zbx_get_timediff_ms(struct _timeb *time1, struct _timeb *time2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_read_from_pipe                                               *
- *                                                                            *
  * Purpose: read data from pipe                                               *
  *                                                                            *
  * Parameters: hRead         - [IN] a handle to the device                    *
@@ -117,8 +113,6 @@ static int	zbx_read_from_pipe(HANDLE hRead, char **buf, size_t *buf_size, size_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_popen                                                        *
- *                                                                            *
  * Purpose: this function opens a process by creating a pipe, forking,        *
  *          and invoking the shell                                            *
  *                                                                            *
@@ -238,8 +232,6 @@ static int	zbx_popen(pid_t *pid, const char *command, const char *dir)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_waitpid                                                      *
- *                                                                            *
  * Purpose: this function waits for process to change state                   *
  *                                                                            *
  * Parameters: pid     - [IN] child process PID                               *
@@ -300,8 +292,6 @@ exit:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_execute                                                      *
- *                                                                            *
  * Purpose: this function executes a script and returns result from stdout    *
  *                                                                            *
  * Parameters: command       - [IN] command for execution                     *
@@ -551,8 +541,6 @@ close:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_execute_nowait                                               *
- *                                                                            *
  * Purpose: this function executes a script in the background and             *
  *          suppresses the std output                                         *
  *                                                                            *
diff --git a/src/libs/zbxha/ha.c b/src/libs/zbxha/ha.c
index 7e8a283f4da..05c523b0039 100644
--- a/src/libs/zbxha/ha.c
+++ b/src/libs/zbxha/ha.c
@@ -25,8 +25,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_get_nodes                                                 *
- *                                                                            *
  * Purpose: get HA nodes in json format                                       *
  *                                                                            *
  ******************************************************************************/
@@ -62,8 +60,6 @@ int	zbx_ha_get_nodes(char **nodes, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_remove_node                                               *
- *                                                                            *
  * Purpose: remove HA node                                                    *
  *                                                                            *
  * Comments: A new socket is opened to avoid interfering with notification    *
@@ -91,8 +87,6 @@ int	zbx_ha_remove_node(const char *node, char **result, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_set_failover_delay                                        *
- *                                                                            *
  * Purpose: set HA failover delay                                             *
  *                                                                            *
  * Comments: A new socket is opened to avoid interfering with notification    *
@@ -118,8 +112,6 @@ int	zbx_ha_set_failover_delay(int delay, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_get_failover_delay                                        *
- *                                                                            *
  * Purpose: get HA failover delay                                             *
  *                                                                            *
  * Comments: A new socket is opened to avoid interfering with notification    *
@@ -144,8 +136,6 @@ int	zbx_ha_get_failover_delay(int *delay, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_change_loglevel                                           *
- *                                                                            *
  * Purpose: change HA manager log level                                       *
  *                                                                            *
  ******************************************************************************/
@@ -169,8 +159,6 @@ int	zbx_ha_change_loglevel(int direction, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_status_str                                                *
- *                                                                            *
  * Purpose: get HA status in text format                                      *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxhistory/history.c b/src/libs/zbxhistory/history.c
index 5f0649ec22f..ce58b202a13 100644
--- a/src/libs/zbxhistory/history.c
+++ b/src/libs/zbxhistory/history.c
@@ -34,8 +34,6 @@ zbx_history_iface_t	history_ifaces[ITEM_VALUE_TYPE_MAX];
 
 /************************************************************************************
  *                                                                                  *
- * Function: zbx_history_init                                                       *
- *                                                                                  *
  * Purpose: initializes history storage                                             *
  *                                                                                  *
  * Comments: History interfaces are created for all values types based on           *
@@ -67,8 +65,6 @@ int	zbx_history_init(char **error)
 
 /************************************************************************************
  *                                                                                  *
- * Function: zbx_history_destroy                                                    *
- *                                                                                  *
  * Purpose: destroys history storage                                                *
  *                                                                                  *
  * Comments: All interfaces created by zbx_history_init() function are destroyed    *
@@ -89,8 +85,6 @@ void	zbx_history_destroy(void)
 
 /************************************************************************************
  *                                                                                  *
- * Function: zbx_history_add_values                                                 *
- *                                                                                  *
  * Purpose: Sends values to the history storage                                     *
  *                                                                                  *
  * Parameters: history - [IN] the values to store                                   *
@@ -132,8 +126,6 @@ int	zbx_history_add_values(const zbx_vector_ptr_t *history, int *ret_flush)
 
 /************************************************************************************
  *                                                                                  *
- * Function: zbx_history_get_values                                                 *
- *                                                                                  *
  * Purpose: gets item values from history storage                                   *
  *                                                                                  *
  * Parameters:  itemid     - [IN] the itemid                                        *
@@ -184,8 +176,6 @@ int	zbx_history_get_values(zbx_uint64_t itemid, int value_type, int start, int c
 
 /************************************************************************************
  *                                                                                  *
- * Function: zbx_history_requires_trends                                            *
- *                                                                                  *
  * Purpose: checks if the value type requires trends data calculations              *
  *                                                                                  *
  * Parameters: value_type - [IN] the value type                                     *
@@ -206,8 +196,6 @@ int	zbx_history_requires_trends(int value_type)
 
 /******************************************************************************
  *                                                                            *
- * Function: history_logfree                                                  *
- *                                                                            *
  * Purpose: frees history log and all resources allocated for it              *
  *                                                                            *
  * Parameters: log   - [IN] the history log to free                           *
@@ -222,8 +210,6 @@ static void	history_logfree(zbx_log_value_t *log)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_record_vector_destroy                                *
- *                                                                            *
  * Purpose: destroys value vector and frees resources allocated for it        *
  *                                                                            *
  * Parameters: vector    - [IN] the value vector                              *
@@ -243,8 +229,6 @@ void	zbx_history_record_vector_destroy(zbx_vector_history_record_t *vector, int
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_record_clear                                         *
- *                                                                            *
  * Purpose: frees resources allocated by a cached value                       *
  *                                                                            *
  * Parameters: value      - [IN] the cached value to clear                    *
@@ -266,8 +250,6 @@ void	zbx_history_record_clear(zbx_history_record_t *value, int value_type)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_value2str                                            *
- *                                                                            *
  * Purpose: converts history value to string format                           *
  *                                                                            *
  * Parameters: buffer     - [OUT] the output buffer                           *
@@ -297,8 +279,6 @@ void	zbx_history_value2str(char *buffer, size_t size, const history_value_t *val
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_value2str_dyn                                        *
- *                                                                            *
  * Purpose: converts history value to string format (with dynamic buffer)     *
  *                                                                            *
  * Parameters: value      - [IN] the value to convert                         *
@@ -332,8 +312,6 @@ char	*zbx_history_value2str_dyn(const history_value_t *value, int value_type)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_value_print                                          *
- *                                                                            *
  * Purpose: converts history value to string format (double type printed in   *
  *          human friendly format)                                            *
  *                                                                            *
@@ -353,8 +331,6 @@ void	zbx_history_value_print(char *buffer, size_t size, const history_value_t *v
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_record_vector_clean                                  *
- *                                                                            *
  * Purpose: releases resources allocated to store history records             *
  *                                                                            *
  * Parameters: vector      - [IN] the history record vector                   *
@@ -383,8 +359,6 @@ void	zbx_history_record_vector_clean(zbx_vector_history_record_t *vector, int va
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_record_compare_asc_func                              *
- *                                                                            *
  * Purpose: compares two cache values by their timestamps                     *
  *                                                                            *
  * Parameters: d1   - [IN] the first value                                    *
@@ -408,8 +382,6 @@ int	zbx_history_record_compare_asc_func(const zbx_history_record_t *d1, const zb
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_history_record_compare_desc_func                              *
- *                                                                            *
  * Purpose: compares two cache values by their timestamps                     *
  *                                                                            *
  * Parameters: d1   - [IN] the first value                                    *
@@ -433,8 +405,6 @@ int	zbx_history_record_compare_desc_func(const zbx_history_record_t *d1, const z
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_value2variant                                        *
- *                                                                            *
  * Purpose: converts history value to variant value                           *
  *                                                                            *
  * Parameters: value      - [IN] the value to convert                         *
@@ -463,8 +433,6 @@ void	zbx_history_value2variant(const history_value_t *value, unsigned char value
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_history_check_version                                        *
- *                                                                            *
  * Purpose: relays the version retrieval logic to the history implementation  *
  *          functions                                                         *
  *                                                                            *
diff --git a/src/libs/zbxhistory/history_elastic.c b/src/libs/zbxhistory/history_elastic.c
index 1639a71aed1..183be8267b7 100644
--- a/src/libs/zbxhistory/history_elastic.c
+++ b/src/libs/zbxhistory/history_elastic.c
@@ -220,8 +220,6 @@ static void	elastic_log_error(CURL *handle, CURLcode error, const char *errbuf)
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_close                                                          *
- *                                                                                  *
  * Purpose: closes connection and releases allocated resources                      *
  *                                                                                  *
  * Parameters:  hist - [IN] the history storage interface                           *
@@ -246,8 +244,6 @@ static void	elastic_close(zbx_history_iface_t *hist)
 
 /******************************************************************************
  *                                                                            *
- * Function: elastic_is_error_present                                         *
- *                                                                            *
  * Purpose: check a error from Elastic json response                          *
  *                                                                            *
  * Parameters: page - [IN]  the buffer with json response                     *
@@ -322,8 +318,6 @@ static int	elastic_is_error_present(zbx_httppage_t *page, char **err)
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_writer_init                                                    *
- *                                                                                  *
  * Purpose: initializes elastic writer for a new batch of history values            *
  *                                                                                  *
  ************************************************************************************/
@@ -345,8 +339,6 @@ static void	elastic_writer_init(void)
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_writer_release                                                 *
- *                                                                                  *
  * Purpose: releases initialized elastic writer by freeing allocated resources and  *
  *          setting its state to uninitialized.                                     *
  *                                                                                  *
@@ -368,8 +360,6 @@ static void	elastic_writer_release(void)
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_writer_add_iface                                               *
- *                                                                                  *
  * Purpose: adds history storage interface to be flushed later                      *
  *                                                                                  *
  * Parameters: db_insert - [IN] bulk insert data                                    *
@@ -429,8 +419,6 @@ out:
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_writer_flush                                                   *
- *                                                                                  *
  * Purpose: posts historical data to elastic storage                                *
  *                                                                                  *
  ************************************************************************************/
@@ -600,8 +588,6 @@ end:
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_destroy                                                        *
- *                                                                                  *
  * Purpose: destroys history storage interface                                      *
  *                                                                                  *
  * Parameters:  hist - [IN] the history storage interface                           *
@@ -619,8 +605,6 @@ static void	elastic_destroy(zbx_history_iface_t *hist)
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_get_values                                                     *
- *                                                                                  *
  * Purpose: gets item history data from history storage                             *
  *                                                                                  *
  * Parameters:  hist    - [IN] the history storage interface                        *
@@ -867,8 +851,6 @@ out:
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_add_values                                                     *
- *                                                                                  *
  * Purpose: sends history data to the storage                                       *
  *                                                                                  *
  * Parameters:  hist    - [IN] the history storage interface                        *
@@ -953,8 +935,6 @@ static int	elastic_add_values(zbx_history_iface_t *hist, const zbx_vector_ptr_t
 
 /************************************************************************************
  *                                                                                  *
- * Function: elastic_flush                                                          *
- *                                                                                  *
  * Purpose: flushes the history data to storage                                     *
  *                                                                                  *
  * Parameters:  hist    - [IN] the history storage interface                        *
@@ -972,8 +952,6 @@ static int	elastic_flush(zbx_history_iface_t *hist)
 
 /************************************************************************************
  *                                                                                  *
- * Function: zbx_history_elastic_init                                               *
- *                                                                                  *
  * Purpose: initializes history storage interface                                   *
  *                                                                                  *
  * Parameters:  hist       - [IN] the history storage interface                     *
@@ -1015,8 +993,6 @@ int	zbx_history_elastic_init(zbx_history_iface_t *hist, unsigned char value_type
 
 /************************************************************************************
  *                                                                                  *
- * Function: zbx_elastic_version_extract                                            *
- *                                                                                  *
  * Purpose: queries elastic search version and extracts the numeric version from    *
  *          the response string                                                     *
  *                                                                                  *
diff --git a/src/libs/zbxhistory/history_sql.c b/src/libs/zbxhistory/history_sql.c
index fedfaaf8f07..6a71187b175 100644
--- a/src/libs/zbxhistory/history_sql.c
+++ b/src/libs/zbxhistory/history_sql.c
@@ -96,8 +96,6 @@ static zbx_vc_history_table_t	vc_history_tables[] = {
 
 /************************************************************************************
  *                                                                                  *
- * Function: sql_writer_init                                                        *
- *                                                                                  *
  * Purpose: initializes sql writer for a new batch of history values                *
  *                                                                                  *
  ************************************************************************************/
@@ -113,8 +111,6 @@ static void	sql_writer_init(void)
 
 /************************************************************************************
  *                                                                                  *
- * Function: sql_writer_release                                                     *
- *                                                                                  *
  * Purpose: releases initialized sql writer by freeing allocated resources and      *
  *          setting its state to uninitialized.                                     *
  *                                                                                  *
@@ -138,8 +134,6 @@ static void	sql_writer_release(void)
 
 /************************************************************************************
  *                                                                                  *
- * Function: sql_writer_add_dbinsert                                                *
- *                                                                                  *
  * Purpose: adds bulk insert data to be flushed later                               *
  *                                                                                  *
  * Parameters: db_insert - [IN] bulk insert data                                    *
@@ -153,8 +147,6 @@ static void	sql_writer_add_dbinsert(zbx_db_insert_t *db_insert)
 
 /************************************************************************************
  *                                                                                  *
- * Function: sql_writer_flush                                                       *
- *                                                                                  *
  * Purpose: flushes bulk insert data into database                                  *
  *                                                                                  *
  ************************************************************************************/
@@ -202,11 +194,6 @@ static int	sql_writer_flush(void)
 
 typedef void (*add_history_func_t)(const zbx_vector_ptr_t *history);
 
-/******************************************************************************
- *                                                                            *
- * Function: add_history_dbl                                                  *
- *                                                                            *
- ******************************************************************************/
 static void	add_history_dbl(const zbx_vector_ptr_t *history)
 {
 	int		i;
@@ -228,11 +215,6 @@ static void	add_history_dbl(const zbx_vector_ptr_t *history)
 	sql_writer_add_dbinsert(db_insert);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: add_history_uint                                                 *
- *                                                                            *
- ******************************************************************************/
 static void	add_history_uint(zbx_vector_ptr_t *history)
 {
 	int		i;
@@ -254,11 +236,6 @@ static void	add_history_uint(zbx_vector_ptr_t *history)
 	sql_writer_add_dbinsert(db_insert);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: add_history_str                                                  *
- *                                                                            *
- ******************************************************************************/
 static void	add_history_str(zbx_vector_ptr_t *history)
 {
 	int		i;
@@ -280,11 +257,6 @@ static void	add_history_str(zbx_vector_ptr_t *history)
 	sql_writer_add_dbinsert(db_insert);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: add_history_text                                                 *
- *                                                                            *
- ******************************************************************************/
 static void	add_history_text(zbx_vector_ptr_t *history)
 {
 	int		i;
@@ -306,11 +278,6 @@ static void	add_history_text(zbx_vector_ptr_t *history)
 	sql_writer_add_dbinsert(db_insert);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: add_history_log                                                  *
- *                                                                            *
- ******************************************************************************/
 static void	add_history_log(zbx_vector_ptr_t *history)
 {
 	int			i;
@@ -345,8 +312,6 @@ static void	add_history_log(zbx_vector_ptr_t *history)
 
 /*********************************************************************************
  *                                                                               *
- * Function: db_read_values_by_time                                              *
- *                                                                               *
  * Purpose: reads item history data from database                                *
  *                                                                               *
  * Parameters:  itemid        - [IN] the itemid                                  *
@@ -415,8 +380,6 @@ out:
 
 /************************************************************************************
  *                                                                                  *
- * Function: db_read_values_by_count                                                *
- *                                                                                  *
  * Purpose: reads item history data from database                                   *
  *                                                                                  *
  * Parameters:  itemid        - [IN] the itemid                                     *
@@ -521,8 +484,6 @@ out:
 
 /************************************************************************************
  *                                                                                  *
- * Function: db_read_values_by_time_and_count                                       *
- *                                                                                  *
  * Purpose: reads item history data from database                                   *
  *                                                                                  *
  * Parameters:  itemid        - [IN] the itemid                                     *
@@ -619,8 +580,6 @@ out:
 
 /************************************************************************************
  *                                                                                  *
- * Function: sql_destroy                                                            *
- *                                                                                  *
  * Purpose: destroys history storage interface                                      *
  *                                                                                  *
  * Parameters:  hist    - [IN] the history storage interface                        *
@@ -633,8 +592,6 @@ static void	sql_destroy(zbx_history_iface_t *hist)
 
 /************************************************************************************
  *                                                                                  *
- * Function: sql_get_values                                                         *
- *                                                                                  *
  * Purpose: gets item history data from history storage                             *
  *                                                                                  *
  * Parameters:  hist    - [IN] the history storage interface                        *
@@ -665,8 +622,6 @@ static int	sql_get_values(zbx_history_iface_t *hist, zbx_uint64_t itemid, int st
 
 /************************************************************************************
  *                                                                                  *
- * Function: sql_add_values                                                         *
- *                                                                                  *
  * Purpose: sends history data to the storage                                       *
  *                                                                                  *
  * Parameters:  hist    - [IN] the history storage interface                        *
@@ -696,8 +651,6 @@ static int	sql_add_values(zbx_history_iface_t *hist, const zbx_vector_ptr_t *his
 
 /************************************************************************************
  *                                                                                  *
- * Function: sql_flush                                                              *
- *                                                                                  *
  * Purpose: flushes the history data to storage                                     *
  *                                                                                  *
  * Parameters:  hist    - [IN] the history storage interface                        *
@@ -715,8 +668,6 @@ static int	sql_flush(zbx_history_iface_t *hist)
 
 /************************************************************************************
  *                                                                                  *
- * Function: zbx_history_sql_init                                                   *
- *                                                                                  *
  * Purpose: initializes history storage interface                                   *
  *                                                                                  *
  * Parameters:  hist       - [IN] the history storage interface                     *
diff --git a/src/libs/zbxhttp/punycode.c b/src/libs/zbxhttp/punycode.c
index d835b9ddba9..ebad90649ad 100644
--- a/src/libs/zbxhttp/punycode.c
+++ b/src/libs/zbxhttp/punycode.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: punycode_adapt                                                   *
- *                                                                            *
  * Purpose: after each delta is encoded or decoded, bias should be set for    *
  *          the next delta (should be adapted)                                *
  *                                                                            *
@@ -52,8 +50,6 @@ static zbx_uint32_t	punycode_adapt(zbx_uint32_t delta, int count, int divisor)
 
 /******************************************************************************
  *                                                                            *
- * Function: punycode_encode_digit                                            *
- *                                                                            *
  * Purpose: encodes punycode digit into ansi character [a-z0-9]               *
  *                                                                            *
  * Parameters: digit      - [IN] digit to encode                              *
@@ -74,8 +70,6 @@ static char	punycode_encode_digit(int digit)
 
 /******************************************************************************
  *                                                                            *
- * Function: punycode_encode_codepoints                                       *
- *                                                                            *
  * Purpose: encodes array of unicode codepoints into into punycode (RFC 3492) *
  *                                                                            *
  * Parameters: codepoints      - [IN] codepoints to encode                    *
@@ -181,8 +175,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: punycode_encode_part                                             *
- *                                                                            *
  * Purpose: encodes unicode domain name part into punycode (RFC 3492)         *
  *          domain is being split in parts by punycode_encode by using        *
  *          character '.' as part separator                                   *
@@ -235,8 +227,6 @@ static int	punycode_encode_part(zbx_uint32_t *codepoints, zbx_uint32_t count, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_http_punycode_encode                                         *
- *                                                                            *
  * Purpose: encodes unicode domain names into punycode (RFC 3492)             *
  *                                                                            *
  * Parameters: text            - [IN] text to encode                          *
@@ -311,8 +301,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_http_punycode_encode_url                                     *
- *                                                                            *
  * Purpose: encodes unicode domain name in URL into punycode                  *
  *                                                                            *
  * Parameters: url - [IN/OUT] URL to encode                                   *
diff --git a/src/libs/zbxhttp/urlencode.c b/src/libs/zbxhttp/urlencode.c
index fa4e92eef3f..b2415ab9959 100644
--- a/src/libs/zbxhttp/urlencode.c
+++ b/src/libs/zbxhttp/urlencode.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_http_url_encode                                              *
- *                                                                            *
  * Purpose: replaces unsafe characters with a '%' followed by two hexadecimal *
  *          digits (the only allowed exception is a space character that can  *
  *          be replaced with a plus (+) sign or with %20).to url encode       *
@@ -63,8 +61,6 @@ void	zbx_http_url_encode(const char *source, char **result)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_http_url_decode                                              *
- *                                                                            *
  * Purpose: replaces URL escape sequences ('+' or '%' followed by two         *
  *          hexadecimal digits) with matching characters.                     *
  *                                                                            *
diff --git a/src/libs/zbxicmpping/icmpping.c b/src/libs/zbxicmpping/icmpping.c
index b8003c7bb9d..e6075f54b50 100644
--- a/src/libs/zbxicmpping/icmpping.c
+++ b/src/libs/zbxicmpping/icmpping.c
@@ -87,8 +87,6 @@ static void	get_source_ip_option(const char *fping, const char **option, unsigne
 
 /******************************************************************************
  *                                                                            *
- * Function: get_interval_option                                              *
- *                                                                            *
  * Purpose: detect minimal possible fping packet interval                     *
  *                                                                            *
  * Parameters: fping         - [IN] the location of fping program             *
@@ -227,8 +225,6 @@ out:
 #ifdef HAVE_IPV6
 /******************************************************************************
  *                                                                            *
- * Function: get_ipv6_support                                                 *
- *                                                                            *
  * Purpose: check fping supports IPv6                                         *
  *                                                                            *
  * Parameters: fping - [IN] the location of fping program                     *
@@ -698,8 +694,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ping                                                         *
- *                                                                            *
  * Purpose: ping hosts listed in the host files                               *
  *                                                                            *
  *             hosts_count   - [IN]  number of target hosts                   *
diff --git a/src/libs/zbxipcservice/ipcservice.c b/src/libs/zbxipcservice/ipcservice.c
index e963b359449..e0544ea67f7 100644
--- a/src/libs/zbxipcservice/ipcservice.c
+++ b/src/libs/zbxipcservice/ipcservice.c
@@ -105,8 +105,6 @@ static const char	*ipc_get_path(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_make_path                                                    *
- *                                                                            *
  * Purpose: makes socket path from the service name                           *
  *                                                                            *
  * Parameters: service_name - [IN] the service name                           *
@@ -167,8 +165,6 @@ static const char	*ipc_make_path(const char *service_name, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_write_data                                                   *
- *                                                                            *
  * Purpose: writes data to a socket                                           *
  *                                                                            *
  * Parameters: fd        - [IN] the socket file descriptor                    *
@@ -215,8 +211,6 @@ static int	ipc_write_data(int fd, const unsigned char *data, zbx_uint32_t size,
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_read_data                                                    *
- *                                                                            *
  * Purpose: reads data from a socket                                          *
  *                                                                            *
  * Parameters: fd        - [IN] the socket file descriptor                    *
@@ -258,8 +252,6 @@ static int	ipc_read_data(int fd, unsigned char *buffer, zbx_uint32_t size, zbx_u
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_read_data_full                                               *
- *                                                                            *
  * Purpose: reads data from a socket until the requested data has been read   *
  *                                                                            *
  * Parameters: fd        - [IN] the socket file descriptor                    *
@@ -302,8 +294,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_socket_write_message                                         *
- *                                                                            *
  * Purpose: writes IPC message to socket                                      *
  *                                                                            *
  * Parameters: csocket - [IN] the IPC socket                                  *
@@ -354,8 +344,6 @@ static int	ipc_socket_write_message(zbx_ipc_socket_t *csocket, zbx_uint32_t code
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_read_buffer                                                  *
- *                                                                            *
  * Purpose: reads message header and data from buffer                         *
  *                                                                            *
  * Parameters: header      - [IN/OUT] the message header                      *
@@ -412,8 +400,6 @@ static int	ipc_read_buffer(zbx_uint32_t *header, unsigned char **data, zbx_uint3
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_message_is_completed                                         *
- *                                                                            *
  * Purpose: checks if IPC message has been completed                          *
  *                                                                            *
  * Parameters: header   - [IN] the message header                             *
@@ -437,8 +423,6 @@ static int	ipc_message_is_completed(const zbx_uint32_t *header, zbx_uint32_t rx_
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_socket_read_message                                          *
- *                                                                            *
  * Purpose: reads IPC message from buffered client socket                     *
  *                                                                            *
  * Parameters: csocket  - [IN] the source socket                              *
@@ -516,8 +500,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_client_free_event                                            *
- *                                                                            *
  * Purpose: frees client's libevent event                                     *
  *                                                                            *
  * Parameters: client - [IN] the client                                       *
@@ -540,8 +522,6 @@ static void	ipc_client_free_events(zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_client_free                                                  *
- *                                                                            *
  * Purpose: frees IPC service client                                          *
  *                                                                            *
  * Parameters: client - [IN] the client to free                               *
@@ -573,8 +553,6 @@ static void	ipc_client_free(zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_client_push_rx_message                                       *
- *                                                                            *
  * Purpose: adds message to received messages queue                           *
  *                                                                            *
  * Parameters: client - [IN] the client to read                               *
@@ -596,8 +574,6 @@ static void	ipc_client_push_rx_message(zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_client_pop_tx_message                                        *
- *                                                                            *
  * Purpose: prepares to send the next message in send queue                   *
  *                                                                            *
  * Parameters: client - [IN] the client                                       *
@@ -622,8 +598,6 @@ static void	ipc_client_pop_tx_message(zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_client_read                                                  *
- *                                                                            *
  * Purpose: reads data from IPC service client                                *
  *                                                                            *
  * Parameters: client - [IN] the client to read                               *
@@ -659,8 +633,6 @@ static int	ipc_client_read(zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_client_write                                                 *
- *                                                                            *
  * Purpose: writes queued data to IPC service client                          *
  *                                                                            *
  * Parameters: client - [IN] the client                                       *
@@ -716,8 +688,6 @@ static int	ipc_client_write(zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_pop_client                                           *
- *                                                                            *
  * Purpose: gets the next client with messages/closed socket from recv queue  *
  *                                                                            *
  * Parameters: service - [IN] the IPC service                                 *
@@ -737,8 +707,6 @@ static zbx_ipc_client_t	*ipc_service_pop_client(zbx_ipc_service_t *service)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_push_client                                          *
- *                                                                            *
  * Purpose: pushes client to the recv queue if needed                         *
  *                                                                            *
  * Parameters: service - [IN] the IPC service                                 *
@@ -763,8 +731,6 @@ static void	ipc_service_push_client(zbx_ipc_service_t *service, zbx_ipc_client_t
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_add_client                                           *
- *                                                                            *
  * Purpose: adds a new IPC service client                                     *
  *                                                                            *
  * Parameters: service - [IN] the IPC service                                 *
@@ -816,8 +782,6 @@ static void	ipc_service_add_client(zbx_ipc_service_t *service, int fd)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_remove_client                                        *
- *                                                                            *
  * Purpose: removes IPC service client                                        *
  *                                                                            *
  * Parameters: service - [IN] the IPC service                                 *
@@ -837,8 +801,6 @@ static void	ipc_service_remove_client(zbx_ipc_service_t *service, zbx_ipc_client
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_client_by_id                                             *
- *                                                                            *
  * Purpose: to find connected client when only it's ID is known               *
  *                                                                            *
  * Parameters: service - [IN] the IPC service                                 *
@@ -865,8 +827,6 @@ zbx_ipc_client_t	*zbx_ipc_client_by_id(const zbx_ipc_service_t *service, zbx_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_client_read_event_cb                                         *
- *                                                                            *
  * Purpose: service client read event libevent callback                       *
  *                                                                            *
  ******************************************************************************/
@@ -888,8 +848,6 @@ static void	ipc_client_read_event_cb(evutil_socket_t fd, short what, void *arg)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_client_write_event_cb                                        *
- *                                                                            *
  * Purpose: service client write event libevent callback                      *
  *                                                                            *
  ******************************************************************************/
@@ -913,8 +871,6 @@ static void	ipc_client_write_event_cb(evutil_socket_t fd, short what, void *arg)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_async_socket_write_event_cb                                  *
- *                                                                            *
  * Purpose: asynchronous socket write event libevent callback                 *
  *                                                                            *
  ******************************************************************************/
@@ -940,8 +896,6 @@ static void	ipc_async_socket_write_event_cb(evutil_socket_t fd, short what, void
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_async_socket_read_event_cb                                   *
- *                                                                            *
  * Purpose: asynchronous socket read event libevent callback                  *
  *                                                                            *
  ******************************************************************************/
@@ -961,8 +915,6 @@ static void	ipc_async_socket_read_event_cb(evutil_socket_t fd, short what, void
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_async_socket_timer_cb                                        *
- *                                                                            *
  * Purpose: timer callback                                                    *
  *                                                                            *
  ******************************************************************************/
@@ -978,8 +930,6 @@ static void	ipc_async_socket_timer_cb(evutil_socket_t fd, short what, void *arg)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_accept                                               *
- *                                                                            *
  * Purpose: accepts a new client connection                                   *
  *                                                                            *
  * Parameters: service - [IN] the IPC service                                 *
@@ -1009,8 +959,6 @@ static void	ipc_service_accept(zbx_ipc_service_t *service)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_message_create                                               *
- *                                                                            *
  * Purpose: creates IPC message                                               *
  *                                                                            *
  * Parameters: code    - [IN] the message code                                *
@@ -1042,8 +990,6 @@ static zbx_ipc_message_t	*ipc_message_create(zbx_uint32_t code, const unsigned c
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_event_log                                            *
- *                                                                            *
  * Purpose: libevent logging callback                                         *
  *                                                                            *
  ******************************************************************************/
@@ -1075,8 +1021,6 @@ static void ipc_service_event_log_cb(int severity, const char *msg)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_init_libevent                                        *
- *                                                                            *
  * Purpose: initialize libevent library                                       *
  *                                                                            *
  ******************************************************************************/
@@ -1087,8 +1031,6 @@ static void	ipc_service_init_libevent(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_free_libevent                                        *
- *                                                                            *
  * Purpose: uninitialize libevent library                                     *
  *                                                                            *
  ******************************************************************************/
@@ -1098,8 +1040,6 @@ static void	ipc_service_free_libevent(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_client_connected_cb                                  *
- *                                                                            *
  * Purpose: libevent listener callback                                        *
  *                                                                            *
  ******************************************************************************/
@@ -1115,8 +1055,6 @@ static void	ipc_service_client_connected_cb(evutil_socket_t fd, short what, void
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_service_timer_cb                                             *
- *                                                                            *
  * Purpose: timer callback                                                    *
  *                                                                            *
  ******************************************************************************/
@@ -1129,8 +1067,6 @@ static void	ipc_service_timer_cb(evutil_socket_t fd, short what, void *arg)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipc_check_running_service                                        *
- *                                                                            *
  * Purpose: checks if an IPC service is already running                       *
  *                                                                            *
  * Parameters: service_name - [IN]                                            *
@@ -1156,8 +1092,6 @@ static int	ipc_check_running_service(const char *service_name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_socket_open                                              *
- *                                                                            *
  * Purpose: opens socket to an IPC service listening on the specified path    *
  *                                                                            *
  * Parameters: csocket      - [OUT] the IPC socket to the service             *
@@ -1218,8 +1152,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_socket_close                                             *
- *                                                                            *
  * Purpose: closes socket to an IPC service                                   *
  *                                                                            *
  * Parameters: csocket - [IN/OUT] the IPC socket to close                     *
@@ -1240,8 +1172,6 @@ void	zbx_ipc_socket_close(zbx_ipc_socket_t *csocket)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_socket_write                                             *
- *                                                                            *
  * Purpose: writes a message to IPC service                                   *
  *                                                                            *
  * Parameters: csocket - [IN] an opened IPC socket to the service             *
@@ -1275,8 +1205,6 @@ int	zbx_ipc_socket_write(zbx_ipc_socket_t *csocket, zbx_uint32_t code, const uns
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_socket_read                                              *
- *                                                                            *
  * Purpose: reads a message from IPC service                                  *
  *                                                                            *
  * Parameters: csocket - [IN] an opened IPC socket to the service             *
@@ -1330,8 +1258,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_socket_connected                                         *
- *                                                                            *
  * Purpose: check if socket is opened                                         *
  *                                                                            *
  * Parameters: csocket      - [OUT] the IPC socket to the service             *
@@ -1347,8 +1273,6 @@ int	zbx_ipc_socket_connected(const zbx_ipc_socket_t *csocket)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_message_free                                             *
- *                                                                            *
  * Purpose: frees the resources allocated to store IPC message data           *
  *                                                                            *
  * Parameters: message - [IN] the message to free                             *
@@ -1365,8 +1289,6 @@ void	zbx_ipc_message_free(zbx_ipc_message_t *message)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_message_clean                                            *
- *                                                                            *
  * Purpose: frees the resources allocated to store IPC message data           *
  *                                                                            *
  * Parameters: message - [IN] the message to clean                            *
@@ -1379,8 +1301,6 @@ void	zbx_ipc_message_clean(zbx_ipc_message_t *message)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_message_init                                             *
- *                                                                            *
  * Purpose: initializes IPC message                                           *
  *                                                                            *
  * Parameters: message - [IN] the message to initialize                       *
@@ -1393,8 +1313,6 @@ void	zbx_ipc_message_init(zbx_ipc_message_t *message)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_message_format                                           *
- *                                                                            *
  * Purpose: formats message to readable format for debug messages             *
  *                                                                            *
  * Parameters: message - [IN] the message                                     *
@@ -1430,8 +1348,6 @@ void	zbx_ipc_message_format(const zbx_ipc_message_t *message, char **data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_message_copy                                             *
- *                                                                            *
  * Purpose: copies ipc message                                                *
  *                                                                            *
  * Parameters: dst - [IN] the destination message                             *
@@ -1452,8 +1368,6 @@ void	zbx_ipc_message_copy(zbx_ipc_message_t *dst, const zbx_ipc_message_t *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_service_init_env                                         *
- *                                                                            *
  * Purpose: initializes IPC service environment                               *
  *                                                                            *
  * Parameters: path    - [IN] the service root path                           *
@@ -1519,8 +1433,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_service_free_env                                         *
- *                                                                            *
  * Purpose: frees IPC service environment                                     *
  *                                                                            *
  ******************************************************************************/
@@ -1531,8 +1443,6 @@ void	zbx_ipc_service_free_env(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_service_start                                            *
- *                                                                            *
  * Purpose: starts IPC service on the specified path                          *
  *                                                                            *
  * Parameters: service      - [IN/OUT] the IPC service                        *
@@ -1618,8 +1528,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_service_close                                            *
- *                                                                            *
  * Purpose: closes IPC service and frees the resources allocated by it        *
  *                                                                            *
  * Parameters: service - [IN/OUT] the IPC service                             *
@@ -1650,8 +1558,6 @@ void	zbx_ipc_service_close(zbx_ipc_service_t *service)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_service_recv                                             *
- *                                                                            *
  * Purpose: receives ipc message from a connected client                      *
  *                                                                            *
  * Parameters: service - [IN] the IPC service                                 *
@@ -1732,8 +1638,6 @@ int	zbx_ipc_service_recv(zbx_ipc_service_t *service, const zbx_timespec_t *timeo
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_client_send                                              *
- *                                                                            *
  * Purpose: Sends IPC message to client                                       *
  *                                                                            *
  * Parameters: client - [IN] the IPC client                                   *
@@ -1784,8 +1688,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_client_close                                             *
- *                                                                            *
  * Purpose: closes client socket and frees resources allocated for client     *
  *                                                                            *
  * Parameters: client - [IN] the IPC client                                   *
@@ -1838,8 +1740,6 @@ void	*zbx_ipc_client_get_userdata(zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_async_socket_open                                        *
- *                                                                            *
  * Purpose: opens asynchronous socket to IPC service client                   *
  *                                                                            *
  * Parameters: client       - [OUT] the IPC service client                    *
@@ -1897,8 +1797,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_async_socket_close                                       *
- *                                                                            *
  * Purpose: closes asynchronous IPC socket and frees allocated resources      *
  *                                                                            *
  * Parameters: asocket - [IN] the asynchronous IPC socket                     *
@@ -1919,8 +1817,6 @@ void	zbx_ipc_async_socket_close(zbx_ipc_async_socket_t *asocket)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_async_socket_send                                        *
- *                                                                            *
  * Purpose: Sends message through asynchronous IPC socket                     *
  *                                                                            *
  * Parameters: asocket - [IN] the asynchronous IPC socket                     *
@@ -1950,8 +1846,6 @@ int	zbx_ipc_async_socket_send(zbx_ipc_async_socket_t *asocket, zbx_uint32_t code
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_async_socket_recv                                        *
- *                                                                            *
  * Purpose: receives message through asynchronous IPC socket                  *
  *                                                                            *
  * Parameters: asocket - [IN] the asynchronous IPC socket                     *
@@ -2024,8 +1918,6 @@ int	zbx_ipc_async_socket_recv(zbx_ipc_async_socket_t *asocket, int timeout, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_async_socket_flush                                       *
- *                                                                            *
  * Purpose: flushes unsent through asynchronous IPC socket                    *
  *                                                                            *
  * Parameters: asocket - [IN] the asynchronous IPC service socket             *
@@ -2093,8 +1985,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_async_socket_check_unsent                                *
- *                                                                            *
  * Purpose: check if there are data to be sent                                *
  *                                                                            *
  * Parameters: asocket - [IN] the asynchronous IPC service socket             *
@@ -2110,8 +2000,6 @@ int	zbx_ipc_async_socket_check_unsent(zbx_ipc_async_socket_t *asocket)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_async_socket_connected                                   *
- *                                                                            *
  * Purpose: check if socket is connected                                      *
  *                                                                            *
  * Parameters: asocket - [IN] the asynchronous IPC service socket             *
@@ -2130,8 +2018,6 @@ int	zbx_ipc_async_socket_connected(zbx_ipc_async_socket_t *asocket)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipc_async_exchange                                           *
- *                                                                            *
  * Purpose: connect, send message and receive response in a given timeout     *
  *                                                                            *
  * Parameters: service_name - [IN] the IPC service name                       *
diff --git a/src/libs/zbxjson/json.c b/src/libs/zbxjson/json.c
index db0c12f047c..fbcf6134322 100644
--- a/src/libs/zbxjson/json.c
+++ b/src/libs/zbxjson/json.c
@@ -25,8 +25,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_strerror                                                *
- *                                                                            *
  * Purpose: return string describing json error                               *
  *                                                                            *
  * Return value: pointer to the null terminated string                        *
@@ -204,8 +202,6 @@ static size_t	__zbx_json_stringsize(const char *string, zbx_json_type_t type)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_num2hex                                                      *
- *                                                                            *
  * Purpose: convert parameter c (0-15) to hexadecimal value ('0'-'f')         *
  *                                                                            *
  * Parameters:                                                                *
@@ -481,8 +477,6 @@ int	zbx_json_close(struct zbx_json *j)
 
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_json_type                                                  *
- *                                                                            *
  * Purpose: return type of pointed value                                      *
  *                                                                            *
  * Return value: type of pointed value                                        *
@@ -512,8 +506,6 @@ static zbx_json_type_t	__zbx_json_type(const char *p)
 
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_json_rbracket                                              *
- *                                                                            *
  * Purpose: return position of right bracket                                  *
  *                                                                            *
  * Return value: position of right bracket                                    *
@@ -570,8 +562,6 @@ static const char	*__zbx_json_rbracket(const char *p)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_open                                                    *
- *                                                                            *
  * Purpose: open json buffer and check for brackets                           *
  *                                                                            *
  * Return value: SUCCESS - processed successfully                             *
@@ -614,8 +604,6 @@ int	zbx_json_open(const char *buffer, struct zbx_json_parse *jp)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_next                                                    *
- *                                                                            *
  * Purpose: locate next pair or element                                       *
  *                                                                            *
  * Return value: NULL - no more values                                        *
@@ -681,8 +669,6 @@ const char	*zbx_json_next(const struct zbx_json_parse *jp, const char *p)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_is_valid_json_hex                                            *
- *                                                                            *
  * Purpose: check if a 4 character sequence is a valid hex number 0000 - FFFF *
  *                                                                            *
  * Parameters:                                                                *
@@ -706,8 +692,6 @@ static int	zbx_is_valid_json_hex(const char *p)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_hex2num                                                      *
- *                                                                            *
  * Purpose: convert hexit c ('0'-'9''a'-'f''A'-'F') to number (0-15)          *
  *                                                                            *
  * Parameters:                                                                *
@@ -733,8 +717,6 @@ static unsigned int	zbx_hex2num(char c)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_decode_character                                        *
- *                                                                            *
  * Purpose: decodes JSON escape character into UTF-8                          *
  *                                                                            *
  * Parameters: p - [IN/OUT] a pointer to the first character in string        *
@@ -852,8 +834,6 @@ static unsigned int	zbx_json_decode_character(const char **p, unsigned char *byt
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_copy_string                                             *
- *                                                                            *
  * Purpose: copies json name/string value by omitting leading/trailing " and  *
  *          converting escape sequences                                       *
  *                                                                            *
@@ -909,8 +889,6 @@ static const char	*zbx_json_copy_string(const char *p, char *out, size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_copy_value                                              *
- *                                                                            *
  * Purpose: copies unquoted (numeric, boolean) json value                     *
  *                                                                            *
  * Parameters: p     - [IN] a pointer to the next character in string         *
@@ -1028,8 +1006,6 @@ const char	*zbx_json_pair_next(const struct zbx_json_parse *jp, const char *p, c
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_pair_by_name                                            *
- *                                                                            *
  * Purpose: find pair by name and return pointer to value                     *
  *                                                                            *
  * Return value: pointer to value                                             *
@@ -1051,11 +1027,6 @@ const char	*zbx_json_pair_by_name(const struct zbx_json_parse *jp, const char *n
 	return NULL;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_json_next_value                                              *
- *                                                                            *
- ******************************************************************************/
 const char	*zbx_json_next_value(const struct zbx_json_parse *jp, const char *p, char *string, size_t len,
 		zbx_json_type_t *type)
 {
@@ -1065,11 +1036,6 @@ const char	*zbx_json_next_value(const struct zbx_json_parse *jp, const char *p,
 	return zbx_json_decodevalue(p, string, len, type);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_json_next_value_dyn                                          *
- *                                                                            *
- ******************************************************************************/
 const char	*zbx_json_next_value_dyn(const struct zbx_json_parse *jp, const char *p, char **string,
 		size_t *string_alloc, zbx_json_type_t *type)
 {
@@ -1081,8 +1047,6 @@ const char	*zbx_json_next_value_dyn(const struct zbx_json_parse *jp, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_value_by_name                                           *
- *                                                                            *
  * Purpose: return value by pair name                                         *
  *                                                                            *
  * Return value: SUCCEED - if value successfully parsed, FAIL - otherwise     *
@@ -1104,8 +1068,6 @@ int	zbx_json_value_by_name(const struct zbx_json_parse *jp, const char *name, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_value_by_name_dyn                                       *
- *                                                                            *
  * Purpose: return value by pair name                                         *
  *                                                                            *
  * Return value: SUCCEED - if value successfully parsed, FAIL - otherwise     *
@@ -1127,8 +1089,6 @@ int	zbx_json_value_by_name_dyn(const struct zbx_json_parse *jp, const char *name
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_brackets_open                                           *
- *                                                                            *
  * Return value: SUCCESS - processed successfully                             *
  *               FAIL - an error occurred                                     *
  *                                                                            *
@@ -1150,8 +1110,6 @@ int	zbx_json_brackets_open(const char *p, struct zbx_json_parse *jp)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_brackets_by_name                                        *
- *                                                                            *
  * Return value: SUCCESS - processed successfully                             *
  *               FAIL - an error occurred                                     *
  *                                                                            *
@@ -1171,8 +1129,6 @@ int	zbx_json_brackets_by_name(const struct zbx_json_parse *jp, const char *name,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_object_is_empty                                         *
- *                                                                            *
  * Return value: SUCCESS - if object is empty                                 *
  *               FAIL - if object contains data                               *
  *                                                                            *
@@ -1184,8 +1140,6 @@ int	zbx_json_object_is_empty(const struct zbx_json_parse *jp)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_count                                                   *
- *                                                                            *
  * Return value: number of elements in zbx_json_parse object                  *
  *                                                                            *
  ******************************************************************************/
@@ -1202,8 +1156,6 @@ int	zbx_json_count(const struct zbx_json_parse *jp)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_open_path                                               *
- *                                                                            *
  * Purpose: opens an object by definite json path                             *
  *                                                                            *
  * Return value: SUCCESS - processed successfully                             *
diff --git a/src/libs/zbxjson/json_parser.c b/src/libs/zbxjson/json_parser.c
index cab9bad248e..d3c508739de 100644
--- a/src/libs/zbxjson/json_parser.c
+++ b/src/libs/zbxjson/json_parser.c
@@ -29,8 +29,6 @@ static zbx_int64_t	json_parse_object(const char *start, char **error);
 
 /******************************************************************************
  *                                                                            *
- * Function: json_error                                                       *
- *                                                                            *
  * Purpose: Prepares JSON parsing error message                               *
  *                                                                            *
  * Parameters: message     - [IN] the error message                           *
@@ -56,8 +54,6 @@ static zbx_int64_t	json_error(const char *message, const char *json_buffer, char
 
 /******************************************************************************
  *                                                                            *
- * Function: json_parse_string                                                *
- *                                                                            *
  * Purpose: Parses JSON string value or object name                           *
  *                                                                            *
  * Parameters: start - [IN] the JSON data without leading whitespace          *
@@ -131,8 +127,6 @@ static zbx_int64_t	json_parse_string(const char *start, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: json_parse_array                                                 *
- *                                                                            *
  * Purpose: Parses JSON array value                                           *
  *                                                                            *
  * Parameters: start - [IN] the JSON data without leading whitespace          *
@@ -178,8 +172,6 @@ static zbx_int64_t	json_parse_array(const char *start, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: json_parse_number                                                *
- *                                                                            *
  * Purpose: Parses JSON number value                                          *
  *                                                                            *
  * Parameters: start - [IN] the JSON data without leading whitespace          *
@@ -251,8 +243,6 @@ static zbx_int64_t	json_parse_number(const char *start, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: json_parse_literal                                               *
- *                                                                            *
  * Purpose: Parses the specified literal value                                *
  *                                                                            *
  * Parameters: start - [IN] the JSON data without leading whitespace          *
@@ -284,8 +274,6 @@ static zbx_int64_t	json_parse_literal(const char *start, const char *text, char
 
 /******************************************************************************
  *                                                                            *
- * Function: json_parse_value                                                 *
- *                                                                            *
  * Purpose: Parses JSON object value                                          *
  *                                                                            *
  * Parameters: start - [IN] the JSON data                                     *
@@ -354,8 +342,6 @@ zbx_int64_t	json_parse_value(const char *start, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: json_parse_object                                                *
- *                                                                            *
  * Purpose: Parses JSON object                                                *
  *                                                                            *
  * Parameters: start - [IN] the JSON data                                     *
@@ -421,8 +407,6 @@ static zbx_int64_t	json_parse_object(const char *start, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_validate                                                *
- *                                                                            *
  * Purpose: Validates JSON object                                             *
  *                                                                            *
  * Parameters: start - [IN]  the string to validate                           *
diff --git a/src/libs/zbxjson/jsonpath.c b/src/libs/zbxjson/jsonpath.c
index 71f3ca91772..b7e7c4d1b5b 100644
--- a/src/libs/zbxjson/jsonpath.c
+++ b/src/libs/zbxjson/jsonpath.c
@@ -115,8 +115,6 @@ static void	zbx_vector_json_clear_ext(zbx_vector_json_t *elements)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_jsonpath_error                                               *
- *                                                                            *
  * Purpose: set json error message and return FAIL                            *
  *                                                                            *
  * Comments: This function is used to return from json path parsing functions *
@@ -133,11 +131,6 @@ static int	zbx_jsonpath_error(const char *path)
 	return FAIL;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: jsonpath_strndup                                                 *
- *                                                                            *
- ******************************************************************************/
 static char	*jsonpath_strndup(const char *source, size_t len)
 {
 	char	*str;
@@ -151,8 +144,6 @@ static char	*jsonpath_strndup(const char *source, size_t len)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_unquote                                                 *
- *                                                                            *
  * Purpose: unquote single or double quoted string by stripping               *
  *          leading/trailing quotes and unescaping backslash sequences        *
  *                                                                            *
@@ -178,8 +169,6 @@ static void	jsonpath_unquote(char *value, const char *start, size_t len)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_unquote_dyn                                             *
- *                                                                            *
  * Purpose: unquote string stripping leading/trailing quotes and unescaping   *
  *          backspace sequences                                               *
  *                                                                            *
@@ -202,8 +191,6 @@ static char	*jsonpath_unquote_dyn(const char *start, size_t len)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_list_create_item                                        *
- *                                                                            *
  * Purpose: create jsonpath list item of the specified size                   *
  *                                                                            *
  ******************************************************************************/
@@ -214,8 +201,6 @@ static zbx_jsonpath_list_node_t	*jsonpath_list_create_node(size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_list_free                                               *
- *                                                                            *
  * Purpose: free jsonpath list                                                *
  *                                                                            *
  ******************************************************************************/
@@ -232,8 +217,6 @@ static void	jsonpath_list_free(zbx_jsonpath_list_node_t *list)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_create_token                                            *
- *                                                                            *
  * Purpose: create jsonpath expression token                                  *
  *                                                                            *
  * Parameters: type       - [IN] the token type                               *
@@ -267,11 +250,6 @@ static zbx_jsonpath_token_t	*jsonpath_create_token(int type, const char *express
 	return token;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: jsonpath_token_free                                              *
- *                                                                            *
- ******************************************************************************/
 static void	jsonpath_token_free(zbx_jsonpath_token_t *token)
 {
 	zbx_free(token->data);
@@ -280,8 +258,6 @@ static void	jsonpath_token_free(zbx_jsonpath_token_t *token)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_reserve                                                 *
- *                                                                            *
  * Purpose: reserve space in jsonpath segments array for more segments        *
  *                                                                            *
  * Parameters: jsonpath - [IN] the jsonpath data                              *
@@ -310,11 +286,6 @@ static void	jsonpath_reserve(zbx_jsonpath_t *jsonpath, int num)
 	}
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: jsonpath_segment_clear                                           *
- *                                                                            *
- ******************************************************************************/
 static void	jsonpath_segment_clear(zbx_jsonpath_segment_t *segment)
 {
 	switch (segment->type)
@@ -334,8 +305,6 @@ static void	jsonpath_segment_clear(zbx_jsonpath_segment_t *segment)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_next                                                    *
- *                                                                            *
  * Purpose: find next component of json path                                  *
  *                                                                            *
  * Parameters: pnext - [IN/OUT] the reference to the next path component      *
@@ -415,8 +384,6 @@ static int	jsonpath_next(const char **pnext)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_substring                                         *
- *                                                                            *
  * Purpose: parse single or double quoted substring                           *
  *                                                                            *
  * Parameters: start - [IN] the substring start                               *
@@ -452,8 +419,6 @@ static int	jsonpath_parse_substring(const char *start, int *len)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_path                                              *
- *                                                                            *
  * Purpose: parse jsonpath reference                                          *
  *                                                                            *
  * Parameters: start - [IN] the jsonpath start                                *
@@ -482,8 +447,6 @@ static int	jsonpath_parse_path(const char *start, int *len)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_number                                            *
- *                                                                            *
  * Purpose: parse number value                                                *
  *                                                                            *
  * Parameters: start - [IN] the number start                                  *
@@ -520,11 +483,9 @@ static int	jsonpath_parse_number(const char *start, int *len)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_expression_next_token                                   *
- *                                                                            *
  * Purpose: get next token in jsonpath expression                             *
  *                                                                            *
- * Parameters: exprsesion - [IN] the jsonpath expression                      *
+ * Parameters: expression - [IN] the jsonpath expression                      *
  *             pos        - [IN] the position of token in the expression      *
  *             prev_group - [IN] the preceding token group, used to determine *
  *                               token type based on context if necessary     *
@@ -676,8 +637,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_expression                                        *
- *                                                                            *
  * Purpose: parse jsonpath filter expression in format                        *
  *                                                                            *
  * Parameters: expression - [IN] the expression, including opening and        *
@@ -876,8 +835,6 @@ cleanup:
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_names                                             *
- *                                                                            *
  * Purpose: parse a list of single or double quoted names, including trivial  *
  *          case when a single name is used                                   *
  *                                                                            *
@@ -990,8 +947,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_indexes                                           *
- *                                                                            *
  * Purpose: parse a list of array indexes or range start:end values           *
  *          case when a single name is used                                   *
  *                                                                            *
@@ -1139,8 +1094,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_bracket_segment                                   *
- *                                                                            *
  * Purpose: parse jsonpath bracket notation segment                           *
  *                                                                            *
  * Parameters: start     - [IN] the segment start                             *
@@ -1197,8 +1150,6 @@ static int	jsonpath_parse_bracket_segment(const char *start, zbx_jsonpath_t *jso
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_dot_segment                                       *
- *                                                                            *
  * Purpose: parse jsonpath dot notation segment                               *
  *                                                                            *
  * Parameters: start     - [IN] the segment start                             *
@@ -1274,8 +1225,6 @@ static int	jsonpath_parse_dot_segment(const char *start, zbx_jsonpath_t *jsonpat
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_parse_name_reference                                    *
- *                                                                            *
  * Purpose: parse jsonpath name reference ~                                   *
  *                                                                            *
  * Parameters: start     - [IN] the segment start                             *
@@ -1300,8 +1249,6 @@ static int	jsonpath_parse_name_reference(const char *start, zbx_jsonpath_t *json
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_pointer_to_jp                                           *
- *                                                                            *
  * Purpose: convert a pointer to an object/array/value in json data to        *
  *          json parse structure                                              *
  *                                                                            *
@@ -1328,8 +1275,6 @@ static int	jsonpath_pointer_to_jp(const char *pnext, struct zbx_json_parse *jp)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_query_contents                                          *
- *                                                                            *
  * Purpose: perform the rest of jsonpath query on json data                   *
  *                                                                            *
  * Parameters: jp_root    - [IN] the document root                            *
@@ -1365,8 +1310,6 @@ static int	jsonpath_query_contents(const struct zbx_json_parse *jp_root, const c
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_query_next_segment                                      *
- *                                                                            *
  * Purpose: query next segment                                                *
  *                                                                            *
  * Parameters: jp_root    - [IN] the document root                            *
@@ -1398,8 +1341,6 @@ static int	jsonpath_query_next_segment(const struct zbx_json_parse *jp_root, con
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_match_name                                              *
- *                                                                            *
  * Purpose: match object value name against jsonpath segment name list        *
  *                                                                            *
  * Parameters: jp_root    - [IN] the document root                            *
@@ -1439,8 +1380,6 @@ static int	jsonpath_match_name(const struct zbx_json_parse *jp_root, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_extract_value                                           *
- *                                                                            *
  * Purpose: extract value from json data by the specified path                *
  *                                                                            *
  * Parameters: jp    - [IN] the parent object                                 *
@@ -1487,8 +1426,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_expression_to_str                                       *
- *                                                                            *
  * Purpose: convert jsonpath expression to text format                        *
  *                                                                            *
  * Parameters: expression - [IN] the jsonpath exprssion                       *
@@ -1578,8 +1515,6 @@ static char	*jsonpath_expression_to_str(zbx_jsonpath_expression_t *expression)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_set_expression_error                                    *
- *                                                                            *
  * Purpose: set jsonpath expression error message                             *
  *                                                                            *
  * Parameters: expression - [IN] the jsonpath exprssion                       *
@@ -1604,8 +1539,6 @@ static void	jsonpath_set_expression_error(zbx_jsonpath_expression_t *expression)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_variant_to_boolean                                      *
- *                                                                            *
  * Purpose: convert variant value to 'boolean' (1, 0)                         *
  *                                                                            *
  * Parameters: value - [IN/OUT] the value                                     *
@@ -1644,8 +1577,6 @@ static void	jsonpath_variant_to_boolean(zbx_variant_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_regexp_match                                            *
- *                                                                            *
  * Purpose: match text against regular expression                             *
  *                                                                            *
  * Parameters: text    - [IN] the text to match                               *
@@ -1675,8 +1606,6 @@ static int	jsonpath_regexp_match(const char *text, const char *pattern, double *
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_match_expression                                        *
- *                                                                            *
  * Purpose: match json array element/object value against jsonpath expression *
  *                                                                            *
  * Parameters: jp_root    - [IN] the document root                            *
@@ -1908,8 +1837,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_query_object                                            *
- *                                                                            *
  * Purpose: query object fields for jsonpath segment match                    *
  *                                                                            *
  * Parameters: jp_root    - [IN] the document root                            *
@@ -1958,8 +1885,6 @@ static int	jsonpath_query_object(const struct zbx_json_parse *jp_root, const str
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_match_index                                             *
- *                                                                            *
  * Purpose: match array element against segment index list                    *
  *                                                                            *
  * Parameters: jp_root      - [IN] the document root                          *
@@ -2004,8 +1929,6 @@ static int	jsonpath_match_index(const struct zbx_json_parse *jp_root, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_match_range                                             *
- *                                                                            *
  * Purpose: match array element against segment index range                   *
  *                                                                            *
  * Parameters: jp_root      - [IN] the document root                          *
@@ -2046,8 +1969,6 @@ static int	jsonpath_match_range(const struct zbx_json_parse *jp_root, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_query_array                                             *
- *                                                                            *
  * Purpose: query array elements for jsonpath segment match                   *
  *                                                                            *
  * Parameters: jp_root    - [IN] the document root                            *
@@ -2108,8 +2029,6 @@ static int	jsonpath_query_array(const struct zbx_json_parse *jp_root, const stru
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_extract_element                                         *
- *                                                                            *
  * Purpose: extract JSON element value from data                              *
  *                                                                            *
  * Parameters: ptr     - [IN] pointer to the element to extract               *
@@ -2141,8 +2060,6 @@ static int	jsonpath_extract_element(const char *ptr, char **element)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_extract_numeric_value                                   *
- *                                                                            *
  * Purpose: extract numeric value from json data                              *
  *                                                                            *
  * Parameters: ptr   - [IN] pointer to the value to extract                   *
@@ -2168,8 +2085,6 @@ static int	jsonpath_extract_numeric_value(const char *ptr, double *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_apply_function                                          *
- *                                                                            *
  * Purpose: apply jsonpath function to the extracted object list              *
  *                                                                            *
  * Parameters: objects       - [IN] the matched json elements (name, value)   *
@@ -2324,8 +2239,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_apply_functions                                         *
- *                                                                            *
  * Purpose: apply jsonpath function to the extracted object list              *
  *                                                                            *
  * Parameters: jp_root    - [IN] the document root                            *
@@ -2386,8 +2299,6 @@ static int	jsonpath_apply_functions(const struct zbx_json_parse *jp_root, const
 
 /******************************************************************************
  *                                                                            *
- * Function: jsonpath_format_query_result                                     *
- *                                                                            *
  * Purpose: format query result, depending on jsonpath type                   *
  *                                                                            *
  * Parameters: objects  - [IN] the matched json elements (name, value)        *
@@ -2440,11 +2351,6 @@ static int	jsonpath_format_query_result(const zbx_vector_json_t *objects, zbx_js
 	return SUCCEED;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_jsonpath_clear                                               *
- *                                                                            *
- ******************************************************************************/
 void	zbx_jsonpath_clear(zbx_jsonpath_t *jsonpath)
 {
 	int	i;
@@ -2457,8 +2363,6 @@ void	zbx_jsonpath_clear(zbx_jsonpath_t *jsonpath)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_jsonpath_compile                                             *
- *                                                                            *
  * Purpose: compile jsonpath to be used in queries                            *
  *                                                                            *
  * Parameters: path     - [IN] the path to parse                              *
@@ -2560,8 +2464,6 @@ int	zbx_jsonpath_compile(const char *path, zbx_jsonpath_t *jsonpath)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_jsonpath_query                                               *
- *                                                                            *
  * Purpose: perform jsonpath query on the specified json data                 *
  *                                                                            *
  * Parameters: jp     - [IN] the json data                                    *
diff --git a/src/libs/zbxlog/log.c b/src/libs/zbxlog/log.c
index c52c04e0f88..eb99a09c581 100644
--- a/src/libs/zbxlog/log.c
+++ b/src/libs/zbxlog/log.c
@@ -681,8 +681,6 @@ char	*strerror_from_module(unsigned long error, const wchar_t *module)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strlog_alloc                                                 *
- *                                                                            *
  * Purpose: log the message optionally appending to a string buffer           *
  *                                                                            *
  * Parameters: lebel      - [IN] the log level                                *
diff --git a/src/libs/zbxmedia/email.c b/src/libs/zbxmedia/email.c
index fba498abc41..a7d43fa77de 100644
--- a/src/libs/zbxmedia/email.c
+++ b/src/libs/zbxmedia/email.c
@@ -39,8 +39,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: str_base64_encode_rfc2047                                        *
- *                                                                            *
  * Purpose: Encode a string into a base64 string as required by rfc2047.      *
  *          Used for encoding e-mail headers.                                 *
  *                                                                            *
@@ -122,8 +120,6 @@ static int	smtp_readln(zbx_socket_t *s, const char **buf)
 
 /********************************************************************************
  *                                                                              *
- * Function: smtp_parse_mailbox                                                 *
- *                                                                              *
  * Purpose: 1. Extract a display name and an angle address from mailbox string  *
  *             for using in "MAIL FROM:", "RCPT TO:", "From:" and "To:" fields. *
  *          2. If the display name contains multibyte UTF-8 characters encode   *
@@ -795,8 +791,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mailaddr_free                                                *
- *                                                                            *
  * Purpose: frees the mail address object                                     *
  *                                                                            *
  * Parameters: mailaddr - [IN] the mail address                               *
diff --git a/src/libs/zbxmodules/modules.c b/src/libs/zbxmodules/modules.c
index e58aea6642c..73b3e15fdb8 100644
--- a/src/libs/zbxmodules/modules.c
+++ b/src/libs/zbxmodules/modules.c
@@ -43,8 +43,6 @@ zbx_history_log_cb_t		*history_log_cbs = NULL;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_register_module_items                                        *
- *                                                                            *
  * Purpose: add items supported by module                                     *
  *                                                                            *
  * Parameters: metrics       - list of items supported by module              *
@@ -75,8 +73,6 @@ static int	zbx_register_module_items(ZBX_METRIC *metrics, char *error, size_t ma
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_register_module                                              *
- *                                                                            *
  * Purpose: add module to the list of successfully loaded modules             *
  *                                                                            *
  ******************************************************************************/
@@ -94,8 +90,6 @@ static zbx_module_t	*zbx_register_module(void *lib, char *name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_register_history_write_cbs                                   *
- *                                                                            *
  * Purpose: registers callback functions for history export                   *
  *                                                                            *
  * Parameters: module            - module pointer for later reference         *
@@ -212,8 +206,6 @@ static int	zbx_module_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_load_module                                                  *
- *                                                                            *
  * Purpose: load loadable module                                              *
  *                                                                            *
  * Parameters: path    - directory where modules are located                  *
@@ -322,8 +314,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_load_modules                                                 *
- *                                                                            *
  * Purpose: load loadable modules (dynamic libraries)                         *
  *                                                                            *
  * Parameters: path - directory where modules are located                     *
@@ -378,8 +368,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_unload_module                                                *
- *                                                                            *
  * Purpose: unload module and free allocated resources                        *
  *                                                                            *
  ******************************************************************************/
@@ -403,8 +391,6 @@ static void	zbx_unload_module(void *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_unload_modules                                               *
- *                                                                            *
  * Purpose: Unload already loaded loadable modules (dynamic libraries).       *
  *          It is called on process shutdown.                                 *
  *                                                                            *
diff --git a/src/libs/zbxnix/control.c b/src/libs/zbxnix/control.c
index 6116b140f97..421a622ec32 100644
--- a/src/libs/zbxnix/control.c
+++ b/src/libs/zbxnix/control.c
@@ -109,8 +109,6 @@ static int	parse_log_level_options(const char *opt, size_t len, unsigned int *sc
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_rtc_options                                                *
- *                                                                            *
  * Purpose: parse runtime control options and create a runtime control        *
  *          message                                                           *
  *                                                                            *
diff --git a/src/libs/zbxnix/coredump.c b/src/libs/zbxnix/coredump.c
index d5ce9afa3a3..d1fab9282cd 100644
--- a/src/libs/zbxnix/coredump.c
+++ b/src/libs/zbxnix/coredump.c
@@ -24,8 +24,6 @@
 #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_coredump_disable                                             *
- *                                                                            *
  * Purpose: disable core dump                                                 *
  *                                                                            *
  * Return value: SUCCEED - core dump disabled                                 *
diff --git a/src/libs/zbxnix/daemon.c b/src/libs/zbxnix/daemon.c
index 63572f22542..f591d2c7020 100644
--- a/src/libs/zbxnix/daemon.c
+++ b/src/libs/zbxnix/daemon.c
@@ -47,8 +47,6 @@ static void	(*zbx_sigusr_handler)(int flags);
 #ifdef HAVE_SIGQUEUE
 /******************************************************************************
  *                                                                            *
- * Function: common_sigusr_handler                                            *
- *                                                                            *
  * Purpose: common SIGUSR1 handler for Zabbix processes                       *
  *                                                                            *
  ******************************************************************************/
@@ -198,8 +196,6 @@ void	zbx_set_sigusr_handler(void (*handler)(int flags))
 
 /******************************************************************************
  *                                                                            *
- * Function: user1_signal_handler                                             *
- *                                                                            *
  * Purpose: handle user signal SIGUSR1                                        *
  *                                                                            *
  ******************************************************************************/
@@ -276,8 +272,6 @@ static void	user1_signal_handler(int sig, siginfo_t *siginfo, void *context)
 
 /******************************************************************************
  *                                                                            *
- * Function: pipe_signal_handler                                              *
- *                                                                            *
  * Purpose: handle pipe signal SIGPIPE                                        *
  *                                                                            *
  ******************************************************************************/
@@ -292,8 +286,6 @@ static void	pipe_signal_handler(int sig, siginfo_t *siginfo, void *context)
 
 /******************************************************************************
  *                                                                            *
- * Function: set_daemon_signal_handlers                                       *
- *                                                                            *
  * Purpose: set the signal handlers used by daemons                           *
  *                                                                            *
  ******************************************************************************/
@@ -315,8 +307,6 @@ static void	set_daemon_signal_handlers(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: daemon_start                                                     *
- *                                                                            *
  * Purpose: init process as daemon                                            *
  *                                                                            *
  * Parameters: allow_root - allow root permission for application             *
diff --git a/src/libs/zbxnix/dshm.c b/src/libs/zbxnix/dshm.c
index e563ee2e729..deb7893c8c9 100644
--- a/src/libs/zbxnix/dshm.c
+++ b/src/libs/zbxnix/dshm.c
@@ -25,8 +25,6 @@ extern char	*CONFIG_FILE;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dshm_create                                                  *
- *                                                                            *
  * Purpose: creates dynamic shared memory segment                             *
  *                                                                            *
  * Parameters: shm       - [OUT] the dynamic shared memory data               *
@@ -76,8 +74,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dshm_destroy                                                 *
- *                                                                            *
  * Purpose: destroys dynamic shared memory segment                            *
  *                                                                            *
  * Parameters: shm    - [IN] the dynamic shared memory data                   *
@@ -114,21 +110,11 @@ out:
 	return ret;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_dshm_lock                                                    *
- *                                                                            *
- ******************************************************************************/
 void	zbx_dshm_lock(zbx_dshm_t *shm)
 {
 	zbx_mutex_lock(shm->lock);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_dshm_unlock                                                  *
- *                                                                            *
- ******************************************************************************/
 void	zbx_dshm_unlock(zbx_dshm_t *shm)
 {
 	zbx_mutex_unlock(shm->lock);
@@ -136,8 +122,6 @@ void	zbx_dshm_unlock(zbx_dshm_t *shm)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dshm_validate_ref                                            *
- *                                                                            *
  * Purpose: validates local reference to dynamic shared memory segment        *
  *                                                                            *
  * Parameters: shm     - [IN] the dynamic shared memory data                  *
@@ -194,8 +178,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_dshm_realloc                                                 *
- *                                                                            *
  * Purpose: reallocates dynamic shared memory segment                         *
  *                                                                            *
  * Parameters: shm      - [IN/OUT] the dynamic shared memory data             *
diff --git a/src/libs/zbxnix/ipc.c b/src/libs/zbxnix/ipc.c
index 34aa24a5461..628eb578318 100644
--- a/src/libs/zbxnix/ipc.c
+++ b/src/libs/zbxnix/ipc.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_shm_create                                                   *
- *                                                                            *
  * Purpose: Create block of shared memory                                     *
  *                                                                            *
  * Parameters:  size - size                                                   *
@@ -49,8 +47,6 @@ int	zbx_shm_create(size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_shm_destroy                                                  *
- *                                                                            *
  * Purpose: Destroy block of shared memory                                    *
  *                                                                            *
  * Parameters:  shmid - Shared memory identifier                              *
diff --git a/src/libs/zbxnix/sighandler.c b/src/libs/zbxnix/sighandler.c
index 224a7b2c3e9..01adfdb22a7 100644
--- a/src/libs/zbxnix/sighandler.c
+++ b/src/libs/zbxnix/sighandler.c
@@ -50,8 +50,6 @@ static void	exit_with_failure(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: fatal_signal_handler                                             *
- *                                                                            *
  * Purpose: handle fatal signals: SIGILL, SIGFPE, SIGSEGV, SIGBUS             *
  *                                                                            *
  ******************************************************************************/
@@ -65,8 +63,6 @@ static void	fatal_signal_handler(int sig, siginfo_t *siginfo, void *context)
 
 /******************************************************************************
  *                                                                            *
- * Function: metric_thread_signal_handler                                     *
- *                                                                            *
  * Purpose: same as fatal_signal_handler() but customized for metric thread - *
  *          does not log memory map                                           *
  *                                                                            *
@@ -81,8 +77,6 @@ static void	metric_thread_signal_handler(int sig, siginfo_t *siginfo, void *cont
 
 /******************************************************************************
  *                                                                            *
- * Function: alarm_signal_handler                                             *
- *                                                                            *
  * Purpose: handle alarm signal SIGALRM                                       *
  *                                                                            *
  ******************************************************************************/
@@ -95,8 +89,6 @@ static void	alarm_signal_handler(int sig, siginfo_t *siginfo, void *context)
 
 /******************************************************************************
  *                                                                            *
- * Function: terminate_signal_handler                                         *
- *                                                                            *
  * Purpose: handle terminate signals: SIGHUP, SIGINT, SIGTERM, SIGUSR2        *
  *                                                                            *
  ******************************************************************************/
@@ -144,8 +136,6 @@ static void	terminate_signal_handler(int sig, siginfo_t *siginfo, void *context)
 
 /******************************************************************************
  *                                                                            *
- * Function: child_signal_handler                                             *
- *                                                                            *
  * Purpose: handle child signal SIGCHLD                                       *
  *                                                                            *
  ******************************************************************************/
@@ -170,8 +160,6 @@ static void	child_signal_handler(int sig, siginfo_t *siginfo, void *context)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_set_common_signal_handlers                                   *
- *                                                                            *
  * Purpose: set the commonly used signal handlers                             *
  *                                                                            *
  ******************************************************************************/
@@ -203,8 +191,6 @@ void	zbx_set_common_signal_handlers(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_set_exit_on_terminate                                        *
- *                                                                            *
  * Purpose: make main process to exit on terminate signals                    *
  *                                                                            *
  ******************************************************************************/
@@ -215,8 +201,6 @@ void	zbx_set_exit_on_terminate(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_unset_exit_on_terminate                                      *
- *                                                                            *
  * Purpose: make main process to set exit flag and continue to work on        *
  *          terminate signals                                                 *
  *                                                                            *
@@ -228,8 +212,6 @@ void	zbx_unset_exit_on_terminate(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_set_child_signal_handler                                     *
- *                                                                            *
  * Purpose: set the handlers for child process signals                        *
  *                                                                            *
  ******************************************************************************/
@@ -253,8 +235,6 @@ void	zbx_unset_child_signal_handler(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_set_metric_thread_signal_handler                             *
- *                                                                            *
  * Purpose: set the handlers for child process signals                        *
  *                                                                            *
  ******************************************************************************/
@@ -276,8 +256,6 @@ void 	zbx_set_metric_thread_signal_handler(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_block_signals                                                *
- *                                                                            *
  * Purpose: block signals to avoid interruption                               *
  *                                                                            *
  ******************************************************************************/
@@ -298,8 +276,6 @@ void	zbx_block_signals(sigset_t *orig_mask)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_unblock_signals                                              *
- *                                                                            *
  * Purpose: unblock signals after blocking                                    *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxprometheus/zbxprometheus.c b/src/libs/zbxprometheus/zbxprometheus.c
index ee1308c51c7..e55a1ae992c 100644
--- a/src/libs/zbxprometheus/zbxprometheus.c
+++ b/src/libs/zbxprometheus/zbxprometheus.c
@@ -131,8 +131,6 @@ zbx_prometheus_label_index_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: str_loc_dup                                                      *
- *                                                                            *
  * Purpose: allocates and copies substring at the specified location          *
  *                                                                            *
  * Parameters: src - [IN] the source string                                   *
@@ -156,8 +154,6 @@ static char	*str_loc_dup(const char *src, const zbx_strloc_t *loc)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_loc_unquote_dyn                                              *
- *                                                                            *
  * Purpose: unquotes substring at the specified location                      *
  *                                                                            *
  * Parameters: src - [IN] the source string                                   *
@@ -202,8 +198,6 @@ static char	*str_loc_unquote_dyn(const char *src, const zbx_strloc_t *loc)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_loc_unescape_hint_dyn                                        *
- *                                                                            *
  * Purpose: unescapes HELP hint                                               *
  *                                                                            *
  * Parameters: src - [IN] the source string                                   *
@@ -250,8 +244,6 @@ static char	*str_loc_unescape_hint_dyn(const char *src, const zbx_strloc_t *loc)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_loc_cmp                                                      *
- *                                                                            *
  * Purpose: compares substring at the specified location with the specified   *
  *          text                                                              *
  *                                                                            *
@@ -273,8 +265,6 @@ static int	str_loc_cmp(const char *src, const zbx_strloc_t *loc, const char *tex
 
 /******************************************************************************
  *                                                                            *
- * Function: str_loc_op                                                       *
- *                                                                            *
  * Purpose: parses condition operation at the specified location              *
  *                                                                            *
  * Parameters: src - [IN] the source string                                   *
@@ -305,12 +295,10 @@ static zbx_prometheus_condition_op_t	str_loc_op(const char *data, const zbx_strl
 
 /******************************************************************************
  *                                                                            *
- * Function: skip_spaces                                                      *
- *                                                                            *
  * Purpose: skips spaces                                                      *
  *                                                                            *
- * Parameters: src - [IN] the source string                                   *
- *             pos - [IN] the starting position                               *
+ * Parameters: data - [IN] the source string                                  *
+ *             pos  - [IN] the starting position                              *
  *                                                                            *
  * Return value: The position of the next non space character.                *
  *                                                                            *
@@ -325,8 +313,6 @@ static size_t	skip_spaces(const char *data, size_t pos)
 
 /******************************************************************************
  *                                                                            *
- * Function: skip_row                                                         *
- *                                                                            *
  * Purpose: skips until beginning of the next row                             *
  *                                                                            *
  * Parameters: src - [IN] the source string                                   *
@@ -347,8 +333,6 @@ static size_t	skip_row(const char *data, size_t pos)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_metric                                                     *
- *                                                                            *
  * Purpose: parses metric name                                                *
  *                                                                            *
  * Parameters: data - [IN] the source string                                  *
@@ -380,8 +364,6 @@ static int	parse_metric(const char *data, size_t pos, zbx_strloc_t *loc)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_label                                                      *
- *                                                                            *
  * Purpose: parses label name                                                 *
  *                                                                            *
  * Parameters: data - [IN] the source string                                  *
@@ -413,8 +395,6 @@ static int	parse_label(const char *data, size_t pos, zbx_strloc_t *loc)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_label_op                                                   *
- *                                                                            *
  * Purpose: parses label operation                                            *
  *                                                                            *
  * Parameters: data - [IN] the source string                                  *
@@ -451,8 +431,6 @@ static int	parse_label_op(const char *data, size_t pos, zbx_strloc_t *loc)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_label_value                                                *
- *                                                                            *
  * Purpose: parses label value                                                *
  *                                                                            *
  * Parameters: data - [IN] the source string                                  *
@@ -495,8 +473,6 @@ static int	parse_label_value(const char *data, size_t pos, zbx_strloc_t *loc)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_metric_op                                                  *
- *                                                                            *
  * Purpose: parses metric operation                                           *
  *                                                                            *
  * Parameters: data - [IN] the source string                                  *
@@ -525,8 +501,6 @@ static int	parse_metric_op(const char *data, size_t pos, zbx_strloc_t *loc)
 
 /******************************************************************************
  *                                                                            *
- * Function: str_copy_lowercase                                               *
- *                                                                            *
  * Purpose: copies lowercase converted string to a buffer                     *
  *                                                                            *
  * Parameters: dst  - [OUT] the output buffer                                 *
@@ -557,8 +531,6 @@ static int	str_copy_lowercase(char *dst, int size, const char *src, int len)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_metric_value                                               *
- *                                                                            *
  * Purpose: parses metric value                                               *
  *                                                                            *
  * Parameters: data - [IN] the source string                                  *
@@ -602,11 +574,6 @@ static int	parse_metric_value(const char *data, size_t pos, zbx_strloc_t *loc)
 	return SUCCEED;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: prometheus_condition_free                                        *
- *                                                                            *
- ******************************************************************************/
 static void	prometheus_condition_free(zbx_prometheus_condition_t *condition)
 {
 	zbx_free(condition->key);
@@ -616,8 +583,6 @@ static void	prometheus_condition_free(zbx_prometheus_condition_t *condition)
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_condition_create                                      *
- *                                                                            *
  * Purpose: allocates and initializes conditionect                            *
  *                                                                            *
  * Parameters: key     - [IN] the key to match                                *
@@ -642,8 +607,6 @@ static zbx_prometheus_condition_t	*prometheus_condition_create(char *key, char *
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_filter_clear                                          *
- *                                                                            *
  * Purpose: clears resources allocated by prometheus filter                   *
  *                                                                            *
  * Parameters: filter - [IN] the filter to clear                              *
@@ -663,8 +626,6 @@ static void	prometheus_filter_clear(zbx_prometheus_filter_t *filter)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_condition                                                  *
- *                                                                            *
  * Purpose: parses condition data - key, pattern and operation                *
  *                                                                            *
  * Parameters: data        - [IN] the filter data                             *
@@ -698,8 +659,6 @@ static int	parse_condition(const char *data, size_t pos, zbx_strloc_t *loc_key,
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_filter_parse_labels                                   *
- *                                                                            *
  * Purpose: parses label conditions                                           *
  *                                                                            *
  * Parameters: filter - [IN/OUT] the filter                                   *
@@ -769,8 +728,6 @@ static int	prometheus_filter_parse_labels(zbx_prometheus_filter_t *filter, const
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_filter_init                                           *
- *                                                                            *
  * Purpose: initializes prometheus pattern filter from the specified data     *
  *                                                                            *
  * Parameters: filter - [IN/OUT] the filter                                   *
@@ -860,11 +817,6 @@ out:
 	return ret;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: prometheus_label_free                                            *
- *                                                                            *
- ******************************************************************************/
 static void	prometheus_label_free(zbx_prometheus_label_t *label)
 {
 	zbx_free(label->name);
@@ -872,11 +824,6 @@ static void	prometheus_label_free(zbx_prometheus_label_t *label)
 	zbx_free(label);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: prometheus_row_free                                              *
- *                                                                            *
- ******************************************************************************/
 static void	prometheus_row_free(zbx_prometheus_row_t *row)
 {
 	zbx_free(row->metric);
@@ -889,8 +836,6 @@ static void	prometheus_row_free(zbx_prometheus_row_t *row)
 
 /******************************************************************************
  *                                                                            *
- * Function: condition_match_key_value                                        *
- *                                                                            *
  * Purpose: matches key,value against filter condition                        *
  *                                                                            *
  * Parameters: condition - [IN] the condition                                 *
@@ -937,8 +882,6 @@ static int	condition_match_key_value(const zbx_prometheus_condition_t *condition
 
 /******************************************************************************
  *                                                                            *
- * Function: condition_match_metric_value                                     *
- *                                                                            *
  * Purpose: matches metric value against filter condition                     *
  *                                                                            *
  * Parameters: pattern   - [IN] the condition                                 *
@@ -977,8 +920,6 @@ static int	condition_match_metric_value(const char *pattern, const char *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_metric_parse_labels                                   *
- *                                                                            *
  * Purpose: parses metric labels                                              *
  *                                                                            *
  * Parameters: data   - [IN] the metric data                                  *
@@ -1043,8 +984,6 @@ static int	prometheus_metric_parse_labels(const char *data, size_t pos, zbx_vect
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_parse_row                                             *
- *                                                                            *
  * Purpose: parses metric row                                                 *
  *                                                                            *
  * Parameters: filter  - [IN] the prometheus filter                           *
@@ -1191,8 +1130,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_help                                                       *
- *                                                                            *
  * Purpose: parses HELP comment metric and help text                          *
  *                                                                            *
  * Parameters: data       - [IN] the prometheus data                          *
@@ -1231,8 +1168,6 @@ static int	parse_help(const char *data, size_t pos, zbx_strloc_t *loc_metric, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_type                                                       *
- *                                                                            *
  * Purpose: parses TYPE comment metric and the type                           *
  *                                                                            *
  * Parameters: data       - [IN] the prometheus data                          *
@@ -1268,8 +1203,6 @@ static int	parse_type(const char *data, size_t pos, zbx_strloc_t *loc_metric, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_register_hint                                         *
- *                                                                            *
  * Purpose: registers TYPE/HELP comment hint to the specified metric          *
  *                                                                            *
  * Parameters: hints      - [IN/OUT] the hint registry                        *
@@ -1327,13 +1260,11 @@ static int	prometheus_register_hint(zbx_hashset_t *hints, const char *data, char
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_parse_hint                                            *
- *                                                                            *
  * Purpose: parses TYPE/HELP comment hint and registers it                    *
  *                                                                            *
  * Parameters: filter     - [IN] the prometheus filter                        *
  *             data       - [IN] the prometheus data                          *
- *             pso        - [IN] the position of comments in prometheus data  *
+ *             pos        - [IN] the position of comments in prometheus data  *
  *             hints      - [IN/OUT] the hint registry                        *
  *             error      - [OUT] the error message                           *
  *                                                                            *
@@ -1403,8 +1334,6 @@ static int	prometheus_parse_hint(zbx_prometheus_filter_t *filter, const char *da
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_parse_rows                                            *
- *                                                                            *
  * Purpose: parses rows with metrics from prometheus data                     *
  *                                                                            *
  * Parameters: filter  - [IN] the prometheus filter                           *
@@ -1488,8 +1417,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_extract_value                                         *
- *                                                                            *
  * Purpose: extracts value from row                                           *
  *                                                                            *
  * Parameters: rows    - [IN] the source rows                                 *
@@ -1569,8 +1496,6 @@ static int prometheus_extract_value(const zbx_vector_ptr_t *rows, const char *ou
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_aggregate_values                                      *
- *                                                                            *
  * Purpose: aggregates row values                                             *
  *                                                                            *
  * Parameters: rows     - [IN] the source rows                                *
@@ -1642,8 +1567,6 @@ static int	prometheus_aggregate_values(const zbx_vector_ptr_t *rows, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_query_rows                                            *
- *                                                                            *
  * Purpose: performs the specified request on rows                            *
  *                                                                            *
  * Parameters: rows    - [IN] the source rows                                 *
@@ -1667,8 +1590,6 @@ static int	prometheus_query_rows(const zbx_vector_ptr_t *rows, const char *reque
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_filter_rows                                           *
- *                                                                            *
  * Purpose: get rows matching the filter criteria                             *
  *                                                                            *
  * Parameters: rows     - [IN] the rows to filter                             *
@@ -1730,8 +1651,6 @@ static void	prometheus_filter_rows(zbx_vector_ptr_t *rows, zbx_prometheus_filter
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_prometheus_init                                              *
- *                                                                            *
  * Purpose: parse prometheus input and initialize cache                       *
  *                                                                            *
  * Parameters: prom  - [IN] the prometheus cache                              *
@@ -1783,8 +1702,6 @@ static void	prometheus_label_index_free(zbx_prometheus_label_index_t *label_inde
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_prometheus_clear                                             *
- *                                                                            *
  * Purpose: free resources allocated by prometheus cache                      *
  *                                                                            *
  * Parameters: prom  - [IN] the prometheus cache                              *
@@ -1842,8 +1759,6 @@ static int	prometheus_index_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_get_row_label                                         *
- *                                                                            *
  * Purpose: get label from row by the specified name                          *
  *                                                                            *
  * Parameters: row  - [IN] the prometheus row                                 *
@@ -1870,8 +1785,6 @@ static zbx_prometheus_label_t	*prometheus_get_row_label(zbx_prometheus_row_t *ro
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_get_indexed_rows_by_label                             *
- *                                                                            *
  * Purpose: get rows matching one filter label                                *
  *                                                                            *
  * Parameters: prom   - [IN] the prometheus cache                             *
@@ -1949,8 +1862,6 @@ static int	prometheus_get_indexed_rows_by_label(zbx_prometheus_t *prom, zbx_prom
 
 /******************************************************************************
  *                                                                            *
- * Function: prometheus_validate_request                                      *
- *                                                                            *
  * Purpose: validate prometheus pattern request and output                    *
  *                                                                            *
  * Return value: SUCCEED - valid request and output combination               *
@@ -1980,12 +1891,10 @@ static int	prometheus_validate_request(const char *request, const char *output,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_prometheus_pattern_ex                                        *
- *                                                                            *
  * Purpose: extract value from prometheus cache by the specified filter       *
  *                                                                            *
  * Parameters: data        - [IN] the prometheus cache                        *
- *             fitler_data - [IN] the filter in text format                   *
+ *             filter_data - [IN] the filter in text format                   *
  *             request     - [IN] the data request - value, label, function   *
  *             output      - [IN] the output template/function name           *
  *             value       - [OUT] the extracted value                        *
@@ -2038,12 +1947,10 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_prometheus_pattern                                           *
- *                                                                            *
  * Purpose: extracts value from prometheus data by the specified filter       *
  *                                                                            *
  * Parameters: data        - [IN] the prometheus data                         *
- *             fitler_data - [IN] the filter in text format                   *
+ *             filter_data - [IN] the filter in text format                   *
  *             request     - [IN] the data request - value, label, function   *
  *             output      - [IN] the output template/function name           *
  *             value       - [OUT] the extracted value                        *
@@ -2098,12 +2005,10 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_prometheus_to_json                                           *
- *                                                                            *
  * Purpose: converts filtered prometheus data to json to be used with LLD     *
  *                                                                            *
  * Parameters: data        - [IN] the prometheus data                         *
- *             fitler_data - [IN] the filter in text format                   *
+ *             filter_data - [IN] the filter in text format                   *
  *             value       - [OUT] the converted data                         *
  *             error       - [OUT] the error message                          *
  *                                                                            *
diff --git a/src/libs/zbxregexp/zbxregexp.c b/src/libs/zbxregexp/zbxregexp.c
index 0e2234839de..ba4acff152e 100644
--- a/src/libs/zbxregexp/zbxregexp.c
+++ b/src/libs/zbxregexp/zbxregexp.c
@@ -71,8 +71,6 @@ zbx_regmatch_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: regexp_compile                                                   *
- *                                                                            *
  * Purpose: compiles a regular expression                                     *
  *                                                                            *
  * Parameters:                                                                *
@@ -187,8 +185,6 @@ static int	regexp_compile(const char *pattern, int flags, zbx_regexp_t **regexp,
 
 /*******************************************************
  *                                                     *
- * Function: zbx_regexp_compile                        *
- *                                                     *
  * Purpose: public wrapper for regexp_compile          *
  *                                                     *
  *******************************************************/
@@ -203,8 +199,6 @@ int	zbx_regexp_compile(const char *pattern, zbx_regexp_t **regexp, const char **
 
 /*******************************************************
  *                                                     *
- * Function: zbx_regexp_compile_ext                    *
- *                                                     *
  * Purpose: public wrapper for regexp_compile          *
  *                                                     *
  *******************************************************/
@@ -215,8 +209,6 @@ int	zbx_regexp_compile_ext(const char *pattern, zbx_regexp_t **regexp, int flags
 
 /****************************************************************************************************
  *                                                                                                  *
- * Function: regexp_prepare                                                                         *
- *                                                                                                  *
  * Purpose: wrapper for zbx_regexp_compile. Caches and reuses the last used regexp.                 *
  *                                                                                                  *
  ****************************************************************************************************/
@@ -270,8 +262,6 @@ static unsigned long int compute_recursion_limit(void)
 
 /***********************************************************************************
  *                                                                                 *
- * Function: regexp_exec                                                           *
- *                                                                                 *
  * Purpose: wrapper for pcre_exec(), searches for a given pattern, specified by    *
  *          regexp, in the string                                                  *
  *                                                                                 *
@@ -395,8 +385,6 @@ static int	regexp_exec(const char *string, const zbx_regexp_t *regexp, int flags
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_regexp_free                                                  *
- *                                                                            *
  * Purpose: wrapper for pcre_free                                             *
  *                                                                            *
  * Parameters: regexp - [IN] compiled regular expression                      *
@@ -422,8 +410,6 @@ void	zbx_regexp_free(zbx_regexp_t *regexp)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_regexp_match_precompiled                                     *
- *                                                                            *
  * Purpose: checks if string matches a precompiled regular expression without *
  *          returning matching groups                                         *
  *                                                                            *
@@ -444,8 +430,6 @@ int     zbx_regexp_match_precompiled(const char *string, const zbx_regexp_t *reg
 
 /****************************************************************************************************
  *                                                                                                  *
- * Function: zbx_regexp                                                                             *
- *                                                                                                  *
  * Purpose: compiles and executes a regexp                                                          *
  *                                                                                                  *
  * Parameters:                                                                                      *
@@ -497,8 +481,6 @@ char	*zbx_regexp_match(const char *string, const char *pattern, int *len)
 
 /******************************************************************************
  *                                                                            *
- * Function: strncpy_alloc                                                    *
- *                                                                            *
  * Purpose: zbx_strncpy_alloc with maximum allocated memory limit.            *
  *                                                                            *
  * Parameters: str       - [IN/OUT] destination buffer pointer                *
@@ -519,8 +501,6 @@ static void	strncpy_alloc(char **str, size_t *alloc_len, size_t *offset, const c
 
 /*********************************************************************************
  *                                                                               *
- * Function: regexp_sub_replace                                                  *
- *                                                                               *
  * Purpose: Constructs a string from the specified template and regexp match.    *
  *                                                                               *
  * Parameters: text            - [IN] the input string.                          *
@@ -639,8 +619,6 @@ out:
 
 /*********************************************************************************
  *                                                                               *
- * Function: regexp_sub                                                          *
- *                                                                               *
  * Purpose: Test if a string matches the specified regular expression. If yes    *
  *          then create a return value by substituting '\<n>' sequences in       *
  *          output template with the captured groups.                            *
@@ -701,8 +679,6 @@ static int	regexp_sub(const char *string, const char *pattern, const char *outpu
 
 /*********************************************************************************
  *                                                                               *
- * Function: zbx_mregexp_sub_precompiled                                         *
- *                                                                               *
  * Purpose: Test if a string matches precompiled regular expression. If yes      *
  *          then create a return value by substituting '\<n>' sequences in       *
  *          output template with the captured groups.                            *
@@ -752,8 +728,6 @@ int	zbx_mregexp_sub_precompiled(const char *string, const zbx_regexp_t *regexp,
 
 /*********************************************************************************
  *                                                                               *
- * Function: zbx_regexp_sub                                                      *
- *                                                                               *
  * Purpose: Test if a string matches the specified regular expression. If yes    *
  *          then create a return value by substituting '\<n>' sequences in       *
  *          output template with the captured groups.                            *
@@ -781,8 +755,6 @@ int	zbx_regexp_sub(const char *string, const char *pattern, const char *output_t
 
 /*********************************************************************************
  *                                                                               *
- * Function: zbx_mregexp_sub                                                     *
- *                                                                               *
  * Purpose: This function is similar to zbx_regexp_sub() with exception that     *
  *          multiline matches are accepted.                                      *
  *                                                                               *
@@ -794,8 +766,6 @@ int	zbx_mregexp_sub(const char *string, const char *pattern, const char *output_
 
 /*********************************************************************************
  *                                                                               *
- * Function: zbx_iregexp_sub                                                     *
- *                                                                               *
  * Purpose: This function is similar to zbx_regexp_sub() with exception that     *
  *          case insensitive matches are accepted.                               *
  *                                                                               *
@@ -807,8 +777,6 @@ int	zbx_iregexp_sub(const char *string, const char *pattern, const char *output_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_regexp_clean_expressions                                     *
- *                                                                            *
  * Purpose: frees expression data retrieved by DCget_expressions function or  *
  *          prepared with add_regexp_ex() function calls                      *
  *                                                                            *
@@ -850,8 +818,6 @@ void	add_regexp_ex(zbx_vector_ptr_t *regexps, const char *name, const char *expr
 
 /**********************************************************************************
  *                                                                                *
- * Function: regexp_match_ex_regsub                                               *
- *                                                                                *
  * Purpose: Test if the string matches regular expression with the specified      *
  *          case sensitivity option and allocates output variable to store the    *
  *          result if necessary.                                                  *
@@ -912,8 +878,6 @@ static int	regexp_match_ex_regsub(const char *string, const char *pattern, int c
 
 /**********************************************************************************
  *                                                                                *
- * Function: regexp_match_ex_substring                                            *
- *                                                                                *
  * Purpose: Test if the string contains substring with the specified case         *
  *          sensitivity option.                                                   *
  *                                                                                *
@@ -945,8 +909,6 @@ static int	regexp_match_ex_substring(const char *string, const char *pattern, in
 
 /**********************************************************************************
  *                                                                                *
- * Function: regexp_match_ex_substring_list                                       *
- *                                                                                *
  * Purpose: Test if the string contains a substring from list with the specified  *
  *          delimiter and case sensitivity option.                                *
  *                                                                                *
@@ -988,8 +950,6 @@ static int	regexp_match_ex_substring_list(const char *string, char *pattern, int
 
 /**********************************************************************************
  *                                                                                *
- * Function: regexp_sub_ex                                                        *
- *                                                                                *
  * Purpose: Test if the string matches regular expression with the specified      *
  *          case sensitivity option and allocates output variable to store the    *
  *          result if necessary.                                                  *
@@ -1145,8 +1105,6 @@ int	zbx_global_regexp_exists(const char *name, const zbx_vector_ptr_t *regexps)
 
 /**********************************************************************************
  *                                                                                *
- * Function: zbx_regexp_escape_stringsize                                         *
- *                                                                                *
  * Purpose: calculate a string size after symbols escaping                        *
  *                                                                                *
  * Parameters: string - [IN] the string to check                                  *
@@ -1199,8 +1157,6 @@ static size_t	zbx_regexp_escape_stringsize(const char *string)
 
 /**********************************************************************************
  *                                                                                *
- * Function: zbx_regexp_escape_string                                             *
- *                                                                                *
  * Purpose: replace . \ + * ? [ ^ ] $ ( ) { } = ! < > | : - symbols in string     *
  *          with combination of \ and escaped symbol                              *
  *                                                                                *
@@ -1250,8 +1206,6 @@ static void	zbx_regexp_escape_string(char *p, const char *string)
 
 /**********************************************************************************
  *                                                                                *
- * Function: zbx_regexp_escape                                                    *
- *                                                                                *
  * Purpose: escaping of symbols for using in regexp expression                    *
  *                                                                                *
  * Parameters: string - [IN/OUT] the string to update                             *
@@ -1274,8 +1228,6 @@ void	zbx_regexp_escape(char **string)
 
 /**********************************************************************************
  *                                                                                *
- * Function: zbx_wildcard_minimize                                                *
- *                                                                                *
  * Purpose: remove repeated wildcard characters from the expression               *
  *                                                                                *
  * Parameters: str - [IN/OUT] the string to update                                *
@@ -1307,8 +1259,6 @@ void	zbx_wildcard_minimize(char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_wildcard_match                                               *
- *                                                                            *
  * Purpose: Matches string value to specified wildcard.                       *
  *          Asterisk (*) characters match to any characters of any length.    *
  *                                                                            *
diff --git a/src/libs/zbxrtc/rtc.c b/src/libs/zbxrtc/rtc.c
index c39868ca337..94e42fdc2cb 100644
--- a/src/libs/zbxrtc/rtc.c
+++ b/src/libs/zbxrtc/rtc.c
@@ -27,8 +27,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rtc_parse_loglevel_option                                    *
- *                                                                            *
  * Purpose: parse loglevel runtime control option                             *
  *                                                                            *
  * Parameters: opt       - [IN] the runtime control option                    *
diff --git a/src/libs/zbxrtc/rtc_client.c b/src/libs/zbxrtc/rtc_client.c
index a4a4411bfff..49a7d7aeae3 100644
--- a/src/libs/zbxrtc/rtc_client.c
+++ b/src/libs/zbxrtc/rtc_client.c
@@ -26,8 +26,6 @@ extern int	CONFIG_TIMEOUT;
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_parse_log_level_parameter                                    *
- *                                                                            *
  * Purpose: parse loglevel runtime control option                             *
  *                                                                            *
  * Parameters: opt   - [IN] the runtime control option                        *
@@ -76,16 +74,9 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_parse_options                                                *
- *                                                                            *
  * Purpose: parse runtime control options and create a runtime control        *
  *          message                                                           *
  *                                                                            *
- * Parameters: opt          - [IN] the command line argument                  *
- *             program_type - [IN] the program type                           *
- *             message      - [OUT] the message containing options for log    *
- *                                  level change or cache reload              *
- *                                                                            *
  * Return value: SUCCEED - the message was created successfully               *
  *               FAIL    - an error occurred                                  *
  *                                                                            *
@@ -160,12 +151,10 @@ static int	rtc_parse_options(const char *opt, zbx_uint32_t *code, char **data, c
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rtc_process                                                  *
- *                                                                            *
  * Purpose: process runtime control option and print result                   *
  *                                                                            *
- * Parameters: opt   - [IN] the runtime control option                        *
- *             error - [OUT] error message                                    *
+ * Parameters: option   - [IN] the runtime control option                     *
+ *             error    - [OUT] error message                                 *
  *                                                                            *
  * Return value: SUCCEED - the runtime control option was processed           *
  *               FAIL    - otherwise                                          *
@@ -239,8 +228,6 @@ int	zbx_rtc_open(zbx_ipc_async_socket_t *asocket, int timeout, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rtc_notify_config_sync                                       *
- *                                                                            *
  * Purpose: notify RTC service about finishing initial configuration sync     *
  *                                                                            *
  * Parameters: error - [OUT] error message                                    *
diff --git a/src/libs/zbxrtc/rtc_server.c b/src/libs/zbxrtc/rtc_server.c
index 2581434af89..7667df4499f 100644
--- a/src/libs/zbxrtc/rtc_server.c
+++ b/src/libs/zbxrtc/rtc_server.c
@@ -129,8 +129,6 @@ int	rtc_parse_options_ex(const char *opt, zbx_uint32_t *code, char **data, char
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_process_loglevel                                             *
- *                                                                            *
  * Purpose: process loglevel runtime control option                           *
  *                                                                            *
  * Parameters: direction - [IN] the loglevel change direction:                *
@@ -191,8 +189,6 @@ static int	rtc_process_loglevel(int direction, const char *data, char **result)
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_process_diaginfo                                             *
- *                                                                            *
  * Purpose: process diaginfo runtime control option                           *
  *                                                                            *
  * Parameters: data   - [IN] the runtime control parameter (optional)         *
@@ -238,8 +234,6 @@ static void	rtc_process_diaginfo(const char *data, char **result)
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_ha_status                                                    *
- *                                                                            *
  * Purpose: process ha_status runtime command                                 *
  *                                                                            *
  ******************************************************************************/
@@ -342,8 +336,6 @@ static void	rtc_ha_status(char **out)
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_ha_remove_node                                               *
- *                                                                            *
  * Purpose: process ha_remove_node runtime command                            *
  *                                                                            *
  ******************************************************************************/
@@ -376,8 +368,6 @@ static void	rtc_ha_remove_node(const char *data, char **out)
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_ha_failover_delay                                            *
- *                                                                            *
  * Purpose: process ha_failover_delay runtime command                         *
  *                                                                            *
  ******************************************************************************/
@@ -419,8 +409,6 @@ static void	rtc_ha_failover_delay(const char *data, char **out)
 }
 /******************************************************************************
  *                                                                            *
- * Function: rtc_process_request_ex                                           *
- *                                                                            *
  * Purpose: process runtime control option                                    *
  *                                                                            *
  * Parameters: code   - [IN] the request code                                 *
diff --git a/src/libs/zbxrtc/rtc_service.c b/src/libs/zbxrtc/rtc_service.c
index 0c1f059a48a..a81ea8fb75a 100644
--- a/src/libs/zbxrtc/rtc_service.c
+++ b/src/libs/zbxrtc/rtc_service.c
@@ -29,8 +29,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_change_service_loglevel                                      *
- *                                                                            *
  * Purpose: change log level of service process                               *
  *                                                                            *
  ******************************************************************************/
@@ -66,8 +64,6 @@ static void	rtc_change_service_loglevel(int code)
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_process_loglevel                                             *
- *                                                                            *
  * Purpose: process loglevel runtime control option                           *
  *                                                                            *
  * Parameters: code   - [IN] the runtime control request code                 *
@@ -137,8 +133,6 @@ static void	rtc_process_loglevel(int code, const char *data, char **result)
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_process_diaginfo                                             *
- *                                                                            *
  * Purpose: process diaginfo runtime control option                           *
  *                                                                            *
  * Parameters: data   - [IN] the runtime control parameter (optional)         *
@@ -186,8 +180,6 @@ static void	rtc_process_diaginfo(const char *data, char **result)
 
 /******************************************************************************
  *                                                                            *
- * Function: rtc_process_request                                              *
- *                                                                            *
  * Purpose: process runtime control option                                    *
  *                                                                            *
  * Parameters: code   - [IN] the request code                                 *
@@ -251,8 +243,6 @@ static void	rtc_process_request(int code, const unsigned char *data, char **resu
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rtc_init                                                     *
- *                                                                            *
  * Purpose: initialize runtime control service                                *
  *                                                                            *
  ******************************************************************************/
@@ -263,8 +253,6 @@ int	zbx_rtc_init(zbx_rtc_t *rtc ,char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rtc_dispatch                                                 *
- *                                                                            *
  * Purpose: accept and process runtime control request                        *
  *                                                                            *
  ******************************************************************************/
@@ -299,8 +287,6 @@ void	zbx_rtc_dispatch(zbx_ipc_client_t *client, zbx_ipc_message_t *message)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rtc_wait_config_sync                                         *
- *                                                                            *
  * Purpose: wait for configuration sync notification while optionally         *
  *          dispatching runtime control commands                              *
  *                                                                            *
diff --git a/src/libs/zbxself/selfmon.c b/src/libs/zbxself/selfmon.c
index 4e49a4998f3..ee24135d476 100644
--- a/src/libs/zbxself/selfmon.c
+++ b/src/libs/zbxself/selfmon.c
@@ -129,8 +129,6 @@ extern ZBX_THREAD_LOCAL int		process_num;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_process_type_forks                                           *
- *                                                                            *
  * Purpose: Returns number of processes depending on process type             *
  *                                                                            *
  * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_*              *
@@ -222,8 +220,6 @@ int	get_process_type_forks(unsigned char proc_type)
 #ifndef _WINDOWS
 /******************************************************************************
  *                                                                            *
- * Function: init_selfmon_collector                                           *
- *                                                                            *
  * Purpose: Initialize structures and prepare state                           *
  *          for self-monitoring collector                                     *
  *                                                                            *
@@ -293,8 +289,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: free_selfmon_collector                                           *
- *                                                                            *
  * Purpose: Free memory allocated for self-monitoring collector               *
  *                                                                            *
  ******************************************************************************/
@@ -319,8 +313,6 @@ void	free_selfmon_collector(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: update_selfmon_counter                                           *
- *                                                                            *
  * Parameters: state - [IN] new process state; ZBX_PROCESS_STATE_*            *
  *                                                                            *
  ******************************************************************************/
@@ -386,11 +378,6 @@ void	update_selfmon_counter(unsigned char state)
 	process->cache.ticks = ticks;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: collect_selfmon_stats                                            *
- *                                                                            *
- ******************************************************************************/
 void	collect_selfmon_stats(void)
 {
 	zbx_stat_process_t	*process;
@@ -467,8 +454,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_selfmon_stats                                                *
- *                                                                            *
  * Purpose: calculate statistics for selected process                         *
  *                                                                            *
  * Parameters: proc_type    - [IN] type of process; ZBX_PROCESS_TYPE_*        *
@@ -564,8 +549,6 @@ unlock:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_all_process_stats                                        *
- *                                                                            *
  * Purpose: retrieves internal metrics of all running processes based on      *
  *          process type                                                      *
  *                                                                            *
@@ -667,8 +650,6 @@ static int	sleep_remains;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_sleep_loop                                                   *
- *                                                                            *
  * Purpose: sleeping process                                                  *
  *                                                                            *
  * Parameters: sleeptime - [IN] required sleeptime, in seconds                *
diff --git a/src/libs/zbxself/selfmon_proxy.c b/src/libs/zbxself/selfmon_proxy.c
index b921eb9a80b..44ac78bc30e 100644
--- a/src/libs/zbxself/selfmon_proxy.c
+++ b/src/libs/zbxself/selfmon_proxy.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: get_component_process_type_forks                                 *
- *                                                                            *
  * Purpose: Returns number of processes depending on process type             *
  *                                                                            *
  * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_*              *
diff --git a/src/libs/zbxself/selfmon_server.c b/src/libs/zbxself/selfmon_server.c
index afabf636d52..4a295084a6f 100644
--- a/src/libs/zbxself/selfmon_server.c
+++ b/src/libs/zbxself/selfmon_server.c
@@ -26,8 +26,6 @@ extern int	CONFIG_REPORTWRITER_FORKS;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_component_process_type_forks                                 *
- *                                                                            *
  * Purpose: Returns number of processes depending on process type             *
  *                                                                            *
  * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_*              *
diff --git a/src/libs/zbxserver/anomalystl.c b/src/libs/zbxserver/anomalystl.c
index b5858478417..c4ab6219bb6 100644
--- a/src/libs/zbxserver/anomalystl.c
+++ b/src/libs/zbxserver/anomalystl.c
@@ -33,8 +33,6 @@ ZBX_PTR_VECTOR_IMPL(VV, zbx_vector_history_record_t *)
 
 /*******************************************************************************
  *                                                                             *
- * Function: zbx_get_percentage_of_deviations_in_remainder                     *
- *                                                                             *
  * Purpose: finds how many values in stl remainder are outliers                *
  *                                                                             *
  * Parameters:  remainder        - [IN] stl remainder values vector            *
diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c
index 186100d9849..8aebb2f34bf 100644
--- a/src/libs/zbxserver/evalfunc.c
+++ b/src/libs/zbxserver/evalfunc.c
@@ -52,8 +52,6 @@ ZBX_PTR_VECTOR_IMPL(valuemaps_ptr, zbx_valuemaps_t *)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_value_suffix_uptime                                          *
- *                                                                            *
  * Purpose: Process suffix 'uptime'                                           *
  *                                                                            *
  * Parameters: value - value for adjusting                                    *
@@ -98,8 +96,6 @@ static void	add_value_suffix_uptime(char *value, size_t max_len)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_value_suffix_s                                               *
- *                                                                            *
  * Purpose: Process suffix 's'                                                *
  *                                                                            *
  * Parameters: value - value for adjusting                                    *
@@ -185,8 +181,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: is_blacklisted_unit                                              *
- *                                                                            *
  * Purpose:  check if unit is blacklisted or not                              *
  *                                                                            *
  * Parameters: unit - unit to check                                           *
@@ -210,8 +204,6 @@ static int	is_blacklisted_unit(const char *unit)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_value_units_no_kmgt                                          *
- *                                                                            *
  * Purpose: add only units to the value                                       *
  *                                                                            *
  * Parameters: value - value for adjusting                                    *
@@ -248,8 +240,6 @@ static void	add_value_units_no_kmgt(char *value, size_t max_len, const char *uni
 
 /******************************************************************************
  *                                                                            *
- * Function: add_value_units_with_kmgt                                        *
- *                                                                            *
  * Purpose: add units with K,M,G,T prefix to the value                        *
  *                                                                            *
  * Parameters: value - value for adjusting                                    *
@@ -315,8 +305,6 @@ static void	add_value_units_with_kmgt(char *value, size_t max_len, const char *u
 
 /******************************************************************************
  *                                                                            *
- * Function: add_value_suffix                                                 *
- *                                                                            *
  * Purpose: Add suffix for value                                              *
  *                                                                            *
  * Parameters: value - value for replacing                                    *
@@ -370,8 +358,6 @@ static void	zbx_valuemaps_free(zbx_valuemaps_t *valuemap)
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_value_by_map                                            *
- *                                                                            *
  * Purpose: replace value by mapping value                                    *
  *                                                                            *
  * Parameters: value - value for replacing                                    *
@@ -524,8 +510,6 @@ map_value:
 
 /******************************************************************************
  *                                                                            *
- * Function: replace_value_by_map                                             *
- *                                                                            *
  * Purpose: replace value by mapping value                                    *
  *                                                                            *
  * Parameters: value - value for replacing                                    *
@@ -584,8 +568,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_format_value                                                 *
- *                                                                            *
  * Purpose: replace value by value mapping or by units                        *
  *                                                                            *
  * Parameters: value      - [IN/OUT] value for replacing                      *
@@ -620,8 +602,6 @@ void	zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid,
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluatable_for_notsupported                                     *
- *                                                                            *
  * Purpose: check is function to be evaluated for NOTSUPPORTED items          *
  *                                                                            *
  * Parameters: fn - [IN] function name                                        *
@@ -643,8 +623,6 @@ int	zbx_evaluatable_for_notsupported(const char *fn)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_function_parameter_period                                    *
- *                                                                            *
  * Purpose: get the value of sec|#num trigger function parameter              *
  *                                                                            *
  * Parameters: parameters     - [IN] trigger function parameters              *
@@ -705,8 +683,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_last_n_value                                                 *
- *                                                                            *
  * Purpose: get last Nth value defined by #num:now-timeshift first parameter  *
  *                                                                            *
  * Parameters: item       - [IN] item (performance metric)                    *
@@ -763,8 +739,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_LOGEVENTID                                              *
- *                                                                            *
  * Purpose: evaluate function 'logeventid' for the item                       *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -862,8 +836,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_LOGSOURCE                                               *
- *                                                                            *
  * Purpose: evaluate function 'logsource' for the item                        *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -956,8 +928,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_LOGSEVERITY                                             *
- *                                                                            *
  * Purpose: evaluate function 'logseverity' for the item                      *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -1206,8 +1176,6 @@ static void	count_one_str(int *count, int op, const char *value, const char *pat
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_COUNT                                                   *
- *                                                                            *
  * Purpose: evaluate functions 'count' and 'find' for the item                *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -1553,8 +1521,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_SUM                                                     *
- *                                                                            *
  * Purpose: evaluate function 'sum' for the item                              *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -1647,8 +1613,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_AVG                                                     *
- *                                                                            *
  * Purpose: evaluate function 'avg' for the item                              *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -1748,8 +1712,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_LAST                                                    *
- *                                                                            *
  * Purpose: evaluate function 'last' for the item                             *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -1783,8 +1745,6 @@ static int	evaluate_LAST(zbx_variant_t *value, DC_ITEM *item, const char *parame
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_MIN                                                     *
- *                                                                            *
  * Purpose: evaluate function 'min' for the item                              *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -1888,8 +1848,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_MAX                                                     *
- *                                                                            *
  * Purpose: evaluate function 'max' for the item                              *
  *                                                                            *
  * Parameters: value      - [OUT]                                             *
@@ -1994,8 +1952,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_PERCENTILE                                              *
- *                                                                            *
  * Purpose: evaluate function 'percentile' for the item                       *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -2102,8 +2058,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_NODATA                                                  *
- *                                                                            *
  * Purpose: evaluate function 'nodata' for the item                           *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -2215,8 +2169,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_CHANGE                                                  *
- *                                                                            *
  * Purpose: evaluate function 'change' for the item                           *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -2288,8 +2240,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_FUZZYTIME                                               *
- *                                                                            *
  * Purpose: evaluate function 'fuzzytime' for the item                        *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -2372,8 +2322,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_BITAND                                                  *
- *                                                                            *
  * Purpose: evaluate logical bitwise function 'and' for the item              *
  *                                                                            *
  * Parameters: value      - [OUT] dynamic buffer,result                       *
@@ -2441,8 +2389,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_FORECAST                                                *
- *                                                                            *
  * Purpose: evaluate function 'forecast' for the item                         *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -2600,8 +2546,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_TIMELEFT                                                *
- *                                                                            *
  * Purpose: evaluate function 'timeleft' for the item                         *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -2819,8 +2763,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_TREND                                                   *
- *                                                                            *
  * Purpose: evaluate trend* functions for the item                            *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -3041,8 +2983,6 @@ static int	validate_params_and_get_data(DC_ITEM *item, const char *parameters, c
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_FIRST                                                   *
- *                                                                            *
  * Purpose: evaluate function 'first' for the item                            *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -3150,8 +3090,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_MONO                                                    *
- *                                                                            *
  * Purpose: evaluate functions 'monoinc' and 'monodec' for the item           *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -3291,8 +3229,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_RATE                                                    *
- *                                                                            *
  * Purpose: evaluate functions 'rate' for the item                            *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -3482,8 +3418,6 @@ int	zbx_evaluate_RATE(zbx_variant_t *value, DC_ITEM *item, const char *parameter
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_CHANGECOUNT                                             *
- *                                                                            *
  * Purpose: evaluate function 'changecount' for the item                      *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -3643,8 +3577,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_BASELINE                                                *
- *                                                                            *
  * Purpose: evaluate baseline* functions for the item                         *
  *                                                                            *
  * Parameters: value      - [OUT] the function result                         *
@@ -3804,8 +3736,6 @@ static void	history_to_dbl_vector(const zbx_history_record_t *v, int n, unsigned
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_statistical_func                                        *
- *                                                                            *
  * Purpose: common operations for aggregate function calculation              *
  *                                                                            *
  * Parameters: value      - [OUT] result                                      *
@@ -3860,8 +3790,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_function                                                *
- *                                                                            *
  * Purpose: evaluate function                                                 *
  *                                                                            *
  * Parameters: value     - [OUT] dynamic buffer, result                       *
@@ -4029,8 +3957,6 @@ int	evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_is_trigger_function                                          *
- *                                                                            *
  * Purpose: check if the specified function is a trigger function             *
  *                                                                            *
  * Parameters: name - [IN] the function name to check                         *
diff --git a/src/libs/zbxserver/evalfunc_common.c b/src/libs/zbxserver/evalfunc_common.c
index d8c15ee11f1..1b86341a267 100644
--- a/src/libs/zbxserver/evalfunc_common.c
+++ b/src/libs/zbxserver/evalfunc_common.c
@@ -101,8 +101,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_function_parameter_hist_range                                *
- *                                                                            *
  * Purpose: get the value of sec|num + timeshift trigger function parameter   *
  *                                                                            *
  * Parameters: from           - [IN] the function calculation time            *
diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c
index 86b037b6fcf..ba853513f6c 100644
--- a/src/libs/zbxserver/expression.c
+++ b/src/libs/zbxserver/expression.c
@@ -86,8 +86,6 @@ static int	substitute_key_macros_impl(char **data, zbx_uint64_t *hostid, DC_ITEM
 
 /******************************************************************************
  *                                                                            *
- * Function: get_trigger_severity_name                                        *
- *                                                                            *
  * Purpose: get trigger severity name                                         *
  *                                                                            *
  * Parameters: trigger    - [IN] a trigger data with priority field;          *
@@ -117,8 +115,6 @@ static int	get_trigger_severity_name(unsigned char priority, char **replace_to)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_problem_update_actions                                       *
- *                                                                            *
  * Purpose: get human readable list of problem update actions                 *
  *                                                                            *
  * Parameters: ack     - [IN] the acknowledge (problem update) data           *
@@ -202,8 +198,6 @@ static int	get_problem_update_actions(const DB_ACKNOWLEDGE *ack, int actions, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_host_value                                                 *
- *                                                                            *
  * Purpose: request host name by hostid                                       *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -234,8 +228,6 @@ static int	DBget_host_value(zbx_uint64_t hostid, char **replace_to, const char *
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_templateid_by_triggerid                                    *
- *                                                                            *
  * Purpose: get template trigger ID from which the trigger is inherited       *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -266,8 +258,6 @@ static int	DBget_templateid_by_triggerid(zbx_uint64_t triggerid, zbx_uint64_t *t
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_trigger_template_name                                      *
- *                                                                            *
  * Purpose: get comma-space separated trigger template names in which         *
  *          the trigger is defined                                            *
  *                                                                            *
@@ -383,8 +373,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_trigger_hostgroup_name                                     *
- *                                                                            *
  * Purpose: get comma-space separated host group names in which the trigger   *
  *          is defined                                                        *
  *                                                                            *
@@ -469,8 +457,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_interface_value                                              *
- *                                                                            *
  * Purpose: retrieve a particular value associated with the interface         *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -538,8 +524,6 @@ static int	get_host_value(zbx_uint64_t itemid, char **replace_to, int request)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_substitute_macros_in_item_key                                *
- *                                                                            *
  * Purpose: get item key, replace macros in the key                           *
  *                                                                            *
  * Parameters: dc_item    - [IN] item information used in substitution        *
@@ -557,8 +541,6 @@ static void	zbx_substitute_macros_in_item_key(DC_ITEM *dc_item, char **replace_t
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_item_value                                                 *
- *                                                                            *
  * Purpose: retrieve a particular value associated with the item              *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -710,8 +692,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_trigger_value                                              *
- *                                                                            *
  * Purpose: retrieve a particular value associated with the trigger's         *
  *          N_functionid'th function                                          *
  *                                                                            *
@@ -736,8 +716,6 @@ int	DBget_trigger_value(const DB_TRIGGER *trigger, char **replace_to, int N_func
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_trigger_event_count                                        *
- *                                                                            *
  * Purpose: retrieve number of events (acknowledged or unacknowledged) for a  *
  *          trigger (in an OK or PROBLEM state) which generated an event      *
  *                                                                            *
@@ -790,8 +768,6 @@ static int	DBget_trigger_event_count(zbx_uint64_t triggerid, char **replace_to,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_dhost_value_by_event                                       *
- *                                                                            *
  * Purpose: retrieve discovered host value by event and field name            *
  *                                                                            *
  * Parameters:                                                                *
@@ -848,8 +824,6 @@ static int	DBget_dhost_value_by_event(const DB_EVENT *event, char **replace_to,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_dchecks_value_by_event                                     *
- *                                                                            *
  * Purpose: retrieve discovery rule check value by event and field name       *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -885,8 +859,6 @@ static int	DBget_dchecks_value_by_event(const DB_EVENT *event, char **replace_to
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_dservice_value_by_event                                    *
- *                                                                            *
  * Purpose: retrieve discovered service value by event and field name         *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -921,8 +893,6 @@ static int	DBget_dservice_value_by_event(const DB_EVENT *event, char **replace_t
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_drule_value_by_event                                       *
- *                                                                            *
  * Purpose: retrieve discovery rule value by event and field name             *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -966,8 +936,6 @@ static int	DBget_drule_value_by_event(const DB_EVENT *event, char **replace_to,
 
 /******************************************************************************
  *                                                                            *
- * Function: DBget_history_log_value                                          *
- *                                                                            *
  * Purpose: retrieve a particular attribute of a log value                    *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -1042,8 +1010,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBitem_get_value                                                 *
- *                                                                            *
  * Purpose: retrieve item value by item id                                    *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -1098,8 +1064,6 @@ static int	DBitem_get_value(zbx_uint64_t itemid, char **lastvalue, int raw, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: DBitem_value                                                     *
- *                                                                            *
  * Purpose: retrieve item value by trigger expression and number of function  *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -1124,8 +1088,6 @@ static int	DBitem_value(const DB_TRIGGER *trigger, char **value, int N_functioni
 
 /******************************************************************************
  *                                                                            *
- * Function: DBitem_lastvalue                                                 *
- *                                                                            *
  * Purpose: retrieve item lastvalue by trigger expression                     *
  *          and number of function                                            *
  *                                                                            *
@@ -1148,8 +1110,6 @@ static int	DBitem_lastvalue(const DB_TRIGGER *trigger, char **lastvalue, int N_f
 
 /******************************************************************************
  *                                                                            *
- * Function: format_user_fullname                                             *
- *                                                                            *
  * Purpose: formats full user name from name, surname and alias               *
  *                                                                            *
  * Parameters: name    - [IN] the user name, can be empty string              *
@@ -1192,8 +1152,6 @@ static char	*format_user_fullname(const char *name, const char *surname, const c
 
 /******************************************************************************
  *                                                                            *
- * Function: get_escalation_history                                           *
- *                                                                            *
  * Purpose: retrieve escalation history                                       *
  *                                                                            *
  ******************************************************************************/
@@ -1302,8 +1260,6 @@ static void	get_escalation_history(zbx_uint64_t actionid, const DB_EVENT *event,
 
 /******************************************************************************
  *                                                                            *
- * Function: get_event_update_history                                         *
- *                                                                            *
  * Purpose: retrieve event acknowledges history                               *
  *                                                                            *
  ******************************************************************************/
@@ -1374,8 +1330,6 @@ static void	get_event_update_history(const DB_EVENT *event, char **replace_to, c
 
 /******************************************************************************
  *                                                                            *
- * Function: get_autoreg_value_by_event                                       *
- *                                                                            *
  * Purpose: request value from autoreg_host table by event                    *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -1799,8 +1753,6 @@ static inventory_field_t	inventory_fields[] =
 
 /******************************************************************************
  *                                                                            *
- * Function: get_action_value                                                 *
- *                                                                            *
  * Purpose: request action value by macro                                     *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -1835,8 +1787,6 @@ static int	get_action_value(const char *macro, zbx_uint64_t actionid, char **rep
 
 /******************************************************************************
  *                                                                            *
- * Function: get_host_inventory                                               *
- *                                                                            *
  * Purpose: request host inventory value by macro and trigger                 *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -1866,8 +1816,6 @@ static int	get_host_inventory(const char *macro, const DB_TRIGGER *trigger, char
 
 /******************************************************************************
  *                                                                            *
- * Function: get_host_inventory_by_itemid                                     *
- *                                                                            *
  * Purpose: request host inventory value by macro and itemid                  *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -1889,8 +1837,6 @@ static int	get_host_inventory_by_itemid(const char *macro, zbx_uint64_t itemid,
 
 /******************************************************************************
  *                                                                            *
- * Function: get_host_inventory_by_itemid                                     *
- *                                                                            *
  * Purpose: request host inventory value by macro and hostid                  *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -1912,8 +1858,6 @@ static int	get_host_inventory_by_hostid(const char *macro, zbx_uint64_t hostid,
 
 /******************************************************************************
  *                                                                            *
- * Function: compare_tags                                                     *
- *                                                                            *
  * Purpose: comparison function to sort tags by tag/value                     *
  *                                                                            *
  ******************************************************************************/
@@ -1932,8 +1876,6 @@ static int	compare_tags(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_event_tags                                                   *
- *                                                                            *
  * Purpose: format event tags string in format <tag1>[:<value1>], ...         *
  *                                                                            *
  * Parameters: event        [IN] the event                                    *
@@ -1985,8 +1927,6 @@ static void	get_event_tags(const DB_EVENT *event, char **replace_to)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_event_tags_json                                              *
- *                                                                            *
  * Purpose: format event tags string in JSON format                           *
  *                                                                            *
  * Parameters: event        [IN] the event                                    *
@@ -2017,8 +1957,6 @@ static void	get_event_tags_json(const DB_EVENT *event, char **replace_to)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_event_tag_by_name                                            *
- *                                                                            *
  * Purpose: get event tag value by name                                       *
  *                                                                            *
  * Parameters: macro      - [IN] the macro                                    *
@@ -2063,8 +2001,6 @@ static void	get_event_tag_by_name(const char *text, const DB_EVENT *event, char
 
 /******************************************************************************
  *                                                                            *
- * Function: get_recovery_event_value                                         *
- *                                                                            *
  * Purpose: request recovery event value by macro                             *
  *                                                                            *
  ******************************************************************************/
@@ -2106,8 +2042,6 @@ static void	get_recovery_event_value(const char *macro, const DB_EVENT *r_event,
 
 /******************************************************************************
  *                                                                            *
- * Function: get_current_event_value                                          *
- *                                                                            *
  * Purpose: request current event value by macro                              *
  *                                                                            *
  ******************************************************************************/
@@ -2126,8 +2060,6 @@ static void	get_current_event_value(const char *macro, const DB_EVENT *event, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: get_event_value                                                  *
- *                                                                            *
  * Purpose: request event value by macro                                      *
  *                                                                            *
  ******************************************************************************/
@@ -2225,8 +2157,6 @@ static void	get_event_value(const char *macro, const DB_EVENT *event, char **rep
 
 /******************************************************************************
  *                                                                            *
- * Function: rootcause_free                                                   *
- *                                                                            *
  * Purpose: free memory allocated for root cause                              *
  *                                                                            *
  ******************************************************************************/
@@ -2239,8 +2169,6 @@ static void	rootcause_free(zbx_rootcause_t *rootcause)
 
 /******************************************************************************
  *                                                                            *
- * Function: rootcause_compare                                                *
- *                                                                            *
  * Purpose: compare root cause to sort by highest severity and host name      *
  *                                                                            *
  ******************************************************************************/
@@ -2253,8 +2181,6 @@ static int	rootcause_compare(const zbx_rootcause_t *d1, const zbx_rootcause_t *d
 
 /******************************************************************************
  *                                                                            *
- * Function: get_rootcause                                                    *
- *                                                                            *
  * Purpose: get root cause of service being in problem state                  *
  *                                                                            *
  ******************************************************************************/
@@ -2311,8 +2237,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_history_log_value                                            *
- *                                                                            *
  * Purpose: retrieve a particular attribute of a log value                    *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -2364,8 +2288,6 @@ static int	get_history_log_value(const char *m, const DB_TRIGGER *trigger, char
 
 /******************************************************************************
  *                                                                            *
- * Function: is_indexed_macro                                                 *
- *                                                                            *
  * Purpose: check if a token contains indexed macro                           *
  *                                                                            *
  ******************************************************************************/
@@ -2391,8 +2313,6 @@ static int	is_indexed_macro(const char *str, const zbx_token_t *token)
 
 /******************************************************************************
  *                                                                            *
- * Function: macro_in_list                                                    *
- *                                                                            *
  * Purpose: check if a macro in string is one of the list and extract index   *
  *                                                                            *
  * Parameters: str          - [IN] string containing potential macro          *
@@ -2444,8 +2364,6 @@ static const char	*macro_in_list(const char *str, zbx_strloc_t strloc, const cha
 
 /******************************************************************************
  *                                                                            *
- * Function: func_macro_in_list                                               *
- *                                                                            *
  * Purpose: check if a macro function one in the list for the macro           *
  *                                                                            *
  * Parameters: str          - [IN] string containing potential macro          *
@@ -2492,8 +2410,6 @@ static const char	*func_macro_in_list(const char *str, zbx_token_func_macro_t *f
 
 /******************************************************************************
  *                                                                            *
- * Function: get_expression_macro_result                                      *
- *                                                                            *
  * Purpose: calculate result of expression macro                              *
  *                                                                            *
  * Return value: upon successful completion return SUCCEED                    *
@@ -2552,8 +2468,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: cache_item_hostid                                                *
- *                                                                            *
  * Purpose: cache host identifier referenced by an item or a lld-rule         *
  *                                                                            *
  * Parameters: hostids - [OUT] the host identifier cache                      *
@@ -2595,8 +2509,6 @@ static const char	*zbx_dobject_status2str(int st)
 
 /******************************************************************************
  *                                                                            *
- * Function: resolve_opdata                                                   *
- *                                                                            *
  * Purpose: resolve {EVENT.OPDATA} macro                                      *
  *                                                                            *
  ******************************************************************************/
@@ -2646,8 +2558,6 @@ static void	resolve_opdata(const DB_EVENT *event, char **replace_to, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: resolve_user_macros                                              *
- *                                                                            *
  * Purpose: resolve {USER.*} macros                                           *
  *                                                                            *
  ******************************************************************************/
@@ -2726,8 +2636,6 @@ static int	resolve_host_target_macros(const char *m, const DC_HOST *dc_host, DC_
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_simple_macros_impl                                    *
- *                                                                            *
  * Purpose: substitute simple macros in data string with real values          *
  *                                                                            *
  ******************************************************************************/
@@ -4835,8 +4743,6 @@ zbx_trigger_func_position_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: expand_trigger_macros                                            *
- *                                                                            *
  * Purpose: expand macros in a trigger expression                             *
  *                                                                            *
  * Parameters: event - The trigger event structure                            *
@@ -4870,8 +4776,6 @@ static int	expand_trigger_macros(zbx_eval_context_t *ctx, const DB_EVENT *event,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_link_triggers_with_functions                                 *
- *                                                                            *
  * Purpose: triggers links with functions                                     *
  *                                                                            *
  * Parameters: triggers_func_pos - [IN/OUT] pointer to the list of triggers   *
@@ -4922,8 +4826,6 @@ static void	zbx_link_triggers_with_functions(zbx_vector_ptr_t *triggers_func_pos
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_determine_items_in_expressions                               *
- *                                                                            *
  * Purpose: mark triggers that use one of the items in problem expression     *
  *          with ZBX_DC_TRIGGER_PROBLEM_EXPRESSION flag                       *
  *                                                                            *
@@ -5053,8 +4955,6 @@ static void	func_clean(void *ptr)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_populate_function_items                                      *
- *                                                                            *
  * Purpose: prepare hashset of functions to evaluate                          *
  *                                                                            *
  * Parameters: functionids - [IN] function identifiers                        *
@@ -5344,8 +5244,6 @@ static void	zbx_substitute_functions_results(zbx_hashset_t *ifuncs, zbx_vector_p
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_functions                                             *
- *                                                                            *
  * Purpose: substitute expression functions with their values                 *
  *                                                                            *
  * Parameters: triggers - [IN] vector of DC_TRIGGER pointers, sorted by      *
@@ -5394,8 +5292,6 @@ empty:
 
 /******************************************************************************
  *                                                                            *
- * Function: prepare_triggers                                                 *
- *                                                                            *
  * Purpose: prepare triggers for evaluation                                   *
  *                                                                            *
  * Parameters: triggers     - [IN] array of DC_TRIGGER pointers               *
@@ -5453,8 +5349,6 @@ static int	evaluate_expression(zbx_eval_context_t *ctx, const zbx_timespec_t *ts
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_expressions                                             *
- *                                                                            *
  * Purpose: evaluate trigger expressions                                      *
  *                                                                            *
  * Parameters: triggers - [IN] vector of DC_TRIGGER pointers, sorted by       *
@@ -5569,8 +5463,6 @@ void	evaluate_expressions(zbx_vector_ptr_t *triggers, const zbx_vector_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: process_lld_macro_token                                          *
- *                                                                            *
  * Purpose: expand discovery macro in expression                              *
  *                                                                            *
  * Parameters: data      - [IN/OUT] the expression containing lld macro       *
@@ -5698,8 +5590,6 @@ static void	process_lld_macro_token(char **data, zbx_token_t *token, int flags,
 
 /******************************************************************************
  *                                                                            *
- * Function: process_user_macro_token                                         *
- *                                                                            *
  * Purpose: expand discovery macro in user macro context                      *
  *                                                                            *
  * Parameters: data          - [IN/OUT] the expression containing lld macro   *
@@ -5753,8 +5643,6 @@ static int	process_user_macro_token(char **data, zbx_token_t *token, const struc
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_query_filter_lld_macros                               *
- *                                                                            *
  * Purpose: substitute lld macros in calculated item query filter             *
  *                                                                            *
  * Parameters: filter          - [IN/OUT] the filter                          *
@@ -5822,8 +5710,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_item_query_macros                                     *
- *                                                                            *
  * Purpose: substitute lld macros in history function item query argument     *
  *          /host/key?[filter]                                                *
  *                                                                            *
@@ -5880,8 +5766,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_substitute_expression_macros                                 *
- *                                                                            *
  * Purpose: substitutes lld macros in an expression                           *
  *                                                                            *
  * Parameters: data            - [IN/OUT] the expression                      *
@@ -5958,8 +5842,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_expression_macro_token                                   *
- *                                                                            *
  * Purpose: expand discovery macro in expression macro                        *
  *                                                                            *
  * Parameters: data            - [IN/OUT] the expression containing macro     *
@@ -5998,8 +5880,6 @@ static int	process_expression_macro_token(char **data, zbx_token_t *token, const
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_func_macro                                            *
- *                                                                            *
  * Purpose: substitute lld macros in function macro parameters                *
  *                                                                            *
  * Parameters: data   - [IN/OUT] pointer to a buffer                          *
@@ -6051,8 +5931,6 @@ static int	substitute_func_macro(char **data, zbx_token_t *token, const struct z
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_lld_macros                                            *
- *                                                                            *
  * Parameters: data   - [IN/OUT] pointer to a buffer                          *
  *             jp_row - [IN] discovery data                                   *
  *             flags  - [IN] ZBX_MACRO_ANY - all LLD macros will be resolved  *
@@ -6150,8 +6028,6 @@ replace_key_param_data_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: replace_key_param                                                *
- *                                                                            *
  * Comments: auxiliary function for substitute_key_macros()                   *
  *                                                                            *
  ******************************************************************************/
@@ -6195,8 +6071,6 @@ static int	replace_key_param_cb(const char *data, int key_type, int level, int n
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_key_macros_impl                                       *
- *                                                                            *
  * Purpose: safely substitutes macros in parameters of an item key and OID    *
  *                                                                            *
  * Example:  key                     | macro  | result            | return    *
@@ -6265,8 +6139,6 @@ static int	substitute_key_macros_impl(char **data, zbx_uint64_t *hostid, DC_ITEM
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_function_lld_param                                    *
- *                                                                            *
  * Purpose: substitute lld macros in function parameters                      *
  *                                                                            *
  * Parameters: e            - [IN] the function parameter list without        *
@@ -6371,8 +6243,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_macros_in_json_pairs                                  *
- *                                                                            *
  * Purpose: substitute LLD macros in JSON pairs                               *
  *                                                                            *
  * Parameters: data   -    [IN/OUT] pointer to a buffer that JSON pair        *
@@ -6451,8 +6321,6 @@ exit:
 #ifdef HAVE_LIBXML2
 /******************************************************************************
  *                                                                            *
- * Function: substitute_macros_in_xml_elements                                *
- *                                                                            *
  * Comments: auxiliary function for substitute_macros_xml()                   *
  *                                                                            *
  ******************************************************************************/
@@ -6552,8 +6420,6 @@ static void	substitute_macros_in_xml_elements(const DC_ITEM *item, const struct
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_macros_xml_impl                                       *
- *                                                                            *
  * Purpose: substitute simple or LLD macros in XML text nodes, attributes of  *
  *          a node or in CDATA section, validate XML                          *
  *                                                                            *
@@ -6616,8 +6482,6 @@ exit:
 #ifdef HAVE_LIBXML2
 /******************************************************************************
  *                                                                            *
- * Function: libxml_handle_error                                              *
- *                                                                            *
  * Purpose: libxml2 callback function for error handle                        *
  *                                                                            *
  * Parameters: user_data - [IN/OUT] the user context                          *
@@ -6647,8 +6511,6 @@ static void	libxml_handle_error(void *user_data, xmlErrorPtr err)
 
 /******************************************************************************
  *                                                                            *
- * Function: xml_xpath_check                                                  *
- *                                                                            *
  * Purpose: validate xpath string                                             *
  *                                                                            *
  * Parameters: xpath  - [IN] the xpath value                                  *
@@ -6694,8 +6556,6 @@ int	xml_xpath_check(const char *xpath, char *error, size_t errlen)
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_simple_macros                                         *
- *                                                                            *
  * Purpose: substitute_simple_macros with masked secret macros                *
  *          (default setting)                                                 *
  *                                                                            *
@@ -6712,8 +6572,6 @@ int	substitute_simple_macros(const zbx_uint64_t *actionid, const DB_EVENT *event
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_simple_macros_unmasked                                *
- *                                                                            *
  * Purpose: substitute_simple_macros with unmasked secret macros              *
  *                                                                            *
  ******************************************************************************/
@@ -6735,9 +6593,7 @@ int	substitute_simple_macros_unmasked(const zbx_uint64_t *actionid, const DB_EVE
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_macros_xml                                            *
- *                                                                            *
- * substitute_macros_xml with masked secret macros                            *
+ * Purpose: substitute_macros_xml with masked secret macros                   *
  *                                                                            *
  ******************************************************************************/
 int	substitute_macros_xml(char **data, const DC_ITEM *item, const struct zbx_json_parse *jp_row,
@@ -6748,9 +6604,7 @@ int	substitute_macros_xml(char **data, const DC_ITEM *item, const struct zbx_jso
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_macros_xml_unmasked                                   *
- *                                                                            *
- * substitute_macros_xml with unmasked secret macros                          *
+ * Purpose: substitute_macros_xml with unmasked secret macros                 *
  *                                                                            *
  ******************************************************************************/
 int	substitute_macros_xml_unmasked(char **data, const DC_ITEM *item, const struct zbx_json_parse *jp_row,
@@ -6767,9 +6621,7 @@ int	substitute_macros_xml_unmasked(char **data, const DC_ITEM *item, const struc
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_key_macros                                            *
- *                                                                            *
- * substitute_key_macros with masked secret macros                            *
+ * Purpose: substitute_key_macros with masked secret macros                   *
  *                                                                            *
  ******************************************************************************/
 int	substitute_key_macros(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, const struct zbx_json_parse *jp_row,
@@ -6780,9 +6632,7 @@ int	substitute_key_macros(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, c
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_key_macros_unmasked                                   *
- *                                                                            *
- * substitute_key_macros with unmasked secret macros                          *
+ * Purpose: substitute_key_macros with unmasked secret macros                 *
  *                                                                            *
  ******************************************************************************/
 int	substitute_key_macros_unmasked(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item,
@@ -6800,8 +6650,6 @@ int	substitute_key_macros_unmasked(char **data, zbx_uint64_t *hostid, DC_ITEM *d
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_host_macro_index                                             *
- *                                                                            *
  * Purpose: extract index from valid indexed host macro                       *
  *                                                                            *
  * Return value: The index or -1 if it was not valid indexed host macro       *
diff --git a/src/libs/zbxserver/expression_eval.c b/src/libs/zbxserver/expression_eval.c
index 48af024e673..01a8a11d246 100644
--- a/src/libs/zbxserver/expression_eval.c
+++ b/src/libs/zbxserver/expression_eval.c
@@ -117,8 +117,6 @@ static void	expression_query_free(zbx_expression_query_t *query)
 
 /******************************************************************************
  *                                                                            *
- * Function: test_key_param_wildcard_cb                                       *
- *                                                                            *
  * Purpose: check if key parameter is a wildcard '*'                          *
  *                                                                            *
  ******************************************************************************/
@@ -144,8 +142,6 @@ static int	test_key_param_wildcard_cb(const char *data, int key_type, int level,
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_create_query                                          *
- *                                                                            *
  * Purpose: create expression item query from item query /host/key?[filter]   *
  *                                                                            *
  * Parameters: itemquery - [IN] the item query                                *
@@ -197,11 +193,6 @@ static zbx_expression_query_t*	expression_create_query(const char *itemquery)
 	return query;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: expression_group_free                                            *
- *                                                                            *
- ******************************************************************************/
 static void	expression_group_free(zbx_expression_group_t *group)
 {
 	zbx_free(group->name);
@@ -211,8 +202,6 @@ static void	expression_group_free(zbx_expression_group_t *group)
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_get_group                                             *
- *                                                                            *
  * Purpose: get group from cache by name                                      *
  *                                                                            *
  * Parameters: eval - [IN] the evaluation data                                *
@@ -247,8 +236,6 @@ static zbx_expression_group_t	*expression_get_group(zbx_expression_eval_t *eval,
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_get_item                                              *
- *                                                                            *
  * Purpose: get item from cache by itemid                                     *
  *                                                                            *
  * Parameters: eval    - [IN] the evaluation data                             *
@@ -281,11 +268,6 @@ static zbx_expression_item_t	*expression_get_item(zbx_expression_eval_t *eval, z
 	return item;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: expression_item_free                                             *
- *                                                                            *
- ******************************************************************************/
 static void	expression_item_free(zbx_expression_item_t *item)
 {
 	zbx_vector_ptr_clear_ext(&item->tags, (zbx_clean_func_t) zbx_free_item_tag);
@@ -295,8 +277,6 @@ static void	expression_item_free(zbx_expression_item_t *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_init_query_one                                        *
- *                                                                            *
  * Purpose: initialize one item query                                         *
  *                                                                            *
  * Parameters: eval  - [IN] the evaluation data                               *
@@ -314,8 +294,6 @@ static void	expression_init_query_one(zbx_expression_eval_t *eval, zbx_expressio
 
 /******************************************************************************
  *                                                                            *
- * Function: replace_key_param_wildcard_cb                                    *
- *                                                                            *
  * Purpose: replace wildcards '*'in key parameters with % and escape existing *
  *          %, \ characters for SQL like operation                            *
  *                                                                            *
@@ -358,8 +336,6 @@ static int	replace_key_param_wildcard_cb(const char *data, int key_type, int lev
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_match_item_key                                        *
- *                                                                            *
  * Purpose: check if item key matches the pattern                             *
  *                                                                            *
  * Parameters: item_key - [IN] the item key to match                          *
@@ -408,8 +384,6 @@ zbx_expression_eval_many_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_get_item_candidates                                   *
- *                                                                            *
  * Purpose: get itemids + hostids of items that might match query based on    *
  *          host, key and filter groups                                       *
  *                                                                            *
@@ -553,8 +527,6 @@ static void	expression_get_item_candidates(zbx_expression_eval_t *eval, const zb
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_item_check_tag                                        *
- *                                                                            *
  * Purpose: check if the item matches the tag                                 *
  *                                                                            *
  * Parameters: item - [IN] the item with tags                                 *
@@ -597,8 +569,6 @@ static int	expression_item_check_tag(zbx_expression_item_t *item, const char *ta
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_eval_filter                                           *
- *                                                                            *
  * Purpose: evaluate filter function                                          *
  *                                                                            *
  * Parameters: name     - [IN] the function name (not zero terminated)        *
@@ -672,8 +642,6 @@ static int	expression_eval_filter(const char *name, size_t len, int args_num, co
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_init_query_many                                       *
- *                                                                            *
  * Purpose: initialize many item query                                        *
  *                                                                            *
  * Parameters: eval    - [IN] the evaluation data                             *
@@ -802,8 +770,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_cache_dcitems_hk                                      *
- *                                                                            *
  * Purpose: cache items used in one item queries                              *
  *                                                                            *
  * Parameters: eval - [IN] the evaluation data                                *
@@ -861,8 +827,6 @@ static int	expression_find_dcitem_by_itemid(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_cache_dcitems                                         *
- *                                                                            *
  * Purpose: cache items used in many item queries                             *
  *                                                                            *
  * Parameters: eval - [IN] the evaluation data                                *
@@ -940,8 +904,6 @@ static void	expression_cache_dcitems(zbx_expression_eval_t *eval)
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_eval_one                                              *
- *                                                                            *
  * Purpose: evaluate historical function for one item query                   *
  *                                                                            *
  * Parameters: eval     - [IN] the evaluation data                            *
@@ -1110,8 +1072,6 @@ static int	get_function_by_name(const char *name, size_t len)
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_min                                        *
- *                                                                            *
  * Purpose: calculate minimum value from the history value vector             *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -1144,8 +1104,6 @@ static void	evaluate_history_func_min(zbx_vector_history_record_t *values, int v
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_max                                        *
- *                                                                            *
  * Purpose: calculate maximum value from the history value vector             *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -1178,8 +1136,6 @@ static void	evaluate_history_func_max(zbx_vector_history_record_t *values, int v
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_sum                                        *
- *                                                                            *
  * Purpose: calculate sum of values from the history value vector             *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -1208,8 +1164,6 @@ static void	evaluate_history_func_sum(zbx_vector_history_record_t *values, int v
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_avg                                        *
- *                                                                            *
  * Purpose: calculate average value of values from the history value vector   *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -1226,8 +1180,6 @@ static void	evaluate_history_func_avg(zbx_vector_history_record_t *values, int v
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_count                                      *
- *                                                                            *
  * Purpose: calculate number of values in value vector                        *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -1243,8 +1195,6 @@ static void	evaluate_history_func_count(zbx_vector_history_record_t *values, dou
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_last                                       *
- *                                                                            *
  * Purpose: calculate the last (newest) value in value vector                 *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -1261,8 +1211,6 @@ static void	evaluate_history_func_last(zbx_vector_history_record_t *values, int
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func                                            *
- *                                                                            *
  * Purpose: calculate function with values from value vector                  *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -1304,8 +1252,6 @@ static void	evaluate_history_func(zbx_vector_history_record_t *values, int value
 
 /******************************************************************************
  *                                                                            *
- * Function: get_dcitem                                                       *
- *                                                                            *
  * Purpose: get item from cache by itemid                                     *
  *                                                                            *
  * Parameters: eval    - [IN] the evaluation data                             *
@@ -1326,8 +1272,6 @@ static DC_ITEM	*get_dcitem(zbx_vector_ptr_t *dcitem_refs, zbx_uint64_t itemid)
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_eval_exists                                           *
- *                                                                            *
  * Purpose: evaluate functions 'exists_foreach' and 'item_count'              *
  *          for multiple items                                                *
  *                                                                            *
@@ -1384,8 +1328,6 @@ 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'                        *
  *                                                                            *
@@ -1566,8 +1508,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_eval_many                                             *
- *                                                                            *
  * Purpose: evaluate historical function for multiple items (aggregate checks)*
  *                                                                            *
  * Parameters: eval     - [IN] the evaluation data                            *
@@ -1710,8 +1650,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_eval_history                                          *
- *                                                                            *
  * Purpose: evaluate historical function                                      *
  *                                                                            *
  * Parameters: name     - [IN] the function name (not zero terminated)        *
@@ -1790,8 +1728,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_eval_common                                           *
- *                                                                            *
  * Purpose: evaluate common function                                          *
  *                                                                            *
  * Parameters: name     - [IN] the function name (not zero terminated)        *
@@ -1851,8 +1787,6 @@ static int	expression_eval_common(const char *name, size_t len, int args_num, co
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_eval_init                                             *
- *                                                                            *
  * Purpose: initialize expression evaluation data                             *
  *                                                                            *
  * Parameters: eval     - [IN] the evaluation data                            *
@@ -1906,8 +1840,6 @@ void	zbx_expression_eval_init(zbx_expression_eval_t *eval, int mode, zbx_eval_co
 
 /******************************************************************************
  *                                                                            *
- * Function: expression_eval_clear                                            *
- *                                                                            *
  * Purpose: free resources allocated by expression evaluation data            *
  *                                                                            *
  * Parameters: eval     - [IN] the evaluation data                            *
@@ -1944,8 +1876,6 @@ void	zbx_expression_eval_clear(zbx_expression_eval_t *eval)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_expression_eval_resolve_item_hosts                           *
- *                                                                            *
  * Purpose: resolve calculated item formula empty and macro host references   *
  *          (// , {HOST.HOST}) to host names                                  *
  *                                                                            *
@@ -1991,8 +1921,6 @@ static void	host_index_free(zbx_host_index_t *index)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_expression_eval_resolve_trigger_hosts                        *
- *                                                                            *
  * Purpose: resolve expression macro empty and macro host references          *
  *          (// , {HOST.HOST}, {HOST.HOST<N>}) to  host names                 *
  *                                                                            *
@@ -2050,8 +1978,6 @@ void	zbx_expression_eval_resolve_trigger_hosts(zbx_expression_eval_t *eval, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_expression_eval_execute                                      *
- *                                                                            *
  * Purpose: execute expression containing history functions                   *
  *                                                                            *
  * Parameters: eval  - [IN] the evaluation data                               *
diff --git a/src/libs/zbxserver/macrofunc.c b/src/libs/zbxserver/macrofunc.c
index f2d7da8b0a9..e894254243f 100644
--- a/src/libs/zbxserver/macrofunc.c
+++ b/src/libs/zbxserver/macrofunc.c
@@ -24,8 +24,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: macrofunc_regsub                                                 *
- *                                                                            *
  * Purpose: calculates regular expression substitution                        *
  *                                                                            *
  * Parameters: params - [IN] the function parameters                          *
@@ -57,8 +55,6 @@ static int	macrofunc_regsub(char **params, size_t nparam, char **out)
 
 /******************************************************************************
  *                                                                            *
- * Function: macrofunc_iregsub                                                *
- *                                                                            *
  * Purpose: calculates case insensitive regular expression substitution       *
  *                                                                            *
  * Parameters: params - [IN] the function parameters                          *
@@ -90,8 +86,6 @@ static int	macrofunc_iregsub(char **params, size_t nparam, char **out)
 
 /******************************************************************************
  *                                                                            *
- * Function: macrofunc_fmttime                                                *
- *                                                                            *
  * Purpose: time formatting macro function                                    *
  *                                                                            *
  * Parameters: params - [IN] the function parameters                          *
@@ -181,8 +175,6 @@ static int	macrofunc_fmttime(char **params, size_t nparam, char **out)
 
 /******************************************************************************
  *                                                                            *
- * Function: macrofunc_fmtnum                                                 *
- *                                                                            *
  * Purpose: number formatting macro function                                  *
  *                                                                            *
  * Parameters: params - [IN] the function data                                *
@@ -223,8 +215,6 @@ static int	macrofunc_fmtnum(char **params, size_t nparam, char **out)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_calculate_macro_function                                     *
- *                                                                            *
  * Purpose: calculates macro function value                                   *
  *                                                                            *
  * Parameters: expression - [IN] expression containing macro function         *
diff --git a/src/libs/zbxserver/zabbix_stats.c b/src/libs/zbxserver/zabbix_stats.c
index e9980d0b865..40f4bad0ff7 100644
--- a/src/libs/zbxserver/zabbix_stats.c
+++ b/src/libs/zbxserver/zabbix_stats.c
@@ -32,8 +32,6 @@ extern unsigned char	program_type;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_send_zabbix_stats                                            *
- *                                                                            *
  * Purpose: collects all metrics required for Zabbix stats request            *
  *                                                                            *
  * Parameters: json - [OUT] the json data                                     *
diff --git a/src/libs/zbxserver/zabbix_stats_proxy.c b/src/libs/zbxserver/zabbix_stats_proxy.c
index df0a6f1ced0..03b178c3b5a 100644
--- a/src/libs/zbxserver/zabbix_stats_proxy.c
+++ b/src/libs/zbxserver/zabbix_stats_proxy.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_zabbix_stats_ext                                         *
- *                                                                            *
  * Purpose: get program type (proxy) specific internal statistics             *
  *                                                                            *
  * Parameters: param1  - [IN/OUT] the json data                               *
diff --git a/src/libs/zbxserver/zabbix_stats_server.c b/src/libs/zbxserver/zabbix_stats_server.c
index d36de00954c..483745fd45d 100644
--- a/src/libs/zbxserver/zabbix_stats_server.c
+++ b/src/libs/zbxserver/zabbix_stats_server.c
@@ -31,8 +31,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_zabbix_stats_ext                                         *
- *                                                                            *
  * Purpose: get program type (server) specific internal statistics            *
  *                                                                            *
  * Parameters: param1  - [IN/OUT] the json data                               *
diff --git a/src/libs/zbxserver/zabbix_users.c b/src/libs/zbxserver/zabbix_users.c
index 8115ddf9b36..1394d5fa596 100644
--- a/src/libs/zbxserver/zabbix_users.c
+++ b/src/libs/zbxserver/zabbix_users.c
@@ -24,8 +24,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: check_perm2system                                                *
- *                                                                            *
  * Purpose: Check user permissions to access system                           *
  *                                                                            *
  * Parameters: userid - user ID                                               *
@@ -75,8 +73,6 @@ char	*get_user_timezone(zbx_uint64_t userid)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_user_administration_permissions                        *
- *                                                                            *
  * Purpose: check if the user has specific or default access for              *
  *          administration actions                                            *
  *                                                                            *
diff --git a/src/libs/zbxsys/mutexs.c b/src/libs/zbxsys/mutexs.c
index e523b51c7b5..dd6812fcce5 100644
--- a/src/libs/zbxsys/mutexs.c
+++ b/src/libs/zbxsys/mutexs.c
@@ -57,8 +57,6 @@ static int			shm_id, locks_disabled;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_locks_create                                                 *
- *                                                                            *
  * Purpose: if pthread mutexes and read-write locks can be shared between     *
  *          processes then create them, otherwise fallback to System V        *
  *          semaphore operations                                              *
@@ -194,8 +192,6 @@ void	zbx_locks_destroy(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mutex_addr_get                                               *
- *                                                                            *
  * Purpose: acquire address of the mutex                                      *
  *                                                                            *
  * Parameters: mutex_name - name of the mutex to return address for           *
@@ -214,8 +210,6 @@ zbx_mutex_t	zbx_mutex_addr_get(zbx_mutex_name_t mutex_name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mutex_addr_get                                               *
- *                                                                            *
  * Purpose: acquire address of the rwlock                                     *
  *                                                                            *
  * Parameters: rwlock_name - name of the rwlock to return address for         *
@@ -234,8 +228,6 @@ zbx_rwlock_t	zbx_rwlock_addr_get(zbx_rwlock_name_t rwlock_name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rwlock_create                                                *
- *                                                                            *
  * Purpose: read-write locks are created using zbx_locks_create() function    *
  *          this is only to obtain handle, if read write locks are not        *
  *          supported, then outputs numeric handle of mutex that can be used  *
@@ -262,8 +254,6 @@ int	zbx_rwlock_create(zbx_rwlock_t *rwlock, zbx_rwlock_name_t name, char **error
 #ifdef HAVE_PTHREAD_PROCESS_SHARED
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_rwlock_wrlock                                              *
- *                                                                            *
  * Purpose: acquire write lock for read-write lock (exclusive access)         *
  *                                                                            *
  * Parameters: rwlock - handle of read-write lock                             *
@@ -286,8 +276,6 @@ void	__zbx_rwlock_wrlock(const char *filename, int line, zbx_rwlock_t rwlock)
 
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_rwlock_rdlock                                              *
- *                                                                            *
  * Purpose: acquire read lock for read-write lock (there can be many readers) *
  *                                                                            *
  * Parameters: rwlock - handle of read-write lock                             *
@@ -310,8 +298,6 @@ void	__zbx_rwlock_rdlock(const char *filename, int line, zbx_rwlock_t rwlock)
 
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_rwlock_unlock                                              *
- *                                                                            *
  * Purpose: unlock read-write lock                                            *
  *                                                                            *
  * Parameters: rwlock - handle of read-write lock                             *
@@ -334,8 +320,6 @@ void	__zbx_rwlock_unlock(const char *filename, int line, zbx_rwlock_t rwlock)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_rwlock_destroy                                               *
- *                                                                            *
  * Purpose: Destroy read-write lock                                           *
  *                                                                            *
  * Parameters: rwlock - handle of read-write lock                             *
@@ -352,8 +336,6 @@ void	zbx_rwlock_destroy(zbx_rwlock_t *rwlock)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_locks_disable                                                *
- *                                                                            *
  * Purpose:  disable locks                                                    *
  *                                                                            *
  ******************************************************************************/
@@ -365,8 +347,6 @@ void	zbx_locks_disable(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_locks_enable                                                 *
- *                                                                            *
  * Purpose:  enable locks                                                     *
  *                                                                            *
  ******************************************************************************/
@@ -381,8 +361,6 @@ void	zbx_locks_enable(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mutex_create                                                 *
- *                                                                            *
  * Purpose: Create the mutex                                                  *
  *                                                                            *
  * Parameters:  mutex - handle of mutex                                       *
@@ -414,8 +392,6 @@ int	zbx_mutex_create(zbx_mutex_t *mutex, zbx_mutex_name_t name, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mutex_lock                                                   *
- *                                                                            *
  * Purpose: Waits until the mutex is in the signalled state                   *
  *                                                                            *
  * Parameters: mutex - handle of mutex                                        *
@@ -486,8 +462,6 @@ void	__zbx_mutex_lock(const char *filename, int line, zbx_mutex_t mutex)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mutex_unlock                                                 *
- *                                                                            *
  * Purpose: Unlock the mutex                                                  *
  *                                                                            *
  * Parameters: mutex - handle of mutex                                        *
@@ -540,8 +514,6 @@ void	__zbx_mutex_unlock(const char *filename, int line, zbx_mutex_t mutex)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mutex_destroy                                                *
- *                                                                            *
  * Purpose: Destroy the mutex                                                 *
  *                                                                            *
  * Parameters: mutex - handle of mutex                                        *
@@ -562,8 +534,6 @@ void	zbx_mutex_destroy(zbx_mutex_t *mutex)
 #ifdef _WINDOWS
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mutex_create_per_process_name                                *
- *                                                                            *
  * Purpose: Appends PID to the prefix of the mutex                            *
  *                                                                            *
  * Parameters: prefix - mutex type                                            *
diff --git a/src/libs/zbxsys/threads.c b/src/libs/zbxsys/threads.c
index 99873182fc9..c39a61de04f 100644
--- a/src/libs/zbxsys/threads.c
+++ b/src/libs/zbxsys/threads.c
@@ -45,8 +45,6 @@ void CALLBACK	ZBXEndThread(ULONG_PTR dwParam)
 #else
 /******************************************************************************
  *                                                                            *
- * Function: zbx_fork                                                         *
- *                                                                            *
  * Purpose: Flush stdout and stderr before forking                            *
  *                                                                            *
  * Return value: same as system fork() function                               *
@@ -61,8 +59,6 @@ int	zbx_fork(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_child_fork                                                   *
- *                                                                            *
  * Purpose: fork from master process and set SIGCHLD handler                  *
  *                                                                            *
  * Return value: same as system fork() function                               *
@@ -98,8 +94,6 @@ void	zbx_child_fork(pid_t *pid)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_thread_start                                                 *
- *                                                                            *
  * Purpose: Start the handled function as "thread"                            *
  *                                                                            *
  * Parameters: handler     - [IN] new thread starts execution from this       *
@@ -144,8 +138,6 @@ void	zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), zbx_thread_args_t *thre
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_thread_wait                                                  *
- *                                                                            *
  * Purpose: Waits until the "thread" is in the signalled state                *
  *                                                                            *
  * Parameters: "thread" handle                                                *
@@ -203,8 +195,6 @@ int	zbx_thread_wait(ZBX_THREAD_HANDLE thread)
 
 /******************************************************************************
  *                                                                            *
- * Function: threads_kill                                                     *
- *                                                                            *
  * Purpose: sends termination signal to "threads"                             *
  *                                                                            *
  * Parameters: threads       - [IN] handles to threads or processes           *
@@ -241,8 +231,6 @@ static void	threads_kill(ZBX_THREAD_HANDLE *threads, int threads_num, const int
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_threads_wait                                                 *
- *                                                                            *
  * Purpose: Waits until the "threads" are in the signalled state              *
  *                                                                            *
  * Parameters: "threads" handles                                              *
diff --git a/src/libs/zbxsysinfo/agent/modbus.c b/src/libs/zbxsysinfo/agent/modbus.c
index e44421bb6a0..b8113209496 100644
--- a/src/libs/zbxsysinfo/agent/modbus.c
+++ b/src/libs/zbxsysinfo/agent/modbus.c
@@ -127,8 +127,6 @@ static void	set_serial_params_default(zbx_modbus_connection_serial *serial_param
 
 /******************************************************************************
  *                                                                            *
- * Function: result_to_str                                                    *
- *                                                                            *
  * Purpose: converts result to a string                                       *
  *                                                                            *
  * Parameters: buf        - [IN] modbus data                                  *
@@ -227,8 +225,6 @@ end:
 
 /******************************************************************************
  *                                                                            *
- * Function: result_to_str_bit                                                *
- *                                                                            *
  * Purpose: converts bits result to a string                                  *
  *                                                                            *
  * Parameters: buf8       - [IN] modbus data                                  *
@@ -254,8 +250,6 @@ static char	*result_to_str_bit(uint8_t *buf8, unsigned short count)
 
 /******************************************************************************
  *                                                                            *
- * Function: set_result                                                       *
- *                                                                            *
  * Purpose: set result                                                        *
  *                                                                            *
  * Parameters: buf        - [IN] modbus data                                  *
@@ -311,8 +305,6 @@ static void	set_result(uint16_t *buf, modbus_datatype_t type, modbus_endianness_
 
 /******************************************************************************
  *                                                                            *
- * Function: get_total_count                                                  *
- *                                                                            *
  * Purpose: get total count of bits/registers plus offset                     *
  *                                                                            *
  * Parameters: count  - [IN] count of sequenced same data type values to      *
@@ -354,8 +346,6 @@ static unsigned int	get_total_count(unsigned short count, unsigned short offset,
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_params                                                     *
- *                                                                            *
  * Purpose: parse serial connection parameters                                *
  *                                                                            *
  * Parameters: params        - [IN] string holding parameters                 *
@@ -394,8 +384,6 @@ static int	parse_params(char *params, zbx_modbus_connection_serial *serial_param
 
 /******************************************************************************
  *                                                                            *
- * Function: endpoint_parse                                                   *
- *                                                                            *
  * Purpose: parse endpoint                                                    *
  *                                                                            *
  * Parameters: endpoint_str - [IN] string holding endpoint                    *
@@ -483,8 +471,6 @@ static int	endpoint_parse(char *endpoint_str, zbx_modbus_endpoint_t *endpoint)
 
 /******************************************************************************
  *                                                                            *
- * Function: modbus_read_data                                                 *
- *                                                                            *
  * Purpose: request and read modbus data                                      *
  *                                                                            *
  * Parameters: endpoint    - [IN] endpoint                                    *
@@ -856,8 +842,6 @@ err:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_init_modbus                                                  *
- *                                                                            *
  * Purpose: create modbus mutex                                               *
  *                                                                            *
  * Parameters: error      - [OUT] error message in case of failure            *
diff --git a/src/libs/zbxsysinfo/common/dir.c b/src/libs/zbxsysinfo/common/dir.c
index 830f653e41e..64991fb9916 100644
--- a/src/libs/zbxsysinfo/common/dir.c
+++ b/src/libs/zbxsysinfo/common/dir.c
@@ -29,8 +29,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: filename_matches                                                 *
- *                                                                            *
  * Purpose: checks if filename matches the include-regexp and doesn't match   *
  *          the exclude-regexp                                                *
  *                                                                            *
@@ -52,8 +50,6 @@ static int	filename_matches(const char *fname, const zbx_regexp_t *regex_incl, c
 
 /******************************************************************************
  *                                                                            *
- * Function: queue_directory                                                  *
- *                                                                            *
  * Purpose: adds directory to processing queue after checking if current      *
  *          depth is less than 'max_depth'                                    *
  *                                                                            *
@@ -88,8 +84,6 @@ static int	queue_directory(zbx_vector_ptr_t *list, char *path, int depth, int ma
 
 /******************************************************************************
  *                                                                            *
- * Function: compare_descriptors                                              *
- *                                                                            *
  * Purpose: compares two zbx_file_descriptor_t values to perform search       *
  *          within descriptor vector                                          *
  *                                                                            *
@@ -415,8 +409,6 @@ static void	descriptors_vector_destroy(zbx_vector_ptr_t *descriptors)
 
 /******************************************************************************
  *                                                                            *
- * Function: has_timed_out                                                    *
- *                                                                            *
  * Purpose: Checks if timeout has occurred. If it is, thread should           *
  *          immediately stop whatever it is doing, clean up everything and    *
  *          return SYSINFO_RET_FAIL.                                          *
@@ -866,8 +858,6 @@ int	VFS_DIR_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: vfs_dir_info                                                     *
- *                                                                            *
  * Purpose: counts or lists files in directory, subject to regexp, type and   *
  *          depth filters                                                     *
  *                                                                            *
diff --git a/src/libs/zbxsysinfo/common/system.c b/src/libs/zbxsysinfo/common/system.c
index f1879f87ca2..78c89cc3b8a 100644
--- a/src/libs/zbxsysinfo/common/system.c
+++ b/src/libs/zbxsysinfo/common/system.c
@@ -27,8 +27,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: SYSTEM_LOCALTIME                                                 *
- *                                                                            *
  * Comments: Thread-safe                                                      *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxsysinfo/common/zabbix_stats.c b/src/libs/zbxsysinfo/common/zabbix_stats.c
index 7f740dbf859..08732b7f914 100644
--- a/src/libs/zbxsysinfo/common/zabbix_stats.c
+++ b/src/libs/zbxsysinfo/common/zabbix_stats.c
@@ -25,8 +25,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: check_response                                                   *
- *                                                                            *
  * Purpose: Check whether JSON response is "success" or "failed"              *
  *                                                                            *
  * Parameters: response - [IN] the request                                    *
@@ -68,8 +66,6 @@ static int	check_response(const char *response, AGENT_RESULT *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_remote_zabbix_stats                                          *
- *                                                                            *
  * Purpose: send Zabbix stats request and receive the result data             *
  *                                                                            *
  * Parameters: json   - [IN] the request                                      *
@@ -121,8 +117,6 @@ static void	get_remote_zabbix_stats(const struct zbx_json *json, const char *ip,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_remote_zabbix_stats                                      *
- *                                                                            *
  * Purpose: create Zabbix stats request                                       *
  *                                                                            *
  * Parameters: ip     - [IN] external Zabbix instance hostname                *
@@ -149,8 +143,6 @@ int	zbx_get_remote_zabbix_stats(const char *ip, unsigned short port, AGENT_RESUL
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_remote_zabbix_stats_queue                                *
- *                                                                            *
  * Purpose: create Zabbix stats queue request                                 *
  *                                                                            *
  * Parameters: ip     - [IN] external Zabbix instance hostname                *
diff --git a/src/libs/zbxsysinfo/linux/net.c b/src/libs/zbxsysinfo/linux/net.c
index f701c64804e..be28f90488e 100644
--- a/src/libs/zbxsysinfo/linux/net.c
+++ b/src/libs/zbxsysinfo/linux/net.c
@@ -294,8 +294,6 @@ static int	get_net_stat(const char *if_name, net_stat_t *result, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_read_tcp_listen                                             *
- *                                                                            *
  * Purpose: reads /proc/net/tcp(6) file by chunks until the last line in      *
  *          in buffer has non-listening socket state                          *
  *                                                                            *
@@ -379,8 +377,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_read_file                                                   *
- *                                                                            *
  * Purpose: reads whole file into a buffer in a single read operation         *
  *                                                                            *
  * Parameters: filename     - [IN] the file to read                           *
diff --git a/src/libs/zbxsysinfo/linux/proc.c b/src/libs/zbxsysinfo/linux/proc.c
index 034cb06575a..cbce51d9475 100644
--- a/src/libs/zbxsysinfo/linux/proc.c
+++ b/src/libs/zbxsysinfo/linux/proc.c
@@ -43,8 +43,6 @@ zbx_sysinfo_proc_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_sysinfo_proc_free                                            *
- *                                                                            *
  * Purpose: frees process data structure                                      *
  *                                                                            *
  ******************************************************************************/
@@ -237,8 +235,6 @@ static int	check_procstate(FILE *f_stat, int zbx_proc_stat)
 
 /******************************************************************************
  *                                                                            *
- * Function: byte_value_from_proc_file                                        *
- *                                                                            *
  * Purpose: Read amount of memory in bytes from a string in /proc file.       *
  *          For example, reading "VmSize:   176712 kB" from /proc/1/status    *
  *          will produce a result 176712*1024 = 180953088 bytes               *
@@ -833,8 +829,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_get_process_name                                            *
- *                                                                            *
  * Purpose: returns process name                                              *
  *                                                                            *
  * Parameters: pid -      [IN] the process identifier                         *
@@ -878,8 +872,6 @@ static int	proc_get_process_name(pid_t pid, char **procname)
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_get_process_cmdline                                         *
- *                                                                            *
  * Purpose: returns process command line                                      *
  *                                                                            *
  * Parameters: pid            - [IN] the process identifier                   *
@@ -945,8 +937,6 @@ static int	proc_get_process_cmdline(pid_t pid, char **cmdline, size_t *cmdline_n
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_get_process_uid                                             *
- *                                                                            *
  * Purpose: returns process user identifier                                   *
  *                                                                            *
  * Parameters: pid - [IN] the process identifier                              *
@@ -973,8 +963,6 @@ static int	proc_get_process_uid(pid_t pid, uid_t *uid)
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_read_value                                                  *
- *                                                                            *
  * Purpose: read 64 bit unsigned space or zero character terminated integer   *
  *          from a text string                                                *
  *                                                                            *
@@ -1002,8 +990,6 @@ static int	proc_read_value(const char *ptr, zbx_uint64_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_read_cpu_util                                               *
- *                                                                            *
  * Purpose: reads process cpu utilization values from /proc/[pid]/stat file   *
  *                                                                            *
  * Parameters: procutil - [IN/OUT] the process cpu utilization data           *
@@ -1085,8 +1071,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_match_name                                                  *
- *                                                                            *
  * Purpose: checks if the process name matches filter                         *
  *                                                                            *
  ******************************************************************************/
@@ -1106,8 +1090,6 @@ static int	proc_match_name(const zbx_sysinfo_proc_t *proc, const char *procname)
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_match_user                                                  *
- *                                                                            *
  * Purpose: checks if the process user matches filter                         *
  *                                                                            *
  ******************************************************************************/
@@ -1124,8 +1106,6 @@ static int	proc_match_user(const zbx_sysinfo_proc_t *proc, const struct passwd *
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_match_cmdline                                               *
- *                                                                            *
  * Purpose: checks if the process command line matches filter                 *
  *                                                                            *
  ******************************************************************************/
@@ -1142,8 +1122,6 @@ static int	proc_match_cmdline(const zbx_sysinfo_proc_t *proc, const char *cmdlin
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proc_get_process_stats                                       *
- *                                                                            *
  * Purpose: get process cpu utilization data                                  *
  *                                                                            *
  * Parameters: procs     - [IN/OUT] an array of process utilization data      *
@@ -1164,8 +1142,6 @@ void	zbx_proc_get_process_stats(zbx_procstat_util_t *procs, int procs_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_create                                                      *
- *                                                                            *
  * Purpose: create process object with the specified properties               *
  *                                                                            *
  * Parameters: pid   - [IN] the process identifier                            *
@@ -1238,8 +1214,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proc_get_processes                                           *
- *                                                                            *
  * Purpose: get system processes                                              *
  *                                                                            *
  * Parameters: processes - [OUT] the system processes                         *
@@ -1286,8 +1260,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proc_free_processes                                          *
- *                                                                            *
  * Purpose: frees process vector read by zbx_proc_get_processes function      *
  *                                                                            *
  * Parameters: processes - [IN/OUT] the process vector to free                *
@@ -1300,8 +1272,6 @@ void	zbx_proc_free_processes(zbx_vector_ptr_t *processes)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proc_get_matching_pids                                       *
- *                                                                            *
  * Purpose: get pids matching the specified process name, user name and       *
  *          command line                                                      *
  *                                                                            *
diff --git a/src/libs/zbxsysinfo/linux/sensors.c b/src/libs/zbxsysinfo/linux/sensors.c
index e22d664287c..e33c779d266 100644
--- a/src/libs/zbxsysinfo/linux/sensors.c
+++ b/src/libs/zbxsysinfo/linux/sensors.c
@@ -78,8 +78,6 @@ static void	count_sensor(int do_task, const char *filename, double *aggr, int *c
 #ifndef KERNEL_2_4
 /*********************************************************************************
  *                                                                               *
- * Function: sysfs_read_attr                                                     *
- *                                                                               *
  * Purpose: locate and read the name attribute of a sensor from sysfs            *
  *                                                                               *
  * Parameters:  device        - [IN] the path to sensor data in sysfs            *
diff --git a/src/libs/zbxsysinfo/solaris/proc.c b/src/libs/zbxsysinfo/solaris/proc.c
index 63137e523b4..1dbb61f85eb 100644
--- a/src/libs/zbxsysinfo/solaris/proc.c
+++ b/src/libs/zbxsysinfo/solaris/proc.c
@@ -55,8 +55,6 @@ zbx_sysinfo_proc_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_solaris_version_get                                          *
- *                                                                            *
  * Purpose: get Solaris version at runtime                                    *
  *                                                                            *
  * Parameters:                                                                *
@@ -93,8 +91,6 @@ static int	zbx_solaris_version_get(unsigned int *major_version, unsigned int *mi
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_detect_zone_support                                          *
- *                                                                            *
  * Purpose: find if zones are supported                                       *
  *                                                                            *
  * Return value:                                                              *
@@ -145,8 +141,6 @@ static void	zbx_sysinfo_proc_clear(zbx_sysinfo_proc_t *proc)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_sysinfo_proc_free                                            *
- *                                                                            *
  * Purpose: frees process data structure                                      *
  *                                                                            *
  ******************************************************************************/
@@ -211,8 +205,6 @@ static int	get_cmdline(FILE *f_cmd, char **line, size_t *line_offset)
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_get_process_info                                            *
- *                                                                            *
  * Purpose: get single process information                                    *
  *                                                                            *
  * Parameters: pid    - [IN] the process pid                                  *
@@ -302,8 +294,6 @@ static int	proc_get_process_info(const char *pid, unsigned int flags, zbx_sysinf
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_match_name                                                  *
- *                                                                            *
  * Purpose: checks if the process name matches filter                         *
  *                                                                            *
  ******************************************************************************/
@@ -323,8 +313,6 @@ static int	proc_match_name(const zbx_sysinfo_proc_t *proc, const char *procname)
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_match_user                                                  *
- *                                                                            *
  * Purpose: checks if the process user matches filter                         *
  *                                                                            *
  ******************************************************************************/
@@ -341,8 +329,6 @@ static int	proc_match_user(const zbx_sysinfo_proc_t *proc, const struct passwd *
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_match_cmdline                                               *
- *                                                                            *
  * Purpose: checks if the process command line matches filter                 *
  *                                                                            *
  ******************************************************************************/
@@ -360,8 +346,6 @@ static int	proc_match_cmdline(const zbx_sysinfo_proc_t *proc, const char *cmdlin
 #ifdef HAVE_ZONE_H
 /******************************************************************************
  *                                                                            *
- * Function: proc_match_zone                                                  *
- *                                                                            *
  * Purpose: checks if the process zone matches filter                         *
  *                                                                            *
  ******************************************************************************/
@@ -379,8 +363,6 @@ static int	proc_match_zone(const zbx_sysinfo_proc_t *proc, zbx_uint64_t flags, z
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_match_props                                                 *
- *                                                                            *
  * Purpose: checks if the process properties (except zone) matches filter     *
  *                                                                            *
  ******************************************************************************/
@@ -706,8 +688,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_read_cpu_util                                               *
- *                                                                            *
  * Purpose: reads process cpu utilization values from /proc/[pid]/usage file  *
  *                                                                            *
  * Parameters: procutil - [IN/OUT] the process cpu utilization data           *
@@ -771,8 +751,6 @@ static int	proc_read_cpu_util(zbx_procstat_util_t *procutil)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proc_get_process_stats                                       *
- *                                                                            *
  * Purpose: get process cpu utilization data                                  *
  *                                                                            *
  * Parameters: procs     - [IN/OUT] an array of process utilization data      *
@@ -793,8 +771,6 @@ void	zbx_proc_get_process_stats(zbx_procstat_util_t *procs, int procs_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proc_get_processes                                           *
- *                                                                            *
  * Purpose: get system processes                                              *
  *                                                                            *
  * Parameters: processes - [OUT] the system processes                         *
@@ -844,8 +820,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proc_free_processes                                          *
- *                                                                            *
  * Purpose: frees process vector read by zbx_proc_get_processes function      *
  *                                                                            *
  * Parameters: processes - [IN/OUT] the process vector to free                *
@@ -858,8 +832,6 @@ void	zbx_proc_free_processes(zbx_vector_ptr_t *processes)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_proc_get_matching_pids                                       *
- *                                                                            *
  * Purpose: get pids matching the specified process name, user name and       *
  *          command line                                                      *
  *                                                                            *
diff --git a/src/libs/zbxsysinfo/solaris/swap.c b/src/libs/zbxsysinfo/solaris/swap.c
index c247998a5ff..98ee08df96b 100644
--- a/src/libs/zbxsysinfo/solaris/swap.c
+++ b/src/libs/zbxsysinfo/solaris/swap.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: get_swapinfo                                                     *
- *                                                                            *
  * Purpose: get swap usage statistics                                         *
  *                                                                            *
  * Return value: SUCCEED if swap usage statistics retrieved successfully      *
diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c
index c15bb1561cb..666db829f03 100644
--- a/src/libs/zbxsysinfo/sysinfo.c
+++ b/src/libs/zbxsysinfo/sysinfo.c
@@ -76,8 +76,6 @@ static int	parse_key_access_rule(char *pattern, zbx_key_access_rule_t *rule);
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_command_dyn                                                *
- *                                                                            *
  * Purpose: parses item key and splits it into command and parameters         *
  *                                                                            *
  * Return value: ZBX_COMMAND_ERROR - error                                    *
@@ -143,8 +141,6 @@ static int	add_to_metrics(ZBX_METRIC **metrics, ZBX_METRIC *metric, char *error,
 
 /******************************************************************************
  *                                                                            *
- * Function: add_metric                                                       *
- *                                                                            *
  * Purpose: registers a new item key into the system                          *
  *                                                                            *
  ******************************************************************************/
@@ -155,8 +151,6 @@ int	add_metric(ZBX_METRIC *metric, char *error, size_t max_error_len)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_metric_local                                                 *
- *                                                                            *
  * Purpose: registers a new item key as local into the system                 *
  *                                                                            *
  ******************************************************************************/
@@ -374,8 +368,6 @@ void	free_metrics(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: init_key_access_rules                                            *
- *                                                                            *
  * Purpose: initializes key access rule list                                  *
  *                                                                            *
  ******************************************************************************/
@@ -386,8 +378,6 @@ void	init_key_access_rules(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_key_access_rule_free                                         *
- *                                                                            *
  * Purpose: frees key access rule and its resources                           *
  *                                                                            *
  ******************************************************************************/
@@ -401,8 +391,6 @@ static void	zbx_key_access_rule_free(zbx_key_access_rule_t *rule)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_key_access_rule_create                                       *
- *                                                                            *
  * Purpose: creates key access rule                                           *
  *                                                                            *
  * Parameters: pattern - [IN] the rule pattern                                *
@@ -430,8 +418,6 @@ static zbx_key_access_rule_t	*zbx_key_access_rule_create(char *pattern, zbx_key_
 
 /******************************************************************************
  *                                                                            *
- * Function: finalize_key_access_rules_configuration                          *
- *                                                                            *
  * Purpose: validates key access rules configuration                          *
  *                                                                            *
  ******************************************************************************/
@@ -527,8 +513,6 @@ void	finalize_key_access_rules_configuration(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_key_access_rule                                            *
- *                                                                            *
  * Purpose: parses key access rule expression from AllowKey and DenyKey       *
  *                                                                            *
  * Parameters: pattern - [IN] key access rule wildcard                        *
@@ -605,8 +589,6 @@ static int	parse_key_access_rule(char *pattern, zbx_key_access_rule_t *rule)
 
 /******************************************************************************
  *                                                                            *
- * Function: compare_key_access_rules                                         *
- *                                                                            *
  * Purpose: Compares two zbx_key_access_rule_t values to perform search       *
  *          within vector. Rule type (allow/deny) is not checked here.        *
  *                                                                            *
@@ -639,8 +621,6 @@ static int	compare_key_access_rules(const void *rule_a, const void *rule_b)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_key_access_rule                                              *
- *                                                                            *
  * Purpose: adds new key access rule from AllowKey and DenyKey parameters     *
  *                                                                            *
  * Parameters: parameter - [IN] the parameter that defined the rule           *
@@ -682,8 +662,6 @@ int	add_key_access_rule(const char *parameter, char *pattern, zbx_key_access_rul
 
 /******************************************************************************
  *                                                                            *
- * Function: check_request_access_rules                                       *
- *                                                                            *
  * Purpose: checks agent metric request against configured access rules       *
  *                                                                            *
  * Parameters: request - [IN] metric request (key and parameters)             *
@@ -768,8 +746,6 @@ int	check_request_access_rules(AGENT_REQUEST *request)
 
 /******************************************************************************
  *                                                                            *
- * Function: check_key_access_rules                                           *
- *                                                                            *
  * Purpose: checks agent metric request against configured access rules       *
  *                                                                            *
  * Parameters: metric - [IN] metric requested (key and parameters)            *
@@ -797,8 +773,6 @@ int	check_key_access_rules(const char *metric)
 
 /******************************************************************************
  *                                                                            *
- * Function: free_key_access_rules                                            *
- *                                                                            *
  * Purpose: cleanup key access rule list                                      *
  *                                                                            *
  ******************************************************************************/
@@ -850,8 +824,6 @@ void	free_result(AGENT_RESULT *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: init_request                                                     *
- *                                                                            *
  * Purpose: initialize the request structure                                  *
  *                                                                            *
  * Parameters: request - pointer to the structure                             *
@@ -869,8 +841,6 @@ void	init_request(AGENT_REQUEST *request)
 
 /******************************************************************************
  *                                                                            *
- * Function: free_request_params                                              *
- *                                                                            *
  * Purpose: free memory used by the request parameters                        *
  *                                                                            *
  * Parameters: request - pointer to the request structure                     *
@@ -890,8 +860,6 @@ static void	free_request_params(AGENT_REQUEST *request)
 
 /******************************************************************************
  *                                                                            *
- * Function: free_request                                                     *
- *                                                                            *
  * Purpose: free memory used by the request                                   *
  *                                                                            *
  * Parameters: request - pointer to the request structure                     *
@@ -905,8 +873,6 @@ void	free_request(AGENT_REQUEST *request)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_request_param                                                *
- *                                                                            *
  * Purpose: add a new parameter                                               *
  *                                                                            *
  * Parameters: request - [OUT] pointer to the request structure               *
@@ -926,8 +892,6 @@ static void	add_request_param(AGENT_REQUEST *request, char *pvalue, zbx_request_
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_item_key                                                   *
- *                                                                            *
  * Purpose: parse item command (key) and fill AGENT_REQUEST structure         *
  *                                                                            *
  * Parameters: itemkey - complete item key                                    *
@@ -1136,8 +1100,6 @@ static int	replace_param(const char *cmd, const AGENT_REQUEST *request, char **o
 
 /******************************************************************************
  *                                                                            *
- * Function: process                                                          *
- *                                                                            *
  * Purpose: execute agent check                                               *
  *                                                                            *
  * Parameters: in_command - item key                                          *
@@ -1502,8 +1464,6 @@ static zbx_log_t	*get_result_log_value(AGENT_RESULT *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_result_value_by_type                                         *
- *                                                                            *
  * Purpose: return value of result in special type                            *
  *          if value missing, convert existing value to requested type        *
  *                                                                            *
@@ -1550,8 +1510,6 @@ void	*get_result_value_by_type(AGENT_RESULT *result, int require_type)
 
 /******************************************************************************
  *                                                                            *
- * Function: unquote_key_param                                                *
- *                                                                            *
  * Purpose: unquotes special symbols in item key parameter                    *
  *                                                                            *
  * Parameters: param - [IN/OUT] item key parameter                            *
@@ -1580,8 +1538,6 @@ void	unquote_key_param(char *param)
 
 /******************************************************************************
  *                                                                            *
- * Function: quote_key_param                                                  *
- *                                                                            *
  * Purpose: quotes special symbols in item key parameter                      *
  *                                                                            *
  * Parameters: param   - [IN/OUT] item key parameter                          *
@@ -1660,8 +1616,6 @@ int	zbx_execute_threaded_metric(zbx_metric_func_t metric_func, AGENT_REQUEST *re
 #else
 /******************************************************************************
  *                                                                            *
- * Function: serialize_agent_result                                           *
- *                                                                            *
  * Purpose: serialize agent result to transfer over pipe/socket               *
  *                                                                            *
  * Parameters: data        - [IN/OUT] the data buffer                         *
@@ -1747,8 +1701,6 @@ static void	serialize_agent_result(char **data, size_t *data_alloc, size_t *data
 
 /******************************************************************************
  *                                                                            *
- * Function: deserialize_agent_result                                         *
- *                                                                            *
  * Purpose: deserialize agent result                                          *
  *                                                                            *
  * Parameters: data        - [IN] the data to deserialize                     *
@@ -1797,8 +1749,6 @@ static int	deserialize_agent_result(char *data, AGENT_RESULT *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_execute_threaded_metric                                      *
- *                                                                            *
  * Purpose: execute metric in a separate process/thread so it can be          *
  *          killed/terminated when timeout is detected                        *
  *                                                                            *
@@ -1972,8 +1922,6 @@ ZBX_THREAD_ENTRY(agent_metric_thread, data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_execute_threaded_metric                                      *
- *                                                                            *
  * Purpose: execute metric in a separate process/thread so it can be          *
  *          killed/terminated when timeout is detected                        *
  *                                                                            *
@@ -2083,8 +2031,6 @@ int	zbx_execute_threaded_metric(zbx_metric_func_t metric_func, AGENT_REQUEST *re
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mpoints_free                                                 *
- *                                                                            *
  * Purpose: frees previously allocated mount-point structure                  *
  *                                                                            *
  * Parameters: mpoint - [IN] pointer to structure from vector                 *
diff --git a/src/libs/zbxsysinfo/win32/cpu.c b/src/libs/zbxsysinfo/win32/cpu.c
index e98273ada14..d2052201f46 100644
--- a/src/libs/zbxsysinfo/win32/cpu.c
+++ b/src/libs/zbxsysinfo/win32/cpu.c
@@ -32,8 +32,6 @@ static GETLPIEX		get_lpiex;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_cpu_num_win32                                                *
- *                                                                            *
  * Purpose: find number of active logical CPUs                                *
  *                                                                            *
  * Return value: number of CPUs or 0 on failure                               *
@@ -127,8 +125,6 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_cpu_group_num_win32                                          *
- *                                                                            *
  * Purpose: returns the number of active processor groups                     *
  *                                                                            *
  * Return value: number of groups, 1 if groups are not supported              *
@@ -167,8 +163,6 @@ int	get_cpu_group_num_win32(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_numa_node_count_win32                                        *
- *                                                                            *
  * Purpose: returns the number of NUMA nodes                                  *
  *                                                                            *
  * Return value: number of NUMA nodes, 1 if NUMA not supported                *
diff --git a/src/libs/zbxsysinfo/win32/net.c b/src/libs/zbxsysinfo/win32/net.c
index 78ef8c23627..22daa06e8ab 100644
--- a/src/libs/zbxsysinfo/win32/net.c
+++ b/src/libs/zbxsysinfo/win32/net.c
@@ -46,8 +46,6 @@ zbx_ifrow_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ifrow_init                                                   *
- *                                                                            *
  * Purpose: initialize the zbx_ifrow_t variable                               *
  *                                                                            *
  * Parameters:                                                                *
@@ -93,8 +91,6 @@ static void	zbx_ifrow_init(zbx_ifrow_t *pIfRow)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ifrow_clean                                                  *
- *                                                                            *
  * Purpose: clean the zbx_ifrow_t variable                                    *
  *                                                                            *
  * Parameters:                                                                *
@@ -111,8 +107,6 @@ static void	zbx_ifrow_clean(zbx_ifrow_t *pIfRow)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ifrow_call_get_if_entry                                      *
- *                                                                            *
  * Purpose: call either GetIfEntry() or GetIfEntry2() based on the Windows    *
  *          release to fill the passed MIB interface structure.               *
  *                                                                            *
@@ -264,8 +258,6 @@ static ULONG64	zbx_ifrow_get_out_discards(const zbx_ifrow_t *pIfRow)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ifrow_get_utf8_description                                   *
- *                                                                            *
  * Purpose: returns interface description encoded in UTF-8 format             *
  *                                                                            *
  * Parameters:                                                                *
@@ -307,8 +299,6 @@ static char	*zbx_ifrow_get_utf8_description(const zbx_ifrow_t *pIfRow)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ifrow_get_guid_str                                           *
- *                                                                            *
  * Purpose: returns interface GUID in string format                           *
  *                                                                            *
  * Parameters:                                                                *
diff --git a/src/libs/zbxsysinfo/win32/services.c b/src/libs/zbxsysinfo/win32/services.c
index 870c7cba012..1a5aab31a05 100644
--- a/src/libs/zbxsysinfo/win32/services.c
+++ b/src/libs/zbxsysinfo/win32/services.c
@@ -39,8 +39,6 @@ zbx_startup_type_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_state_code                                                   *
- *                                                                            *
  * Purpose: convert service state code from value used in Microsoft Windows   *
  *          to value used in Zabbix                                           *
  *                                                                            *
@@ -119,8 +117,6 @@ static void	log_if_buffer_too_small(const char *function_name, DWORD sz)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_service_config                                           *
- *                                                                            *
  * Purpose: wrapper function around QueryServiceConfig()                      *
  *                                                                            *
  * Parameters:                                                                *
@@ -146,8 +142,6 @@ static int	zbx_get_service_config(SC_HANDLE hService, LPQUERY_SERVICE_CONFIG buf
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_service_config2                                          *
- *                                                                            *
  * Purpose: wrapper function around QueryServiceConfig2()                     *
  *                                                                            *
  * Parameters:                                                                *
diff --git a/src/libs/zbxsysinfo/win32/system.c b/src/libs/zbxsysinfo/win32/system.c
index f994659186e..64556d9526b 100644
--- a/src/libs/zbxsysinfo/win32/system.c
+++ b/src/libs/zbxsysinfo/win32/system.c
@@ -26,8 +26,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: read_registry_value                                              *
- *                                                                            *
  * Purpose: read value from Windows registry                                  *
  *                                                                            *
  ******************************************************************************/
@@ -48,8 +46,6 @@ static wchar_t	*read_registry_value(HKEY hKey, LPCTSTR name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_win_getversion                                               *
- *                                                                            *
  * Purpose: get Windows version information                                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/libs/zbxsysinfo/win32/wmi.cpp b/src/libs/zbxsysinfo/win32/wmi.cpp
index 7d3afcb5f04..ed3578bbea9 100644
--- a/src/libs/zbxsysinfo/win32/wmi.cpp
+++ b/src/libs/zbxsysinfo/win32/wmi.cpp
@@ -114,8 +114,6 @@ extern "C" void	zbx_co_uninitialize()
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_first_first                                                *
- *                                                                            *
  * Purpose: extract only one value from the search result                     *
  *                                                                            *
  * Parameters: pEnumerator - [IN] the search result                           *
@@ -195,8 +193,6 @@ out2:
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_all                                                        *
- *                                                                            *
  * Purpose: extract all values from the search result                         *
  *                                                                            *
  * Parameters: pEnumerator - [IN] the search result                           *
@@ -282,8 +278,6 @@ extern "C" static int	parse_all(IEnumWbemClassObject *pEnumerator, double timeou
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_wmi_get_variant                                              *
- *                                                                            *
  * Purpose: retrieves WMI value and stores it in the provided memory location *
  *                                                                            *
  * Parameters: wmi_namespace  - [IN] object path of the WMI namespace (UTF-8) *
@@ -373,8 +367,6 @@ exit:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_wmi_get                                                      *
- *                                                                            *
  * Purpose: wrapper function for zbx_wmi_get_variant(), stores the retrieved  *
  *          WMI value as UTF-8 encoded string                                 *
  *                                                                            *
@@ -430,8 +422,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: WMI_GET                                                          *
- *                                                                            *
  * Purpose: wrapper function for wmi.get metric                               *
  *                                                                            *
  * Parameters: request - [IN] WMI request parameters                          *
@@ -550,8 +540,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proc_arr_element                                                 *
- *                                                                            *
  * Purpose: take one element from array and put value to JSON document        *
  *                                                                            *
  * Parameters: sa       - [IN] SafeArray from WMI property                    *
@@ -686,8 +674,6 @@ extern "C" int	proc_arr_element(SAFEARRAY *sa, LONG *index, const char *prop_err
 
 /******************************************************************************
  *                                                                            *
- * Function: convert_wmiarray_json                                            *
- *                                                                            *
  * Purpose: transformation of variant array from WMI search result to JSON    *
  *                                                                            *
  * Parameters: vtProp     - [IN] variant WMI property value                   *
@@ -757,8 +743,6 @@ extern "C" int	convert_wmiarray_json(VARIANT *vtProp, const char *prop_name, ULO
 
 /******************************************************************************
  *                                                                            *
- * Function: put_variant_json                                                 *
- *                                                                            *
  * Purpose: copy value of VARIANT type to JSON document                       *
  *                                                                            *
  * Parameters: prop_json - [IN] json attribute name                           *
@@ -850,8 +834,6 @@ extern "C" int	put_variant_json(const char *prop_json, const char *prop_err, VAR
 
 /******************************************************************************
  *                                                                            *
- * Function: convert_wmi_json                                                 *
- *                                                                            *
  * Purpose: transformation of WMI search result to JSON                       *
  *                                                                            *
  * Parameters: wmi_values - [IN] WMI search result                            *
@@ -902,8 +884,6 @@ extern "C" int	convert_wmi_json(zbx_vector_wmi_instance_t *wmi_values, char **js
 
 /******************************************************************************
  *                                                                            *
- * Function: WMI_GETALL                                                       *
- *                                                                            *
  * Purpose: wrapper function for wmi.getall metric                            *
  *                                                                            *
  * Parameters: request - [IN] WMI request parameters                          *
diff --git a/src/libs/zbxtasks/task.c b/src/libs/zbxtasks/task.c
index 54b76c8bd65..8730db9a71b 100644
--- a/src/libs/zbxtasks/task.c
+++ b/src/libs/zbxtasks/task.c
@@ -28,8 +28,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_remote_command_clear                                          *
- *                                                                            *
  * Purpose: frees remote command task resources                               *
  *                                                                            *
  * Parameters: data - [IN] the remote command task data                       *
@@ -46,8 +44,6 @@ static void	tm_remote_command_clear(zbx_tm_remote_command_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_remote_command_result_clear                                   *
- *                                                                            *
  * Purpose: frees remote command result task resources                        *
  *                                                                            *
  * Parameters: data - [IN] the remote command result task data                *
@@ -60,8 +56,6 @@ static void	tm_remote_command_result_clear(zbx_tm_remote_command_result_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_data_result_clear                                             *
- *                                                                            *
  * Purpose: frees data result task resources                                  *
  *                                                                            *
  * Parameters: data - [IN] the data result task data                          *
@@ -74,8 +68,6 @@ static void	tm_data_result_clear(zbx_tm_data_result_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_data_clear                                                    *
- *                                                                            *
  * Purpose: frees data task resources                                         *
  *                                                                            *
  * Parameters: data - [IN] the data task                                      *
@@ -88,8 +80,6 @@ static void	tm_data_clear(zbx_tm_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_task_clear                                                *
- *                                                                            *
  * Purpose: frees task resources                                              *
  *                                                                            *
  * Parameters: task - [IN]                                                    *
@@ -127,8 +117,6 @@ void	zbx_tm_task_clear(zbx_tm_task_t *task)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_task_free                                                 *
- *                                                                            *
  * Purpose: frees task and its resources                                      *
  *                                                                            *
  * Parameters: task - [IN] the task to free                                   *
@@ -142,8 +130,6 @@ void	zbx_tm_task_free(zbx_tm_task_t *task)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_remote_command_create                                     *
- *                                                                            *
  * Purpose: create a remote command task data                                 *
  *                                                                            *
  * Parameters: command_type  - [IN] the remote command type (ZBX_SCRIPT_TYPE_)*
@@ -187,8 +173,6 @@ zbx_tm_remote_command_t	*zbx_tm_remote_command_create(int command_type, const ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_remote_command_result_create                              *
- *                                                                            *
  * Purpose: create a remote command result task data                          *
  *                                                                            *
  * Parameters: parent_taskid - [IN] the parent task identifier                *
@@ -213,8 +197,6 @@ zbx_tm_remote_command_result_t	*zbx_tm_remote_command_result_create(zbx_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_check_now_create                                          *
- *                                                                            *
  * Purpose: create a check now task data                                      *
  *                                                                            *
  * Parameters: itemid - [IN] the item identifier                              *
@@ -234,8 +216,6 @@ zbx_tm_check_now_t	*zbx_tm_check_now_create(zbx_uint64_t itemid)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_data_create                                               *
- *                                                                            *
  * Purpose: create a data task                                                *
  *                                                                            *
  * Parameters: parent_taskid - [IN] parent task identifier                    *
@@ -262,8 +242,6 @@ zbx_tm_data_t	*zbx_tm_data_create(zbx_uint64_t parent_taskid, const char *str, i
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_data_result_create                                        *
- *                                                                            *
  * Purpose: create a data result task data                                    *
  *                                                                            *
  * Parameters: parent_taskid - [IN] the parent task identifier                *
@@ -287,8 +265,6 @@ zbx_tm_data_result_t	*zbx_tm_data_result_create(zbx_uint64_t parent_taskid, int
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_task_create                                               *
- *                                                                            *
  * Purpose: create a new task                                                 *
  *                                                                            *
  * Parameters: taskid       - [IN] the task identifier                        *
@@ -321,8 +297,6 @@ zbx_tm_task_t	*zbx_tm_task_create(zbx_uint64_t taskid, unsigned char type, unsig
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_save_remote_command_tasks                                     *
- *                                                                            *
  * Purpose: saves remote command task data in database                        *
  *                                                                            *
  * Parameters: tasks     - [IN] the tasks                                     *
@@ -367,8 +341,6 @@ static int	tm_save_remote_command_tasks(zbx_tm_task_t **tasks, int tasks_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_save_remote_command_result_tasks                              *
- *                                                                            *
  * Purpose: saves remote command result task data in database                 *
  *                                                                            *
  * Parameters: tasks     - [IN] the tasks                                     *
@@ -410,8 +382,6 @@ static int	tm_save_remote_command_result_tasks(zbx_tm_task_t **tasks, int tasks_
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_save_check_now_tasks                                          *
- *                                                                            *
  * Purpose: saves remote command task data in database                        *
  *                                                                            *
  * Parameters: tasks     - [IN] the tasks                                     *
@@ -451,8 +421,6 @@ static int	tm_save_check_now_tasks(zbx_tm_task_t **tasks, int tasks_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_save_data_tasks                                               *
- *                                                                            *
  * Purpose: saves data task in database                                       *
  *                                                                            *
  * Parameters: tasks     - [IN] the tasks                                     *
@@ -493,8 +461,6 @@ static int	tm_save_data_tasks(zbx_tm_task_t **tasks, int tasks_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_save_data_result_tasks                                        *
- *                                                                            *
  * Purpose: saves data task result in database                                *
  *                                                                            *
  * Parameters: tasks     - [IN] the tasks                                     *
@@ -535,8 +501,6 @@ static int	tm_save_data_result_tasks(zbx_tm_task_t **tasks, int tasks_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_save_tasks                                                    *
- *                                                                            *
  * Purpose: saves tasks into database                                         *
  *                                                                            *
  * Parameters: tasks     - [IN] the tasks                                     *
@@ -624,8 +588,6 @@ static int	tm_save_tasks(zbx_tm_task_t **tasks, int tasks_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_save_tasks                                                *
- *                                                                            *
  * Purpose: saves tasks and their data into database                          *
  *                                                                            *
  * Parameters: tasks - [IN] the tasks                                         *
@@ -642,8 +604,6 @@ void	zbx_tm_save_tasks(zbx_vector_ptr_t *tasks)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_save_task                                                 *
- *                                                                            *
  * Purpose: saves task and its data into database                             *
  *                                                                            *
  * Parameters: task - [IN] the task                                           *
@@ -667,8 +627,6 @@ int	zbx_tm_save_task(zbx_tm_task_t *task)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_update_task_status                                        *
- *                                                                            *
  * Purpose: update status of the specified tasks in database                  *
  *                                                                            *
  * Parameters: tasks  - [IN] the tasks                                        *
@@ -706,8 +664,6 @@ void	zbx_tm_update_task_status(zbx_vector_ptr_t *tasks, int status)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_serialize_task                                           *
- *                                                                            *
  * Purpose: serializes common task data in json format                        *
  *                                                                            *
  * Parameters: json - [OUT] the json data                                     *
@@ -723,8 +679,6 @@ static void	tm_json_serialize_task(struct zbx_json *json, const zbx_tm_task_t *t
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_serialize_remote_command                                 *
- *                                                                            *
  * Purpose: serializes remote command data in json format                     *
  *                                                                            *
  * Parameters: json - [OUT] the json data                                     *
@@ -749,8 +703,6 @@ static void	tm_json_serialize_remote_command(struct zbx_json *json, const zbx_tm
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_serialize_remote_command_result                          *
- *                                                                            *
  * Purpose: serializes remote command result data in json format              *
  *                                                                            *
  * Parameters: json - [OUT] the json data                                     *
@@ -767,8 +719,6 @@ static void	tm_json_serialize_remote_command_result(struct zbx_json *json,
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_serialize_check_now                                      *
- *                                                                            *
  * Purpose: serializes check now data in json format                          *
  *                                                                            *
  * Parameters: json - [OUT] the json data                                     *
@@ -782,8 +732,6 @@ static void	tm_json_serialize_check_now(struct zbx_json *json, const zbx_tm_chec
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_serialize_data                                           *
- *                                                                            *
  * Purpose: serializes data task in json format                               *
  *                                                                            *
  * Parameters: json - [OUT] the json data                                     *
@@ -799,8 +747,6 @@ static void	tm_json_serialize_data(struct zbx_json *json, const zbx_tm_data_t *d
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_serialize_data_result                                    *
- *                                                                            *
  * Purpose: serializes data task result in json format                        *
  *                                                                            *
  * Parameters: json - [OUT] the json data                                     *
@@ -816,8 +762,6 @@ static void	tm_json_serialize_data_result(struct zbx_json *json, const zbx_tm_da
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_json_serialize_tasks                                      *
- *                                                                            *
  * Purpose: serializes remote command data in json format                     *
  *                                                                            *
  * Parameters: json  - [OUT] the json data                                    *
@@ -867,8 +811,6 @@ void	zbx_tm_json_serialize_tasks(struct zbx_json *json, const zbx_vector_ptr_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_deserialize_remote_command                               *
- *                                                                            *
  * Purpose: deserializes remote command from json data                        *
  *                                                                            *
  * Parameters: jp - [IN] the json data                                        *
@@ -955,8 +897,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_deserialize_remote_command_result                        *
- *                                                                            *
  * Purpose: deserializes remote command result from json data                 *
  *                                                                            *
  * Parameters: jp - [IN] the json data                                        *
@@ -997,8 +937,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_deserialize_check_now                                    *
- *                                                                            *
  * Purpose: deserializes check now from json data                             *
  *                                                                            *
  * Parameters: jp - [IN] the json data                                        *
@@ -1023,8 +961,6 @@ static zbx_tm_check_now_t	*tm_json_deserialize_check_now(const struct zbx_json_p
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_deserialize_data                                         *
- *                                                                            *
  * Purpose: deserializes data task from json                                  *
  *                                                                            *
  * Parameters: jp - [IN] the json                                             *
@@ -1065,8 +1001,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_deserialize_data_result                                  *
- *                                                                            *
  * Purpose: deserializes data task result from json                           *
  *                                                                            *
  * Parameters: jp - [IN] the json                                             *
@@ -1107,8 +1041,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_json_deserialize_task                                         *
- *                                                                            *
  * Purpose: deserializes common task data from json data                      *
  *                                                                            *
  * Parameters: jp - [IN] the json data                                        *
@@ -1141,8 +1073,6 @@ static zbx_tm_task_t	*tm_json_deserialize_task(const struct zbx_json_parse *jp)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_json_deserialize_tasks                                    *
- *                                                                            *
  * Purpose: deserializes tasks from json data                                 *
  *                                                                            *
  * Parameters: jp    - [IN] the json data                                     *
@@ -1207,8 +1137,6 @@ void	zbx_tm_json_deserialize_tasks(const struct zbx_json_parse *jp, zbx_vector_p
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_create_task_data                                             *
- *                                                                            *
  * Purpose: insert task and its data in database                              *
  *                                                                            *
  * Parameters: data         - [IN] task data                                  *
@@ -1243,8 +1171,6 @@ static zbx_uint64_t	zbx_create_task_data(const char *data, int len, zbx_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_task_result_wait                                          *
- *                                                                            *
  * Purpose: wait for task result                                              *
  *                                                                            *
  * Parameters: taskid - [IN] task identifier                                  *
@@ -1288,8 +1214,6 @@ static int	zbx_tm_task_result_wait(zbx_uint64_t taskid, char **info)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_execute_task_data                                         *
- *                                                                            *
  * Purpose: wait for task result                                              *
  *                                                                            *
  * Parameters: data         - [IN] task data                                  *
diff --git a/src/libs/zbxtrends/baseline.c b/src/libs/zbxtrends/baseline.c
index e89c148dda4..fa302e458a3 100644
--- a/src/libs/zbxtrends/baseline.c
+++ b/src/libs/zbxtrends/baseline.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: baseline_get_common_data                                         *
- *                                                                            *
  * Purpose: get baseline data for common period/season combinations           *
  *                                                                            *
  * Parameters: itemid      - [IN] the item identifier                         *
@@ -97,8 +95,6 @@ static int	baseline_get_common_data(zbx_uint64_t itemid, const char *table, time
 
 /******************************************************************************
  *                                                                            *
- * Function: baseline_get_isoyear_data                                        *
- *                                                                            *
  * Purpose: get baseline data for week based periods in a year                *
  *                                                                            *
  * Parameters: itemid     - [IN] the item identifier                          *
@@ -186,8 +182,6 @@ static int	baseline_get_isoyear_data(zbx_uint64_t itemid, const char *table, tim
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_baseline_get_data                                            *
- *                                                                            *
  * Purpose: get baseline data for the specified period                        *
  *                                                                            *
  * Parameters: itemid     - [IN] the item identifier                          *
diff --git a/src/libs/zbxtrends/cache.c b/src/libs/zbxtrends/cache.c
index f5360964fd8..590b514d336 100644
--- a/src/libs/zbxtrends/cache.c
+++ b/src/libs/zbxtrends/cache.c
@@ -141,8 +141,6 @@ static int	tfc_compare_func(const void *v1, const void *v2)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_malloc_func                                                  *
- *                                                                            *
  * Purpose: allocate memory for indexing hashset                              *
  *                                                                            *
  * Comments: There are two kinds of allocations that should be done:          *
@@ -182,8 +180,6 @@ static void	tfc_free_func(void *ptr)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_lru_append                                                   *
- *                                                                            *
  * Purpose: append data to the tail of least recently used slot list          *
  *                                                                            *
  ******************************************************************************/
@@ -206,8 +202,6 @@ static void	tfc_lru_append(zbx_tfc_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_lru_remove                                                   *
- *                                                                            *
  * Purpose: remove data from least recently used slot list                    *
  *                                                                            *
  ******************************************************************************/
@@ -226,8 +220,6 @@ static void	tfc_lru_remove(zbx_tfc_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_value_append                                                 *
- *                                                                            *
  * Purpose: append data to the tail of same item value list                   *
  *                                                                            *
  ******************************************************************************/
@@ -249,8 +241,6 @@ static void	tfc_value_append(zbx_tfc_data_t *root, zbx_tfc_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_value_remove                                                 *
- *                                                                            *
  * Purpose: remove data from same item value list                             *
  *                                                                            *
  ******************************************************************************/
@@ -262,8 +252,6 @@ static void	tfc_value_remove(zbx_tfc_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_free_data                                                    *
- *                                                                            *
  * Purpose: frees slot used to store trends function data                     *
  *                                                                            *
  ******************************************************************************/
@@ -283,8 +271,6 @@ static void	tfc_free_data(zbx_tfc_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_reserve_slot                                                 *
- *                                                                            *
  * Purpose: ensure there is a free slot available                             *
  *                                                                            *
  ******************************************************************************/
@@ -304,8 +290,6 @@ static void	tfc_reserve_slot(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_index_add                                                    *
- *                                                                            *
  * Purpose: indexes data by adding it to the index hashset                    *
  *                                                                            *
  ******************************************************************************/
@@ -331,8 +315,6 @@ static zbx_tfc_data_t	*tfc_index_add(zbx_tfc_data_t *data_local)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_function_str                                                 *
- *                                                                            *
  * Purpose: return trend function name in readable format                     *
  *                                                                            *
  ******************************************************************************/
@@ -359,8 +341,6 @@ static const char	*tfc_function_str(zbx_trend_function_t function)
 
 /******************************************************************************
  *                                                                            *
- * Function: tfc_state_str                                                    *
- *                                                                            *
  * Purpose: return trend cache state in readable format                       *
  *                                                                            *
  ******************************************************************************/
@@ -381,8 +361,6 @@ static const char	*tfc_state_str(zbx_trend_state_t state)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tfc_init                                                     *
- *                                                                            *
  * Purpose: initialize trend function cache                                   *
  *                                                                            *
  * Parameters: error - [OUT] the error message                                *
@@ -451,8 +429,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tfc_destroy                                                  *
- *                                                                            *
  * Purpose: destroy trend function cache                                      *
  *                                                                            *
  ******************************************************************************/
@@ -469,8 +445,6 @@ void	zbx_tfc_destroy(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tfc_get_value                                                *
- *                                                                            *
  * Purpose: get value and state from trend function cache                     *
  *                                                                            *
  * Parameters: itemid   - [IN] the itemid                                     *
@@ -548,8 +522,6 @@ int	zbx_tfc_get_value(zbx_uint64_t itemid, int start, int end, zbx_trend_functio
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tfc_put_value                                                *
- *                                                                            *
  * Purpose: put value and state from trend function cache                     *
  *                                                                            *
  * Parameters: itemid   - [IN] the itemid                                     *
diff --git a/src/libs/zbxtrends/trends.c b/src/libs/zbxtrends/trends.c
index b921c800dda..fd797488c65 100644
--- a/src/libs/zbxtrends/trends.c
+++ b/src/libs/zbxtrends/trends.c
@@ -32,8 +32,6 @@ static char	*trends_errors[ZBX_TREND_STATE_COUNT] = {
 
 /******************************************************************************
  *                                                                            *
- * Function: trends_parse_base                                                *
- *                                                                            *
  * Purpose: parse largest period base from function parameters                *
  *                                                                            *
  * Parameters: shift  - [IN] the period shift parameter                       *
@@ -76,8 +74,6 @@ static int	trends_parse_base(const char *period_shift, zbx_time_unit_t *base, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trends_parse_base                                            *
- *                                                                            *
  * Purpose: parse largest period base from function parameters                *
  *                                                                            *
  * Parameters: params - [IN] the function parameters                          *
@@ -103,8 +99,6 @@ int	zbx_trends_parse_base(const char *params, zbx_time_unit_t *base, char **erro
 
 /******************************************************************************
  *                                                                            *
- * Function: trends_parse_timeshift                                           *
- *                                                                            *
  * Purpose: parse timeshift                                                   *
  *                                                                            *
  * Parameters: from          - [IN] the start time                            *
@@ -198,8 +192,6 @@ static int	trends_parse_timeshift(time_t from, const char *timeshift, zbx_time_u
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_parse_timeshift                                              *
- *                                                                            *
  * Purpose: parse timeshift                                                   *
  *                                                                            *
  * Parameters: from          - [IN] the start time                            *
@@ -218,8 +210,6 @@ int	zbx_parse_timeshift(time_t from, const char *timeshift, struct tm *tm, char
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trends_parse_range                                           *
- *                                                                            *
  * Purpose: parse trend function period arguments into time range             *
  *                                                                            *
  * Parameters: from         - [IN] the time the period shift is calculated    *
@@ -311,8 +301,6 @@ int	zbx_trends_parse_range(time_t from, const char *param, int *start, int *end,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trends_parse_nextcheck                                       *
- *                                                                            *
  * Purpose: calculate possible nextcheck based on trend function parameters   *
  *                                                                            *
  * Parameters: from         - [IN] the time the period shift is calculated    *
@@ -414,8 +402,6 @@ int	zbx_trends_parse_nextcheck(time_t from, const char *period_shift, time_t *ne
 
 /******************************************************************************
  *                                                                            *
- * Function: trends_eval                                                      *
- *                                                                            *
  * Purpose: evaluate expression with trends data                              *
  *                                                                            *
  * Parameters: table       - [IN] the trends table name                       *
@@ -478,8 +464,6 @@ static zbx_trend_state_t	trends_eval(const char *table, zbx_uint64_t itemid, int
 
 /******************************************************************************
  *                                                                            *
- * Function: trends_eval_avg                                                  *
- *                                                                            *
  * Purpose: evaluate avg function with trends data                            *
  *                                                                            *
  * Parameters: table       - [IN] the trends table name                       *
@@ -539,8 +523,6 @@ static zbx_trend_state_t	trends_eval_avg(const char *table, zbx_uint64_t itemid,
 
 /******************************************************************************
  *                                                                            *
- * Function: trends_eval_sum                                                  *
- *                                                                            *
  * Purpose: evaluate sum function with trends data                            *
  *                                                                            *
  * Parameters: table       - [IN] the trends table name                       *
diff --git a/src/libs/zbxwin32/disk.c b/src/libs/zbxwin32/disk.c
index 2b12be05128..8ec4d902451 100644
--- a/src/libs/zbxwin32/disk.c
+++ b/src/libs/zbxwin32/disk.c
@@ -22,8 +22,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: get_cluster_size                                                 *
- *                                                                            *
  * Purpose: get file system cluster size for specified path (for cases when   *
  *          the file system is mounted on empty NTFS directory)               *
  *                                                                            *
diff --git a/src/libs/zbxwin32/perfmon.c b/src/libs/zbxwin32/perfmon.c
index dbc26681927..b3a99d1b7ee 100644
--- a/src/libs/zbxwin32/perfmon.c
+++ b/src/libs/zbxwin32/perfmon.c
@@ -290,8 +290,6 @@ close_query:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_builtin_object_index                                         *
- *                                                                            *
  * Purpose: get performance object index by reference value described by      *
  *          zbx_builtin_counter_ref_t enum                                    *
  *                                                                            *
@@ -308,8 +306,6 @@ DWORD	get_builtin_object_index(zbx_builtin_counter_ref_t counter_ref)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_builtin_counter_index                                        *
- *                                                                            *
  * Purpose: get performance counter index by reference value described by     *
  *          zbx_builtin_counter_ref_t enum                                    *
  *                                                                            *
@@ -326,8 +322,6 @@ DWORD	get_builtin_counter_index(zbx_builtin_counter_ref_t counter_ref)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_all_counter_names                                            *
- *                                                                            *
  * Purpose: function to read counter names/help from registry                 *
  *                                                                            *
  * Parameters: reg_key           - [IN] registry key                          *
@@ -378,8 +372,6 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_perf_name_by_index                                           *
- *                                                                            *
  * Purpose: fills performance counter name based on its index                 *
  *                                                                            *
  * Parameters: index - [IN]  PDH counter index                                *
@@ -407,8 +399,6 @@ static int	get_perf_name_by_index(DWORD index, wchar_t *name, DWORD size)
 
 /******************************************************************************
  *                                                                            *
- * Function: validate_counter_path                                            *
- *                                                                            *
  * Purpose: checks if a specified counter path data is pointing to a valid    *
  *          counter                                                           *
  *                                                                            *
@@ -461,8 +451,6 @@ static int	validate_counter_path(PDH_COUNTER_PATH_ELEMENTS	*cpe)
 
 /******************************************************************************
  *                                                                            *
- * Function: validate_object_counter                                          *
- *                                                                            *
  * Purpose: checks if specified counter is valid successor of the object      *
  *                                                                            *
  * Parameters: object  - [IN] PDH object index                                *
@@ -509,8 +497,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: init_builtin_counter_indexes                                     *
- *                                                                            *
  * Purpose: Scans registry key with all performance counter English names     *
  *          and obtains system-dependent PDH counter indexes for further      *
  *          use by corresponding items.                                       *
@@ -619,8 +605,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_counter_name                                                 *
- *                                                                            *
  * Purpose: get performance object or counter name by PDH index               *
  *                                                                            *
  * Parameters: pdhIndex - [IN] built-in performance counter index             *
diff --git a/src/libs/zbxxml/xml.c b/src/libs/zbxxml/xml.c
index 8553d299ed9..02a511f5450 100644
--- a/src/libs/zbxxml/xml.c
+++ b/src/libs/zbxxml/xml.c
@@ -51,8 +51,6 @@ ZBX_PTR_VECTOR_IMPL(xml_node_ptr, zbx_xml_node_t *)
 
 /******************************************************************************
  *                                                                            *
- * Function: xml_escape_dyn                                                   *
- *                                                                            *
  * Purpose: replace <> symbols in string with &lt;&gt; so the resulting       *
  *          string can be written into xml field                              *
  *                                                                            *
@@ -146,8 +144,6 @@ char	*xml_escape_dyn(const char *data)
 
 /**********************************************************************************
  *                                                                                *
- * Function: xml_escape_xpath_stringsize                                          *
- *                                                                                *
  * Purpose: calculate a string size after symbols escaping                        *
  *                                                                                *
  * Parameters: string - [IN] the string to check                                  *
@@ -171,8 +167,6 @@ static size_t	xml_escape_xpath_stringsize(const char *string)
 
 /**********************************************************************************
  *                                                                                *
- * Function: xml_escape_xpath_string                                              *
- *                                                                                *
  * Purpose: replace " symbol in string with ""                                    *
  *                                                                                *
  * Parameters: string - [IN] the xpath string to escape                           *
@@ -194,8 +188,6 @@ static void xml_escape_xpath_string(char *p, const char *string)
 
 /**********************************************************************************
  *                                                                                *
- * Function: xml_escape_xpath                                                     *
- *                                                                                *
  * Purpose: escaping of symbols for using in xpath expression                     *
  *                                                                                *
  * Parameters: data - [IN/OUT] the string to update                               *
@@ -218,8 +210,6 @@ void xml_escape_xpath(char **data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_query_xpath                                                  *
- *                                                                            *
  * Purpose: execute xpath query                                               *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -329,8 +319,6 @@ out:
 #ifdef HAVE_LIBXML2
 /******************************************************************************
  *                                                                            *
- * Function: compare_xml_nodes_by_name                                        *
- *                                                                            *
  * Purpose: compare two xml nodes by name                                     *
  *                                                                            *
  * Comments: This function is used to sort xml nodes by name                  *
@@ -357,8 +345,6 @@ static void	zbx_xml_node_free(zbx_xml_node_t *node)
 
 /******************************************************************************
  *                                                                            *
- * Function: xml_to_vector                                                    *
- *                                                                            *
  * Purpose: to collect content of XML document nodes into vector              *
  *                                                                            *
  * Parameters: xml_node  - [IN] parent XML node structure                     *
@@ -471,8 +457,6 @@ static void	xml_to_vector(xmlNode *xml_node, zbx_vector_xml_node_ptr_t *nodes)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_data                                                          *
- *                                                                            *
  * Purpose: to check if node is leaf node with text content                   *
  *                                                                            *
  * Parameters: node       - [IN] node structure                               *
@@ -494,8 +478,6 @@ static int	is_data(zbx_xml_node_t *node)
 
 /******************************************************************************
  *                                                                            *
- * Function: vector_to_json                                                   *
- *                                                                            *
  * Purpose: to write content of vector into JSON document                     *
  *                                                                            *
  * Parameters: nodes   - [IN] vector of nodes                                 *
@@ -586,8 +568,6 @@ static void	vector_to_json(zbx_vector_xml_node_ptr_t *nodes, struct zbx_json *js
 #ifdef HAVE_LIBXML2
 /******************************************************************************
  *                                                                            *
- * Function: zbx_open_xml                                                     *
- *                                                                            *
  * Purpose: to create xmlDoc and it's root node for input data                *
  *                                                                            *
  * Parameters: data      - [IN] input data                                    *
@@ -647,8 +627,6 @@ int	zbx_open_xml(char *data, int options, int maxerrlen, void **xml_doc, void **
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_xml_memory                                             *
- *                                                                            *
  * Purpose: to check xml memory to be valid                                   *
  *                                                                            *
  * Parameters: mem       - [IN] pointer to memory                             *
@@ -685,8 +663,6 @@ int	zbx_check_xml_memory(char *mem, int maxerrlen, char **errmsg)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_xml_to_json                                                  *
- *                                                                            *
  * Purpose: convert XML format value to JSON format                           *
  *                                                                            *
  * Parameters: xml_data - [IN] the XML data to process                        *
@@ -728,8 +704,6 @@ exit:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_xmlnode_to_json                                              *
- *                                                                            *
  * Purpose: convert XML format value to JSON format                           *
  *                                                                            *
  * Parameters: xml_node - [IN] the XML data to process                        *
@@ -769,8 +743,6 @@ int	zbx_xmlnode_to_json(void *xml_node, char **jstr)
 #ifdef HAVE_LIBXML2
 /******************************************************************************
  *                                                                            *
- * Function: json_to_xmlnode                                                  *
- *                                                                            *
  * Purpose: to write content of JSON document into XML node                   *
  *                                                                            *
  * Parameters: jp             - [IN] JSON parse structure                     *
@@ -900,8 +872,6 @@ static void	json_to_xmlnode(struct zbx_json_parse *jp, char *arr_name, int deep,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_json_to_xml                                                  *
- *                                                                            *
  * Purpose: convert JSON format value to XML format                           *
  *                                                                            *
  * Parameters: json_data   - [IN] the JSON data to process                    *
diff --git a/src/modules/dummy/dummy.c b/src/modules/dummy/dummy.c
index e5e7305f532..0b07baf6353 100644
--- a/src/modules/dummy/dummy.c
+++ b/src/modules/dummy/dummy.c
@@ -44,8 +44,6 @@ static ZBX_METRIC keys[] =
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_module_api_version                                           *
- *                                                                            *
  * Purpose: returns version number of the module interface                    *
  *                                                                            *
  * Return value: ZBX_MODULE_API_VERSION - version of module.h module is       *
@@ -60,8 +58,6 @@ int	zbx_module_api_version(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_module_item_timeout                                          *
- *                                                                            *
  * Purpose: set timeout value for processing of items                         *
  *                                                                            *
  * Parameters: timeout - timeout in seconds, 0 - no timeout set               *
@@ -74,8 +70,6 @@ void	zbx_module_item_timeout(int timeout)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_module_item_list                                             *
- *                                                                            *
  * Purpose: returns list of item keys supported by the module                 *
  *                                                                            *
  * Return value: list of item keys                                            *
@@ -113,8 +107,6 @@ static int	dummy_echo(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: dummy_random                                                     *
- *                                                                            *
  * Purpose: a main entry point for processing of an item                      *
  *                                                                            *
  * Parameters: request - structure that contains item key and parameters      *
@@ -171,8 +163,6 @@ static int	dummy_random(AGENT_REQUEST *request, AGENT_RESULT *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_module_init                                                  *
- *                                                                            *
  * Purpose: the function is called on agent startup                           *
  *          It should be used to call any initialization routines             *
  *                                                                            *
@@ -192,8 +182,6 @@ int	zbx_module_init(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_module_uninit                                                *
- *                                                                            *
  * Purpose: the function is called on agent shutdown                          *
  *          It should be used to cleanup used resources if there are any      *
  *                                                                            *
@@ -273,8 +261,6 @@ static void	dummy_history_log_cb(const ZBX_HISTORY_LOG *history, int history_num
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_module_history_write_cbs                                     *
- *                                                                            *
  * Purpose: returns a set of module functions Zabbix will call to export      *
  *          different types of historical data                                *
  *                                                                            *
diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c
index db628fb3f1a..124e9319622 100644
--- a/src/zabbix_agent/active.c
+++ b/src/zabbix_agent/active.c
@@ -255,8 +255,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: mode_parameter_is_skip                                           *
- *                                                                            *
  * Purpose: test log[] or log.count[] item key if <mode> parameter is set to  *
  *          'skip'                                                            *
  *                                                                            *
@@ -291,8 +289,6 @@ static int	mode_parameter_is_skip(unsigned char flags, const char *itemkey)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_list_of_checks                                             *
- *                                                                            *
  * Purpose: Parse list of active checks received from server                  *
  *                                                                            *
  * Parameters: str  - NULL terminated string received from server             *
@@ -524,8 +520,6 @@ out:
 
 /*********************************************************************************
  *                                                                               *
- * Function: process_config_item                                                 *
- *                                                                               *
  * Purpose: process configuration item and set it value to respective parameter  *
  *                                                                               *
  * Parameters: json   - pointer to JSON structure where to put resulting value   *
@@ -588,13 +582,8 @@ static void process_config_item(struct zbx_json *json, char *config, size_t leng
 
 /******************************************************************************
  *                                                                            *
- * Function: refresh_active_checks                                            *
- *                                                                            *
  * Purpose: Retrieve from Zabbix server list of active checks                 *
  *                                                                            *
- * Parameters: host - IP or Hostname of Zabbix server                         *
- *             port - port of Zabbix server                                   *
- *                                                                            *
  * Return value: returns SUCCEED on successful parsing,                       *
  *               FAIL on other cases                                          *
  *                                                                            *
@@ -703,8 +692,6 @@ static int	refresh_active_checks(zbx_vector_ptr_t *addrs)
 
 /******************************************************************************
  *                                                                            *
- * Function: check_response                                                   *
- *                                                                            *
  * Purpose: Check whether JSON response is SUCCEED                            *
  *                                                                            *
  * Parameters: JSON response from Zabbix trapper                              *
@@ -742,8 +729,6 @@ static int	check_response(char *response)
 
 /******************************************************************************
  *                                                                            *
- * Function: send_buffer                                                      *
- *                                                                            *
  * Purpose: Send value stored in the buffer to Zabbix server                  *
  *                                                                            *
  * Parameters: addrs    - [IN] vector with a pair of Zabbix server IP or      *
@@ -922,8 +907,6 @@ ret:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_value                                                    *
- *                                                                            *
  * Purpose: Buffer new value or send the whole buffer to the server           *
  *                                                                            *
  * Parameters: addrs       - vector with a pair of Zabbix server IP or        *
@@ -1164,8 +1147,6 @@ out:
 #if !defined(_WINDOWS) && !defined(__MINGW32__)
 /******************************************************************************
  *                                                                            *
- * Function: zbx_minimal_init_prep_vec_data                                   *
- *                                                                            *
  * Purpose: initialize an element of preparation vector with available data   *
  *                                                                            *
  * Parameters: lastlogsize   - [IN] lastlogize value to write into persistent *
@@ -1332,8 +1313,6 @@ static void	process_active_checks(zbx_vector_ptr_t *addrs)
 
 /******************************************************************************
  *                                                                            *
- * Function: update_schedule                                                  *
- *                                                                            *
  * Purpose: update active check and send buffer schedule by the specified     *
  *          time delta                                                        *
  *                                                                            *
diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c
index f047ee45edf..f2c890d5ed9 100644
--- a/src/zabbix_agent/cpustat.c
+++ b/src/zabbix_agent/cpustat.c
@@ -1308,8 +1308,6 @@ static int	get_cpu_status(int pc_status)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_cpus                                                         *
- *                                                                            *
  * Purpose: Retrieve list of available CPUs in the collector                  *
  *                                                                            *
  * Parameters: vector [OUT] - vector for CPUNUM/STATUS pairs                  *
diff --git a/src/zabbix_agent/eventlog.c b/src/zabbix_agent/eventlog.c
index 88854092136..0f69f189c03 100644
--- a/src/zabbix_agent/eventlog.c
+++ b/src/zabbix_agent/eventlog.c
@@ -173,8 +173,6 @@ static void	zbx_close_eventlog(HANDLE eventlog_handle)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_message_files                                            *
- *                                                                            *
  * Purpose: gets event message and parameter translation files from registry  *
  *                                                                            *
  * Parameters: szLogName         - [IN] the log name                          *
@@ -221,8 +219,6 @@ static void	zbx_get_message_files(const wchar_t *szLogName, const wchar_t *szSou
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_load_message_file                                            *
- *                                                                            *
  * Purpose: load the specified message file, expanding environment variables  *
  *          in the file name if necessary                                     *
  *                                                                            *
@@ -259,8 +255,6 @@ static HINSTANCE	zbx_load_message_file(const wchar_t *szFileName)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_format_message                                               *
- *                                                                            *
  * Purpose: extracts the specified message from a message file                *
  *                                                                            *
  * Parameters: hLib           - [IN] the message file handle                  *
@@ -296,8 +290,6 @@ static char	*zbx_format_message(HINSTANCE hLib, DWORD dwMessageId, wchar_t **pIn
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_translate_message_params                                     *
- *                                                                            *
  * Purpose: translates message by replacing parameters %%<id> with translated *
  *          values                                                            *
  *                                                                            *
@@ -700,8 +692,6 @@ cleanup:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_parse_eventlog_message6                                      *
- *                                                                            *
  * Purpose: details parse of a single EventLog record                         *
  *                                                                            *
  * Parameters: wsource        - [IN] EventLog file name                       *
@@ -846,8 +836,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_eventslog6                                               *
- *                                                                            *
  * Purpose:  batch processing of Event Log file                               *
  *                                                                            *
  * Parameters: server           - [IN] IP or Hostname of Zabbix server        *
@@ -1135,8 +1123,6 @@ int	finalize_eventlog6(EVT_HANDLE *render_context, EVT_HANDLE *query)
 
 /******************************************************************************
  *                                                                            *
- * Function: seek_eventlog                                                    *
- *                                                                            *
  * Purpose: try to set reading position in event log                          *
  *                                                                            *
  * Parameters: eventlog_handle - [IN] the handle to the event log to be read  *
@@ -1266,8 +1252,6 @@ static int	seek_eventlog(HANDLE *eventlog_handle, zbx_uint64_t FirstID, DWORD Re
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_parse_eventlog_message                                       *
- *                                                                            *
  * Purpose: details parse of a single Event Log record                        *
  *                                                                            *
  * Parameters: wsource       - [IN] EventLog file name                        *
@@ -1377,8 +1361,6 @@ static void	zbx_parse_eventlog_message(const wchar_t *wsource, const EVENTLOGREC
 
 /******************************************************************************
  *                                                                            *
- * Function: process_eventslog                                                *
- *                                                                            *
  * Purpose:  batch processing of Event Log file                               *
  *                                                                            *
  * Parameters: server           - [IN] IP or Hostname of Zabbix server        *
diff --git a/src/zabbix_agent/logfiles/logfiles.c b/src/zabbix_agent/logfiles/logfiles.c
index 44e5af729a5..210050134ac 100644
--- a/src/zabbix_agent/logfiles/logfiles.c
+++ b/src/zabbix_agent/logfiles/logfiles.c
@@ -48,8 +48,6 @@ extern ZBX_THREAD_LOCAL char	*CONFIG_HOSTNAME;
 
 /******************************************************************************
  *                                                                            *
- * Function: split_string                                                     *
- *                                                                            *
  * Purpose: separates given string to two parts by given delimiter in string  *
  *                                                                            *
  * Parameters:                                                                *
@@ -100,8 +98,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: split_filename                                                   *
- *                                                                            *
  * Purpose: separates full-path file name into directory and file name regexp *
  *          parts                                                             *
  *                                                                            *
@@ -233,8 +229,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: file_part_md5                                                    *
- *                                                                            *
  * Purpose: calculate the MD5 sum of the specified part of the file           *
  *                                                                            *
  * Parameters:                                                                *
@@ -296,8 +290,6 @@ static int	file_part_md5(int f, size_t offset, int length, md5_byte_t *md5buf, c
 #if defined(_WINDOWS) || defined(__MINGW32__)
 /******************************************************************************
  *                                                                            *
- * Function: file_id                                                          *
- *                                                                            *
  * Purpose: get Microsoft Windows file device ID, 64-bit FileIndex or         *
  *          128-bit FileId                                                    *
  *                                                                            *
@@ -376,8 +368,6 @@ static int	file_id(int f, int use_ino, zbx_uint64_t *dev, zbx_uint64_t *ino_lo,
 
 /******************************************************************************
  *                                                                            *
- * Function: set_use_ino_by_fs_type                                           *
- *                                                                            *
  * Purpose: find file system type and set 'use_ino' parameter                 *
  *                                                                            *
  * Parameters:                                                                *
@@ -436,8 +426,6 @@ static int	set_use_ino_by_fs_type(const char *path, int *use_ino, char **err_msg
 
 /******************************************************************************
  *                                                                            *
- * Function: print_logfile_list                                               *
- *                                                                            *
  * Purpose: write logfile list into log for debugging                         *
  *                                                                            *
  * Parameters:                                                                *
@@ -472,8 +460,6 @@ static void	print_logfile_list(const struct st_logfile *logfiles, int logfiles_n
 
 /******************************************************************************
  *                                                                            *
- * Function: compare_file_places                                              *
- *                                                                            *
  * Purpose: compare device numbers and inode numbers of 2 files               *
  *                                                                            *
  * Parameters: old_file - [IN] details of the 1st log file                    *
@@ -505,8 +491,6 @@ static int	compare_file_places(const struct st_logfile *old_file, const struct s
 
 /******************************************************************************
  *                                                                            *
- * Function: open_file_helper                                                 *
- *                                                                            *
  * Purpose: open specified file for reading                                   *
  *                                                                            *
  * Parameters: pathname - [IN] full pathname of file                          *
@@ -527,8 +511,6 @@ static int	open_file_helper(const char *pathname, char **err_msg)
 
 /******************************************************************************
  *                                                                            *
- * Function: close_file_helper                                                *
- *                                                                            *
  * Purpose: close specified file                                              *
  *                                                                            *
  * Parameters: fd       - [IN] file descriptor to close                       *
@@ -553,8 +535,6 @@ static int	close_file_helper(int fd, const char *pathname, char **err_msg)
 
 /******************************************************************************
  *                                                                            *
- * Function: examine_md5_and_place                                            *
- *                                                                            *
  * Purpose: from MD5 sums of blocks and places of 2 files make a conclusion   *
  *          is it the same file, a pair 'original/copy' or 2 different files  *
  *                                                                            *
@@ -590,8 +570,6 @@ static int	examine_md5_and_place(const md5_byte_t *buf1, const md5_byte_t *buf2,
 
 /******************************************************************************
  *                                                                            *
- * Function: is_same_file_logcpt                                              *
- *                                                                            *
  * Purpose: find out if a file from the old list and a file from the new list *
  *          could be the same file or copy in case of copy/truncate rotation  *
  *                                                                            *
@@ -807,8 +785,6 @@ clean3:
 
 /******************************************************************************
  *                                                                            *
- * Function: is_same_file_logrt                                               *
- *                                                                            *
  * Purpose: find out if a file from the old list and a file from the new list *
  *          could be the same file in case of simple rotation                 *
  *                                                                            *
@@ -1022,8 +998,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: cross_out                                                        *
- *                                                                            *
  * Purpose: fill the given row and column with '0' except the element at the  *
  *          cross point and protected columns and protected rows              *
  *                                                                            *
@@ -1077,8 +1051,6 @@ static void	cross_out(char *arr, int n_rows, int n_cols, int row, int col, const
 
 /******************************************************************************
  *                                                                            *
- * Function: is_uniq_row                                                      *
- *                                                                            *
  * Purpose: check if there is only one element '1' or '2' in the given row    *
  *                                                                            *
  * Parameters:                                                                *
@@ -1119,8 +1091,6 @@ static int	is_uniq_row(const char * const arr, int n_cols, int row)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_uniq_col                                                      *
- *                                                                            *
  * Purpose: check if there is only one element '1' or '2' in the given column *
  *                                                                            *
  * Parameters:                                                                *
@@ -1162,8 +1132,6 @@ static int	is_uniq_col(const char * const arr, int n_rows, int n_cols, int col)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_old2new_unique_mapping                                        *
- *                                                                            *
  * Purpose: check if 'old2new' array has only unique mappings                 *
  *                                                                            *
  * Parameters:                                                                *
@@ -1201,8 +1169,6 @@ static int	is_old2new_unique_mapping(const char * const old2new, int num_old, in
 
 /******************************************************************************
  *                                                                            *
- * Function: resolve_old2new                                                  *
- *                                                                            *
  * Purpose: resolve non-unique mappings                                       *
  *                                                                            *
  * Parameters:                                                                *
@@ -1356,8 +1322,6 @@ static void	resolve_old2new(char *old2new, int num_old, int num_new)
 
 /******************************************************************************
  *                                                                            *
- * Function: create_old2new_and_copy_of                                       *
- *                                                                            *
  * Purpose: allocate and fill an array of possible mappings from the old log  *
  *          files to the new log files                                        *
  *                                                                            *
@@ -1441,8 +1405,6 @@ static char	*create_old2new_and_copy_of(zbx_log_rotation_options_t rotation_type
 
 /******************************************************************************
  *                                                                            *
- * Function: find_old2new                                                     *
- *                                                                            *
  * Purpose: find a mapping from old to new file                               *
  *                                                                            *
  * Parameters:                                                                *
@@ -1472,8 +1434,6 @@ static int	find_old2new(const char * const old2new, int num_new, int i_old)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_logfile                                                      *
- *                                                                            *
  * Purpose: adds information of a logfile to the list of logfiles             *
  *                                                                            *
  * Parameters: logfiles - pointer to the list of logfiles                     *
@@ -1574,8 +1534,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: destroy_logfile_list                                             *
- *                                                                            *
  * Purpose: release resources allocated to a logfile list                     *
  *                                                                            *
  * Parameters:                                                                *
@@ -1602,8 +1560,6 @@ void	destroy_logfile_list(struct st_logfile **logfiles, int *logfiles_alloc, int
 
 /******************************************************************************
  *                                                                            *
- * Function: pick_logfile                                                     *
- *                                                                            *
  * Purpose: checks if the specified file meets requirements and adds it to    *
  *          the logfile list                                                  *
  *                                                                            *
@@ -1647,8 +1603,6 @@ static void	pick_logfile(const char *directory, const char *filename, int mtime,
 
 /******************************************************************************
  *                                                                            *
- * Function: pick_logfiles                                                    *
- *                                                                            *
  * Purpose: find logfiles in a directory and put them into a list             *
  *                                                                            *
  * Parameters:                                                                *
@@ -1748,8 +1702,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: compile_filename_regexp                                          *
- *                                                                            *
  * Purpose: compile regular expression                                        *
  *                                                                            *
  * Parameters:                                                                *
@@ -1778,8 +1730,6 @@ static int	compile_filename_regexp(const char *filename_regexp, zbx_regexp_t **r
 
 /******************************************************************************
  *                                                                            *
- * Function: fill_file_details                                                *
- *                                                                            *
  * Purpose: fill-in MD5 sums, device and inode numbers for files in the list  *
  *                                                                            *
  * Parameters:                                                                *
@@ -1846,8 +1796,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: make_logfile_list                                                *
- *                                                                            *
  * Purpose: select log files to be analyzed and make a list, set 'use_ino'    *
  *          parameter                                                         *
  *                                                                            *
@@ -2066,8 +2014,6 @@ static int	zbx_match_log_rec(const zbx_vector_ptr_t *regexps, const char *value,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_read2                                                        *
- *                                                                            *
  * Comments: Thread-safe                                                      *
  *                                                                            *
  ******************************************************************************/
@@ -2412,8 +2358,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_log                                                      *
- *                                                                            *
  * Purpose: Match new records in logfile with regexp, transmit matching       *
  *          records to Zabbix server                                          *
  *                                                                            *
@@ -2606,8 +2550,6 @@ static void	ensure_order_if_mtimes_equal(const struct st_logfile *logfiles_old,
 
 /******************************************************************************
  *                                                                            *
- * Function: files_have_same_blocks_md5                                       *
- *                                                                            *
  * Purpose: compare MD5 sums of first and last blocks between 2 files. If MD5 *
  *          sums have been calculated for blocks of different sizes or        *
  *          offsets then open the log file with larger size of blocks and get *
@@ -2811,8 +2753,6 @@ static zbx_uint64_t	max_processed_size_in_copies(const struct st_logfile *logfil
 
 /******************************************************************************
  *                                                                            *
- * Function: calculate_delay                                                  *
- *                                                                            *
  * Purpose: calculate delay based on number of processed and remaining bytes, *
  *          and processing time                                               *
  *                                                                            *
@@ -2895,8 +2835,6 @@ static void	jump_remaining_bytes_logrt(struct st_logfile *logfiles, int logfiles
 
 /******************************************************************************
  *                                                                            *
- * Function: adjust_position_after_jump                                       *
- *                                                                            *
  * Purpose:                                                                   *
  *    After jumping over a number of bytes we "land" most likely somewhere in *
  *    the middle of log file line. This function tries to adjust position to  *
@@ -3066,8 +3004,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: jump_ahead                                                       *
- *                                                                            *
  * Purpose: move forward to a new position in the log file list               *
  *                                                                            *
  * Parameters:                                                                *
@@ -3231,8 +3167,6 @@ static void	transfer_for_copytruncate(const struct st_logfile *logfiles_old, int
 
 /******************************************************************************
  *                                                                            *
- * Function: update_new_list_from_old                                         *
- *                                                                            *
  * Comments: Thread-safe                                                      *
  *                                                                            *
  ******************************************************************************/
@@ -3281,8 +3215,6 @@ static int	update_new_list_from_old(zbx_log_rotation_options_t rotation_type, st
 
 /******************************************************************************
  *                                                                            *
- * Function: process_logrt                                                    *
- *                                                                            *
  * Purpose: Find new records in logfiles                                      *
  *                                                                            *
  * Parameters:                                                                *
@@ -3714,8 +3646,6 @@ static int	check_number_of_parameters(unsigned char flags, const AGENT_REQUEST *
 
 /******************************************************************************
  *                                                                            *
- * Function: init_max_lines_per_sec                                           *
- *                                                                            *
  * Comments: thread-safe if CONFIG_MAX_LINES_PER_SECOND is updated when log   *
  *           checks are not running                                           *
  *                                                                            *
@@ -3880,8 +3810,6 @@ static int	init_persistent_dir_parameter(const char *server, unsigned short port
 
 /******************************************************************************
  *                                                                            *
- * Function: process_log_check                                                *
- *                                                                            *
  * Comments: Function body is thread-safe if CONFIG_HOSTNAME is not updated   *
  *           while log checks are running. Uses callback function             *
  *           process_value_cb, so overall thread-safety depends on caller.    *
diff --git a/src/zabbix_agent/logfiles/persistent_state.c b/src/zabbix_agent/logfiles/persistent_state.c
index 231b5c2afa4..2f21b3ef6f0 100644
--- a/src/zabbix_agent/logfiles/persistent_state.c
+++ b/src/zabbix_agent/logfiles/persistent_state.c
@@ -53,8 +53,6 @@ static int	zbx_persistent_inactive_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: str2file_name_part                                               *
- *                                                                            *
  * Purpose: for the specified string get the part of persistent storage path  *
  *                                                                            *
  * Parameters:                                                                *
@@ -101,8 +99,6 @@ static char	*str2file_name_part(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: active_server2dir_name_part                                      *
- *                                                                            *
  * Purpose: calculate the part of persistent storage path for the specified   *
  *          server/port pair where the agent is sending active check data     *
  *                                                                            *
@@ -134,8 +130,6 @@ static char	*active_server2dir_name_part(const char *server, unsigned short port
 
 /******************************************************************************
  *                                                                            *
- * Function: make_persistent_server_directory_name                            *
- *                                                                            *
  * Purpose: make the name of persistent storage directory for the specified   *
  *          server/proxy and port                                             *
  *                                                                            *
@@ -163,8 +157,6 @@ static char	*make_persistent_server_directory_name(const char *base_path, const
 
 /******************************************************************************
  *                                                                            *
- * Function: check_persistent_directory_exists                                *
- *                                                                            *
  * Purpose: check if the directory exists                                     *
  *                                                                            *
  * Parameters:                                                                *
@@ -195,8 +187,6 @@ static int	check_persistent_directory_exists(const char *pathname, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: create_persistent_directory                                      *
- *                                                                            *
  * Purpose: create directory if it does not exist or check access if it       *
  *          exists                                                            *
  *                                                                            *
@@ -228,8 +218,6 @@ static int	create_persistent_directory(const char *pathname, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: create_base_path_directories                                     *
- *                                                                            *
  * Purpose: create all subdirectories in the pathname if they do not exist    *
  *                                                                            *
  * Parameters:                                                                *
@@ -294,8 +282,6 @@ static int	create_base_path_directories(const char *pathname, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_create_persistent_server_directory                           *
- *                                                                            *
  * Purpose: create directory if it does not exist or check access if it       *
  *          exists. Directory name is derived from host and port.             *
  *                                                                            *
@@ -350,8 +336,6 @@ char	*zbx_create_persistent_server_directory(const char *base_path, const char *
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_make_persistent_file_name                                    *
- *                                                                            *
  * Purpose: make the name of persistent storage directory or file             *
  *                                                                            *
  * Parameters:                                                                *
@@ -374,8 +358,6 @@ char	*zbx_make_persistent_file_name(const char *persistent_server_dir, const cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_write_persistent_file                                        *
- *                                                                            *
  * Purpose: write metric info into persistent file                            *
  *                                                                            *
  * Parameters:                                                                *
@@ -422,8 +404,6 @@ static int	zbx_write_persistent_file(const char *filename, const char *data, cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_read_persistent_file                                         *
- *                                                                            *
  * Purpose: read metric info from persistent file. One line is read.          *
  *                                                                            *
  * Parameters:                                                                *
@@ -468,8 +448,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_remove_persistent_file                                       *
- *                                                                            *
  * Purpose: remove the specified file                                         *
  *                                                                            *
  * Parameters:                                                                *
@@ -653,8 +631,6 @@ static int	zbx_pre_persistent_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_find_or_create_prep_vec_element                              *
- *                                                                            *
  * Purpose: search preparation vector to find element with the specified key. *
  *          If not found then create the element.                             *
  *                                                                            *
@@ -728,8 +704,6 @@ void	zbx_update_prep_vec_data(const struct st_logfile *logfile, zbx_uint64_t pro
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_restore_file_details                                         *
- *                                                                            *
  * Purpose: create the 'old log file list' and restore log file attributes    *
  *          from JSON string which was read from persistent file              *
  *                                                                            *
diff --git a/src/zabbix_agent/perfstat.c b/src/zabbix_agent/perfstat.c
index 277a566d714..ca20374f242 100644
--- a/src/zabbix_agent/perfstat.c
+++ b/src/zabbix_agent/perfstat.c
@@ -164,8 +164,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: extend_perf_counter_interval                                     *
- *                                                                            *
  * Purpose: extends the performance counter buffer to store the new data      *
  *          interval                                                          *
  *                                                                            *
@@ -212,8 +210,6 @@ static void	free_object_names(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: set_object_names                                                 *
- *                                                                            *
  * Purpose: obtains PDH object localized names and associates them with       *
  *          English names, to be used by perf_instance_en.discovery           *
  *                                                                            *
@@ -627,8 +623,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_perf_counter_value_by_name                                   *
- *                                                                            *
  * Purpose: gets average named performance counter value                      *
  *                                                                            *
  * Parameters: name  - [IN] the performance counter name                      *
@@ -706,8 +700,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_perf_counter_value_by_path                                   *
- *                                                                            *
  * Purpose: gets average performance counter value                            *
  *                                                                            *
  * Parameters: counterpath - [IN] the performance counter path                *
@@ -778,8 +770,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_perf_counter_value                                           *
- *                                                                            *
  * Purpose: gets average value of the specified performance counter interval  *
  *                                                                            *
  * Parameters: counter  - [IN] the performance counter                        *
@@ -879,8 +869,6 @@ static wchar_t	*get_object_name(char *eng_name)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_object_name_local                                            *
- *                                                                            *
  * Purpose: get localized name of the object                                  *
  *                                                                            *
  * Parameters: eng_name - [IN] english name                                   *
diff --git a/src/zabbix_agent/procstat.c b/src/zabbix_agent/procstat.c
index 9df0f0d1030..cc7462420f7 100644
--- a/src/zabbix_agent/procstat.c
+++ b/src/zabbix_agent/procstat.c
@@ -190,8 +190,6 @@ static int			procstat_snapshot_num;
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_dshm_has_enough_space                                   *
- *                                                                            *
  * Purpose: check if the procstat shared memory segment has at least          *
  *          the specified amount of free bytes in the segment                 *
  *                                                                            *
@@ -214,8 +212,6 @@ static int	procstat_dshm_has_enough_space(void *base, size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_dshm_used_size                                          *
- *                                                                            *
  * Purpose: calculate the actual shared memory size used by procstat          *
  *                                                                            *
  * Parameters: base - [IN] the procstat shared memory segment                 *
@@ -252,8 +248,6 @@ static size_t	procstat_dshm_used_size(void *base)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_queries_num                                             *
- *                                                                            *
  * Purpose: calculate the number of active queries                            *
  *                                                                            *
  * Parameters: base - [IN] the procstat shared memory segment                 *
@@ -279,8 +273,6 @@ static int	procstat_queries_num(void *base)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_alloc                                                   *
- *                                                                            *
  * Purpose: allocates memory in the shared memory segment,                    *
  *          calls exit() if segment is too small                              *
  *                                                                            *
@@ -312,8 +304,6 @@ static int	procstat_alloc(void *base, size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_strdup                                                  *
- *                                                                            *
  * Purpose: allocates required memory in procstat memory segment and copies   *
  *          the specified string (calls exit() if segment is too small)       *
  *                                                                            *
@@ -343,8 +333,6 @@ static size_t	procstat_strdup(void *base, const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_reattach                                                *
- *                                                                            *
  * Purpose: reattaches the procstat_ref to the shared memory segment if it    *
  *          was 'resized' (a new segment created and the old data copied) by  *
  *          other process.                                                    *
@@ -367,8 +355,6 @@ static void	procstat_reattach(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_copy_data                                               *
- *                                                                            *
  * Purpose: copies procstat data to a new shared memory segment               *
  *                                                                            *
  * Parameters: dst      - [OUT] the destination segment                       *
@@ -416,8 +402,6 @@ static void	procstat_copy_data(void *dst, size_t size_dst, const void *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_running                                                 *
- *                                                                            *
  * Purpose: checks if processor statistics collector is running (at least one *
  *          one process statistics query has been made).                      *
  *                                                                            *
@@ -432,8 +416,6 @@ static int	procstat_running(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_get_query                                               *
- *                                                                            *
  * Purpose: get process statistics query based on process name, user name     *
  *          and command line                                                  *
  *                                                                            *
@@ -472,8 +454,6 @@ static	zbx_procstat_query_t	*procstat_get_query(void *base, const char *procname
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_add                                                     *
- *                                                                            *
  * Purpose: adds a new query to process statistics collector                  *
  *                                                                            *
  * Parameters: procname - [IN] the process name                               *
@@ -555,8 +535,6 @@ static void	procstat_add(const char *procname, const char *username, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_free_query_data                                         *
- *                                                                            *
  * Purpose: frees the query data structure used to store queries locally      *
  *                                                                            *
  ******************************************************************************/
@@ -568,8 +546,6 @@ static void	procstat_free_query_data(zbx_procstat_query_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_try_compress                                            *
- *                                                                            *
  * Purpose: try to compress (remove inactive queries) the procstat shared     *
  *          memory segment once per day                                       *
  *                                                                            *
@@ -605,8 +581,6 @@ static void	procstat_try_compress(void *base)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_build_local_query_vector                                *
- *                                                                            *
  * Purpose: builds a local copy of the process cpu utilization queries and    *
  *          removes expired (not used during last 24 hours) queries           *
  *                                                                            *
@@ -695,8 +669,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_scan_query_pids                                         *
- *                                                                            *
  * Purpose: for every query gets the pids of processes matching query         *
  *          attributes                                                        *
  *                                                                            *
@@ -725,8 +697,6 @@ static int	procstat_scan_query_pids(zbx_vector_ptr_t *queries, const zbx_vector_
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_get_monitored_pids                                      *
- *                                                                            *
  * Purpose: creates a list of unique pids that are monitored by current data  *
  *          gathering cycle                                                   *
  *                                                                            *
@@ -761,8 +731,6 @@ static void	procstat_get_monitored_pids(zbx_vector_uint64_t *pids, const zbx_vec
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_get_cpu_util_snapshot_for_pids                          *
- *                                                                            *
  * Purpose: gets cpu utilization data snapshot for the monitored processes    *
  *                                                                            *
  * Parameters: stats - [OUT] current reading of the per-pid cpu usage         *
@@ -791,8 +759,6 @@ static zbx_timespec_t	procstat_get_cpu_util_snapshot_for_pids(zbx_procstat_util_
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_util_compare                                            *
- *                                                                            *
  * Purpose: compare process utilization data by their pids                    *
  *                                                                            *
  ******************************************************************************/
@@ -808,8 +774,6 @@ static int	procstat_util_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_calculate_cpu_util_for_queries                          *
- *                                                                            *
  * Purpose: calculates the cpu utilization for queries since the previous     *
  *          snapshot                                                          *
  *                                                                            *
@@ -868,8 +832,6 @@ static void	procstat_calculate_cpu_util_for_queries(zbx_vector_ptr_t *queries,
 
 /******************************************************************************
  *                                                                            *
- * Function: procstat_update_query_statistics                                 *
- *                                                                            *
  * Purpose: updates cpu utilization and saves the new snapshot for queries in *
  *          shared memory segment                                             *
  *                                                                            *
@@ -950,8 +912,6 @@ static void	procstat_update_query_statistics(zbx_vector_ptr_t *queries, int runi
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_procstat_collector_started                                   *
- *                                                                            *
  * Purpose: checks if processor statistics collector is enabled (the main     *
  *          collector has been initialized)                                   *
  *                                                                            *
@@ -966,8 +926,6 @@ int	zbx_procstat_collector_started(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_procstat_init                                                *
- *                                                                            *
  * Purpose: initializes process statistics collector                          *
  *                                                                            *
  * Return value: This function calls exit() on shared memory errors.          *
@@ -991,8 +949,6 @@ void	zbx_procstat_init(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_procstat_destroy                                             *
- *                                                                            *
  * Purpose: destroys process statistics collector                             *
  *                                                                            *
  ******************************************************************************/
@@ -1012,8 +968,6 @@ void	zbx_procstat_destroy(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_procstat_get_util                                            *
- *                                                                            *
  * Purpose: gets process cpu utilization                                      *
  *                                                                            *
  * Parameters: procname       - [IN] the process name, NULL - all             *
@@ -1103,8 +1057,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_procstat_collect                                             *
- *                                                                            *
  * Purpose: performs process statistics collection                            *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_agent/stats.c b/src/zabbix_agent/stats.c
index 459879838de..a81016ae068 100644
--- a/src/zabbix_agent/stats.c
+++ b/src/zabbix_agent/stats.c
@@ -56,8 +56,6 @@ zbx_mutex_t		diskstats_lock = ZBX_MUTEX_NULL;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_cpu_num                                                  *
- *                                                                            *
  * Purpose: returns the number of processors which are currently online       *
  *          (i.e., available).                                                *
  *                                                                            *
@@ -128,8 +126,6 @@ return_one:
 
 /******************************************************************************
  *                                                                            *
- * Function: init_collector_data                                              *
- *                                                                            *
  * Purpose: Allocate memory for collector                                     *
  *                                                                            *
  * Comments: Unix version allocates memory as shared.                         *
@@ -219,8 +215,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: free_collector_data                                              *
- *                                                                            *
  * Purpose: Free memory allocated for collector                               *
  *                                                                            *
  * Comments: Unix version allocated memory as shared.                         *
@@ -259,8 +253,6 @@ void	free_collector_data(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: diskstat_shm_init                                                *
- *                                                                            *
  * Purpose: Allocate shared memory for collecting disk statistics             *
  *                                                                            *
  ******************************************************************************/
@@ -296,8 +288,6 @@ void	diskstat_shm_init(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: diskstat_shm_reattach                                            *
- *                                                                            *
  * Purpose: If necessary, reattach to disk statistics shared memory segment.  *
  *                                                                            *
  ******************************************************************************/
@@ -338,8 +328,6 @@ void	diskstat_shm_reattach(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: diskstat_shm_extend                                              *
- *                                                                            *
  * Purpose: create a new, larger disk statistics shared memory segment and    *
  *          copy data from the old one.                                       *
  *                                                                            *
@@ -411,8 +399,6 @@ void	diskstat_shm_extend(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: collector_thread                                                 *
- *                                                                            *
  * Purpose: Collect system information                                        *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_agent/vmstats.c b/src/zabbix_agent/vmstats.c
index eea2d601409..63505219fc2 100644
--- a/src/zabbix_agent/vmstats.c
+++ b/src/zabbix_agent/vmstats.c
@@ -76,8 +76,6 @@ static zbx_uint64_t	last_rblks = 0;			/* 512 bytes blocks read from all disks */
 
 /******************************************************************************
  *                                                                            *
- * Function: update_vmstat                                                    *
- *                                                                            *
  * Purpose: update vmstat values at most once per second                      *
  *                                                                            *
  * Parameters: vmstat - a structure containing vmstat data                    *
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index 61408effbbd..7a3c3f3c499 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -553,8 +553,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: set_defaults                                                     *
- *                                                                            *
  * Purpose: set configuration defaults                                        *
  *                                                                            *
  ******************************************************************************/
@@ -617,8 +615,6 @@ static void	set_defaults(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_validate_config_hostnames                                    *
- *                                                                            *
  * Purpose: validate listed host names                                        *
  *                                                                            *
  ******************************************************************************/
@@ -647,8 +643,6 @@ static void	zbx_validate_config_hostnames(zbx_vector_str_t *hostnames)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_validate_config                                              *
- *                                                                            *
  * Purpose: validate configuration parameters                                 *
  *                                                                            *
  ******************************************************************************/
@@ -789,8 +783,6 @@ static void	parse_hostnames(const char *hostname_param, zbx_vector_str_t *hostna
 
 /******************************************************************************
  *                                                                            *
- * Function: load_enable_remote_commands                                      *
- *                                                                            *
  * Purpose: aliases EnableRemoteCommands parameter to                         *
  *          Allow/DenyKey=system.run[*]                                       *
  *                                                                            *
@@ -821,8 +813,6 @@ static int	load_enable_remote_commands(const char *value, const struct cfg_line
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_load_config                                                  *
- *                                                                            *
  * Purpose: load configuration from config file                               *
  *                                                                            *
  * Parameters: requirement - produce error if config file missing or not      *
@@ -1002,8 +992,6 @@ static void	zbx_load_config(int requirement, ZBX_TASK_EX *task)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_free_config                                                  *
- *                                                                            *
  * Purpose: free configuration memory                                         *
  *                                                                            *
  ******************************************************************************/
@@ -1269,8 +1257,6 @@ int	MAIN_ZABBIX_ENTRY(int flags)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_free_service_resources                                       *
- *                                                                            *
  * Purpose: free service resources allocated by main thread                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c
index 95b0e792c79..f95ebd2198f 100644
--- a/src/zabbix_agent/zbxconf.c
+++ b/src/zabbix_agent/zbxconf.c
@@ -31,8 +31,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: load_aliases                                                     *
- *                                                                            *
  * Purpose: load aliases from configuration                                   *
  *                                                                            *
  * Parameters: lines - aliases from configuration file                        *
@@ -75,8 +73,6 @@ void	load_aliases(char **lines)
 
 /******************************************************************************
  *                                                                            *
- * Function: load_user_parameters                                             *
- *                                                                            *
  * Purpose: load user parameters from configuration                           *
  *                                                                            *
  * Parameters: lines - user parameter entries from configuration file         *
@@ -115,8 +111,6 @@ int	load_user_parameters(char **lines, char **err)
 
 /******************************************************************************
  *                                                                            *
- * Function: load_key_access_rule                                             *
- *                                                                            *
  * Purpose: Adds key access rule from configuration                           *
  *                                                                            *
  * Parameters: value - [IN] key access rule parameter value                   *
@@ -143,8 +137,6 @@ int	load_key_access_rule(const char *value, const struct cfg_line *cfg)
 #ifdef _WINDOWS
 /******************************************************************************
  *                                                                            *
- * Function: load_perf_counters                                               *
- *                                                                            *
  * Purpose: load performance counters from configuration                      *
  *                                                                            *
  * Parameters: def_lines - array of PerfCounter configuration entries         *
@@ -229,8 +221,6 @@ void	load_perf_counters(const char **def_lines, const char **eng_lines)
 #else
 /******************************************************************************
  *                                                                            *
- * Function: load_config_user_params                                          *
- *                                                                            *
  * Purpose: load user parameters from configuration file                      *
  *                                                                            *
  ******************************************************************************/
@@ -250,8 +240,6 @@ static int	load_config_user_params(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: reload_user_parameters                                           *
- *                                                                            *
  * Purpose: reload user parameters                                            *
  *                                                                            *
  * Parameters: process_type - process type                                    *
diff --git a/src/zabbix_agent/zbxkstat.c b/src/zabbix_agent/zbxkstat.c
index adedacc7b61..ed3bfaddcef 100644
--- a/src/zabbix_agent/zbxkstat.c
+++ b/src/zabbix_agent/zbxkstat.c
@@ -36,8 +36,6 @@ static zbx_mutex_t	kstat_lock = ZBX_MUTEX_NULL;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_kstat_refresh                                                *
- *                                                                            *
  * Purpose: refreshes kstat environment                                       *
  *                                                                            *
  * Parameters: error - [OUT] the error message                                *
@@ -70,8 +68,6 @@ static int	zbx_kstat_refresh(char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_kstat_init                                                   *
- *                                                                            *
  * Purpose: initialize kstat environment                                      *
  *                                                                            *
  * Parameters: kstat - [IN] the kstat data storage                            *
@@ -124,8 +120,6 @@ void	zbx_kstat_destroy(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_kstat_collect                                                *
- *                                                                            *
  * Purpose: collect kstat stats                                               *
  *                                                                            *
  * Comments: This function is called every second to collect statistics.      *
@@ -158,8 +152,6 @@ void	zbx_kstat_collect(zbx_kstat_t *kstat)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_kstat_get_freemem                                            *
- *                                                                            *
  * Purpose: get free memory size                                              *
  *                                                                            *
  * Parameters: value - [OUT] the free memory size in bytes                    *
diff --git a/src/zabbix_get/zabbix_get.c b/src/zabbix_get/zabbix_get.c
index ad2a261d27b..27d25c7b42b 100644
--- a/src/zabbix_get/zabbix_get.c
+++ b/src/zabbix_get/zabbix_get.c
@@ -221,16 +221,10 @@ static char	shortopts[] = "s:p:k:I:t:hV";
 
 /******************************************************************************
  *                                                                            *
- * Function: get_signal_handler                                               *
- *                                                                            *
  * Purpose: process signals                                                   *
  *                                                                            *
  * Parameters: sig - signal ID                                                *
  *                                                                            *
- * Return value:                                                              *
- *                                                                            *
- * Comments:                                                                  *
- *                                                                            *
  ******************************************************************************/
 static void	get_signal_handler(int sig)
 {
@@ -251,8 +245,6 @@ static void	get_signal_handler(int sig)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_value                                                        *
- *                                                                            *
  * Purpose: connect to Zabbix agent, receive and print value                  *
  *                                                                            *
  * Parameters: host - server name or IP address                               *
@@ -328,19 +320,6 @@ static int	get_value(const char *source_ip, const char *host, unsigned short por
 	return ret;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: main                                                             *
- *                                                                            *
- * Purpose: main function                                                     *
- *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
- * Return value:                                                              *
- *                                                                            *
- * Comments:                                                                  *
- *                                                                            *
- ******************************************************************************/
 int	main(int argc, char **argv)
 {
 	int		i, ret = SUCCEED;
diff --git a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
index 7d9555cb7ce..5c25a625fa1 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 = "13 December 2021";
+	static final String REVISION_DATE = "11 January 2022";
 	static final String REVISION = "{ZABBIX_REVISION}";
-	static final String VERSION = "6.0.0beta2";
+	static final String VERSION = "6.0.0rc1";
 
 	static void printVersion()
 	{
diff --git a/src/zabbix_proxy/datasender/datasender.c b/src/zabbix_proxy/datasender/datasender.c
index 1421c95c4ba..eb44f1afca5 100644
--- a/src/zabbix_proxy/datasender/datasender.c
+++ b/src/zabbix_proxy/datasender/datasender.c
@@ -56,8 +56,6 @@ extern unsigned int	configured_tls_connect_mode;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_hist_upload_state                                            *
- *                                                                            *
  * Purpose: Get current history upload state (disabled/enabled)               *
  *                                                                            *
  * Parameters: buffer - [IN] the contents of a packet (JSON)                  *
@@ -85,8 +83,6 @@ static void	get_hist_upload_state(const char *buffer, int *state)
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_data_sender                                                *
- *                                                                            *
  * Purpose: collects host availability, history, discovery, autoregistration  *
  *          data and sends 'proxy data' request                               *
  *                                                                            *
@@ -265,8 +261,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: main_datasender_loop                                             *
- *                                                                            *
  * Purpose: periodically sends history and events to the server               *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_proxy/heart/heart.c b/src/zabbix_proxy/heart/heart.c
index f6aab77e8d1..dbdc26cbe46 100644
--- a/src/zabbix_proxy/heart/heart.c
+++ b/src/zabbix_proxy/heart/heart.c
@@ -38,11 +38,6 @@ extern char		*CONFIG_SOURCE_IP;
 extern int		CONFIG_TIMEOUT;
 extern unsigned int	configured_tls_connect_mode;
 
-/******************************************************************************
- *                                                                            *
- * Function: send_heartbeat                                                   *
- *                                                                            *
- ******************************************************************************/
 static int	send_heartbeat(void)
 {
 	zbx_socket_t		sock;
@@ -89,8 +84,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: main_heart_loop                                                  *
- *                                                                            *
  * Purpose: periodically send heartbeat message to the server                 *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_proxy/housekeeper/housekeeper.c b/src/zabbix_proxy/housekeeper/housekeeper.c
index 826d7965f9a..216ac54cf60 100644
--- a/src/zabbix_proxy/housekeeper/housekeeper.c
+++ b/src/zabbix_proxy/housekeeper/housekeeper.c
@@ -51,8 +51,6 @@ static void	zbx_housekeeper_sigusr_handler(int flags)
 
 /******************************************************************************
  *                                                                            *
- * Function: delete_history                                                   *
- *                                                                            *
  * Purpose: remove outdated information from historical table                 *
  *                                                                            *
  * Parameters: now - current timestamp                                        *
@@ -126,8 +124,6 @@ rollback:
 
 /******************************************************************************
  *                                                                            *
- * Function: housekeeping_history                                             *
- *                                                                            *
  * Purpose: remove outdated information from history                          *
  *                                                                            *
  * Parameters: now - current timestamp                                        *
diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c
index 525030c0e56..45ba4c4b2cf 100644
--- a/src/zabbix_proxy/proxy.c
+++ b/src/zabbix_proxy/proxy.c
@@ -454,8 +454,6 @@ int	get_process_info_by_thread(int local_server_num, unsigned char *local_proces
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_set_defaults                                                 *
- *                                                                            *
  * Purpose: set configuration defaults                                        *
  *                                                                            *
  ******************************************************************************/
@@ -560,8 +558,6 @@ static void	zbx_set_defaults(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_validate_config                                              *
- *                                                                            *
  * Purpose: validate configuration parameters                                 *
  *                                                                            *
  ******************************************************************************/
@@ -688,8 +684,6 @@ static int	proxy_add_serveractive_host_cb(const zbx_vector_ptr_t *addrs, zbx_vec
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_load_config                                                  *
- *                                                                            *
  * Purpose: parse config file and update configuration parameters             *
  *                                                                            *
  * Comments: will terminate process if parsing fails                          *
@@ -937,8 +931,6 @@ static void	zbx_load_config(ZBX_TASK_EX *task)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_free_config                                                  *
- *                                                                            *
  * Purpose: free configuration memory                                         *
  *                                                                            *
  ******************************************************************************/
@@ -949,8 +941,6 @@ static void	zbx_free_config(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: main                                                             *
- *                                                                            *
  * Purpose: executes proxy processes                                          *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_proxy/proxyconfig/proxyconfig.c b/src/zabbix_proxy/proxyconfig/proxyconfig.c
index d30f70e93f8..3126e7141ab 100644
--- a/src/zabbix_proxy/proxyconfig/proxyconfig.c
+++ b/src/zabbix_proxy/proxyconfig/proxyconfig.c
@@ -55,11 +55,6 @@ static void	zbx_proxyconfig_sigusr_handler(int flags)
 	}
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: process_configuration_sync                                       *
- *                                                                            *
- ******************************************************************************/
 static void	process_configuration_sync(size_t *data_size)
 {
 	zbx_socket_t		sock;
@@ -157,8 +152,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: main_proxyconfig_loop                                            *
- *                                                                            *
  * Purpose: periodically request config data                                  *
  *                                                                            *
  * Comments: never returns                                                    *
diff --git a/src/zabbix_proxy/taskmanager/server_tasks.c b/src/zabbix_proxy/taskmanager/server_tasks.c
index 70cd77cd6a0..d4774c11c04 100644
--- a/src/zabbix_proxy/taskmanager/server_tasks.c
+++ b/src/zabbix_proxy/taskmanager/server_tasks.c
@@ -28,8 +28,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_get_remote_tasks                                          *
- *                                                                            *
  * Purpose: get tasks scheduled to be executed on the server                  *
  *                                                                            *
  * Parameters: tasks        - [OUT] the tasks to execute                      *
diff --git a/src/zabbix_proxy/taskmanager/taskmanager.c b/src/zabbix_proxy/taskmanager/taskmanager.c
index 5eaf22bbac3..0742cde7f98 100644
--- a/src/zabbix_proxy/taskmanager/taskmanager.c
+++ b/src/zabbix_proxy/taskmanager/taskmanager.c
@@ -45,8 +45,6 @@ static volatile sig_atomic_t	snmp_cache_reload_requested;
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_execute_remote_command                                        *
- *                                                                            *
  * Purpose: execute remote command task                                       *
  *                                                                            *
  * Parameters: taskid - [IN] the task identifier                              *
@@ -164,8 +162,6 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_check_now                                             *
- *                                                                            *
  * Purpose: process check now tasks for item rescheduling                     *
  *                                                                            *
  * Return value: The number of successfully processed tasks                   *
@@ -219,8 +215,6 @@ static int	tm_process_check_now(zbx_vector_uint64_t *taskids)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_execute_data_json                                             *
- *                                                                            *
  * Purpose: process data task with json contents                              *
  *                                                                            *
  * Return value: SUCCEED - the data task was executed                         *
@@ -253,8 +247,6 @@ static int	tm_execute_data_json(int type, const char *data, char **info)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_execute_data                                                  *
- *                                                                            *
  * Purpose: process data task                                                 *
  *                                                                            *
  * Return value: SUCCEED - the data task was executed                         *
@@ -321,8 +313,6 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_tasks                                                 *
- *                                                                            *
  * Purpose: process task manager tasks depending on task type                 *
  *                                                                            *
  * Return value: The number of successfully processed tasks                   *
@@ -383,8 +373,6 @@ static int	tm_process_tasks(int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_remove_old_tasks                                              *
- *                                                                            *
  * Purpose: remove old done/expired tasks                                     *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_sender/win32/zabbix_sender.h b/src/zabbix_sender/win32/zabbix_sender.h
index a60acab6131..16efc2f3959 100644
--- a/src/zabbix_sender/win32/zabbix_sender.h
+++ b/src/zabbix_sender/win32/zabbix_sender.h
@@ -50,8 +50,6 @@ zabbix_sender_info_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_send_values                                        *
- *                                                                            *
  * Purpose: send values to Zabbix server/proxy                                *
  *                                                                            *
  * Parameters: address   - [IN] zabbix server/proxy address                   *
@@ -74,8 +72,6 @@ ZBX_API int	zabbix_sender_send_values(const char *address, unsigned short port,
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_parse_result                                       *
- *                                                                            *
  * Purpose: parses the result returned from zabbix_sender_send_values()       *
  *          function                                                          *
  *                                                                            *
@@ -97,8 +93,6 @@ ZBX_API int	zabbix_sender_parse_result(const char *result, int *response, zabbix
 
 /******************************************************************************
  *                                                                            *
- * Function: zabbix_sender_free_result                                        *
- *                                                                            *
  * Purpose: free data allocated by zabbix_sender_send_values() function       *
  *                                                                            *
  * Parameters: ptr   - [IN] pointer to the data to free                       *
diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c
index 9bbcf560225..7c931d3037a 100644
--- a/src/zabbix_sender/zabbix_sender.c
+++ b/src/zabbix_sender/zabbix_sender.c
@@ -452,8 +452,6 @@ static void	zbx_thread_handle_pipe_response(ZBX_THREAD_SENDVAL_ARGS *sendval_arg
 
 /******************************************************************************
  *                                                                            *
- * Function: sender_threads_wait                                              *
- *                                                                            *
  * Purpose: waits until the "threads" are in the signalled state and manages  *
  *          exit status updates                                               *
  *                                                                            *
@@ -530,8 +528,6 @@ static int	sender_threads_wait(ZBX_THREAD_HANDLE *threads, zbx_thread_args_t *th
 
 /******************************************************************************
  *                                                                            *
- * Function: get_string                                                       *
- *                                                                            *
  * Purpose: get current string from the quoted or unquoted string list,       *
  *          delimited by blanks                                               *
  *                                                                            *
@@ -630,8 +626,6 @@ static const char	*get_string(const char *p, char *buf, size_t bufsize)
 
 /******************************************************************************
  *                                                                            *
- * Function: check_response                                                   *
- *                                                                            *
  * Purpose: Check whether JSON response is SUCCEED                            *
  *                                                                            *
  * Parameters: JSON response from Zabbix trapper                              *
@@ -793,8 +787,6 @@ static	ZBX_THREAD_ENTRY(send_value, args)
 
 /******************************************************************************
  *                                                                            *
- * Function: perform_data_sending                                             *
- *                                                                            *
  * Purpose: Send data to all destinations each in a separate thread and wait  *
  *          till threads have completed their task                            *
  *                                                                            *
@@ -858,8 +850,6 @@ static int	perform_data_sending(ZBX_THREAD_SENDVAL_ARGS *sendval_args, int old_s
 
 /******************************************************************************
  *                                                                            *
- * Function: sender_add_serveractive_host_cb                                  *
- *                                                                            *
  * Purpose: add server or proxy to the list of destinations                   *
  *                                                                            *
  * Parameters:                                                                *
@@ -1460,8 +1450,6 @@ static void	parse_commandline(int argc, char **argv)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_fgets_alloc                                                  *
- *                                                                            *
  * Purpose: reads a line from file                                            *
  *                                                                            *
  * Parameters: buffer       - [IN/OUT] the output buffer                      *
diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c
index 2dfcef34f62..cb5c66c4a6f 100644
--- a/src/zabbix_server/actions.c
+++ b/src/zabbix_server/actions.c
@@ -32,8 +32,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: compare_events                                                   *
- *                                                                            *
  * Purpose: compare events by objectid                                        *
  *                                                                            *
  * Parameters: d1 - [IN] event structure to compare to d2                     *
@@ -56,8 +54,6 @@ static int	compare_events(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_condition_match                                              *
- *                                                                            *
  * Purpose: save eventids that match condition                                *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -103,8 +99,6 @@ static void	add_condition_match(const zbx_vector_ptr_t *esc_events, zbx_conditio
 
 /******************************************************************************
  *                                                                            *
- * Function: get_object_ids                                                   *
- *                                                                            *
  * Purpose: get objectids of escalation events                                *
  *                                                                            *
  * Parameters: esc_events [IN]  - events to check                             *
@@ -130,8 +124,6 @@ static void	get_object_ids(const zbx_vector_ptr_t *esc_events, zbx_vector_uint64
 
 /******************************************************************************
  *                                                                            *
- * Function: check_host_group_condition                                       *
- *                                                                            *
  * Purpose: check host group condition                                        *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -216,8 +208,6 @@ static int	check_host_group_condition(const zbx_vector_ptr_t *esc_events, zbx_co
 
 /******************************************************************************
  *                                                                            *
- * Function: trigger_parents_sql_alloc                                        *
- *                                                                            *
  * Purpose: mapping between discovered triggers and their prototypes          *
  *                                                                            *
  * Parameters: sql           [IN/OUT] - allocated sql query                   *
@@ -241,8 +231,6 @@ static void	trigger_parents_sql_alloc(char **sql, size_t *sql_alloc, zbx_vector_
 
 /******************************************************************************
  *                                                                            *
- * Function: objectids_to_pair                                                *
- *                                                                            *
  * Purpose: copy objects to pair, for hierarchy checks                        *
  *                                                                            *
  * Parameters: objectids       [IN]  - objects                                *
@@ -265,8 +253,6 @@ static void	objectids_to_pair(zbx_vector_uint64_t *objectids, zbx_vector_uint64_
 
 /******************************************************************************
  *                                                                            *
- * Function: check_object_hierarchy                                           *
- *                                                                            *
  * Purpose: there can be multiple levels of templates, that need              *
  *          resolving in order to compare to condition                        *
  *                                                                            *
@@ -404,8 +390,6 @@ static void	check_object_hierarchy(int object, const zbx_vector_ptr_t *esc_event
 
 /******************************************************************************
  *                                                                            *
- * Function: check_host_template_condition                                    *
- *                                                                            *
  * Purpose: check host template condition                                     *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -470,8 +454,6 @@ static int	check_host_template_condition(const zbx_vector_ptr_t *esc_events, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: check_host_condition                                             *
- *                                                                            *
  * Purpose: check host condition                                              *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -534,8 +516,6 @@ static int	check_host_condition(const zbx_vector_ptr_t *esc_events, zbx_conditio
 
 /******************************************************************************
  *                                                                            *
- * Function: check_trigger_id_condition                                       *
- *                                                                            *
  * Purpose: check trigger id condition                                        *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -594,8 +574,6 @@ static int	check_trigger_id_condition(const zbx_vector_ptr_t *esc_events, zbx_co
 
 /******************************************************************************
  *                                                                            *
- * Function: check_trigger_name_condition                                     *
- *                                                                            *
  * Purpose: check trigger name condition                                      *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -635,8 +613,6 @@ static int	check_trigger_name_condition(const zbx_vector_ptr_t *esc_events, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: check_trigger_severity_condition                                 *
- *                                                                            *
  * Purpose: check trigger severity condition                                  *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -686,8 +662,6 @@ static int	check_trigger_severity_condition(const zbx_vector_ptr_t *esc_events,
 
 /******************************************************************************
  *                                                                            *
- * Function: check_time_period_condition                                      *
- *                                                                            *
  * Purpose: check time period condition                                       *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -824,8 +798,6 @@ static int	check_acknowledged_condition(const zbx_vector_ptr_t *esc_events, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: check_condition_event_tag                                        *
- *                                                                            *
  * Purpose: check condition event tag                                         *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -863,8 +835,6 @@ static void	check_condition_event_tag(const zbx_vector_ptr_t *esc_events, zbx_co
 
 /******************************************************************************
  *                                                                            *
- * Function: check_condition_event_tag_value                                  *
- *                                                                            *
  * Purpose: check condition event tag value                                   *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -903,8 +873,6 @@ static void	check_condition_event_tag_value(const zbx_vector_ptr_t *esc_events,
 
 /******************************************************************************
  *                                                                            *
- * Function: check_trigger_condition                                          *
- *                                                                            *
  * Purpose: check if event matches single condition                           *
  *                                                                            *
  * Parameters: event - trigger event to check                                 *
@@ -974,8 +942,6 @@ static void	check_trigger_condition(const zbx_vector_ptr_t *esc_events, zbx_cond
 
 /******************************************************************************
  *                                                                            *
- * Function: get_object_ids_discovery                                         *
- *                                                                            *
  * Purpose: get objectids for dhost                                           *
  *                                                                            *
  * Parameters: esc_events - [IN]  events to check                             *
@@ -1003,8 +969,6 @@ static void	get_object_ids_discovery(const zbx_vector_ptr_t *esc_events, zbx_vec
 }
 /******************************************************************************
  *                                                                            *
- * Function: check_drule_condition                                            *
- *                                                                            *
  * Purpose: check discovery rule condition                                    *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1101,8 +1065,6 @@ static int	check_drule_condition(const zbx_vector_ptr_t *esc_events, zbx_conditi
 
 /******************************************************************************
  *                                                                            *
- * Function: check_dcheck_condition                                           *
- *                                                                            *
  * Purpose: check discovery check condition                                   *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1176,8 +1138,6 @@ static int	check_dcheck_condition(const zbx_vector_ptr_t *esc_events, zbx_condit
 
 /******************************************************************************
  *                                                                            *
- * Function: check_dobject_condition                                          *
- *                                                                            *
  * Purpose: check discovery object condition                                  *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1208,8 +1168,6 @@ static int	check_dobject_condition(const zbx_vector_ptr_t *esc_events, zbx_condi
 
 /******************************************************************************
  *                                                                            *
- * Function: check_proxy_condition                                            *
- *                                                                            *
  * Purpose: check proxy condition for discovery event                         *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1302,8 +1260,6 @@ static int	check_proxy_condition(const zbx_vector_ptr_t *esc_events, zbx_conditi
 
 /******************************************************************************
  *                                                                            *
- * Function: check_dvalue_condition                                           *
- *                                                                            *
  * Purpose: check discovery value condition                                   *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1405,8 +1361,6 @@ static int	check_dvalue_condition(const zbx_vector_ptr_t *esc_events, zbx_condit
 
 /******************************************************************************
  *                                                                            *
- * Function: check_dhost_ip_condition                                         *
- *                                                                            *
  * Purpose: check host ip condition for discovery event                       *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1496,8 +1450,6 @@ static int	check_dhost_ip_condition(const zbx_vector_ptr_t *esc_events, zbx_cond
 
 /******************************************************************************
  *                                                                            *
- * Function: check_dservice_type_condition                                    *
- *                                                                            *
  * Purpose: check service type condition for discovery event                  *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1578,8 +1530,6 @@ static int	check_dservice_type_condition(const zbx_vector_ptr_t *esc_events, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: check_dstatus_condition                                          *
- *                                                                            *
  * Purpose: check discovery status condition                                  *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1618,8 +1568,6 @@ static int	check_dstatus_condition(const zbx_vector_ptr_t *esc_events, zbx_condi
 
 /******************************************************************************
  *                                                                            *
- * Function: check_duptime_condition                                          *
- *                                                                            *
  * Purpose: check uptime condition for discovery                              *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1714,8 +1662,6 @@ static int	check_duptime_condition(const zbx_vector_ptr_t *esc_events, zbx_condi
 
 /******************************************************************************
  *                                                                            *
- * Function: check_dservice_port_condition                                    *
- *                                                                            *
  * Purpose: check service port condition for discovery                        *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1790,8 +1736,6 @@ static int	check_dservice_port_condition(const zbx_vector_ptr_t *esc_events, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: check_discovery_condition                                        *
- *                                                                            *
  * Purpose: check if event matches single condition                           *
  *                                                                            *
  * Parameters: event - discovery event to check                               *
@@ -1856,8 +1800,6 @@ static void	check_discovery_condition(const zbx_vector_ptr_t *esc_events, zbx_co
 
 /******************************************************************************
  *                                                                            *
- * Function: check_hostname_metadata_condition                                *
- *                                                                            *
  * Purpose: check metadata or host condition for auto registration            *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -1943,8 +1885,6 @@ static int	check_hostname_metadata_condition(const zbx_vector_ptr_t *esc_events,
 
 /******************************************************************************
  *                                                                            *
- * Function: check_areg_proxy_condition                                       *
- *                                                                            *
  * Purpose: check proxy condition for auto registration                       *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -2013,8 +1953,6 @@ static int	check_areg_proxy_condition(const zbx_vector_ptr_t *esc_events, zbx_co
 
 /******************************************************************************
  *                                                                            *
- * Function: check_autoregistration_condition                                 *
- *                                                                            *
  * Purpose: check if event matches single condition                           *
  *                                                                            *
  * Parameters: event - autoregistration event to check                        *
@@ -2057,8 +1995,6 @@ static void	check_autoregistration_condition(const zbx_vector_ptr_t *esc_events,
 
 /******************************************************************************
  *                                                                            *
- * Function: is_supported_event_object                                        *
- *                                                                            *
  * Purpose: not all event objects are supported for internal events           *
  *                                                                            *
  * Parameters: events     - [IN]  events to check                             *
@@ -2075,8 +2011,6 @@ static int	is_supported_event_object(const DB_EVENT *event)
 
 /******************************************************************************
  *                                                                            *
- * Function: check_intern_event_type_condition                                *
- *                                                                            *
  * Purpose: check event type condition for internal events                    *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -2129,8 +2063,6 @@ static int	check_intern_event_type_condition(const zbx_vector_ptr_t *esc_events,
 
 /******************************************************************************
  *                                                                            *
- * Function: get_object_ids_internal                                          *
- *                                                                            *
  * Purpose: get objectids of escalation internal events                       *
  *                                                                            *
  * Parameters: esc_events  - [IN]  events to check                            *
@@ -2169,8 +2101,6 @@ static void	get_object_ids_internal(const zbx_vector_ptr_t *esc_events, zbx_vect
 
 /******************************************************************************
  *                                                                            *
- * Function: check_intern_host_group_condition                                *
- *                                                                            *
  * Purpose: check host group condition for internal events                    *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -2286,8 +2216,6 @@ static int	check_intern_host_group_condition(const zbx_vector_ptr_t *esc_events,
 
 /******************************************************************************
  *                                                                            *
- * Function: item_parents_sql_alloc                                           *
- *                                                                            *
  * Purpose: get parent id from item discovery                                 *
  *                                                                            *
  * Parameters: sql           [IN/OUT] - allocated sql query                   *
@@ -2314,8 +2242,6 @@ static void	item_parents_sql_alloc(char **sql, size_t *sql_alloc, zbx_vector_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: check_intern_host_template_condition                             *
- *                                                                            *
  * Purpose: check host template condition for internal events                 *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -2409,8 +2335,6 @@ static int	check_intern_host_template_condition(const zbx_vector_ptr_t *esc_even
 
 /******************************************************************************
  *                                                                            *
- * Function: check_intern_host_condition                                      *
- *                                                                            *
  * Purpose: check host condition for internal events                          *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -2508,8 +2432,6 @@ static int	check_intern_host_condition(const zbx_vector_ptr_t *esc_events, zbx_c
 
 /******************************************************************************
  *                                                                            *
- * Function: check_internal_condition                                         *
- *                                                                            *
  * Purpose: check if internal event matches single condition                  *
  *                                                                            *
  * Parameters: event     - [IN] trigger event to check                        *
@@ -2563,8 +2485,6 @@ static void	check_internal_condition(const zbx_vector_ptr_t *esc_events, zbx_con
 
 /******************************************************************************
  *                                                                            *
- * Function: check_events_condition                                           *
- *                                                                            *
  * Purpose: check if multiple events matches single condition                 *
  *                                                                            *
  * Parameters: esc_events - [IN] events to check                              *
@@ -2604,8 +2524,6 @@ static void	check_events_condition(const zbx_vector_ptr_t *esc_events, unsigned
 
 /******************************************************************************
  *                                                                            *
- * Function: check_action_condition                                           *
- *                                                                            *
  * Purpose: check if event matches single condition                           *
  *                                                                            *
  * Parameters: event - event to check                                         *
@@ -2640,8 +2558,6 @@ int	check_action_condition(const DB_EVENT *event, zbx_condition_t *condition)
 
 /******************************************************************************
  *                                                                            *
- * Function: check_action_conditions                                          *
- *                                                                            *
  * Purpose: check if action have to be processed for the event                *
  *          (check all conditions of the action)                              *
  *                                                                            *
@@ -2749,8 +2665,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: execute_operations                                               *
- *                                                                            *
  * Purpose: execute host, group, template operations linked to the action     *
  *                                                                            *
  * Parameters: action - action to execute operations for                      *
@@ -2905,8 +2819,6 @@ zbx_escalation_new_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: is_recovery_event                                                *
- *                                                                            *
  * Purpose: checks if the event is recovery event                             *
  *                                                                            *
  * Parameters: event - [IN] the event to check                                *
@@ -2946,8 +2858,6 @@ static int	is_recovery_event(const DB_EVENT *event)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_escalation_event                                              *
- *                                                                            *
  * Purpose: to determine if event needs condition checks                      *
  *                                                                            *
  * Parameters: event - [IN] event to validate                                 *
@@ -2973,8 +2883,6 @@ static int	is_escalation_event(const DB_EVENT *event)
 
 /******************************************************************************
  *                                                                            *
- * Function: uniq_conditions_compare_func                                     *
- *                                                                            *
  * Purpose: compare to find equal conditions                                  *
  *                                                                            *
  * Parameters: d1 - [IN] condition structure to compare to d2                 *
@@ -3003,8 +2911,6 @@ static int	uniq_conditions_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: uniq_conditions_hash_func                                        *
- *                                                                            *
  * Purpose: generate hash based on condition values                           *
  *                                                                            *
  * Parameters: data - [IN] condition structure                                *
@@ -3027,8 +2933,6 @@ static zbx_hash_t	uniq_conditions_hash_func(const void *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_escalation_events                                            *
- *                                                                            *
  * Purpose: add events that have escalation possible and skip others, also    *
  *          adds according to source                                          *
  *                                                                            *
@@ -3052,8 +2956,6 @@ static void	get_escalation_events(const zbx_vector_ptr_t *events, zbx_vector_ptr
 
 /******************************************************************************
  *                                                                            *
- * Function: db_condition_clean                                               *
- *                                                                            *
  * Purpose: cleans condition data structure                                   *
  *                                                                            *
  * Parameters: condition - [IN] the condition data to free                    *
@@ -3068,8 +2970,6 @@ static void	db_condition_clean(zbx_condition_t *condition)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_conditions_eval_clean                                        *
- *                                                                            *
  * Purpose: cleans condition data structures from hashset                     *
  *                                                                            *
  * Parameters: uniq_conditions - [IN] hashset with data structures to clean   *
@@ -3088,8 +2988,6 @@ static void	conditions_eval_clean(zbx_hashset_t *uniq_conditions)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_action_eval_free                                             *
- *                                                                            *
  * Purpose: frees action evaluation data structure                            *
  *                                                                            *
  * Parameters: action - [IN] the action evaluation to free                    *
@@ -3106,8 +3004,6 @@ static void	zbx_action_eval_free(zbx_action_eval_t *action)
 
 /******************************************************************************
  *                                                                            *
- * Function: prepare_actions_conditions_eval                                  *
- *                                                                            *
  * Purpose: make actions to point, to conditions from hashset, where all      *
  *          conditions are unique, this ensures that we don't double check    *
  *          same conditions.                                                  *
@@ -3175,8 +3071,6 @@ static void	prepare_actions_conditions_eval(zbx_vector_ptr_t *actions, zbx_hashs
 
 /******************************************************************************
  *                                                                            *
- * Function: process_actions                                                  *
- *                                                                            *
  * Purpose: process all actions of each event in a list                       *
  *                                                                            *
  * Parameters: events        - [IN] events to apply actions for               *
@@ -3400,8 +3294,6 @@ void	process_actions(const zbx_vector_ptr_t *events, const zbx_vector_uint64_pai
 
 /******************************************************************************
  *                                                                            *
- * Function: process_actions_by_acknowledgements                              *
- *                                                                            *
  * Purpose: process actions for each acknowledgement in the array             *
  *                                                                            *
  * Parameters: event_ack        - [IN] vector for eventid/ackid pairs         *
@@ -3563,8 +3455,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_actions_info                                                 *
- *                                                                            *
  * Purpose: reads actions from database                                       *
  *                                                                            *
  * Parameters: actionids - [IN] requested action ids                          *
diff --git a/src/zabbix_server/alerter/alert_manager.c b/src/zabbix_server/alerter/alert_manager.c
index a55a740cc00..35957fbee2c 100644
--- a/src/zabbix_server/alerter/alert_manager.c
+++ b/src/zabbix_server/alerter/alert_manager.c
@@ -352,11 +352,6 @@ static void	shared_str_release(zbx_shared_str_t str)
 	}
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: am_dispatch_free                                                 *
- *                                                                            *
- ******************************************************************************/
 static void	am_dispatch_free(zbx_am_dispatch_t *dispatch)
 {
 	zbx_free(dispatch->subject);
@@ -369,8 +364,6 @@ static void	am_dispatch_free(zbx_am_dispatch_t *dispatch)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_get_mediatype                                                 *
- *                                                                            *
  * Purpose: gets media type object                                            *
  *                                                                            *
  * Parameters: manager     - [IN] the alert manager                           *
@@ -386,8 +379,6 @@ static zbx_am_mediatype_t	*am_get_mediatype(zbx_am_t *manager, zbx_uint64_t medi
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_am_update_webhook                                            *
- *                                                                            *
  * Purpose: updates additional webhook media type fields                      *
  *                                                                            *
  ******************************************************************************/
@@ -420,8 +411,6 @@ static void	zbx_am_update_webhook(zbx_am_t *manager, zbx_am_mediatype_t *mediaty
 
 /******************************************************************************
  *                                                                            *
- * Function: am_update_mediatype                                              *
- *                                                                            *
  * Purpose: updates media type object, creating one if necessary              *
  *                                                                            *
  * Parameters: manager     - [IN] the alert manager                           *
@@ -493,8 +482,6 @@ static void	am_update_mediatype(zbx_am_t *manager, zbx_uint64_t mediatypeid, uns
 
 /******************************************************************************
  *                                                                            *
- * Function: am_push_mediatype                                                *
- *                                                                            *
  * Purpose: pushes media type into manager media type queue                   *
  *                                                                            *
  * Parameters: manager   - [IN] the alert manager                             *
@@ -528,8 +515,6 @@ static void	am_push_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_pop_mediatype                                                 *
- *                                                                            *
  * Purpose: gets the next media type from queue                               *
  *                                                                            *
  * Parameters: manager - [IN] the alert manager                               *
@@ -554,11 +539,6 @@ static zbx_am_mediatype_t	*am_pop_mediatype(zbx_am_t *manager)
 	return mediatype;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: am_remove_mediatype                                              *
- *                                                                            *
- ******************************************************************************/
 static void am_remove_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype)
 {
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() mediatypeid:" ZBX_FS_UI64, __func__, mediatype->mediatypeid);
@@ -579,11 +559,6 @@ static void am_remove_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype
 	zbx_hashset_remove_direct(&manager->mediatypes, mediatype);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: am_release_mediatype                                             *
- *                                                                            *
- ******************************************************************************/
 static int	am_release_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype)
 {
 	if (0 != --mediatype->refcount)
@@ -597,8 +572,6 @@ static int	am_release_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype
 
 /******************************************************************************
  *                                                                            *
- * Function: am_calc_alertpoolid                                              *
- *                                                                            *
  * Purpose: calculate alert pool id from event source, object and objectid    *
  *                                                                            *
  * Parameters: source   - [IN] the event source                               *
@@ -629,8 +602,6 @@ static zbx_uint64_t	am_calc_alertpoolid(int source, int object, zbx_uint64_t obj
 
 /******************************************************************************
  *                                                                            *
- * Function: am_get_alertpool                                                 *
- *                                                                            *
  * Purpose: gets alert pool object, creating one if the object with specified *
  *          identifiers was not found                                         *
  *                                                                            *
@@ -665,8 +636,6 @@ static zbx_am_alertpool_t	*am_get_alertpool(zbx_am_t *manager, zbx_uint64_t medi
 
 /******************************************************************************
  *                                                                            *
- * Function: am_push_alertpool                                                *
- *                                                                            *
  * Purpose: pushes alert pool into media type alert pool queue                *
  *                                                                            *
  * Parameters: mediatype - [IN] the media type                                *
@@ -694,8 +663,6 @@ static void	am_push_alertpool(zbx_am_mediatype_t *mediatype, zbx_am_alertpool_t
 
 /******************************************************************************
  *                                                                            *
- * Function: am_pop_alertpool                                                 *
- *                                                                            *
  * Purpose: gets the next alert pool from queue                               *
  *                                                                            *
  * Parameters: mediatype - [IN] the media type                                *
@@ -722,12 +689,10 @@ static zbx_am_alertpool_t	*am_pop_alertpool(zbx_am_mediatype_t *mediatype)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_release_alertpool                                             *
- *                                                                            *
  * Purpose: removes alert pool                                                *
  *                                                                            *
- * Parameters: manager - [IN] the alert manager                               *
- *             alert   - [IN] the alert pool                                  *
+ * Parameters: manager     - [IN] the alert manager                           *
+ *             alertpool   - [IN] the alert pool                              *
  *                                                                            *
  * Return value: SUCCEED - the object was removed                             *
  *               FAIL    - otherwise                                          *
@@ -747,8 +712,6 @@ static int	am_release_alertpool(zbx_am_t *manager, zbx_am_alertpool_t *alertpool
 
 /******************************************************************************
  *                                                                            *
- * Function: am_create_alert                                                  *
- *                                                                            *
  * Purpose: creates new alert object                                          *
  *                                                                            *
  * Parameters: ...           - [IN] alert data                                *
@@ -797,8 +760,6 @@ static zbx_am_alert_t	*am_create_alert(zbx_uint64_t alertid, zbx_uint64_t mediat
 
 /******************************************************************************
  *                                                                            *
- * Function: am_copy_db_alert                                                 *
- *                                                                            *
  * Purpose: creates new alert object from db alert                            *
  *                                                                            *
  * Parameters: db_alert - [IN] the db alert object                            *
@@ -841,8 +802,6 @@ static zbx_am_alert_t	*am_copy_db_alert(zbx_am_db_alert_t *db_alert)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_alert_free                                                    *
- *                                                                            *
  * Purpose: frees the alert object                                            *
  *                                                                            *
  * Parameters: alert - [IN] the alert object                                  *
@@ -859,12 +818,10 @@ static void	am_alert_free(zbx_am_alert_t *alert)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_push_alert                                                    *
- *                                                                            *
  * Purpose: pushes alert into alert pool alert queue                          *
  *                                                                            *
- * Parameters: alertpool - [IN] the alert pool                                *
- *             alert     - [IN] the alert                                     *
+ * Parameters: alertpool - [IN]                                               *
+ *             alert     - [IN]                                               *
  *                                                                            *
  ******************************************************************************/
 static void	am_push_alert(zbx_am_alertpool_t *alertpool, zbx_am_alert_t *alert)
@@ -876,11 +833,9 @@ static void	am_push_alert(zbx_am_alertpool_t *alertpool, zbx_am_alert_t *alert)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_pop_alert                                                     *
- *                                                                            *
  * Purpose: gets the next alert from queue                                    *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  * Return value: The alert object.                                            *
  *                                                                            *
@@ -912,8 +867,6 @@ static zbx_am_alert_t	*am_pop_alert(zbx_am_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_remove_alert                                                  *
- *                                                                            *
  * Purpose: removes alert and requeues associated alert pool and media type   *
  *                                                                            *
  * Parameters: manager - [IN] the alert manager                               *
@@ -947,12 +900,10 @@ static void	am_remove_alert(zbx_am_t *manager, zbx_am_alert_t *alert)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_retry_alert                                                   *
- *                                                                            *
  * Purpose: retries alert if there are attempts left or removes it            *
  *                                                                            *
  * Parameters: manager - [IN] the alert manager                               *
- *             alert   - [IN] the alert                                       *
+ *             alert   - [IN]                                                 *
  *                                                                            *
  * Return value: SUCCEED - the alert was queued to be sent again              *
  *               FAIL - the alert retries value exceeded the mediatype        *
@@ -993,8 +944,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: am_alerter_free                                                  *
- *                                                                            *
  * Purpose: frees alerter                                                     *
  *                                                                            *
  ******************************************************************************/
@@ -1006,8 +955,6 @@ static void	am_alerter_free(zbx_am_alerter_t *alerter)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_register_alerter                                              *
- *                                                                            *
  * Purpose: registers alerter                                                 *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -1052,11 +999,9 @@ static void	am_register_alerter(zbx_am_t *manager, zbx_ipc_client_t *client, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: am_get_alerter_by_client                                         *
- *                                                                            *
  * Purpose: returns alerter by connected client                               *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             client  - [IN] the connected alerter                           *
  *                                                                            *
  * Return value: The alerter                                                  *
@@ -1089,8 +1034,6 @@ static zbx_am_alerter_t	*am_get_alerter_by_client(zbx_am_t *manager, zbx_ipc_cli
 
 /******************************************************************************
  *                                                                            *
- * Function: am_create_db_alert_message                                       *
- *                                                                            *
  * Purpose: get and format error message from database when it is unavailable *
  *                                                                            *
  * Return value: full database error message is allocated                     *
@@ -1131,8 +1074,6 @@ static char	*am_create_db_alert_message(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_queue_watchdog_alerts                                         *
- *                                                                            *
  * Purpose: queues 'database down' watchdog alerts                            *
  *                                                                            *
  * Parameters: manager - [IN] the alert manager                               *
@@ -1188,8 +1129,6 @@ static void	am_queue_watchdog_alerts(zbx_am_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_init                                                          *
- *                                                                            *
  * Purpose: initializes alert manager                                         *
  *                                                                            *
  * Parameters: manager - [IN] the manager to initialize                       *
@@ -1236,8 +1175,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: am_destroy                                                       *
- *                                                                            *
  * Purpose: destroys alert manager                                            *
  *                                                                            *
  * Parameters: manager - [IN] the manager to destroy                          *
@@ -1276,8 +1213,6 @@ static void	am_destroy(zbx_am_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_update_alert                                               *
- *                                                                            *
  * Purpose: update alert status in local cache to be flushed after reading    *
  *          new alerts from database                                          *
  *                                                                            *
@@ -1323,13 +1258,12 @@ static void	am_db_update_alert(zbx_am_t *manager, zbx_am_alert_t *alert, int sta
 
 /******************************************************************************
  *                                                                            *
- * Function: am_external_alert_send_response                                  *
- *                                                                            *
  * Purpose: send response to external alert request                           *
  *                                                                            *
  * Parameters: alerter_service - [IN] the IPC service                         *
- *             alert           - [IN] the alert                               *
- *             value           - [IN] the value                               *
+ *             alert           - [IN]                                         *
+ *             value           - [IN]                                         *
+ *             errcode         - [IN]                                         *
  *             error           - [IN] error message                           *
  *             debug           - [IN] debug message                           *
  *                                                                            *
@@ -1354,8 +1288,6 @@ static void	am_external_alert_send_response(const zbx_ipc_service_t *alerter_ser
 
 /******************************************************************************
  *                                                                            *
- * Function: am_sync_watchdog                                                 *
- *                                                                            *
  * Purpose: synchronize watchdog alert recipients                             *
  *                                                                            *
  * Parameters: manager    - [IN] the manager                                  *
@@ -1423,12 +1355,10 @@ static void	am_sync_watchdog(zbx_am_t *manager, zbx_am_media_t **medias, int med
 
 /******************************************************************************
  *                                                                            *
- * Function: am_prepare_mediatype_exec_command                                *
- *                                                                            *
  * Purpose: gets script media type parameters with expanded macros            *
  *                                                                            *
- * Parameters: mediatype - [IN] the media type                                *
- *             alert     - [IN] the alert                                     *
+ * Parameters: mediatype - [IN]                                               *
+ *             alert     - [IN]                                               *
  *             cmd       - [OUT] the command to execute                       *
  *             error     - [OUT] the error message                            *
  *                                                                            *
@@ -1492,8 +1422,6 @@ static int	am_prepare_mediatype_exec_command(zbx_am_mediatype_t *mediatype, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: am_process_alert                                                 *
- *                                                                            *
  * Purpose: sends alert to the alerter                                        *
  *                                                                            *
  * Parameters: manager         - [IN] the alert manager                       *
@@ -1607,11 +1535,9 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: am_process_result                                                *
- *                                                                            *
  * Purpose: process alerter result                                            *
  *                                                                            *
- * Parameters: manager         - [IN] the manager                             *
+ * Parameters: manager         - [IN]                                         *
  *             client          - [IN] the connected alerter                   *
  *             message         - [IN] the received message                    *
  *                                                                            *
@@ -1684,8 +1610,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: am_check_queue                                                   *
- *                                                                            *
  * Purpose: checks alert queue if there is an alert that should be sent now   *
  *                                                                            *
  * Parameters: manager - [IN] the alert manager                               *
@@ -1728,8 +1652,6 @@ static int	am_check_queue(zbx_am_t *manager, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_update_mediatypes                                             *
- *                                                                            *
  * Purpose: update cached media types                                         *
  *                                                                            *
  ******************************************************************************/
@@ -1764,8 +1686,6 @@ static void	am_update_mediatypes(zbx_am_t *manager, zbx_ipc_message_t *message)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_queue_alert                                                   *
- *                                                                            *
  * Purpose: queue new alerts                                                  *
  *                                                                            *
  ******************************************************************************/
@@ -1795,8 +1715,6 @@ static int	am_queue_alert(zbx_am_t *manager, zbx_am_alert_t *alert, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_queue_alerts                                                  *
- *                                                                            *
  * Purpose: queue new alerts                                                  *
  *                                                                            *
  ******************************************************************************/
@@ -1824,8 +1742,6 @@ static void	am_queue_alerts(zbx_am_t *manager, zbx_ipc_message_t *message, int n
 
 /******************************************************************************
  *                                                                            *
- * Function: am_update_watchdog                                               *
- *                                                                            *
  * Purpose: update 'database down' watchdog alert recipients                  *
  *                                                                            *
  ******************************************************************************/
@@ -1844,8 +1760,6 @@ static void	am_update_watchdog(zbx_am_t *manager, zbx_ipc_message_t *message)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_drop_mediatypes                                               *
- *                                                                            *
  * Purpose: remove unused mediatypes                                          *
  *                                                                            *
  ******************************************************************************/
@@ -1873,8 +1787,6 @@ static void	am_drop_mediatypes(zbx_am_t *manager, zbx_ipc_message_t *message)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_flush_results                                                 *
- *                                                                            *
  * Purpose: returns alert sending results                                     *
  *                                                                            *
  ******************************************************************************/
@@ -1926,8 +1838,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: am_process_external_alert_request                                *
- *                                                                            *
  * Purpose: process external alert request                                    *
  *                                                                            *
  * Parameters: manager - [IN] the alert manager                               *
@@ -1990,14 +1900,8 @@ static void	am_process_external_alert_request(zbx_am_t *manager, zbx_uint64_t id
 
 /******************************************************************************
  *                                                                            *
- * Function: am_process_begin_dispatch                                        *
- *                                                                            *
  * Purpose: begin file dispatch                                               *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
- *             client  - [IN] the connected worker IPC client data            *
- *             message - [IN] the received message                            *
- *                                                                            *
  ******************************************************************************/
 static void	am_process_begin_dispatch(zbx_ipc_client_t *client, const unsigned char *data)
 {
@@ -2017,8 +1921,6 @@ static void	am_process_begin_dispatch(zbx_ipc_client_t *client, const unsigned c
 
 /******************************************************************************
  *                                                                            *
- * Function: am_prepare_dispatch_message                                      *
- *                                                                            *
  * Purpose: prepare message to dispatch by attaching dispatch contents for    *
  *          supported media types                                             *
  *                                                                            *
@@ -2057,14 +1959,8 @@ static void	am_prepare_dispatch_message(zbx_am_dispatch_t *dispatch, DB_MEDIATYP
 
 /******************************************************************************
  *                                                                            *
- * Function: am_process_send_dispatch                                         *
- *                                                                            *
  * Purpose: send dispatch to the specified media type users                   *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
- *             client  - [IN] the connected worker IPC client                 *
- *             message - [IN] the received message                            *
- *                                                                            *
  ******************************************************************************/
 static void	am_process_send_dispatch(zbx_am_t *manager, zbx_ipc_client_t *client, const unsigned char *data)
 {
@@ -2125,8 +2021,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: am_process_end_dispatch                                          *
- *                                                                            *
  * Purpose: finish sending dispatches                                         *
  *                                                                            *
  * Parameters: client  - [IN] the connected worker IPC client                 *
@@ -2147,8 +2041,6 @@ static void	am_process_end_dispatch(zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_remove_unused_mediatypes                                      *
- *                                                                            *
  * Purpose: remove unused media types                                         *
  *                                                                            *
  ******************************************************************************/
@@ -2167,8 +2059,6 @@ static void	am_remove_unused_mediatypes(zbx_am_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_process_diag_stats                                            *
- *                                                                            *
  * Purpose: process diagnostic statistics request                             *
  *                                                                            *
  ******************************************************************************/
@@ -2184,8 +2074,6 @@ static void	am_process_diag_stats(zbx_am_t *manager, zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_compare_mediatype_by_alerts_desc                              *
- *                                                                            *
  * Purpose: compare mediatypes by total queued alerts                         *
  *                                                                            *
  ******************************************************************************/
@@ -2199,11 +2087,9 @@ static int	am_compare_mediatype_by_alerts_desc(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_process_diag_top_mediatypes                                   *
- *                                                                            *
  * Purpose: processes top mediatypes by queued alerts                         *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             client  - [IN] the connected worker IPC client data            *
  *             message - [IN] the received message                            *
  *                                                                            *
@@ -2274,11 +2160,9 @@ static int	am_source_compare_func(const void *d1, const void *d2)
 }
 /******************************************************************************
  *                                                                            *
- * Function: am_process_diag_top_sources                                      *
- *                                                                            *
  * Purpose: processes top alert sources by queued alerts                      *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             client  - [IN] the connected worker IPC client data            *
  *             message - [IN] the received message                            *
  *                                                                            *
diff --git a/src/zabbix_server/alerter/alert_syncer.c b/src/zabbix_server/alerter/alert_syncer.c
index a9f799caa61..f4ec0955381 100644
--- a/src/zabbix_server/alerter/alert_syncer.c
+++ b/src/zabbix_server/alerter/alert_syncer.c
@@ -53,8 +53,6 @@ zbx_am_db_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_create_alert                                               *
- *                                                                            *
  * Purpose: creates new alert object                                          *
  *                                                                            *
  * Parameters: ...           - [IN] alert data                                *
@@ -88,11 +86,6 @@ static zbx_am_db_alert_t	*am_db_create_alert(zbx_uint64_t alertid, zbx_uint64_t
 	return alert;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: am_db_init                                                       *
- *                                                                            *
- ******************************************************************************/
 static int 	am_db_init(zbx_am_db_t *amdb, char **error)
 {
 	zbx_hashset_create(&amdb->mediatypes, 5, ZBX_DEFAULT_UINT64_HASH_FUNC, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
@@ -103,11 +96,6 @@ static int 	am_db_init(zbx_am_db_t *amdb, char **error)
 	return SUCCEED;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: am_db_clear                                                      *
- *                                                                            *
- ******************************************************************************/
 static void	am_db_clear(zbx_am_db_t *amdb)
 {
 	zbx_hashset_iter_t	iter;
@@ -122,8 +110,6 @@ static void	am_db_clear(zbx_am_db_t *amdb)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_get_alerts                                                 *
- *                                                                            *
  * Purpose: reads the new alerts from database                                *
  *                                                                            *
  * Parameters: alerts - [OUT] the new alerts                                  *
@@ -254,8 +240,6 @@ static int	am_db_get_alerts(zbx_vector_ptr_t *alerts)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_update_mediatype                                           *
- *                                                                            *
  * Purpose: updates media type object, creating one if necessary              *
  *                                                                            *
  * Return value: Updated mediatype or NULL, if the cached media was up to     *
@@ -315,8 +299,6 @@ static zbx_am_db_mediatype_t	*am_db_update_mediatype(zbx_am_db_t *amdb, time_t n
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_update_mediatypes                                          *
- *                                                                            *
  * Purpose: updates alert manager media types                                 *
  *                                                                            *
  * Parameters: amdb            - [IN] the alert manager cache                 *
@@ -388,8 +370,6 @@ static void	am_db_update_mediatypes(zbx_am_db_t *amdb, const zbx_uint64_t *media
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_queue_alerts                                               *
- *                                                                            *
  * Purpose: reads alerts/mediatypes from database and queues them in alert    *
  *          manager                                                           *
  *                                                                            *
@@ -504,8 +484,6 @@ static void	event_tags_free(zbx_event_tags_t *event_tags)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_update_event_tags                                          *
- *                                                                            *
  * Purpose: adds event tags to sql query                                      *
  *                                                                            *
  * Parameters: eventid     - [IN]  problem_tag update db event                *
@@ -604,8 +582,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_validate_tags_for_update                                   *
- *                                                                            *
  * Purpose: removes duplicate event tags and checks if problem tags need to   *
  *          be updated                                                        *
  *                                                                            *
@@ -692,8 +668,6 @@ static void	am_service_add_event_tags(zbx_vector_events_tags_t *events_tags)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_flush_results                                              *
- *                                                                            *
  * Purpose: retrieves alert updates from alert manager and flushes them into  *
  *          database                                                          *
  *                                                                            *
@@ -816,8 +790,6 @@ static int	am_db_flush_results(zbx_am_db_t *amdb)
 }
 /******************************************************************************
  *                                                                            *
- * Function: am_db_remove_expired_mediatypes                                  *
- *                                                                            *
  * Purpose: removes cached media types used more than a day ago               *
  *                                                                            *
  * Parameters: amdb            - [IN] the alert manager cache                 *
@@ -864,8 +836,6 @@ static void	am_db_remove_expired_mediatypes(zbx_am_db_t *amdb)
 
 /******************************************************************************
  *                                                                            *
- * Function: am_db_update_watchdog                                            *
- *                                                                            *
  * Purpose: updates watchdog recipients                                       *
  *                                                                            *
  * Parameters: amdb            - [IN] the alert manager cache                 *
diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c
index f6e4ff986cb..b563283c911 100644
--- a/src/zabbix_server/alerter/alerter.c
+++ b/src/zabbix_server/alerter/alerter.c
@@ -44,8 +44,6 @@ static zbx_es_t	es_engine;
 
 /******************************************************************************
  *                                                                            *
- * Function: execute_script_alert                                             *
- *                                                                            *
  * Purpose: execute script alert type                                         *
  *                                                                            *
  ******************************************************************************/
@@ -66,8 +64,6 @@ static int	execute_script_alert(const char *command, char *error, size_t max_err
 
 /******************************************************************************
  *                                                                            *
- * Function: alerter_register                                                 *
- *                                                                            *
  * Purpose: registers alerter with alert manager                              *
  *                                                                            *
  * Parameters: socket - [IN] the connections socket                           *
@@ -84,8 +80,6 @@ static void	alerter_register(zbx_ipc_socket_t *socket)
 
 /******************************************************************************
  *                                                                            *
- * Function: alerter_send_result                                              *
- *                                                                            *
  * Purpose: sends alert sending result to alert manager                       *
  *                                                                            *
  * Parameters: socket  - [IN] the connections socket                          *
@@ -108,8 +102,6 @@ static void	alerter_send_result(zbx_ipc_socket_t *socket, const char *value, int
 
 /******************************************************************************
  *                                                                            *
- * Function: create_email_inreplyto                                           *
- *                                                                            *
  * Purpose: create email In-Reply_To field value to group related messages    *
  *                                                                            *
  ******************************************************************************/
@@ -142,8 +134,6 @@ static char	*create_email_inreplyto(zbx_uint64_t mediatypeid, const char *sendto
 
 /******************************************************************************
  *                                                                            *
- * Function: alerter_process_email                                            *
- *                                                                            *
  * Purpose: processes email alert                                             *
  *                                                                            *
  * Parameters: socket      - [IN] the connections socket                      *
@@ -185,8 +175,6 @@ static void	alerter_process_email(zbx_ipc_socket_t *socket, zbx_ipc_message_t *i
 
 /******************************************************************************
  *                                                                            *
- * Function: alerter_process_sms                                              *
- *                                                                            *
  * Purpose: processes SMS alert                                               *
  *                                                                            *
  * Parameters: socket      - [IN] the connections socket                      *
@@ -214,8 +202,6 @@ static void	alerter_process_sms(zbx_ipc_socket_t *socket, zbx_ipc_message_t *ipc
 
 /******************************************************************************
  *                                                                            *
- * Function: alerter_process_exec                                             *
- *                                                                            *
  * Purpose: processes script alert                                            *
  *                                                                            *
  * Parameters: socket      - [IN] the connections socket                      *
@@ -240,8 +226,6 @@ static void	alerter_process_exec(zbx_ipc_socket_t *socket, zbx_ipc_message_t *ip
 
 /******************************************************************************
  *                                                                            *
- * Function: alerter_process_webhook                                          *
- *                                                                            *
  * Purpose: processes webhook alert                                           *
  *                                                                            *
  * Parameters: socket      - [IN] the connections socket                      *
@@ -297,8 +281,6 @@ static void	alerter_process_webhook(zbx_ipc_socket_t *socket, zbx_ipc_message_t
 
 /******************************************************************************
  *                                                                            *
- * Function: main_alerter_loop                                                *
- *                                                                            *
  * Purpose: periodically check table alerts and send notifications if needed  *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/alerter/alerter_protocol.c b/src/zabbix_server/alerter/alerter_protocol.c
index 35eb102b2ff..e99f52bd474 100644
--- a/src/zabbix_server/alerter/alerter_protocol.c
+++ b/src/zabbix_server/alerter/alerter_protocol.c
@@ -44,8 +44,6 @@ void	zbx_am_db_mediatype_clear(zbx_am_db_mediatype_t *mediatype)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_am_db_alert_free                                             *
- *                                                                            *
  * Purpose: frees the alert object                                            *
  *                                                                            *
  * Parameters: alert - [IN] the alert object                                  *
@@ -770,11 +768,6 @@ void	zbx_alerter_deserialize_ids(const unsigned char *data, zbx_uint64_t **ids,
 		data += zbx_deserialize_value(data, &(*ids)[i]);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_alerter_serialize_diag_stats                                 *
- *                                                                            *
- ******************************************************************************/
 zbx_uint32_t	zbx_alerter_serialize_diag_stats(unsigned char **data, zbx_uint64_t alerts_num)
 {
 	zbx_uint32_t	data_len = 0;
@@ -786,21 +779,11 @@ zbx_uint32_t	zbx_alerter_serialize_diag_stats(unsigned char **data, zbx_uint64_t
 	return data_len;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_alerter_deserialize_diag_stats                               *
- *                                                                            *
- ******************************************************************************/
 static void	zbx_alerter_deserialize_diag_stats(const unsigned char *data, zbx_uint64_t *alerts_num)
 {
 	(void)zbx_deserialize_value(data, alerts_num);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_alerter_serialize_top_request                                *
- *                                                                            *
- ******************************************************************************/
 static zbx_uint32_t	zbx_alerter_serialize_top_request(unsigned char **data, int limit)
 {
 	zbx_uint32_t	len;
@@ -811,21 +794,11 @@ static zbx_uint32_t	zbx_alerter_serialize_top_request(unsigned char **data, int
 	return len;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_alerter_deserialize_top_request                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_alerter_deserialize_top_request(const unsigned char *data, int *limit)
 {
 	(void)zbx_deserialize_value(data, limit);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_alerter_serialize_top_mediatypes_result                      *
- *                                                                            *
- ******************************************************************************/
 zbx_uint32_t	zbx_alerter_serialize_top_mediatypes_result(unsigned char **data, zbx_am_mediatype_t **mediatypes,
 		int mediatypes_num)
 {
@@ -855,11 +828,6 @@ zbx_uint32_t	zbx_alerter_serialize_top_mediatypes_result(unsigned char **data, z
 	return data_len;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_alerter_deserialize_top_mediatypes_result                    *
- *                                                                            *
- ******************************************************************************/
 static void	zbx_alerter_deserialize_top_mediatypes_result(const unsigned char *data,
 		zbx_vector_uint64_pair_t *mediatypes)
 {
@@ -884,11 +852,6 @@ static void	zbx_alerter_deserialize_top_mediatypes_result(const unsigned char *d
 	}
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_alerter_serialize_top_sources_result                         *
- *                                                                            *
- ******************************************************************************/
 zbx_uint32_t	zbx_alerter_serialize_top_sources_result(unsigned char **data, zbx_am_source_stats_t **sources,
 		int sources_num)
 {
@@ -922,11 +885,6 @@ zbx_uint32_t	zbx_alerter_serialize_top_sources_result(unsigned char **data, zbx_
 	return data_len;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_alerter_deserialize_top_sources_result                       *
- *                                                                            *
- ******************************************************************************/
 static void	zbx_alerter_deserialize_top_sources_result(const unsigned char *data, zbx_vector_ptr_t *sources)
 {
 	int	i, sources_num;
@@ -953,8 +911,6 @@ static void	zbx_alerter_deserialize_top_sources_result(const unsigned char *data
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_alerter_get_diag_stats                                       *
- *                                                                            *
  * Purpose: get alerter manager diagnostic statistics                         *
  *                                                                            *
  ******************************************************************************/
@@ -976,8 +932,6 @@ int	zbx_alerter_get_diag_stats(zbx_uint64_t *alerts_num, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_alerter_get_top_mediatypes                                   *
- *                                                                            *
  * Purpose: get the top N mediatypes by the number of queued alerts           *
  *                                                                            *
  * Parameters limit      - [IN] the number of top records to retrieve         *
@@ -1012,8 +966,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_alerter_get_top_sources                                      *
- *                                                                            *
  * Purpose: get the top N sources by the number of queued alerts              *
  *                                                                            *
  * Parameters limit   - [IN] the number of top records to retrieve            *
@@ -1172,8 +1124,6 @@ void	zbx_alerter_deserialize_send_dispatch(const unsigned char *data, DB_MEDIATY
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_alerter_begin_dispatch                                       *
- *                                                                            *
  * Purpose: begin data dispatch                                               *
  *                                                                            *
  * Parameters: dispatch     - [IN] the dispatcher                             *
@@ -1235,8 +1185,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_alerter_send_dispatch                                        *
- *                                                                            *
  * Purpose: dispatch data                                                     *
  *                                                                            *
  * Parameters: dispatch   - [IN] the dispatcher                               *
@@ -1279,8 +1227,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_alerter_end_dispatch                                         *
- *                                                                            *
  * Purpose: finish data dispatch                                              *
  *                                                                            *
  * Parameters: dispatch  - [IN] the dispatcher                                *
diff --git a/src/zabbix_server/dbconfig/dbconfig.c b/src/zabbix_server/dbconfig/dbconfig.c
index 2abade8467a..8ecbd6b5eba 100644
--- a/src/zabbix_server/dbconfig/dbconfig.c
+++ b/src/zabbix_server/dbconfig/dbconfig.c
@@ -64,8 +64,6 @@ static void	zbx_dbconfig_sigusr_handler(int flags)
 
 /******************************************************************************
  *                                                                            *
- * Function: main_dbconfig_loop                                               *
- *                                                                            *
  * Purpose: periodically synchronises database data with memory cache         *
  *                                                                            *
  * Comments: never returns                                                    *
diff --git a/src/zabbix_server/dbsyncer/dbsyncer.c b/src/zabbix_server/dbsyncer/dbsyncer.c
index 40cd1c97860..24c7b7d7df5 100644
--- a/src/zabbix_server/dbsyncer/dbsyncer.c
+++ b/src/zabbix_server/dbsyncer/dbsyncer.c
@@ -37,8 +37,6 @@ static sigset_t				orig_mask;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_db_flush_timer_queue                                         *
- *                                                                            *
  * Purpose: flush timer queue to the database                                 *
  *                                                                            *
  ******************************************************************************/
@@ -81,8 +79,6 @@ static void	db_trigger_queue_cleanup(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: main_dbsyncer_loop                                               *
- *                                                                            *
  * Purpose: periodically synchronises data in memory cache with database      *
  *                                                                            *
  * Comments: never returns                                                    *
diff --git a/src/zabbix_server/discoverer/discoverer.c b/src/zabbix_server/discoverer/discoverer.c
index 2659f285acc..a54af92ba40 100644
--- a/src/zabbix_server/discoverer/discoverer.c
+++ b/src/zabbix_server/discoverer/discoverer.c
@@ -47,8 +47,6 @@ static volatile sig_atomic_t	snmp_cache_reload_requested;
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_update_service                                             *
- *                                                                            *
  * Purpose: process new service status                                        *
  *                                                                            *
  * Parameters: service - service info                                         *
@@ -74,8 +72,6 @@ static void	proxy_update_service(zbx_uint64_t druleid, zbx_uint64_t dcheckid, co
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_update_host                                                *
- *                                                                            *
  * Purpose: process new service status                                        *
  *                                                                            *
  * Parameters: service - service info                                         *
@@ -98,8 +94,6 @@ static void	proxy_update_host(zbx_uint64_t druleid, const char *ip, const char *
 
 /******************************************************************************
  *                                                                            *
- * Function: discover_service                                                 *
- *                                                                            *
  * Purpose: check if service is available                                     *
  *                                                                            *
  * Parameters: service type, ip address, port number                          *
@@ -337,8 +331,6 @@ static int	discover_service(const DB_DCHECK *dcheck, char *ip, int port, char **
 
 /******************************************************************************
  *                                                                            *
- * Function: process_check                                                    *
- *                                                                            *
  * Purpose: check if service is available and update database                 *
  *                                                                            *
  * Parameters: service - service info                                         *
@@ -405,11 +397,6 @@ static void	process_check(const DB_DCHECK *dcheck, int *host_status, char *ip, i
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: process_checks                                                   *
- *                                                                            *
- ******************************************************************************/
 static void	process_checks(const DB_DRULE *drule, int *host_status, char *ip, int unique, int now,
 		zbx_vector_ptr_t *services, zbx_vector_uint64_t *dcheckids)
 {
@@ -461,11 +448,6 @@ static void	process_checks(const DB_DRULE *drule, int *host_status, char *ip, in
 	DBfree_result(result);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: process_services                                                 *
- *                                                                            *
- ******************************************************************************/
 static int	process_services(const DB_DRULE *drule, DB_DHOST *dhost, const char *ip, const char *dns, int now,
 		const zbx_vector_ptr_t *services, zbx_vector_uint64_t *dcheckids)
 {
@@ -504,8 +486,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_rule                                                     *
- *                                                                            *
  * Purpose: process single discovery rule                                     *
  *                                                                            *
  ******************************************************************************/
@@ -644,8 +624,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: discovery_clean_services                                         *
- *                                                                            *
  * Purpose: clean dservices and dhosts not presenting in drule                *
  *                                                                            *
  ******************************************************************************/
@@ -876,8 +854,6 @@ static void	zbx_discoverer_sigusr_handler(int flags)
 
 /******************************************************************************
  *                                                                            *
- * Function: discoverer_thread                                                *
- *                                                                            *
  * Purpose: periodically try to find new hosts and services                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c
index b0262ad7b5a..26533d92177 100644
--- a/src/zabbix_server/escalator/escalator.c
+++ b/src/zabbix_server/escalator/escalator.c
@@ -154,8 +154,6 @@ static int	get_user_info(zbx_uint64_t userid, zbx_uint64_t *roleid, char **user_
 
 /******************************************************************************
  *                                                                            *
- * Function: get_hostgroups_permission                                        *
- *                                                                            *
  * Purpose: Return user permissions for access to the host                    *
  *                                                                            *
  * Parameters:                                                                *
@@ -199,8 +197,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: check_tag_based_permission                                       *
- *                                                                            *
  * Purpose: Check user access to event by tags                                *
  *                                                                            *
  * Parameters: userid       - user id                                         *
@@ -293,8 +289,6 @@ static int	check_tag_based_permission(zbx_uint64_t userid, zbx_vector_uint64_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: get_trigger_permission                                           *
- *                                                                            *
  * Purpose: Return user permissions for access to trigger                     *
  *                                                                            *
  * Return value: PERM_DENY - if host or user not found,                       *
@@ -350,8 +344,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_item_permission                                              *
- *                                                                            *
  * Purpose: Return user permissions for access to item                        *
  *                                                                            *
  * Return value: PERM_DENY - if host or user not found,                       *
@@ -575,8 +567,6 @@ static void	zbx_db_cache_service_role(zbx_service_role_t *role)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_service_permission                                           *
- *                                                                            *
  * Purpose: Return user permissions for access to services                    *
  *                                                                            *
  * Return value: PERM_DENY - if host or user not found,                       *
@@ -889,8 +879,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: add_sentusers_msg                                                *
- *                                                                            *
  * Purpose: adds message to be sent to all recipients of messages previously  *
  *          generated by action operations or acknowledgement operations,     *
  *          which is related with an event or recovery event                  *
@@ -993,8 +981,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: add_sentusers_msg_esc_cancel                                     *
- *                                                                            *
  * Purpose: adds message for the canceled escalation to be sent to all        *
  *          recipients of messages previously generated by action operations  *
  *          or acknowledgement operations, which is related with an event or  *
@@ -1094,8 +1080,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: add_sentusers_ack_msg                                            *
- *                                                                            *
  * Purpose: adds message to be sent to all who added acknowlegment and        *
  *          involved in discussion                                            *
  *                                                                            *
@@ -1209,8 +1193,6 @@ static void	add_command_alert(zbx_db_insert_t *db_insert, int alerts_num, zbx_ui
 
 /******************************************************************************
  *                                                                            *
- * Function: get_operation_groupids                                           *
- *                                                                            *
  * Purpose: get groups (including nested groups) used by an operation         *
  *                                                                            *
  * Parameters: operationid - [IN] the operation id                            *
@@ -1776,8 +1758,6 @@ err_alert:
 
 /******************************************************************************
  *                                                                            *
- * Function: check_operation_conditions                                       *
- *                                                                            *
  * Purpose:                                                                   *
  *                                                                            *
  * Parameters: event    - event to check                                      *
@@ -1985,8 +1965,6 @@ static void	escalation_execute_operations(DB_ESCALATION *escalation, const DB_EV
 
 /******************************************************************************
  *                                                                            *
- * Function: escalation_execute_recovery_operations                           *
- *                                                                            *
  * Purpose: execute escalation recovery operations                            *
  *                                                                            *
  * Parameters: event      - [IN] the event                                    *
@@ -2052,8 +2030,6 @@ static void	escalation_execute_recovery_operations(const DB_EVENT *event, const
 
 /******************************************************************************
  *                                                                            *
- * Function: escalation_execute_update_operations                             *
- *                                                                            *
  * Purpose: execute escalation update operations                              *
  *                                                                            *
  * Parameters: event  - [IN] the event                                        *
@@ -2124,8 +2100,6 @@ static void	escalation_execute_update_operations(const DB_EVENT *event, const DB
 
 /******************************************************************************
  *                                                                            *
- * Function: check_escalation_trigger                                         *
- *                                                                            *
  * Purpose: check whether the escalation trigger and related items, hosts are *
  *          not deleted or disabled.                                          *
  *                                                                            *
@@ -2291,8 +2265,6 @@ static int	check_unfinished_alerts(const DB_ESCALATION *escalation)
 
 /******************************************************************************
  *                                                                            *
- * Function: check_escalation                                                 *
- *                                                                            *
  * Purpose: check whether escalation must be cancelled, deleted, skipped or   *
  *          processed.                                                        *
  *                                                                            *
@@ -2409,8 +2381,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: escalation_log_cancel_warning                                    *
- *                                                                            *
  * Purpose: write escalation cancellation warning message into log file       *
  *                                                                            *
  * Parameters: escalation - [IN] the escalation                               *
@@ -2425,8 +2395,6 @@ static void	escalation_log_cancel_warning(const DB_ESCALATION *escalation, const
 
 /******************************************************************************
  *                                                                            *
- * Function: escalation_cancel                                                *
- *                                                                            *
  * Purpose: cancel escalation with the specified error message                *
  *                                                                            *
  * Parameters: escalation - [IN/OUT] the escalation to cancel                 *
@@ -2460,8 +2428,6 @@ static void	escalation_cancel(DB_ESCALATION *escalation, const DB_ACTION *action
 
 /******************************************************************************
  *                                                                            *
- * Function: escalation_execute                                               *
- *                                                                            *
  * Purpose: execute next escalation step                                      *
  *                                                                            *
  * Parameters: escalation - [IN/OUT] the escalation to execute                *
@@ -2482,8 +2448,6 @@ static void	escalation_execute(DB_ESCALATION *escalation, const DB_ACTION *actio
 
 /******************************************************************************
  *                                                                            *
- * Function: escalation_recover                                               *
- *                                                                            *
  * Purpose: process escalation recovery                                       *
  *                                                                            *
  * Parameters: escalation - [IN/OUT] the escalation to recovery               *
@@ -2508,8 +2472,6 @@ static void	escalation_recover(DB_ESCALATION *escalation, const DB_ACTION *actio
 
 /******************************************************************************
  *                                                                            *
- * Function: escalation_acknowledge                                           *
- *                                                                            *
  * Purpose: process escalation acknowledge                                    *
  *                                                                            *
  * Parameters: escalation - [IN/OUT] the escalation to recovery               *
@@ -2557,8 +2519,6 @@ static void	escalation_acknowledge(DB_ESCALATION *escalation, const DB_ACTION *a
 
 /******************************************************************************
  *                                                                            *
- * Function: escalation_update                                                *
- *                                                                            *
  * Purpose: process update escalation                                         *
  *                                                                            *
  * Parameters: escalation       - [IN/OUT] the escalation to recovery         *
@@ -2640,8 +2600,6 @@ static void	escalation_update_diff(const DB_ESCALATION *escalation, zbx_escalati
 
 /******************************************************************************
  *                                                                            *
- * Function: add_ack_escalation_r_eventids                                    *
- *                                                                            *
  * Purpose: check if acknowledgement events of current escalation has related *
  *          recovery events and add those recovery event IDs to array of      *
  *          event IDs if this escalation                                      *
@@ -3250,8 +3208,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_escalations                                              *
- *                                                                            *
  * Purpose: execute escalation steps and recovery operations;                 *
  *          postpone escalations during maintenance and due to trigger dep.;  *
  *          delete completed escalations from the database;                   *
@@ -3417,8 +3373,6 @@ static int	process_escalations(int now, int *nextcheck, unsigned int escalation_
 
 /******************************************************************************
  *                                                                            *
- * Function: main_escalator_loop                                              *
- *                                                                            *
  * Purpose: periodically check table escalations and generate alerts          *
  *                                                                            *
  * Comments: never returns                                                    *
diff --git a/src/zabbix_server/events.c b/src/zabbix_server/events.c
index 7f0f5f96db6..bf91a909d08 100644
--- a/src/zabbix_server/events.c
+++ b/src/zabbix_server/events.c
@@ -66,8 +66,6 @@ static zbx_correlation_rules_t	correlation_rules;
 
 /******************************************************************************
  *                                                                            *
- * Function: validate_event_tag                                               *
- *                                                                            *
  * Purpose: Check that tag name is not empty and that tag is not duplicate.   *
  *                                                                            *
  ******************************************************************************/
@@ -169,8 +167,6 @@ static void	get_item_tags_by_expression(const DB_TRIGGER *trigger, zbx_vector_pt
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_add_event                                                    *
- *                                                                            *
  * Purpose: add event to an array                                             *
  *                                                                            *
  * Parameters: source   - [IN] event source (EVENT_SOURCE_*)                  *
@@ -312,8 +308,6 @@ DB_EVENT	*zbx_add_event(unsigned char source, unsigned char object, zbx_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: close_trigger_event                                              *
- *                                                                            *
  * Purpose: add closing OK event for the specified problem event to an array  *
  *                                                                            *
  * Parameters: eventid  - [IN] the problem eventid                            *
@@ -362,8 +356,6 @@ static DB_EVENT	*close_trigger_event(zbx_uint64_t eventid, zbx_uint64_t objectid
 
 /******************************************************************************
  *                                                                            *
- * Function: save_events                                                      *
- *                                                                            *
  * Purpose: flushes the events into a database                                *
  *                                                                            *
  ******************************************************************************/
@@ -442,8 +434,6 @@ static int	save_events(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: save_problems                                                    *
- *                                                                            *
  * Purpose: generates problems from problem events (trigger and internal      *
  *          event sources)                                                    *
  *                                                                            *
@@ -553,8 +543,6 @@ static void	save_problems(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: save_event_recovery                                              *
- *                                                                            *
  * Purpose: saves event recovery data and removes recovered events from       *
  *          problem table                                                     *
  *                                                                            *
@@ -617,8 +605,6 @@ static void	save_event_recovery(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_event_index_by_source_object_id                              *
- *                                                                            *
  * Purpose: find event index by its source object                             *
  *                                                                            *
  * Parameters: source   - [IN] the event source                               *
@@ -646,8 +632,6 @@ static DB_EVENT	*get_event_by_source_object_id(int source, int object, zbx_uint6
 
 /******************************************************************************
  *                                                                            *
- * Function: correlation_match_event_hostgroup                                *
- *                                                                            *
  * Purpose: checks if the event matches the specified host group              *
  *          (including nested groups)                                         *
  *                                                                            *
@@ -695,8 +679,6 @@ static int	correlation_match_event_hostgroup(const DB_EVENT *event, zbx_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: correlation_condition_match_new_event                            *
- *                                                                            *
  * Purpose: checks if the correlation condition matches the new event         *
  *                                                                            *
  * Parameters: condition - [IN] the correlation condition to check            *
@@ -777,8 +759,6 @@ static const char	*correlation_condition_match_new_event(zbx_corr_condition_t *c
 
 /******************************************************************************
  *                                                                            *
- * Function: correlation_match_new_event                                      *
- *                                                                            *
  * Purpose: checks if the correlation rule might match the new event          *
  *                                                                            *
  * Parameters: correlation - [IN] the correlation rule to check               *
@@ -848,8 +828,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: correlation_has_old_event_operation                              *
- *                                                                            *
  * Purpose: checks if correlation has operations to change old events         *
  *                                                                            *
  * Parameters: correlation - [IN] the correlation to check                    *
@@ -879,8 +857,6 @@ static int	correlation_has_old_event_operation(const zbx_correlation_t *correlat
 
 /******************************************************************************
  *                                                                            *
- * Function: correlation_condition_add_tag_match                              *
- *                                                                            *
  * Purpose: adds sql statement to match tag according to the defined          *
  *          matching operation                                                *
  *                                                                            *
@@ -933,8 +909,6 @@ static void	correlation_condition_add_tag_match(char **sql, size_t *sql_alloc, s
 
 /******************************************************************************
  *                                                                            *
- * Function: correlation_condition_get_event_filter                           *
- *                                                                            *
  * Purpose: creates sql filter to find events matching a correlation          *
  *          condition                                                         *
  *                                                                            *
@@ -1025,8 +999,6 @@ static char	*correlation_condition_get_event_filter(zbx_corr_condition_t *condit
 
 /******************************************************************************
  *                                                                            *
- * Function: correlation_add_event_filter                                     *
- *                                                                            *
  * Purpose: add sql statement to filter out correlation conditions and        *
  *          matching events                                                   *
  *                                                                            *
@@ -1090,8 +1062,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: correlation_execute_operations                                   *
- *                                                                            *
  * Purpose: execute correlation operations for the new event and matched      *
  *          old eventid                                                       *
  *                                                                            *
@@ -1176,8 +1146,6 @@ zbx_problem_state_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: correlate_event_by_global_rules                                  *
- *                                                                            *
  * Purpose: find problem events that must be recovered by global correlation  *
  *          rules and check if the new event must be closed                   *
  *                                                                            *
@@ -1325,8 +1293,6 @@ static void	correlate_event_by_global_rules(DB_EVENT *event, zbx_problem_state_t
 
 /******************************************************************************
  *                                                                            *
- * Function: correlate_events_by_global_rules                                 *
- *                                                                            *
  * Purpose: add events to the closing queue according to global correlation   *
  *          rules                                                             *
  *                                                                            *
@@ -1373,8 +1339,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: flush_correlation_queue                                          *
- *                                                                            *
  * Purpose: try flushing correlation close events queue, generated by         *
  *          correlation rules                                                 *
  *                                                                            *
@@ -1538,8 +1502,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: update_trigger_problem_count                                     *
- *                                                                            *
  * Purpose: update number of open problems                                    *
  *                                                                            *
  * Parameters: trigger_diff    - [IN/OUT] the changeset of triggers that      *
@@ -1617,8 +1579,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: update_trigger_changes                                           *
- *                                                                            *
  * Purpose: update trigger value, problem count fields depending on problem   *
  *          and recovered events                                              *
  *                                                                            *
@@ -1680,8 +1640,6 @@ static void	update_trigger_changes(zbx_vector_ptr_t *trigger_diff)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_initialize_events                                            *
- *                                                                            *
  * Purpose: initializes the data structures required for event processing     *
  *                                                                            *
  ******************************************************************************/
@@ -1696,8 +1654,6 @@ void	zbx_initialize_events(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_uninitialize_events                                          *
- *                                                                            *
  * Purpose: uninitializes the data structures required for event processing   *
  *                                                                            *
  ******************************************************************************/
@@ -1712,8 +1668,6 @@ void	zbx_uninitialize_events(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_reset_event_recovery                                         *
- *                                                                            *
  * Purpose: reset event_recovery data                                         *
  *                                                                            *
  ******************************************************************************/
@@ -1724,8 +1678,6 @@ void	zbx_reset_event_recovery(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_clean_event                                                  *
- *                                                                            *
  * Purpose: cleans single event                                               *
  *                                                                            *
  ******************************************************************************/
@@ -1750,8 +1702,6 @@ static void	zbx_clean_event(DB_EVENT *event)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_clean_events                                                 *
- *                                                                            *
  * Purpose: cleans all events and events recoveries                           *
  *                                                                            *
  ******************************************************************************/
@@ -1764,8 +1714,6 @@ void	zbx_clean_events(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: db_trigger_get_hosts                                             *
- *                                                                            *
  * Purpose:  get hosts that are associated with trigger expression/recovery   *
  *           expression                                                       *
  *                                                                            *
@@ -1782,8 +1730,6 @@ static void	db_trigger_get_hosts(zbx_hashset_t *hosts, DB_TRIGGER *trigger)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_export_events                                                *
- *                                                                            *
  * Purpose: export events                                                     *
  *                                                                            *
  ******************************************************************************/
@@ -1962,8 +1908,6 @@ void	zbx_events_update_itservices(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: add_event_suppress_data                                          *
- *                                                                            *
  * Purpose: adds event suppress data for problem events matching active       *
  *          maintenance periods                                               *
  *                                                                            *
@@ -2050,8 +1994,6 @@ static void	add_event_suppress_data(zbx_vector_ptr_t *event_refs, zbx_vector_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: save_event_suppress_data                                         *
- *                                                                            *
  * Purpose: retrieve running maintenances for each event and saves it in      *
  *          event_suppress table                                              *
  *                                                                            *
@@ -2097,8 +2039,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: flush_events                                                     *
- *                                                                            *
  * Purpose: flushes local event cache to database                             *
  *                                                                            *
  ******************************************************************************/
@@ -2134,8 +2074,6 @@ static int	flush_events(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: recover_event                                                    *
- *                                                                            *
  * Purpose: recover an event                                                  *
  *                                                                            *
  * Parameters: eventid   - [IN] the event to recover                          *
@@ -2176,8 +2114,6 @@ static void	recover_event(zbx_uint64_t eventid, int source, int object, zbx_uint
 
 /******************************************************************************
  *                                                                            *
- * Function: process_internal_ok_events                                       *
- *                                                                            *
  * Purpose: process internal recovery events                                  *
  *                                                                            *
  * Parameters: ok_events - [IN] the recovery events to process                *
@@ -2281,8 +2217,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_internal_events_without_actions                          *
- *                                                                            *
  * Purpose: do not generate unnecessary internal events if there are no       *
  *          internal actions and no problem recovery from when actions were   *
  *          enabled                                                           *
@@ -2314,8 +2248,6 @@ static void	process_internal_events_without_actions(zbx_vector_ptr_t *internal_p
 
 /******************************************************************************
  *                                                                            *
- * Function: get_open_problems                                                *
- *                                                                            *
  * Purpose: gets open problems created by the specified triggers              *
  *                                                                            *
  * Parameters: triggerids - [IN] the trigger identifiers (sorted)             *
@@ -2395,8 +2327,6 @@ static void	get_open_problems(const zbx_vector_uint64_t *triggerids, zbx_vector_
 
 /******************************************************************************
  *                                                                            *
- * Function: event_problem_free                                               *
- *                                                                            *
  * Purpose: frees cached problem event                                        *
  *                                                                            *
  ******************************************************************************/
@@ -2409,8 +2339,6 @@ static void	event_problem_free(zbx_event_problem_t *problem)
 
 /******************************************************************************
  *                                                                            *
- * Function: trigger_dep_free                                                 *
- *                                                                            *
  * Purpose: frees trigger dependency                                          *
  *                                                                            *
  ******************************************************************************/
@@ -2423,8 +2351,6 @@ static void	trigger_dep_free(zbx_trigger_dep_t *dep)
 
 /******************************************************************************
  *                                                                            *
- * Function: event_check_dependency                                           *
- *                                                                            *
  * Purpose: check event dependency based on cached and actual trigger values  *
  *                                                                            *
  * Parameters: event        - [IN] the event to check                         *
@@ -2473,8 +2399,6 @@ static int	event_check_dependency(const DB_EVENT *event, const zbx_vector_ptr_t
 
 /******************************************************************************
  *                                                                            *
- * Function: match_tag                                                        *
- *                                                                            *
  * Purpose: checks if the two tag sets have matching tag                      *
  *                                                                            *
  * Parameters: name  - [IN] the name of tag to match                          *
@@ -2512,8 +2436,6 @@ static int	match_tag(const char *name, const zbx_vector_ptr_t *tags1, const zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: process_trigger_events                                           *
- *                                                                            *
  * Purpose: processes trigger events                                          *
  *                                                                            *
  * Parameters: trigger_events - [IN] the trigger events to process            *
@@ -2670,8 +2592,6 @@ static void	process_trigger_events(zbx_vector_ptr_t *trigger_events, zbx_vector_
 
 /******************************************************************************
  *                                                                            *
- * Function: process_internal_events_dependency                               *
- *                                                                            *
  * Purpose: process internal trigger events                                   *
  *          to avoid trigger dependency                                       *
  *                                                                            *
@@ -2741,8 +2661,6 @@ static void	process_internal_events_dependency(zbx_vector_ptr_t *internal_events
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_process_events                                               *
- *                                                                            *
  * Purpose: processes cached events                                           *
  *                                                                            *
  * Parameters: trigger_diff    - [IN/OUT] the changeset of triggers that      *
@@ -2860,8 +2778,6 @@ int	zbx_process_events(zbx_vector_ptr_t *trigger_diff, zbx_vector_uint64_t *trig
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_close_problem                                                *
- *                                                                            *
  * Purpose: closes problem event                                              *
  *                                                                            *
  * Parameters: triggerid - [IN] the source trigger id                         *
diff --git a/src/zabbix_server/ha/ha_manager.c b/src/zabbix_server/ha/ha_manager.c
index 4978e5726b4..e4414e62dac 100644
--- a/src/zabbix_server/ha/ha_manager.c
+++ b/src/zabbix_server/ha/ha_manager.c
@@ -105,8 +105,6 @@ static int	ha_db_execute(zbx_ha_info_t *info, const char *sql, ...) __zbx_attr_f
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_manager_send_message                                          *
- *                                                                            *
  * Purpose: connect, send message and receive response in a given timeout     *
  *                                                                            *
  * Parameters: service_name - [IN] the IPC service name                       *
@@ -170,8 +168,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_update_parent                                                 *
- *                                                                            *
  * Purpose: update parent process with ha_status and failover delay           *
  *                                                                            *
  ******************************************************************************/
@@ -210,8 +206,6 @@ static void	ha_update_parent(zbx_ipc_async_socket_t *rtc_socket, zbx_ha_info_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_send_heartbeat                                                *
- *                                                                            *
  * Purpose: send heartbeat message to main process                            *
  *                                                                            *
  ******************************************************************************/
@@ -227,8 +221,6 @@ static void	ha_send_heartbeat(zbx_ipc_async_socket_t *rtc_socket)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_set_error                                                 *
- *                                                                            *
  * Purpose: set HA manager error                                              *
  *                                                                            *
  ******************************************************************************/
@@ -256,8 +248,6 @@ static void	ha_set_error(zbx_ha_info_t *info, const char *fmt, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_begin                                                      *
- *                                                                            *
  * Purpose: start database transaction                                        *
  *                                                                            *
  * Comments: Sets error status on non-recoverable database error              *
@@ -279,8 +269,6 @@ static int	ha_db_begin(zbx_ha_info_t *info)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_rollback                                                   *
- *                                                                            *
  * Purpose: roll back database transaction                                    *
  *                                                                            *
  * Comments: Sets error status on non-recoverable database error              *
@@ -302,8 +290,6 @@ static int	ha_db_rollback(zbx_ha_info_t *info)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_commit                                                     *
- *                                                                            *
  * Purpose: commit/rollback database transaction depending on commit result   *
  *                                                                            *
  * Comments: Sets error status on non-recoverable database error              *
@@ -329,8 +315,6 @@ static int	ha_db_commit(zbx_ha_info_t *info)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_select                                                     *
- *                                                                            *
  * Purpose: perform database select sql query based on current database       *
  *          connection status                                                 *
  *                                                                            *
@@ -362,8 +346,6 @@ static DB_RESULT	ha_db_select(zbx_ha_info_t *info, const char *sql, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_select                                                     *
- *                                                                            *
  * Purpose: perform database sql query based on current database              *
  *          connection status                                                 *
  *                                                                            *
@@ -385,8 +367,6 @@ static int	ha_db_execute(zbx_ha_info_t *info, const char *sql, ...)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_update_config                                              *
- *                                                                            *
  * Purpose: update HA configuration from database                             *
  *                                                                            *
  ******************************************************************************/
@@ -415,8 +395,6 @@ static int	ha_db_update_config(zbx_ha_info_t *info)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_get_nodes                                                  *
- *                                                                            *
  * Purpose: get all nodes from database                                       *
  *                                                                            *
  * Return value: SUCCEED - the nodes were retrieved from database             *
@@ -463,8 +441,6 @@ static int	ha_db_get_nodes(zbx_ha_info_t *info, zbx_vector_ha_node_t *nodes, int
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_check_registered_node                                         *
- *                                                                            *
  * Purpose: check if the node is registered in node table and get ID          *
  *                                                                            *
  ******************************************************************************/
@@ -483,8 +459,6 @@ static zbx_ha_node_t	*ha_find_node_by_name(zbx_vector_ha_node_t *nodes, const ch
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_get_external_address                                          *
- *                                                                            *
  * Purpose: get server external address and port from configuration           *
  *                                                                            *
  ******************************************************************************/
@@ -495,8 +469,6 @@ static void	ha_get_external_address(char **address, unsigned short *port)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_lock_nodes                                                 *
- *                                                                            *
  * Purpose: lock nodes in database                                            *
  *                                                                            *
  * Comments: To lock ha_node table it must have at least one node             *
@@ -516,8 +488,6 @@ static int	ha_db_lock_nodes(zbx_ha_info_t *info)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_is_available                                                  *
- *                                                                            *
  * Purpose: check availability based on lastaccess timestamp, database time   *
  *          and failover delay                                                *
  *                                                                            *
@@ -535,8 +505,6 @@ static int	ha_is_available(const zbx_ha_info_t *info, int lastaccess, int db_tim
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_check_standalone_config                                       *
- *                                                                            *
  * Purpose: check if server can be started in standalone configuration        *
  *                                                                            *
  * Return value: SUCCEED - server can be started in active mode               *
@@ -568,8 +536,6 @@ static int	ha_check_standalone_config(zbx_ha_info_t *info, zbx_vector_ha_node_t
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_check_cluster_config                                          *
- *                                                                            *
  * Purpose: check if server can be started in cluster configuration           *
  *                                                                            *
  * Parameters: info     - [IN] - the HA node information                      *
@@ -625,8 +591,6 @@ static int	ha_check_cluster_config(zbx_ha_info_t *info, zbx_vector_ha_node_t *no
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_get_time                                                   *
- *                                                                            *
  * Purpose: get current database time                                         *
  *                                                                            *
  ******************************************************************************/
@@ -658,8 +622,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_flush_audit                                                   *
- *                                                                            *
  * Purpose: flush audit taking in account database connection status          *
  *                                                                            *
  ******************************************************************************/
@@ -676,8 +638,6 @@ static void	ha_flush_audit(zbx_ha_info_t *info)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_create_node                                                *
- *                                                                            *
  * Purpose: add new node record in ha_node table if necessary                 *
  *                                                                            *
  * Return value: SUCCEED - node exists, was created or database is offline    *
@@ -761,8 +721,6 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_register_node                                              *
- *                                                                            *
  * Purpose: register server node                                              *
  *                                                                            *
  * Return value: SUCCEED - node was registered or database was offline        *
@@ -883,8 +841,6 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_check_standby_nodes                                           *
- *                                                                            *
  * Purpose: check for standby nodes being unavailable for failrover_delay     *
  *          seconds and mark them unavailable                                 *
  *                                                                            *
@@ -943,8 +899,6 @@ static int	ha_check_standby_nodes(zbx_ha_info_t *info, zbx_vector_ha_node_t *nod
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_check_active_node                                             *
- *                                                                            *
  * Purpose: check for active nodes being unavailable for failover_delay       *
  *          seconds, mark them unavailable and set own status to active       *
  *                                                                            *
@@ -998,8 +952,6 @@ static int	ha_check_active_node(zbx_ha_info_t *info, zbx_vector_ha_node_t *nodes
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_check_nodes                                                   *
- *                                                                            *
  * Purpose: check HA status based on nodes                                    *
  *                                                                            *
  * Comments: Sets error status on critical errors forcing manager to exit     *
@@ -1113,8 +1065,6 @@ finish:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_update_lastaccess                                          *
- *                                                                            *
  * Purpose: update node lastaccess                                            *
  *                                                                            *
  ******************************************************************************/
@@ -1139,8 +1089,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_get_nodes_json                                             *
- *                                                                            *
  * Purpose: get cluster status in lld compatible json format                  *
  *                                                                            *
  ******************************************************************************/
@@ -1203,8 +1151,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_remove_node_impl                                              *
- *                                                                            *
  * Purpose: remove node by its cuid or name                                   *
  *                                                                            *
  ******************************************************************************/
@@ -1292,8 +1238,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_report_cluster_status                                         *
- *                                                                            *
  * Purpose: report cluster status in log file                                 *
  *                                                                            *
  ******************************************************************************/
@@ -1326,8 +1270,6 @@ static void	ha_remove_node(zbx_ha_info_t *info, zbx_ipc_client_t *client, const
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_send_status                                                   *
- *                                                                            *
  * Purpose: reply to ha_status request                                        *
  *                                                                            *
  ******************************************************************************/
@@ -1359,8 +1301,6 @@ static void	ha_send_status(zbx_ha_info_t *info, zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_set_failover_delay                                            *
- *                                                                            *
  * Purpose: set failover delay                                                *
  *                                                                            *
  ******************************************************************************/
@@ -1416,8 +1356,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_get_failover_delay                                            *
- *                                                                            *
  * Purpose: get failover delay                                                *
  *                                                                            *
  ******************************************************************************/
@@ -1433,8 +1371,6 @@ static void	ha_get_failover_delay(zbx_ha_info_t *info, zbx_ipc_client_t *client)
 }
 /******************************************************************************
  *                                                                            *
- * Function: ha_send_node_list                                               *
- *                                                                            *
  * Purpose: reply to get nodes request                                        *
  *                                                                            *
  ******************************************************************************/
@@ -1468,8 +1404,6 @@ static void	ha_send_node_list(zbx_ha_info_t *info, zbx_ipc_client_t *client)
 
 /******************************************************************************
  *                                                                            *
- * Function: ha_db_update_exit_status                                         *
- *                                                                            *
  * Purpose: update node status in database on shutdown                        *
  *                                                                            *
  ******************************************************************************/
@@ -1502,8 +1436,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_get_status                                                *
- *                                                                            *
  * Purpose: get HA manager status                                             *
  *                                                                            *
  ******************************************************************************/
@@ -1557,8 +1489,6 @@ int	zbx_ha_get_status(int *ha_status, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_dispatch_message                                          *
- *                                                                            *
  * Purpose: handle HA manager notifications                                   *
  *                                                                            *
  * Comments: This function also monitors heartbeat notifications and          *
@@ -1621,8 +1551,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_start                                                     *
- *                                                                            *
  * Purpose: start HA manager                                                  *
  *                                                                            *
  ******************************************************************************/
@@ -1691,8 +1619,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_pause                                                     *
- *                                                                            *
  * Purpose: pause HA manager                                                  *
  *                                                                            *
  * Comments: HA manager must be paused before stopping it normally            *
@@ -1716,8 +1642,6 @@ int	zbx_ha_pause(char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_stop                                                      *
- *                                                                            *
  * Purpose: stop  HA manager                                                  *
  *                                                                            *
  * Comments: This function is used to stop HA manager on normal shutdown      *
@@ -1759,8 +1683,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_kill                                                      *
- *                                                                            *
  * Purpose: kill HA manager                                                   *
  *                                                                            *
  ******************************************************************************/
@@ -1773,8 +1695,6 @@ void	zbx_ha_kill(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ha_check_pid                                                 *
- *                                                                            *
  * Purpose: check if the pid is HA manager pid                                *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/housekeeper/history_compress.c b/src/zabbix_server/housekeeper/history_compress.c
index f8554c5f29a..d6ffd525bfc 100644
--- a/src/zabbix_server/housekeeper/history_compress.c
+++ b/src/zabbix_server/housekeeper/history_compress.c
@@ -63,8 +63,6 @@ static int		compress_older_cache = 0;
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_check_table_segmentation                                      *
- *                                                                            *
  * Purpose: check that hypertables are segmented by itemid                    *
  *                                                                            *
  * Parameters: table_name - [IN] hypertable name                              *
@@ -114,8 +112,6 @@ static void	hk_check_table_segmentation(const char *table_name, zbx_compress_tab
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_get_table_compression_age                                     *
- *                                                                            *
  * Purpose: returns data compression age configured for hypertable            *
  *                                                                            *
  * Parameters: table_name - [IN] hypertable name                              *
@@ -156,8 +152,6 @@ static int	hk_get_table_compression_age(const char *table_name)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_check_table_compression_age                                   *
- *                                                                            *
  * Purpose: ensures that table compression is configured to specified age     *
  *                                                                            *
  * Parameters: table_name - [IN] hypertable name                              *
@@ -192,8 +186,6 @@ static void	hk_check_table_compression_age(const char *table_name, int age)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_enable_compression                                    *
- *                                                                            *
  * Purpose: turns table compression on for items older than specified age     *
  *                                                                            *
  * Parameters: age - [IN] compression age                                     *
@@ -218,8 +210,6 @@ static void	hk_history_enable_compression(int age)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_disable_compression                                   *
- *                                                                            *
  * Purpose: turns table compression off                                       *
  *                                                                            *
  ******************************************************************************/
@@ -244,8 +234,6 @@ static void	hk_history_disable_compression(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_compression_init                                      *
- *                                                                            *
  * Purpose: initializing compression for history/trends tables                *
  *                                                                            *
  ******************************************************************************/
@@ -319,8 +307,6 @@ void	hk_history_compression_init(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_compression_update                                    *
- *                                                                            *
  * Purpose: history compression settings periodic update                      *
  *                                                                            *
  * Parameters: cfg - [IN] database extension history compression settings     *
diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c
index 2195c90b0cd..0d1578f1a3f 100644
--- a/src/zabbix_server/housekeeper/housekeeper.c
+++ b/src/zabbix_server/housekeeper/housekeeper.c
@@ -202,8 +202,6 @@ static void	zbx_housekeeper_sigusr_handler(int flags)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_item_update_cache_compare                                     *
- *                                                                            *
  * Purpose: compare two delete queue items by their itemid                    *
  *                                                                            *
  * Parameters: d1 - [IN] the first delete queue item to compare               *
@@ -228,8 +226,6 @@ static int	hk_item_update_cache_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_delete_queue_append                                   *
- *                                                                            *
  * Purpose: add item to the delete queue if necessary                         *
  *                                                                            *
  * Parameters: rule        - [IN/OUT] the history housekeeping rule           *
@@ -269,8 +265,6 @@ static void	hk_history_delete_queue_append(zbx_hk_history_rule_t *rule, int now,
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_prepare                                               *
- *                                                                            *
  * Purpose: prepares history housekeeping rule                                *
  *                                                                            *
  * Parameters: rule        - [IN/OUT] the history housekeeping rule           *
@@ -313,8 +307,6 @@ static void	hk_history_prepare(zbx_hk_history_rule_t *rule)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_release                                               *
- *                                                                            *
  * Purpose: releases history housekeeping rule                                *
  *                                                                            *
  * Parameters: rule  - [IN/OUT] the history housekeeping rule                 *
@@ -335,8 +327,6 @@ static void	hk_history_release(zbx_hk_history_rule_t *rule)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_item_update                                           *
- *                                                                            *
  * Purpose: updates history housekeeping rule with item history setting and   *
  *          adds item to the delete queue if necessary                        *
  *                                                                            *
@@ -380,8 +370,6 @@ static void	hk_history_item_update(zbx_hk_history_rule_t *rules, zbx_hk_history_
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_update                                                *
- *                                                                            *
  * Purpose: updates history housekeeping rule with the latest item history    *
  *          settings and prepares delete queue                                *
  *                                                                            *
@@ -478,8 +466,6 @@ static void	hk_history_update(zbx_hk_history_rule_t *rules, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_delete_queue_prepare_all                              *
- *                                                                            *
  * Purpose: prepares history housekeeping delete queues for all defined       *
  *          history rules.                                                    *
  *                                                                            *
@@ -522,8 +508,6 @@ static void	hk_history_delete_queue_prepare_all(zbx_hk_history_rule_t *rules, in
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_history_delete_queue_clear                                    *
- *                                                                            *
  * Purpose: clears the history housekeeping delete queue                      *
  *                                                                            *
  * Parameters: rule   - [IN/OUT] the history housekeeping rule                *
@@ -537,8 +521,6 @@ static void	hk_history_delete_queue_clear(zbx_hk_history_rule_t *rule)
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_drop_partition_for_rule                                       *
- *                                                                            *
  * Purpose: drop appropriate partitions from the history and trends tables    *
  *                                                                            *
  * Parameters: rules - [IN/OUT] history housekeeping rules                    *
@@ -600,8 +582,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: housekeeping_history_and_trends                                  *
- *                                                                            *
  * Purpose: performs housekeeping for history and trends tables               *
  *                                                                            *
  * Parameters: now    - [IN] the current timestamp                            *
@@ -659,8 +639,6 @@ static int	housekeeping_history_and_trends(int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: housekeeping_process_rule                                        *
- *                                                                            *
  * Purpose: removes old records from a table according to the specified rule  *
  *                                                                            *
  * Parameters: now  - [IN] the current time in seconds                        *
@@ -759,8 +737,6 @@ static int	housekeeping_process_rule(int now, zbx_hk_rule_t *rule)
 
 /******************************************************************************
  *                                                                            *
- * Function: DBdelete_from_table                                              *
- *                                                                            *
  * Purpose: delete limited count of rows from table                           *
  *                                                                            *
  * Return value: number of deleted rows or less than 0 if an error occurred   *
@@ -817,8 +793,6 @@ static int	DBdelete_from_table(const char *tablename, const char *filter, int li
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_problem_cleanup                                               *
- *                                                                            *
  * Purpose: perform problem table cleanup                                     *
  *                                                                            *
  * Parameters: table    - [IN] the problem table name                         *
@@ -849,8 +823,6 @@ static int	hk_problem_cleanup(const char *table, int source, int object, zbx_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: hk_table_cleanup                                                 *
- *                                                                            *
  * Purpose: perform generic table cleanup                                     *
  *                                                                            *
  * Parameters: table    - [IN] the table name                                 *
@@ -879,8 +851,6 @@ static int	hk_table_cleanup(const char *table, const char *field, zbx_uint64_t i
 
 /******************************************************************************
  *                                                                            *
- * Function: housekeeping_cleanup                                             *
- *                                                                            *
  * Purpose: remove deleted items/triggers data                                *
  *                                                                            *
  * Return value: number of rows deleted                                       *
diff --git a/src/zabbix_server/httppoller/httpmacro.c b/src/zabbix_server/httppoller/httpmacro.c
index cf61e29f0b0..855eefbe014 100644
--- a/src/zabbix_server/httppoller/httpmacro.c
+++ b/src/zabbix_server/httppoller/httpmacro.c
@@ -30,8 +30,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: httpmacro_cmp_func                                               *
- *                                                                            *
  * Purpose: compare two macros by name                                        *
  *                                                                            *
  * Parameters: d1 - [IN] the first macro                                      *
@@ -52,8 +50,6 @@ static int 	httpmacro_cmp_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: httpmacro_append_pair                                            *
- *                                                                            *
  * Purpose: appends key/value pair to the http test macro cache.              *
  *          If the value format is 'regex:<pattern>', then regular expression *
  *          match is performed against the supplied data value and specified  *
@@ -164,8 +160,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: http_substitute_variables                                        *
- *                                                                            *
  * Purpose: substitute variables in input string with their values from http  *
  *          test config                                                       *
  *                                                                            *
@@ -260,8 +254,6 @@ int	http_substitute_variables(const zbx_httptest_t *httptest, char **data)
 
 /******************************************************************************
  *                                                                            *
- * Function: http_process_variables                                           *
- *                                                                            *
  * Purpose: parses http test/step variable string and stores results into     *
  *          httptest macro cache.                                             *
  *          The variables are specified as {<key>}=><value> pairs             *
diff --git a/src/zabbix_server/httppoller/httppoller.c b/src/zabbix_server/httppoller/httppoller.c
index c39de20295a..d0f83f54b1f 100644
--- a/src/zabbix_server/httppoller/httppoller.c
+++ b/src/zabbix_server/httppoller/httppoller.c
@@ -34,8 +34,6 @@ extern ZBX_THREAD_LOCAL int		server_num, process_num;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_minnextcheck                                                 *
- *                                                                            *
  * Purpose: calculate when we have to process earliest httptest               *
  *                                                                            *
  * Return value: timestamp of earliest check or -1 if not found               *
@@ -76,8 +74,6 @@ static int	get_minnextcheck(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: main_httppoller_loop                                             *
- *                                                                            *
  * Purpose: main loop of processing of httptests                              *
  *                                                                            *
  * Comments: never returns                                                    *
diff --git a/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c
index 1dfdcef548f..7629789b8ac 100644
--- a/src/zabbix_server/httppoller/httptest.c
+++ b/src/zabbix_server/httppoller/httptest.c
@@ -85,8 +85,6 @@ static size_t	curl_ignore_cb(void *ptr, size_t size, size_t nmemb, void *userdat
 
 /******************************************************************************
  *                                                                            *
- * Function: httptest_remove_macros                                           *
- *                                                                            *
  * Purpose: remove all macro variables cached during http test execution      *
  *                                                                            *
  * Parameters: httptest - [IN] the http test data                             *
@@ -201,8 +199,6 @@ static void	process_test_data(zbx_uint64_t httptestid, int lastfailedstep, doubl
 
 /******************************************************************************
  *                                                                            *
- * Function: httpstep_pairs_join                                              *
- *                                                                            *
  * Purpose: performs concatenation of vector of pairs into delimited string   *
  *                                                                            *
  * Parameters: str             - [IN/OUT] result string                       *
@@ -236,8 +232,6 @@ static void	httpstep_pairs_join(char **str, size_t *alloc_len, size_t *offset, c
 
 /******************************************************************************
  *                                                                            *
- * Function: httppairs_free                                                   *
- *                                                                            *
  * Purpose: frees memory allocated for vector of pairs                        *
  *                                                                            *
  * Parameters: pairs           - [IN] vector of pairs                         *
@@ -344,8 +338,6 @@ static void	process_step_data(zbx_uint64_t httpstepid, zbx_httpstat_t *stat, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: httpstep_load_pairs                                              *
- *                                                                            *
  * Purpose: loads http fields of web scenario step                            *
  *                                                                            *
  * Parameters: host            - [IN] host to be used in macro expansion      *
@@ -498,8 +490,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: add_http_headers                                                 *
- *                                                                            *
  * Purpose: adds HTTP headers to curl_slist and prepares cookie header string *
  *                                                                            *
  * Parameters: headers         - [IN] HTTP headers as string                  *
@@ -531,8 +521,6 @@ static void	add_http_headers(char *headers, struct curl_slist **headers_slist, c
 
 /******************************************************************************
  *                                                                            *
- * Function: httptest_load_pairs                                              *
- *                                                                            *
  * Purpose: loads http fields of web scenario                                 *
  *                                                                            *
  * Parameters: host            - [IN] host to be used in macro expansion      *
@@ -621,8 +609,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_httptest                                                 *
- *                                                                            *
  * Purpose: process single scenario of http test                              *
  *                                                                            *
  ******************************************************************************/
@@ -1045,8 +1031,6 @@ httptest_error:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_httptests                                                *
- *                                                                            *
  * Purpose: process httptests                                                 *
  *                                                                            *
  * Parameters: now - current timestamp                                        *
diff --git a/src/zabbix_server/ipmi/checks_ipmi.c b/src/zabbix_server/ipmi/checks_ipmi.c
index 43268744336..f41790bdcf1 100644
--- a/src/zabbix_server/ipmi/checks_ipmi.c
+++ b/src/zabbix_server/ipmi/checks_ipmi.c
@@ -189,8 +189,6 @@ static char	*zbx_sensor_id_to_str(char *str, size_t str_sz, const char *id, enum
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_ipmi_host                                                *
- *                                                                            *
  * Purpose: Find element in the global list 'hosts' using parameters as       *
  *          search criteria                                                   *
  *                                                                            *
@@ -225,8 +223,6 @@ static zbx_ipmi_host_t	*zbx_get_ipmi_host(const char *ip, const int port, int au
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_allocate_ipmi_host                                           *
- *                                                                            *
  * Purpose: create a new element in the global list 'hosts'                   *
  *                                                                            *
  * Return value: pointer to the new list element with host data               *
@@ -330,8 +326,6 @@ static zbx_ipmi_sensor_t	*zbx_get_ipmi_sensor_by_full_name(const zbx_ipmi_host_t
 
 /******************************************************************************
  *                                                                            *
- * Function: get_domain_offset                                                *
- *                                                                            *
  * Purpose: Check if an item name starts from domain name and find the domain *
  *          name length                                                       *
  *                                                                            *
@@ -356,8 +350,6 @@ static size_t	get_domain_offset(const zbx_ipmi_host_t *h, const char *full_name)
 }
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_sensor_id                                                *
- *                                                                            *
  * Purpose:  Converts sensor id to printable string and return id_type        *
  *                                                                            *
  * Parameters: sensor    - [IN] ipmi sensor                                   *
@@ -848,8 +840,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_perform_openipmi_ops                                         *
- *                                                                            *
  * Purpose: Pass control to OpenIPMI library to process events                *
  *                                                                            *
  * Return value: SUCCEED - no errors                                          *
@@ -885,8 +875,6 @@ static int	zbx_perform_openipmi_ops(zbx_ipmi_host_t *h, const char *func_name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_perform_all_openipmi_ops                                     *
- *                                                                            *
  * Purpose: Pass control to OpenIPMI library to process all internal events   *
  *                                                                            *
  * Parameters: timeout - [IN] timeout (in seconds) for processing single      *
@@ -1683,8 +1671,6 @@ void	zbx_delete_inactive_ipmi_hosts(time_t last_check)
 
 /******************************************************************************
  *                                                                            *
- * Function: has_name_prefix                                                  *
- *                                                                            *
  * Purpose: Check if a string starts with one of predefined prefixes and      *
  *          set prefix length                                                 *
  *                                                                            *
diff --git a/src/zabbix_server/ipmi/ipmi.c b/src/zabbix_server/ipmi/ipmi.c
index 265258316c1..82de9ca96c4 100644
--- a/src/zabbix_server/ipmi/ipmi.c
+++ b/src/zabbix_server/ipmi/ipmi.c
@@ -33,8 +33,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipmi_port_expand_macros                                      *
- *                                                                            *
  * Purpose: expands user macros in IPMI port value and converts the result to *
  *          to unsigned short value                                           *
  *                                                                            *
@@ -69,8 +67,6 @@ int	zbx_ipmi_port_expand_macros(zbx_uint64_t hostid, const char *port_orig, unsi
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipmi_execute_command                                         *
- *                                                                            *
  * Purpose: executes IPMI command                                             *
  *                                                                            *
  * Parameters: host          - [IN] the target host                           *
@@ -161,8 +157,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_ipmi_test_item                                               *
- *                                                                            *
  * Purpose: test IPMI item                                                    *
  *                                                                            *
  * Parameters: item - [IN] IPMI item                                          *
diff --git a/src/zabbix_server/ipmi/ipmi_manager.c b/src/zabbix_server/ipmi/ipmi_manager.c
index d91c65306c1..ad5a9adf5e5 100644
--- a/src/zabbix_server/ipmi/ipmi_manager.c
+++ b/src/zabbix_server/ipmi/ipmi_manager.c
@@ -193,8 +193,6 @@ static int	ipmi_request_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_request_create                                              *
- *                                                                            *
  * Purpose: creates an IPMI request                                           *
  *                                                                            *
  * Parameters: hostid - [IN] the target hostid                                *
@@ -215,8 +213,6 @@ static zbx_ipmi_request_t	*ipmi_request_create(zbx_uint64_t hostid)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_request_free                                                *
- *                                                                            *
  * Purpose: frees IPMI request                                                *
  *                                                                            *
  ******************************************************************************/
@@ -228,8 +224,6 @@ static void	ipmi_request_free(zbx_ipmi_request_t *request)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_pop_request                                          *
- *                                                                            *
  * Purpose: pops the next queued request from IPMI poller request queue       *
  *                                                                            *
  * Parameters: poller - [IN] the IPMI poller                                  *
@@ -254,8 +248,6 @@ static zbx_ipmi_request_t	*ipmi_poller_pop_request(zbx_ipmi_poller_t *poller)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_push_request                                         *
- *                                                                            *
  * Purpose: pushes the requests into IPMI poller request queue                *
  *                                                                            *
  * Parameters: poller  - [IN] the IPMI poller                                 *
@@ -271,8 +263,6 @@ static void	ipmi_poller_push_request(zbx_ipmi_poller_t *poller, zbx_ipmi_request
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_send_request                                         *
- *                                                                            *
  * Purpose: sends request to IPMI poller                                      *
  *                                                                            *
  * Parameters: poller  - [IN] the IPMI poller                                 *
@@ -293,8 +283,6 @@ static void	ipmi_poller_send_request(zbx_ipmi_poller_t *poller, zbx_ipmi_request
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_schedule_request                                     *
- *                                                                            *
  * Purpose: schedules request to IPMI poller                                  *
  *                                                                            *
  * Parameters: poller  - [IN] the IPMI poller                                 *
@@ -311,8 +299,6 @@ static void	ipmi_poller_schedule_request(zbx_ipmi_poller_t *poller, zbx_ipmi_req
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_free_request                                         *
- *                                                                            *
  * Purpose: frees the current request processed by IPMI poller                *
  *                                                                            *
  * Parameters: poller  - [IN] the IPMI poller                                 *
@@ -326,8 +312,6 @@ static void	ipmi_poller_free_request(zbx_ipmi_poller_t *poller)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_free                                                 *
- *                                                                            *
  * Purpose: frees IPMI poller                                                 *
  *                                                                            *
  ******************************************************************************/
@@ -347,8 +331,6 @@ static void	ipmi_poller_free(zbx_ipmi_poller_t *poller)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_init                                                *
- *                                                                            *
  * Purpose: initializes IPMI manager                                          *
  *                                                                            *
  * Parameters: manager - [IN] the manager to initialize                       *
@@ -392,8 +374,6 @@ static void	ipmi_manager_init(zbx_ipmi_manager_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_destroy                                             *
- *                                                                            *
  * Purpose: destroys IPMI manager                                             *
  *                                                                            *
  * Parameters: manager - [IN] the manager to destroy                          *
@@ -410,8 +390,6 @@ static void	ipmi_manager_destroy(zbx_ipmi_manager_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_host_cleanup                                        *
- *                                                                            *
  * Purpose: performs cleanup of monitored hosts cache                         *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -450,8 +428,6 @@ static void	ipmi_manager_host_cleanup(zbx_ipmi_manager_t *manager, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_register_poller                                     *
- *                                                                            *
  * Purpose: registers IPMI poller                                             *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -494,8 +470,6 @@ static zbx_ipmi_poller_t	*ipmi_manager_register_poller(zbx_ipmi_manager_t *manag
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_get_poller_by_client                                *
- *                                                                            *
  * Purpose: returns IPMI poller by connected client                           *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -524,8 +498,6 @@ static zbx_ipmi_poller_t	*ipmi_manager_get_poller_by_client(zbx_ipmi_manager_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_get_host_poller                                     *
- *                                                                            *
  * Purpose: returns IPMI poller to be assigned to a new host                  *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -553,8 +525,6 @@ static zbx_ipmi_poller_t	*ipmi_manager_get_host_poller(zbx_ipmi_manager_t *manag
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_process_poller_queue                                *
- *                                                                            *
  * Purpose: processes IPMI poller request queue                               *
  *                                                                            *
  * Parameters: manager - [IN] the IPMI manager                                *
@@ -604,8 +574,6 @@ static void	ipmi_manager_process_poller_queue(zbx_ipmi_manager_t *manager, zbx_i
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_cache_host                                          *
- *                                                                            *
  * Purpose: caches host to keep local copy of its availability data           *
  *                                                                            *
  * Parameters: manager - [IN] the IPMI manager                                *
@@ -637,8 +605,6 @@ static zbx_ipmi_manager_host_t	*ipmi_manager_cache_host(zbx_ipmi_manager_t *mana
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_update_host                                         *
- *                                                                            *
  * Purpose: updates cached host                                               *
  *                                                                            *
  * Parameters: manager   - [IN] the IPMI manager                              *
@@ -662,8 +628,6 @@ static void	ipmi_manager_update_host(zbx_ipmi_manager_t *manager, const DC_INTER
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_activate_interface                                  *
- *                                                                            *
  * Purpose: tries to activate item's interface after receiving response       *
  *                                                                            *
  * Parameters: manager - [IN] the IPMI manager                                *
@@ -694,8 +658,6 @@ static void	ipmi_manager_activate_interface(zbx_ipmi_manager_t *manager, zbx_uin
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_deactivate_interface                                *
- *                                                                            *
  * Purpose: tries to deactivate item's interface after receiving              *
  *          host level error                                                  *
  *                                                                            *
@@ -729,8 +691,6 @@ static void	ipmi_manager_deactivate_interface(zbx_ipmi_manager_t *manager, zbx_u
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_serialize_request                                   *
- *                                                                            *
  * Purpose: serializes IPMI poll and discovery requests                       *
  *                                                                            *
  * Parameters: item      - [IN] the item to poll                              *
@@ -754,8 +714,6 @@ static void	ipmi_manager_serialize_request(const DC_ITEM *item, zbx_ipc_message_
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_schedule_request                                    *
- *                                                                            *
  * Purpose: schedules request to the host                                     *
  *                                                                            *
  * Parameters: manager  - [IN] the IPMI manager                               *
@@ -775,8 +733,6 @@ static void	ipmi_manager_schedule_request(zbx_ipmi_manager_t *manager, zbx_uint6
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_schedule_requests                                   *
- *                                                                            *
  * Purpose: either sends or queues IPMI poll requests from configuration      *
  *          cache IPMI poller queue                                           *
  *                                                                            *
@@ -831,8 +787,6 @@ static int	ipmi_manager_schedule_requests(zbx_ipmi_manager_t *manager, int now,
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_process_client_request                              *
- *                                                                            *
  * Purpose: forwards IPMI request to the poller managing the specified host   *
  *                                                                            *
  * Parameters: manager - [IN] the IPMI manager                                *
@@ -862,8 +816,6 @@ static void	ipmi_manager_process_client_request(zbx_ipmi_manager_t *manager, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_process_client_result                               *
- *                                                                            *
  * Purpose: forwards result of request to the client                          *
  *                                                                            *
  * Parameters: manager - [IN] the IPMI manager                                *
@@ -896,8 +848,6 @@ static void	ipmi_manager_process_client_result(zbx_ipmi_manager_t *manager, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_manager_process_value_result                                *
- *                                                                            *
  * Purpose: processes IPMI check result received from IPMI poller             *
  *                                                                            *
  * Parameters: manager   - [IN] the IPMI manager                              *
diff --git a/src/zabbix_server/ipmi/ipmi_poller.c b/src/zabbix_server/ipmi/ipmi_poller.c
index cd3061f9e52..0b94594262e 100644
--- a/src/zabbix_server/ipmi/ipmi_poller.c
+++ b/src/zabbix_server/ipmi/ipmi_poller.c
@@ -40,8 +40,6 @@ extern ZBX_THREAD_LOCAL int		server_num, process_num;
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_register                                             *
- *                                                                            *
  * Purpose: registers IPMI poller with IPMI manager                           *
  *                                                                            *
  * Parameters: socket - [IN] the connections socket                           *
@@ -58,8 +56,6 @@ static void	ipmi_poller_register(zbx_ipc_async_socket_t *socket)
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_send_result                                          *
- *                                                                            *
  * Purpose: sends IPMI poll result to manager                                 *
  *                                                                            *
  * Parameters: socket  - [IN] the connections socket                          *
@@ -84,8 +80,6 @@ static void	ipmi_poller_send_result(zbx_ipc_async_socket_t *socket, zbx_uint32_t
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_process_value_request                                *
- *                                                                            *
  * Purpose: gets IPMI sensor value from the specified host                    *
  *                                                                            *
  * Parameters: socket  - [IN] the connections socket                          *
@@ -135,8 +129,6 @@ static void	ipmi_poller_process_value_request(zbx_ipc_async_socket_t *socket, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: ipmi_poller_process_command_request                              *
- *                                                                            *
  * Purpose:sets IPMI sensor value                                             *
  *                                                                            *
  * Parameters: socket  - [IN] the connections socket                          *
diff --git a/src/zabbix_server/lld/lld.c b/src/zabbix_server/lld/lld.c
index d1e355275f6..6b8d48feab2 100644
--- a/src/zabbix_server/lld/lld.c
+++ b/src/zabbix_server/lld/lld.c
@@ -63,8 +63,6 @@ lld_override_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_condition_free                                               *
- *                                                                            *
  * Purpose: release resources allocated by filter condition                   *
  *                                                                            *
  * Parameters: condition  - [IN] the filter condition                         *
@@ -82,8 +80,6 @@ static void	lld_condition_free(lld_condition_t *condition)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_conditions_free                                              *
- *                                                                            *
  * Purpose: release resources allocated by filter conditions                  *
  *                                                                            *
  * Parameters: conditions - [IN] the filter conditions                        *
@@ -97,8 +93,6 @@ static void	lld_conditions_free(zbx_vector_ptr_t *conditions)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_condition_compare_by_macro                                   *
- *                                                                            *
  * Purpose: compare two filter conditions by their macros                     *
  *                                                                            *
  * Parameters: item1  - [IN] the first filter condition                       *
@@ -115,8 +109,6 @@ static int	lld_condition_compare_by_macro(const void *item1, const void *item2)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_filter_init                                                  *
- *                                                                            *
  * Purpose: initializes lld filter                                            *
  *                                                                            *
  * Parameters: filter  - [IN] the lld filter                                  *
@@ -131,8 +123,6 @@ static void	lld_filter_init(lld_filter_t *filter)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_filter_clean                                                 *
- *                                                                            *
  * Purpose: releases resources allocated by lld filter                        *
  *                                                                            *
  * Parameters: filter  - [IN] the lld filter                                  *
@@ -181,8 +171,6 @@ static int	lld_filter_condition_add(zbx_vector_ptr_t *conditions, const char *id
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_filter_load                                                  *
- *                                                                            *
  * Purpose: loads lld filter data                                             *
  *                                                                            *
  * Parameters: filter     - [IN] the lld filter                               *
@@ -219,8 +207,6 @@ static int	lld_filter_load(lld_filter_t *filter, zbx_uint64_t lld_ruleid, const
 
 /******************************************************************************
  *                                                                            *
- * Function: filter_condition_match                                           *
- *                                                                            *
  * Purpose: check if the lld data passes filter evaluation                    *
  *                                                                            *
  * Parameters: jp_row          - [IN] the lld data row                        *
@@ -277,8 +263,6 @@ static int	filter_condition_match(const struct zbx_json_parse *jp_row, const zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: filter_evaluate_and_or                                           *
- *                                                                            *
  * Purpose: check if the lld data passes filter evaluation by and/or rule     *
  *                                                                            *
  * Parameters: filter          - [IN] the lld filter                          *
@@ -329,8 +313,6 @@ static int	filter_evaluate_and_or(const lld_filter_t *filter, const struct zbx_j
 
 /******************************************************************************
  *                                                                            *
- * Function: filter_evaluate_and                                              *
- *                                                                            *
  * Purpose: check if the lld data passes filter evaluation by and rule        *
  *                                                                            *
  * Parameters: filter          - [IN] the lld filter                          *
@@ -366,8 +348,6 @@ static int	filter_evaluate_and(const lld_filter_t *filter, const struct zbx_json
 
 /******************************************************************************
  *                                                                            *
- * Function: filter_evaluate_or                                               *
- *                                                                            *
  * Purpose: check if the lld data passes filter evaluation by or rule         *
  *                                                                            *
  * Parameters: filter          - [IN] the lld filter                          *
@@ -403,8 +383,6 @@ static int	filter_evaluate_or(const lld_filter_t *filter, const struct zbx_json_
 
 /******************************************************************************
  *                                                                            *
- * Function: filter_evaluate_expression                                       *
- *                                                                            *
  * Purpose: check if the lld data passes filter evaluation by custom          *
  *          expression                                                        *
  *                                                                            *
@@ -463,8 +441,6 @@ static int	filter_evaluate_expression(const lld_filter_t *filter, const struct z
 
 /******************************************************************************
  *                                                                            *
- * Function: filter_evaluate                                                  *
- *                                                                            *
  * Purpose: check if the lld data passes filter evaluation                    *
  *                                                                            *
  * Parameters: filter          - [IN] the lld filter                          *
@@ -1108,8 +1084,6 @@ static void	lld_row_free(zbx_lld_row_t *lld_row)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_process_discovery_rule                                       *
- *                                                                            *
  * Purpose: add or update items, triggers and graphs for discovery item       *
  *                                                                            *
  * Parameters: lld_ruleid - [IN] discovery item identifier from database      *
diff --git a/src/zabbix_server/lld/lld_common.c b/src/zabbix_server/lld/lld_common.c
index 90815de6a14..5c2469132be 100644
--- a/src/zabbix_server/lld/lld_common.c
+++ b/src/zabbix_server/lld/lld_common.c
@@ -25,11 +25,6 @@
 #include "../../libs/zbxaudit/audit_graph.h"
 #include "../../libs/zbxaudit/audit_trigger.h"
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_field_str_rollback                                           *
- *                                                                            *
- ******************************************************************************/
 void	lld_field_str_rollback(char **field, char **field_orig, zbx_uint64_t *flags, zbx_uint64_t flag)
 {
 	if (0 == (*flags & flag))
@@ -41,11 +36,6 @@ void	lld_field_str_rollback(char **field, char **field_orig, zbx_uint64_t *flags
 	*flags &= ~flag;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_field_uint64_rollback                                        *
- *                                                                            *
- ******************************************************************************/
 void	lld_field_uint64_rollback(zbx_uint64_t *field, zbx_uint64_t *field_orig, zbx_uint64_t *flags, zbx_uint64_t flag)
 {
 	if (0 == (*flags & flag))
@@ -58,8 +48,6 @@ void	lld_field_uint64_rollback(zbx_uint64_t *field, zbx_uint64_t *field_orig, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_end_of_life                                                  *
- *                                                                            *
  * Purpose: calculate when to delete lost resources in an overflow-safe way   *
  *                                                                            *
  ******************************************************************************/
@@ -70,8 +58,6 @@ int	lld_end_of_life(int lastcheck, int lifetime)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_remove_lost_objects                                          *
- *                                                                            *
  * Purpose: updates lastcheck and ts_delete fields; removes lost resources    *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/lld/lld_graph.c b/src/zabbix_server/lld/lld_graph.c
index 51fdd967951..ec614da9e33 100644
--- a/src/zabbix_server/lld/lld_graph.c
+++ b/src/zabbix_server/lld/lld_graph.c
@@ -165,8 +165,6 @@ static void	lld_graphs_free(zbx_vector_ptr_t *graphs)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_graphs_get                                                   *
- *                                                                            *
  * Purpose: retrieve graphs which were created by the specified graph         *
  *          prototype                                                         *
  *                                                                            *
@@ -277,8 +275,6 @@ static void	lld_graphs_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *graphs
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_gitems_get                                                   *
- *                                                                            *
  * Purpose: retrieve graphs_items which are used by the graph prototype and   *
  *          by selected graphs                                                *
  *                                                                            *
@@ -382,8 +378,6 @@ static void	lld_gitems_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *gitems
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_get                                                    *
- *                                                                            *
  * Purpose: returns the list of items which are related to the graph          *
  *          prototype                                                         *
  *                                                                            *
@@ -458,8 +452,6 @@ static void	lld_items_get(const zbx_vector_ptr_t *gitems_proto, zbx_uint64_t ymi
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_graph_by_item                                                *
- *                                                                            *
  * Purpose: finds already existing graph, using an item                       *
  *                                                                            *
  * Return value: upon successful completion return pointer to the graph       *
@@ -492,8 +484,6 @@ static zbx_lld_graph_t	*lld_graph_by_item(zbx_vector_ptr_t *graphs, zbx_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_graph_get                                                    *
- *                                                                            *
  * Purpose: finds already existing graph, using an item prototype and items   *
  *          already created by it                                             *
  *                                                                            *
@@ -518,8 +508,6 @@ static zbx_lld_graph_t	*lld_graph_get(zbx_vector_ptr_t *graphs, const zbx_vector
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_get                                                     *
- *                                                                            *
  * Purpose: finds already created item when itemid_proto is an item prototype *
  *          or return itemid_proto as itemid if it's a normal item            *
  *                                                                            *
@@ -669,8 +657,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_graph_make                                                   *
- *                                                                            *
  * Purpose: create a graph based on lld rule and add it to the list           *
  *                                                                            *
  ******************************************************************************/
@@ -787,11 +773,6 @@ static void	lld_graphs_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr
 	zbx_vector_ptr_sort(graphs, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_validate_graph_field                                         *
- *                                                                            *
- ******************************************************************************/
 static void	lld_validate_graph_field(zbx_lld_graph_t *graph, char **field, char **field_orig, zbx_uint64_t flag,
 		size_t field_len, char **error)
 {
@@ -829,8 +810,6 @@ static void	lld_validate_graph_field(zbx_lld_graph_t *graph, char **field, char
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_graphs_validate                                              *
- *                                                                            *
  * Parameters: graphs - [IN] sorted list of graphs                            *
  *                                                                            *
  ******************************************************************************/
@@ -984,8 +963,6 @@ static void	lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_graphs_save                                                  *
- *                                                                            *
  * Purpose: add or update graphs in database based on discovery rule          *
  *                                                                            *
  * Return value: SUCCEED - if graphs were successfully saved or saving        *
@@ -1470,8 +1447,6 @@ static	void	get_graph_info(const void *object, zbx_uint64_t *id, int *discovery_
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_update_graphs                                                *
- *                                                                            *
  * Purpose: add or update graphs for discovery item                           *
  *                                                                            *
  * Parameters: hostid  - [IN] host identifier from database                   *
diff --git a/src/zabbix_server/lld/lld_host.c b/src/zabbix_server/lld/lld_host.c
index a8351a923e5..31d5124356c 100644
--- a/src/zabbix_server/lld/lld_host.c
+++ b/src/zabbix_server/lld/lld_host.c
@@ -331,8 +331,6 @@ static int	zbx_ids_names_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_hosts_get_tags                                               *
- *                                                                            *
  * Purpose: retrieves tags of the existing hosts                              *
  *                                                                            *
  * Parameters: hosts - [IN/OUT] list of hosts                                 *
@@ -400,8 +398,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_hosts_get                                                    *
- *                                                                            *
  * Purpose: retrieves existing hosts for the specified host prototype         *
  *                                                                            *
  * Parameters: parent_hostid - [IN] host prototype identifier                 *
@@ -551,8 +547,6 @@ static void	lld_hosts_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts, z
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_hosts_validate                                               *
- *                                                                            *
  * Parameters: hosts - [IN] list of hosts; should be sorted by hostid         *
  *                                                                            *
  ******************************************************************************/
@@ -973,8 +967,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_simple_groups_get                                            *
- *                                                                            *
  * Purpose: retrieve list of host groups which should be present on the each  *
  *          discovered host                                                   *
  *                                                                            *
@@ -1007,8 +999,6 @@ static void	lld_simple_groups_get(zbx_uint64_t parent_hostid, zbx_vector_uint64_
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_hostgroups_make                                              *
- *                                                                            *
  * Parameters: groupids         - [IN] sorted list of host group ids which    *
  *                                     should be present on the each          *
  *                                     discovered host (Groups)               *
@@ -1128,8 +1118,6 @@ static void	lld_hostgroups_make(const zbx_vector_uint64_t *groupids, zbx_vector_
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_group_prototypes_get                                         *
- *                                                                            *
  * Purpose: retrieve list of group prototypes                                 *
  *                                                                            *
  * Parameters: parent_hostid    - [IN] host prototype identifier              *
@@ -1169,8 +1157,6 @@ static void	lld_group_prototypes_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_groups_get                                                   *
- *                                                                            *
  * Purpose: retrieves existing groups for the specified host prototype        *
  *                                                                            *
  * Parameters: parent_hostid - [IN] host prototype identifier                 *
@@ -1217,11 +1203,6 @@ static void	lld_groups_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *groups)
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_group_make                                                   *
- *                                                                            *
- ******************************************************************************/
 static zbx_lld_group_t	*lld_group_make(zbx_vector_ptr_t *groups, zbx_uint64_t group_prototypeid,
 		const char *name_proto, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macros)
 {
@@ -1319,11 +1300,6 @@ out:
 	return group;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_groups_make                                                  *
- *                                                                            *
- ******************************************************************************/
 static void	lld_groups_make(zbx_lld_host_t *host, zbx_vector_ptr_t *groups, const zbx_vector_ptr_t *group_prototypes,
 		const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macros)
 {
@@ -1349,10 +1325,6 @@ static void	lld_groups_make(zbx_lld_host_t *host, zbx_vector_ptr_t *groups, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_validate_group_name                                          *
- *                                                                            *
- * Purpose: validate group name                                               *
- *                                                                            *
  * Return value: SUCCEED - the group name is valid                            *
  *               FAIL    - otherwise                                          *
  *                                                                            *
@@ -1384,8 +1356,6 @@ static int	lld_validate_group_name(const char *name)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_groups_validate                                              *
- *                                                                            *
  * Parameters: groups - [IN] list of groups; should be sorted by groupid      *
  *                                                                            *
  ******************************************************************************/
@@ -1540,8 +1510,6 @@ static void	lld_groups_validate(zbx_vector_ptr_t *groups, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_group_rights_compare                                         *
- *                                                                            *
  * Purpose: sorting function to sort group rights vector by name              *
  *                                                                            *
  ******************************************************************************/
@@ -1555,8 +1523,6 @@ static int	lld_group_rights_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_group_rights_append                                          *
- *                                                                            *
  * Purpose: append a new item to group rights vector                          *
  *                                                                            *
  * Return value: Index of the added item.                                     *
@@ -1578,9 +1544,7 @@ static int	lld_group_rights_append(zbx_vector_ptr_t *group_rights, const char *n
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_group_rights_free                                            *
- *                                                                            *
- * PUrpose: frees group rights data                                           *
+ * Purpose: frees group rights data                                           *
  *                                                                            *
  ******************************************************************************/
 static void	lld_group_rights_free(zbx_lld_group_rights_t *rights)
@@ -1592,8 +1556,6 @@ static void	lld_group_rights_free(zbx_lld_group_rights_t *rights)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_groups_save_rights                                           *
- *                                                                            *
  * Parameters: groups - [IN] list of new groups                               *
  *                                                                            *
  ******************************************************************************/
@@ -1736,8 +1698,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_groups_save                                                  *
- *                                                                            *
  * Parameters: groups           - [IN/OUT] list of groups; should be sorted   *
  *                                         by groupid                         *
  *             group_prototypes - [IN] list of group prototypes; should be    *
@@ -1915,8 +1875,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_masterhostmacros_get                                         *
- *                                                                            *
  * Purpose: retrieve list of host macros which should be present on the each  *
  *          discovered host                                                   *
  *                                                                            *
@@ -1961,8 +1919,6 @@ static void	lld_masterhostmacros_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: macro_str_compare_func                                           *
- *                                                                            *
  * Purpose: compare the name of host macros for search in vector              *
  *                                                                            *
  * Parameters: d1 - [IN] first zbx_lld_hostmacro_t                            *
@@ -1981,8 +1937,6 @@ static int	macro_str_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_hostmacros_get                                               *
- *                                                                            *
  * Purpose: retrieve list of host macros which should be present on the each  *
  *          discovered host                                                   *
  *                                                                            *
@@ -2050,11 +2004,6 @@ static void	lld_hostmacros_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *mas
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_hostmacro_make                                               *
- *                                                                            *
- ******************************************************************************/
 static void	lld_hostmacro_make(zbx_vector_ptr_t *hostmacros, zbx_uint64_t hostmacroid, const char *macro,
 		const char *value, const char *description, unsigned char type)
 {
@@ -2105,8 +2054,6 @@ static void	lld_hostmacro_make(zbx_vector_ptr_t *hostmacros, zbx_uint64_t hostma
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_hostmacros_make                                              *
- *                                                                            *
  * Parameters: hostmacros       - [IN] list of host macros which              *
  *                                     should be present on the each          *
  *                                     discovered host                        *
@@ -2207,8 +2154,6 @@ static void	lld_hostmacros_make(const zbx_vector_ptr_t *hostmacros, zbx_vector_p
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_tags_get                                                     *
- *                                                                            *
  * Purpose: retrieve list of host tags which should be present on the each    *
  *          discovered host                                                   *
  *                                                                            *
@@ -2243,8 +2188,6 @@ static void	lld_proto_tags_get(zbx_uint64_t parent_hostid, zbx_vector_db_tag_ptr
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_tag_validate_field                                           *
- *                                                                            *
  * Purpose: validate host tag field                                           *
  *                                                                            *
  * Parameters: name      - [IN] the field name (tag, value)                   *
@@ -2278,8 +2221,6 @@ static int	lld_tag_validate_field(const char *name, const char *field, size_t fi
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_tag_validate                                                 *
- *                                                                            *
  * Purpose: validate host tag                                                 *
  *                                                                            *
  * Parameters: tags     - [IN] the current host tags                          *
@@ -2321,8 +2262,6 @@ static int	lld_tag_validate(zbx_db_tag_t **tags, int tags_num, const char *name,
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_host_update_tags                                             *
- *                                                                            *
  * Purpose: update host tags                                                  *
  *                                                                            *
  * Parameters: host       - [IN] a host with existing tags, sorted by tag +   *
@@ -2428,8 +2367,6 @@ static void	lld_host_update_tags(zbx_lld_host_t *host, const zbx_vector_db_tag_p
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_templates_make                                               *
- *                                                                            *
  * Purpose: gets templates from a host prototype                              *
  *                                                                            *
  * Parameters: parent_hostid - [IN] host prototype identifier                 *
@@ -2548,8 +2485,6 @@ static void	lld_templates_make(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hos
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_interface_snmp_prepare_sql                                   *
- *                                                                            *
  * Purpose: prepare sql for update record of interface_snmp table             *
  *                                                                            *
  * Parameters: hostid      - [IN] host identifier                             *
@@ -2671,8 +2606,6 @@ static void	lld_interface_snmp_prepare_sql(zbx_uint64_t hostid, const zbx_uint64
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_hosts_save                                                   *
- *                                                                            *
  * Parameters: parent_hostid    - [IN] parent host id                         *
  *             hosts            - [IN] list of hosts;                         *
  *             host_proto       - [IN] host proto                             *
@@ -3569,11 +3502,6 @@ out:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_templates_link                                               *
- *                                                                            *
- ******************************************************************************/
 static void	lld_templates_link(const zbx_vector_ptr_t *hosts, char **error)
 {
 	int		i;
@@ -3614,8 +3542,6 @@ static void	lld_templates_link(const zbx_vector_ptr_t *hosts, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_hosts_remove                                                 *
- *                                                                            *
  * Purpose: updates host_discovery.lastcheck and host_discovery.ts_delete     *
  *          fields; removes lost resources                                    *
  *                                                                            *
@@ -3749,8 +3675,6 @@ static void	lld_hosts_remove(const zbx_vector_ptr_t *hosts, int lifetime, int la
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_groups_remove                                                *
- *                                                                            *
  * Purpose: updates group_discovery.lastcheck and group_discovery.ts_delete   *
  *          fields; removes lost resources                                    *
  *                                                                            *
@@ -3852,8 +3776,6 @@ static void	lld_groups_remove(const zbx_vector_ptr_t *groups, int lifetime, int
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_interfaces_get                                               *
- *                                                                            *
  * Purpose: retrieves either the list of interfaces from the lld rule's host  *
  *          or the list of custom interfaces defined for the host prototype   *
  *                                                                            *
@@ -3952,11 +3874,6 @@ static void	lld_interfaces_get(zbx_uint64_t id, zbx_vector_ptr_t *interfaces, un
 	zbx_vector_ptr_sort(interfaces, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_interface_make                                               *
- *                                                                            *
- ******************************************************************************/
 static void	lld_interface_make(zbx_vector_ptr_t *interfaces, zbx_uint64_t parent_interfaceid,
 		zbx_uint64_t interfaceid, unsigned char type, unsigned char main, unsigned char useip, const char *ip,
 		const char *dns, const char *port, unsigned char snmp_type, unsigned char bulk, const char *community,
@@ -4107,8 +4024,6 @@ static void	lld_interface_make(zbx_vector_ptr_t *interfaces, zbx_uint64_t parent
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_interfaces_make                                              *
- *                                                                            *
  * Parameters: interfaces - [IN] sorted list of interfaces which              *
  *                               should be present on the each                *
  *                               discovered host                              *
@@ -4283,8 +4198,6 @@ static void	lld_interfaces_make(const zbx_vector_ptr_t *interfaces, zbx_vector_p
 
 /******************************************************************************
  *                                                                            *
- * Function: another_main_interface_exists                                    *
- *                                                                            *
  * Return value: SUCCEED if interface with same type exists in the list of    *
  *               interfaces; FAIL - otherwise                                 *
  *                                                                            *
@@ -4319,8 +4232,6 @@ static int	another_main_interface_exists(const zbx_vector_ptr_t *interfaces, con
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_interfaces_validate                                          *
- *                                                                            *
  * Parameters: hosts - [IN/OUT] list of hosts                                 *
  *                                                                            *
  ******************************************************************************/
@@ -4495,8 +4406,6 @@ static void	lld_interfaces_validate(zbx_vector_ptr_t *hosts, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_update_hosts                                                 *
- *                                                                            *
  * Purpose: add or update low-level discovered hosts                          *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/lld/lld_item.c b/src/zabbix_server/lld/lld_item.c
index 0abd8f6dfe1..db1f13b4fac 100644
--- a/src/zabbix_server/lld/lld_item.c
+++ b/src/zabbix_server/lld/lld_item.c
@@ -364,8 +364,6 @@ static void	lld_item_free(zbx_lld_item_t *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_get                                                    *
- *                                                                            *
  * Purpose: retrieves existing items for the specified item prototypes        *
  *                                                                            *
  * Parameters: item_prototypes - [IN] item prototypes                         *
@@ -788,8 +786,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: is_user_macro                                                    *
- *                                                                            *
  * Purpose: checks if string is user macro                                    *
  *                                                                            *
  * Parameters: str - [IN] string to validate                                  *
@@ -813,11 +809,6 @@ static int	is_user_macro(const char *str)
 	return SUCCEED;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_validate_item_param                                          *
- *                                                                            *
- ******************************************************************************/
 static int	lld_validate_item_param(zbx_uint64_t itemid, int type, size_t len, char *param, char **error)
 {
 	if (SUCCEED != zbx_is_utf8(param))
@@ -844,11 +835,6 @@ static int	lld_validate_item_param(zbx_uint64_t itemid, int type, size_t len, ch
 	return SUCCEED;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_validate_item_tag                                            *
- *                                                                            *
- ******************************************************************************/
 static int	lld_validate_item_tag(zbx_uint64_t itemid, int type, char *tag, char **error)
 {
 	size_t	len;
@@ -883,11 +869,6 @@ static int	lld_validate_item_tag(zbx_uint64_t itemid, int type, char *tag, char
 	return SUCCEED;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_validate_item_field                                          *
- *                                                                            *
- ******************************************************************************/
 static void	lld_validate_item_field(zbx_lld_item_t *item, char **field, char **field_orig, zbx_uint64_t flag,
 		size_t field_len, char **error)
 {
@@ -996,8 +977,6 @@ static void	lld_validate_item_field(zbx_lld_item_t *item, char **field, char **f
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_dependence_add                                          *
- *                                                                            *
  * Purpose: add a new dependency                                              *
  *                                                                            *
  * Parameters: item_dependencies - [IN\OUT] list of dependencies              *
@@ -1027,8 +1006,6 @@ static zbx_item_dependence_t	*lld_item_dependence_add(zbx_vector_ptr_t *item_dep
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_dependencies_get                                        *
- *                                                                            *
  * Purpose: recursively get dependencies with dependent items taking into     *
  *          account item prototypes                                           *
  *                                                                            *
@@ -1161,8 +1138,6 @@ static void	lld_item_dependencies_get(const zbx_vector_ptr_t *item_prototypes, z
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_dependencies_count                                      *
- *                                                                            *
  * Purpose: recursively count the number of dependencies                      *
  *                                                                            *
  * Parameters: itemid            - [IN] item ID to be checked                 *
@@ -1232,8 +1207,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_dependencies_check                                      *
- *                                                                            *
  * Purpose: check the limits of dependent items                               *
  *                                                                            *
  * Parameters: item             - [IN] discovered item                        *
@@ -1313,8 +1286,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_preproc_step_validate                                  *
- *                                                                            *
  * Purpose: validation of a item preprocessing step expressions for discovery *
  *          process                                                           *
  *                                                                            *
@@ -1517,8 +1488,6 @@ static int	lld_items_preproc_step_validate(const zbx_lld_item_preproc_t * pp, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_validate                                               *
- *                                                                            *
  * Parameters: hostid            - [IN] host id                               *
  *             items             - [IN] list of items                         *
  *             item_prototypes   - [IN] the item prototypes                   *
@@ -1875,8 +1844,6 @@ static void	lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_formula_macros                                        *
- *                                                                            *
  * Purpose: substitutes lld macros in calculated item formula expression      *
  *                                                                            *
  * Parameters: data            - [IN/OUT] the expression                      *
@@ -1902,8 +1869,6 @@ static int	substitute_formula_macros(char **data, const struct zbx_json_parse *j
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_make                                                    *
- *                                                                            *
  * Purpose: creates a new item based on item prototype and lld data row       *
  *                                                                            *
  * Parameters: item_prototype  - [IN] the item prototype                      *
@@ -2134,8 +2099,6 @@ static zbx_lld_item_t	*lld_item_make(const zbx_lld_item_prototype_t *item_protot
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_update                                                  *
- *                                                                            *
  * Purpose: updates an existing item based on item prototype and lld data row *
  *                                                                            *
  * Parameters: item_prototype  - [IN] the item prototype                      *
@@ -2482,8 +2445,6 @@ static void	lld_item_update(const zbx_lld_item_prototype_t *item_prototype, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_make                                                   *
- *                                                                            *
  * Purpose: updates existing items and creates new ones based on item         *
  *          item prototypes and lld data                                      *
  *                                                                            *
@@ -2596,8 +2557,6 @@ static void	lld_items_make(const zbx_vector_ptr_t *item_prototypes, zbx_vector_p
 
 /******************************************************************************
  *                                                                            *
- * Function: substitute_lld_macors_in_preproc_params                          *
- *                                                                            *
  * Purpose: escaping of a symbols in items preprocessing steps for discovery  *
  *          process                                                           *
  *                                                                            *
@@ -2683,8 +2642,6 @@ static void	substitute_lld_macros_in_preproc_params(int type, const zbx_lld_row_
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_preproc_make                                           *
- *                                                                            *
  * Purpose: updates existing items preprocessing operations and create new    *
  *          based on item item prototypes                                     *
  *                                                                            *
@@ -2803,8 +2760,6 @@ static void	lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes,
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_param_make                                             *
- *                                                                            *
  * Purpose: updates existing items parameters and create new based on item    *
  *          prototypes                                                        *
  *                                                                            *
@@ -2909,8 +2864,6 @@ static void	lld_items_param_make(const zbx_vector_ptr_t *item_prototypes,
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_tags_make                                              *
- *                                                                            *
  * Purpose: updates existing items tags and create new based on item          *
  *          prototypes                                                        *
  *                                                                            *
@@ -3030,8 +2983,6 @@ static void	lld_items_tags_make(const zbx_vector_ptr_t *item_prototypes, const z
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_save                                                    *
- *                                                                            *
  * Purpose: recursively prepare LLD item bulk insert if any and               *
  *          update dependent items with their masters                         *
  *                                                                            *
@@ -3111,8 +3062,6 @@ static void	lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_prepare_update                                          *
- *                                                                            *
  * Purpose: prepare sql to update LLD item                                    *
  *                                                                            *
  * Parameters: item_prototype       - [IN] item prototype                     *
@@ -3501,8 +3450,6 @@ static void	lld_item_prepare_update(const zbx_lld_item_prototype_t *item_prototy
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_discovery_prepare_update                                *
- *                                                                            *
  * Purpose: prepare sql to update key in LLD item discovery                   *
  *                                                                            *
  * Parameters: item_prototype       - [IN] item prototype                     *
@@ -3536,8 +3483,6 @@ static void lld_item_discovery_prepare_update(const zbx_lld_item_prototype_t *it
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_save                                                   *
- *                                                                            *
  * Parameters: hostid          - [IN] parent host id                          *
  *             item_prototypes - [IN] item prototypes                         *
  *             items           - [IN/OUT] items to save                       *
@@ -3756,8 +3701,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_preproc_save                                           *
- *                                                                            *
  * Purpose: saves/updates/removes item preprocessing operations               *
  *                                                                            *
  * Parameters: hostid      - [IN] parent host id                              *
@@ -3971,8 +3914,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_param_save                                             *
- *                                                                            *
  * Purpose: saves/updates/removes item parameters                             *
  *                                                                            *
  * Parameters: hostid      - [IN] parent host id                              *
@@ -4152,8 +4093,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_tags_save                                              *
- *                                                                            *
  * Purpose: saves/updates/removes item tags                                   *
  *                                                                            *
  * Parameters: hostid      - [IN] parent host id                              *
@@ -4395,8 +4334,6 @@ void	lld_item_links_sort(zbx_vector_ptr_t *lld_rows)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_item_prototypes_get                                          *
- *                                                                            *
  * Purpose: load discovery rule item prototypes                               *
  *                                                                            *
  * Parameters: lld_ruleid      - [IN] the discovery rule id                   *
@@ -4609,8 +4546,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_link_dependent_items                                         *
- *                                                                            *
  * Purpose: create dependent item index in master item data                   *
  *                                                                            *
  * Parameters: items       - [IN/OUT] the lld items                           *
@@ -4647,8 +4582,6 @@ static void	lld_link_dependent_items(zbx_vector_ptr_t *items, zbx_hashset_t *ite
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_update_items                                                 *
- *                                                                            *
  * Purpose: add or update discovered items                                    *
  *                                                                            *
  * Return value: SUCCEED - if items were successfully added/updated or        *
diff --git a/src/zabbix_server/lld/lld_manager.c b/src/zabbix_server/lld/lld_manager.c
index 1807391dd8e..894661f2931 100644
--- a/src/zabbix_server/lld/lld_manager.c
+++ b/src/zabbix_server/lld/lld_manager.c
@@ -114,8 +114,6 @@ static int	rule_elem_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_data_free                                                    *
- *                                                                            *
  * Purpose: frees LLD data                                                    *
  *                                                                            *
  ******************************************************************************/
@@ -128,8 +126,6 @@ static void	lld_data_free(zbx_lld_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_rule_clear                                                   *
- *                                                                            *
  * Purpose: clears LLD rule                                                   *
  *                                                                            *
  ******************************************************************************/
@@ -147,8 +143,6 @@ static void	lld_rule_clear(zbx_lld_rule_t *rule)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_worker_free                                                  *
- *                                                                            *
  * Purpose: frees LLD worker                                                  *
  *                                                                            *
  ******************************************************************************/
@@ -159,8 +153,6 @@ static void	lld_worker_free(zbx_lld_worker_t *worker)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_manager_init                                                 *
- *                                                                            *
  * Purpose: initializes LLD manager                                           *
  *                                                                            *
  * Parameters: manager - [IN] the manager to initialize                       *
@@ -201,8 +193,6 @@ static void	lld_manager_init(zbx_lld_manager_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_manager_destroy                                              *
- *                                                                            *
  * Purpose: destroys LLD manager                                              *
  *                                                                            *
  * Parameters: manager - [IN] the manager to destroy                          *
@@ -220,8 +210,6 @@ static void	lld_manager_destroy(zbx_lld_manager_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_get_worker_by_client                                         *
- *                                                                            *
  * Purpose: returns worker by connected IPC client data                       *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -248,8 +236,6 @@ static zbx_lld_worker_t	*lld_get_worker_by_client(zbx_lld_manager_t *manager, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_register_worker                                              *
- *                                                                            *
  * Purpose: registers worker                                                  *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -292,8 +278,6 @@ static void	lld_register_worker(zbx_lld_manager_t *manager, zbx_ipc_client_t *cl
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_queue_rule                                                   *
- *                                                                            *
  * Purpose: queues LLD rule                                                   *
  *                                                                            *
  * Parameters: manager - [IN] the LLD manager                                 *
@@ -309,8 +293,6 @@ static void	lld_queue_rule(zbx_lld_manager_t *manager, zbx_lld_rule_t *rule)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_queue_request                                                *
- *                                                                            *
  * Purpose: queues low level discovery request                                *
  *                                                                            *
  * Parameters: manager - [IN] the LLD manager                                 *
@@ -379,8 +361,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_process_next_request                                         *
- *                                                                            *
  * Purpose: processes next LLD request from queue                             *
  *                                                                            *
  * Parameters: manager - [IN] the LLD manager                                 *
@@ -407,8 +387,6 @@ static void	lld_process_next_request(zbx_lld_manager_t *manager, zbx_lld_worker_
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_process_queue                                                *
- *                                                                            *
  * Purpose: sends queued LLD rules to free workers                            *
  *                                                                            *
  * Parameters: manager - [IN] the LLD manager                                 *
@@ -429,8 +407,6 @@ static void	lld_process_queue(zbx_lld_manager_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_process_result                                               *
- *                                                                            *
  * Purpose: processes LLD worker 'done' response                              *
  *                                                                            *
  * Parameters: manager - [IN] the LLD manager                                 *
@@ -478,8 +454,6 @@ static void	lld_process_result(zbx_lld_manager_t *manager, zbx_ipc_client_t *cli
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_process_diag_stats                                           *
- *                                                                            *
  * Purpose: processes external diagnostic statistics request                  *
  *                                                                            *
  * Parameters: manager - [IN] the LLD manager                                 *
@@ -498,8 +472,6 @@ static void	lld_process_diag_stats(zbx_lld_manager_t *manager, zbx_ipc_client_t
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_diag_item_compare_values_desc                                *
- *                                                                            *
  * Purpose: sort lld manager cache item view by second value                  *
  *          (number of values) in descending order                            *
  *                                                                            *
@@ -514,8 +486,6 @@ static int	lld_diag_item_compare_values_desc(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_process_diag_top                                             *
- *                                                                            *
  * Purpose: processes external top items request                              *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -579,8 +549,6 @@ static void	lld_process_top_items(zbx_lld_manager_t *manager, zbx_ipc_client_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_manager_thread                                               *
- *                                                                            *
  * Purpose: main processing loop                                              *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/lld/lld_protocol.c b/src/zabbix_server/lld/lld_protocol.c
index a24850ed2fb..b69ff43e4f0 100644
--- a/src/zabbix_server/lld/lld_protocol.c
+++ b/src/zabbix_server/lld/lld_protocol.c
@@ -26,11 +26,6 @@
 #include "zbxlld.h"
 #include "lld_manager.h"
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_lld_serialize_item_value                                     *
- *                                                                            *
- ******************************************************************************/
 zbx_uint32_t	zbx_lld_serialize_item_value(unsigned char **data, zbx_uint64_t itemid, zbx_uint64_t hostid,
 		const char *value, const zbx_timespec_t *ts, unsigned char meta, zbx_uint64_t lastlogsize, int mtime,
 		const char *error)
@@ -69,11 +64,6 @@ zbx_uint32_t	zbx_lld_serialize_item_value(unsigned char **data, zbx_uint64_t ite
 	return data_len;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_lld_deserialize_item_value                                   *
- *                                                                            *
- ******************************************************************************/
 void	zbx_lld_deserialize_item_value(const unsigned char *data, zbx_uint64_t *itemid, zbx_uint64_t *hostid,
 		char **value, zbx_timespec_t *ts, unsigned char *meta, zbx_uint64_t *lastlogsize, int *mtime,
 		char **error)
@@ -93,11 +83,6 @@ void	zbx_lld_deserialize_item_value(const unsigned char *data, zbx_uint64_t *ite
 	}
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_lld_serialize_diag_stats                                     *
- *                                                                            *
- ******************************************************************************/
 zbx_uint32_t	zbx_lld_serialize_diag_stats(unsigned char **data, zbx_uint64_t items_num, zbx_uint64_t values_num)
 {
 	unsigned char	*ptr;
@@ -115,22 +100,12 @@ zbx_uint32_t	zbx_lld_serialize_diag_stats(unsigned char **data, zbx_uint64_t ite
 	return data_len;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_lld_deserialize_diag_stats                                   *
- *                                                                            *
- ******************************************************************************/
 static void	zbx_lld_deserialize_diag_stats(const unsigned char *data, zbx_uint64_t *items_num, zbx_uint64_t *values_num)
 {
 	data += zbx_deserialize_value(data, items_num);
 	(void)zbx_deserialize_value(data, values_num);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_lld_serialize_top_request                                    *
- *                                                                            *
- ******************************************************************************/
 static zbx_uint32_t	zbx_lld_serialize_top_items_request(unsigned char **data, int limit)
 {
 	zbx_uint32_t	data_len = 0;
@@ -142,21 +117,11 @@ static zbx_uint32_t	zbx_lld_serialize_top_items_request(unsigned char **data, in
 	return data_len;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_deserialize_top_request                                      *
- *                                                                            *
- ******************************************************************************/
 void	zbx_lld_deserialize_top_items_request(const unsigned char *data, int *limit)
 {
 	(void)zbx_deserialize_value(data, limit);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_lld_serialize_top_items_result                               *
- *                                                                            *
- ******************************************************************************/
 zbx_uint32_t	zbx_lld_serialize_top_items_result(unsigned char **data, const zbx_lld_rule_info_t **rule_infos,
 		int num)
 {
@@ -186,11 +151,6 @@ zbx_uint32_t	zbx_lld_serialize_top_items_result(unsigned char **data, const zbx_
 	return data_len;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_lld_deserialize_top_result                                   *
- *                                                                            *
- ******************************************************************************/
 static void	zbx_lld_deserialize_top_items_result(const unsigned char *data, zbx_vector_uint64_pair_t *items)
 {
 	int	i, items_num;
@@ -216,8 +176,6 @@ static void	zbx_lld_deserialize_top_items_result(const unsigned char *data, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_lld_process_value                                            *
- *                                                                            *
  * Purpose: process low level discovery value/error                           *
  *                                                                            *
  * Parameters: itemid - [IN] the LLD rule id                                  *
@@ -255,8 +213,6 @@ void	zbx_lld_process_value(zbx_uint64_t itemid, zbx_uint64_t hostid, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_lld_process_agent_result                                     *
- *                                                                            *
  * Purpose: process low level discovery agent result                          *
  *                                                                            *
  * Parameters: itemid - [IN] the LLD rule id                                  *
@@ -293,8 +249,6 @@ void	zbx_lld_process_agent_result(zbx_uint64_t itemid, zbx_uint64_t hostid, AGEN
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_lld_get_queue_size                                           *
- *                                                                            *
  * Purpose: get queue size (enqueued value count) of LLD manager              *
  *                                                                            *
  * Parameters: size  - [OUT] the queue size                                   *
@@ -338,8 +292,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_lld_get_diag_stats                                           *
- *                                                                            *
  * Purpose: get lld manager diagnostic statistics                             *
  *                                                                            *
  ******************************************************************************/
@@ -361,12 +313,9 @@ int	zbx_lld_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_lld_get_top_items                                            *
- *                                                                            *
  * Purpose: get the top N items by the number of queued values                *
  *                                                                            *
- * Parameters field - [IN] the sort field                                     *
- *            limit - [IN] the number of top records to retrieve              *
+ * Parameters limit - [IN] the number of top records to retrieve              *
  *            items - [OUT] a vector of top itemid, values_num pairs          *
  *            error - [OUT] the error message                                 *
  *                                                                            *
diff --git a/src/zabbix_server/lld/lld_trigger.c b/src/zabbix_server/lld/lld_trigger.c
index b8a690c420c..9371483f342 100644
--- a/src/zabbix_server/lld/lld_trigger.c
+++ b/src/zabbix_server/lld/lld_trigger.c
@@ -304,8 +304,6 @@ static void	lld_trigger_free(zbx_lld_trigger_t *trigger)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_prototypes_get                                       *
- *                                                                            *
  * Purpose: retrieve trigger prototypes which are inherited from the          *
  *          discovery rule                                                    *
  *                                                                            *
@@ -392,8 +390,6 @@ static void	lld_trigger_prototypes_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_triggers_get                                                 *
- *                                                                            *
  * Purpose: retrieve triggers which were created by the specified trigger     *
  *          prototypes                                                        *
  *                                                                            *
@@ -535,8 +531,6 @@ static void	lld_triggers_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vec
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_functions_get                                                *
- *                                                                            *
  * Purpose: retrieve functions which are used by all triggers in the host of  *
  *          the trigger prototype                                             *
  *                                                                            *
@@ -656,8 +650,6 @@ static void	lld_functions_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_p
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_dependencies_get                                             *
- *                                                                            *
  * Purpose: retrieve trigger dependencies                                     *
  *                                                                            *
  ******************************************************************************/
@@ -760,8 +752,6 @@ static void	lld_dependencies_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vecto
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_tags_get                                                     *
- *                                                                            *
  * Purpose: retrieve trigger tags                                             *
  *                                                                            *
  ******************************************************************************/
@@ -865,8 +855,6 @@ static void	lld_tags_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vector_
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_items_get                                                    *
- *                                                                            *
  * Purpose: returns the list of items which are related to the trigger        *
  *          prototypes                                                        *
  *                                                                            *
@@ -931,8 +919,6 @@ static void	lld_items_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_get                                                  *
- *                                                                            *
  * Purpose: finds already existing trigger, using an item prototype and items *
  *          already created by it                                             *
  *                                                                            *
@@ -961,8 +947,6 @@ static zbx_lld_trigger_t	*lld_trigger_get(zbx_uint64_t parent_triggerid, zbx_has
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_eval_expression_index_functions                              *
- *                                                                            *
  * Purpose: set indexes for functionid tokens {<functionid>} from the         *
  *          specified function vector                                         *
  *                                                                            *
@@ -1000,8 +984,6 @@ static void	lld_eval_expression_index_functions(zbx_eval_context_t *ctx, zbx_vec
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_eval_expression_simplify                                     *
- *                                                                            *
  * Purpose: simplify parsed expression by replacing {<functionid>} with       *
  *          {<function index>}                                                *
  *                                                                            *
@@ -1029,8 +1011,6 @@ static void	lld_eval_expression_simplify(zbx_eval_context_t *ctx, char **express
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_expression_simplify                                  *
- *                                                                            *
  * Purpose: simplify trigger expression by replacing {<functionid>} with      *
  *          {<function index>}                                                *
  *                                                                            *
@@ -1065,8 +1045,6 @@ static void	lld_trigger_expression_simplify(const zbx_lld_trigger_t *trigger, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_eval_expression_expand                                       *
- *                                                                            *
  * Purpose: expand parsed expression function indexes with function strings   *
  *          in format itemid:func(params)                                     *
  *                                                                            *
@@ -1124,8 +1102,6 @@ static char	*lld_eval_expression_expand(zbx_eval_context_t *ctx, const zbx_vecto
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_expression_expand                                    *
- *                                                                            *
  * Purpose: expand trigger expression function indexes with function strings  *
  *          in format itemid:func(params)                                     *
  *                                                                            *
@@ -1160,8 +1136,6 @@ static char	*lld_trigger_expression_expand(const zbx_lld_trigger_t *trigger, con
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_expression_simplify_and_expand                       *
- *                                                                            *
  * Purpose: set function indexes and expand them to function strings in       *
  *          format itemid:func(params)                                        *
  *                                                                            *
@@ -1362,8 +1336,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_eval_get_expanded_expression                                 *
- *                                                                            *
  * Purpose: return copy of the expression with expanded LLD macros            *
  *                                                                            *
  ******************************************************************************/
@@ -1416,8 +1388,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_make                                                 *
- *                                                                            *
  * Purpose: create a trigger based on lld rule and add it to the list         *
  *                                                                            *
  ******************************************************************************/
@@ -1713,8 +1683,6 @@ static void	lld_triggers_make(const zbx_vector_ptr_t *trigger_prototypes, zbx_ve
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_dependency_make                                      *
- *                                                                            *
  * Purpose: create a trigger dependencies                                     *
  *                                                                            *
  ******************************************************************************/
@@ -1921,8 +1889,6 @@ static void	lld_trigger_dependencies_make(const zbx_vector_ptr_t *trigger_protot
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_tag_make                                             *
- *                                                                            *
  * Purpose: create a trigger tag                                              *
  *                                                                            *
  ******************************************************************************/
@@ -2022,8 +1988,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_tags_make                                            *
- *                                                                            *
  * Purpose: create a trigger tags                                             *
  *                                                                            *
  ******************************************************************************/
@@ -2093,11 +2057,6 @@ static void	lld_trigger_tags_make(const zbx_vector_ptr_t *trigger_prototypes, zb
 	zbx_vector_ptr_sort(triggers, ZBX_DEFAULT_UINT64_PTR_COMPARE_FUNC);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_validate_trigger_field                                       *
- *                                                                            *
- ******************************************************************************/
 static void	lld_validate_trigger_field(zbx_lld_trigger_t *trigger, char **field, char **field_orig,
 		zbx_uint64_t flag, size_t field_len, char **error)
 {
@@ -2135,8 +2094,6 @@ static void	lld_validate_trigger_field(zbx_lld_trigger_t *trigger, char **field,
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_changed                                              *
- *                                                                            *
  * Return value: returns SUCCEED if a trigger description or expression has   *
  *               been changed; FAIL - otherwise                               *
  *                                                                            *
@@ -2174,8 +2131,6 @@ static int	lld_trigger_changed(const zbx_lld_trigger_t *trigger)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_triggers_equal                                               *
- *                                                                            *
  * Return value: returns SUCCEED if descriptions and expressions of           *
  *               the triggers are identical; FAIL - otherwise                 *
  *                                                                            *
@@ -2210,8 +2165,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_triggers_validate                                            *
- *                                                                            *
  * Parameters: triggers - [IN] sorted list of triggers                        *
  *                                                                            *
  ******************************************************************************/
@@ -2425,11 +2378,6 @@ static void	lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: lld_validate_trigger_tag_field                                   *
- *                                                                            *
- ******************************************************************************/
 static void	lld_validate_trigger_tag_field(zbx_lld_tag_t *tag, const char *field, zbx_uint64_t flag,
 		size_t field_len, char **error)
 {
@@ -2467,8 +2415,6 @@ static void	lld_validate_trigger_tag_field(zbx_lld_tag_t *tag, const char *field
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_tags_validate                                        *
- *                                                                            *
  * Purpose: validate created or updated trigger tags                          *
  *                                                                            *
  ******************************************************************************/
@@ -2526,8 +2472,6 @@ static void	lld_trigger_tags_validate(zbx_vector_ptr_t *triggers, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_expression_create                                            *
- *                                                                            *
  * Purpose: transforms the simple trigger expression to the DB format         *
  *                                                                            *
  * Example:                                                                   *
@@ -2609,8 +2553,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_triggers_save                                                *
- *                                                                            *
  * Purpose: add or update triggers in database based on discovery rule        *
  *                                                                            *
  * Parameters: hostid            - [IN] parent host id                        *
@@ -3332,12 +3274,10 @@ static int	zbx_lld_trigger_node_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_cache_append                                         *
- *                                                                            *
  * Purpose: adds a node to trigger cache                                      *
  *                                                                            *
  * Parameters: cache     - [IN] the trigger cache                             *
- *             triggerid - [IN] the trigger id                                *
+ *             triggerid - [IN]                                               *
  *             trigger   - [IN] the trigger data for new triggers             *
  *                                                                            *
  * Return value: the added node                                               *
@@ -3361,8 +3301,6 @@ static zbx_lld_trigger_node_t	*lld_trigger_cache_append(zbx_hashset_t *cache, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_cache_add_trigger_node                               *
- *                                                                            *
  * Purpose: add trigger and all triggers related to it to trigger dependency  *
  *          validation cache.                                                 *
  *                                                                            *
@@ -3444,8 +3382,6 @@ static void	lld_trigger_cache_add_trigger_node(zbx_hashset_t *cache, zbx_lld_tri
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_cache_init                                           *
- *                                                                            *
  * Purpose: initializes trigger cache used to perform trigger dependency      *
  *          validation                                                        *
  *                                                                            *
@@ -3625,8 +3561,6 @@ static void	lld_trigger_cache_init(zbx_hashset_t *cache, zbx_vector_ptr_t *trigg
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trigger_cache_clean                                          *
- *                                                                            *
  * Purpose: releases resources allocated by trigger cache                     *
  *          validation                                                        *
  *                                                                            *
@@ -3650,8 +3584,6 @@ static void	zbx_trigger_cache_clean(zbx_hashset_t *cache)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_dependency_delete                                    *
- *                                                                            *
  * Purpose: removes trigger dependency                                        *
  *                                                                            *
  * Parameters: from  - [IN] the reference to dependent trigger                *
@@ -3714,8 +3646,6 @@ static void	lld_trigger_dependency_delete(zbx_lld_trigger_ref_t *from, zbx_lld_t
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_dependencies_iter                                    *
- *                                                                            *
  * Purpose: iterates through trigger dependencies to find dependency loops    *
  *                                                                            *
  * Parameters: cache         - [IN] the trigger cache                         *
@@ -3792,8 +3722,6 @@ static int	lld_trigger_dependencies_iter(zbx_hashset_t *cache, zbx_vector_ptr_t
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_trigger_dependencies_validate                                *
- *                                                                            *
  * Purpose: validate discovered trigger dependencies                          *
  *                                                                            *
  * Parameters: triggers - [IN] the discovered triggers                        *
@@ -3885,8 +3813,6 @@ static	void	get_trigger_info(const void *object, zbx_uint64_t *id, int *discover
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_update_triggers                                              *
- *                                                                            *
  * Purpose: add or update triggers for discovered items                       *
  *                                                                            *
  * Return value: SUCCEED - if triggers were successfully added/updated or     *
diff --git a/src/zabbix_server/lld/lld_worker.c b/src/zabbix_server/lld/lld_worker.c
index 30306dfd61d..076fbf95ed2 100644
--- a/src/zabbix_server/lld/lld_worker.c
+++ b/src/zabbix_server/lld/lld_worker.c
@@ -36,8 +36,6 @@ extern ZBX_THREAD_LOCAL int		server_num, process_num;
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_register_worker                                              *
- *                                                                            *
  * Purpose: registers lld worker with lld manager                             *
  *                                                                            *
  * Parameters: socket - [IN] the connections socket                           *
@@ -54,8 +52,6 @@ static void	lld_register_worker(zbx_ipc_socket_t *socket)
 
 /******************************************************************************
  *                                                                            *
- * Function: lld_process_task                                                 *
- *                                                                            *
  * Purpose: processes lld task and updates rule state/error in configuration  *
  *          cache and database                                                *
  *                                                                            *
diff --git a/src/zabbix_server/odbc/odbc.c b/src/zabbix_server/odbc/odbc.c
index 40b3810b749..e424e0cf4f4 100644
--- a/src/zabbix_server/odbc/odbc.c
+++ b/src/zabbix_server/odbc/odbc.c
@@ -48,8 +48,6 @@ struct zbx_odbc_query_result
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_rc_str                                                  *
- *                                                                            *
  * Purpose: get human readable representation of ODBC return code             *
  *                                                                            *
  * Parameters: rc - [IN] ODBC return code                                     *
@@ -83,8 +81,6 @@ static const char	*zbx_odbc_rc_str(SQLRETURN rc)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_diag                                                    *
- *                                                                            *
  * Purpose: diagnose result of ODBC function call                             *
  *                                                                            *
  * Parameters: h_type - [IN] type of handle call was executed on              *
@@ -149,8 +145,6 @@ static int	zbx_odbc_diag(SQLSMALLINT h_type, SQLHANDLE h, SQLRETURN rc, char **d
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_log_odbc_connection_info                                     *
- *                                                                            *
  * Purpose: log details upon successful connection on behalf of caller        *
  *                                                                            *
  * Parameters: function - [IN] caller function name                           *
@@ -205,8 +199,6 @@ static void	zbx_log_odbc_connection_info(const char *function, SQLHDBC hdbc)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_connection_string_append                                *
- *                                                                            *
  * Purpose: Appends a new argument to ODBC connection string.                 *
  *          Connection string is reallocated to fit new value.                *
  *                                                                            *
@@ -232,8 +224,6 @@ static void zbx_odbc_connection_string_append(char **connection_str, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_connect                                                 *
- *                                                                            *
  * Purpose: connect to ODBC data source                                       *
  *                                                                            *
  * Parameters: dsn        - [IN] data source name                             *
@@ -344,8 +334,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_data_source_free                                        *
- *                                                                            *
  * Purpose: free resources allocated by successful zbx_odbc_connect() call    *
  *                                                                            *
  * Parameters: data_source - [IN] pointer to data source structure            *
@@ -364,8 +352,6 @@ void	zbx_odbc_data_source_free(zbx_odbc_data_source_t *data_source)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_select                                                  *
- *                                                                            *
  * Purpose: execute a query to ODBC data source                               *
  *                                                                            *
  * Parameters: data_source - [IN] pointer to data source structure            *
@@ -444,8 +430,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_query_result_free                                       *
- *                                                                            *
  * Purpose: free resources allocated by successful zbx_odbc_select() call     *
  *                                                                            *
  * Parameters: query_result - [IN] pointer to query result structure          *
@@ -469,8 +453,6 @@ void	zbx_odbc_query_result_free(zbx_odbc_query_result_t *query_result)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_fetch                                                   *
- *                                                                            *
  * Purpose: fetch single row of ODBC query result                             *
  *                                                                            *
  * Parameters: query_result - [IN] pointer to query result structure          *
@@ -549,8 +531,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_query_result_to_string                                  *
- *                                                                            *
  * Purpose: extract the first column of the first row of ODBC SQL query       *
  *                                                                            *
  * Parameters: query_result - [IN] result of SQL query                        *
@@ -594,8 +574,6 @@ int	zbx_odbc_query_result_to_string(zbx_odbc_query_result_t *query_result, char
 
 /******************************************************************************
  *                                                                            *
- * Function: odbc_query_result_to_json                                        *
- *                                                                            *
  * Purpose: convert ODBC SQL query result into JSON                           *
  *                                                                            *
  * Parameters: query_result - [IN] result of SQL query                        *
@@ -717,8 +695,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_query_result_to_lld_json                                *
- *                                                                            *
  * Purpose: public wrapper for odbc_query_result_to_json                      *
  *                                                                            *
  *****************************************************************************/
@@ -729,8 +705,6 @@ int	zbx_odbc_query_result_to_lld_json(zbx_odbc_query_result_t *query_result, cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_odbc_query_result_to_json                                    *
- *                                                                            *
  * Purpose: public wrapper for odbc_query_result_to_json                      *
  *                                                                            *
  *****************************************************************************/
diff --git a/src/zabbix_server/operations.c b/src/zabbix_server/operations.c
index 611abb2d982..87ab4ee0d26 100644
--- a/src/zabbix_server/operations.c
+++ b/src/zabbix_server/operations.c
@@ -39,8 +39,6 @@ zbx_dcheck_source_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: select_discovered_host                                           *
- *                                                                            *
  * Purpose: select hostid of discovered host                                  *
  *                                                                            *
  * Parameters: event          - [IN] source event data                        *
@@ -130,8 +128,6 @@ exit:
 
 /******************************************************************************
  *                                                                            *
- * Function: add_discovered_host_groups                                       *
- *                                                                            *
  * Purpose: add group to host if not added already                            *
  *                                                                            *
  * Parameters: hostid         - [IN]  host identifier                         *
@@ -204,8 +200,6 @@ static void	add_discovered_host_groups(zbx_uint64_t hostid, zbx_vector_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: add_discovered_host                                              *
- *                                                                            *
  * Purpose: add discovered host if it was not added already                   *
  *                                                                            *
  * Parameters: event          - [IN] the source event                         *
@@ -644,8 +638,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: is_discovery_or_autoregistration                                 *
- *                                                                            *
  * Purpose: checks if the event is discovery or autoregistration event        *
  *                                                                            *
  * Parameters: event          - [IN] source event data                        *
@@ -670,8 +662,6 @@ static int	is_discovery_or_autoregistration(const DB_EVENT *event)
 
 /******************************************************************************
  *                                                                            *
- * Function: op_host_add                                                      *
- *                                                                            *
  * Purpose: add discovered host                                               *
  *                                                                            *
  * Parameters: event          - [IN] source event data                        *
@@ -694,8 +684,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: op_host_del                                                      *
- *                                                                            *
  * Purpose: delete host                                                       *
  *                                                                            *
  * Parameters: event          - [IN] source event data                        *
@@ -735,8 +723,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: op_host_enable                                                   *
- *                                                                            *
  * Purpose: enable discovered                                                 *
  *                                                                            *
  * Parameters: event          - [IN] the source event                         *
@@ -771,8 +757,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: op_host_disable                                                  *
- *                                                                            *
  * Purpose: disable host                                                      *
  *                                                                            *
  * Parameters: event          - [IN] the source event                         *
@@ -807,8 +791,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: op_host_inventory_mode                                           *
- *                                                                            *
  * Purpose: sets host inventory mode                                          *
  *                                                                            *
  * Parameters: event          - [IN] the source event                         *
@@ -840,8 +822,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: op_groups_add                                                    *
- *                                                                            *
  * Purpose: add groups to discovered host                                     *
  *                                                                            *
  * Parameters: event    - [IN] the source event data                          *
@@ -869,8 +849,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: op_groups_del                                                    *
- *                                                                            *
  * Purpose: delete groups from discovered host                                *
  *                                                                            *
  * Parameters: event    - [IN] source event data                              *
@@ -975,8 +953,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: op_template_add                                                  *
- *                                                                            *
  * Purpose: link host with template                                           *
  *                                                                            *
  * Parameters: event           - [IN] source event data                       *
@@ -1009,8 +985,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: op_template_del                                                  *
- *                                                                            *
  * Purpose: unlink and clear host from template                               *
  *                                                                            *
  * Parameters: event           - [IN] source event data                       *
diff --git a/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c
index 87a023dd774..ff4a6a25a12 100644
--- a/src/zabbix_server/pinger/pinger.c
+++ b/src/zabbix_server/pinger/pinger.c
@@ -43,8 +43,6 @@ extern ZBX_THREAD_LOCAL int		server_num, process_num;
 
 /******************************************************************************
  *                                                                            *
- * Function: process_value                                                    *
- *                                                                            *
  * Purpose: process new item value                                            *
  *                                                                            *
  ******************************************************************************/
@@ -99,8 +97,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_values                                                   *
- *                                                                            *
  * Purpose: process new item values                                           *
  *                                                                            *
  ******************************************************************************/
@@ -378,8 +374,6 @@ static void	add_icmpping_item(icmpitem_t **items, int *items_alloc, int *items_c
 
 /******************************************************************************
  *                                                                            *
- * Function: get_pinger_hosts                                                 *
- *                                                                            *
  * Purpose: creates buffer which contains list of hosts to ping               *
  *                                                                            *
  * Return value: SUCCEED - the file was created successfully                  *
@@ -524,8 +518,6 @@ static void	process_pinger_hosts(icmpitem_t *items, int items_count)
 
 /******************************************************************************
  *                                                                            *
- * Function: main_pinger_loop                                                 *
- *                                                                            *
  * Purpose: periodically perform ICMP pings                                   *
  *                                                                            *
  * Comments: never returns                                                    *
diff --git a/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c
index a9ba014626d..9961643a42f 100644
--- a/src/zabbix_server/poller/checks_agent.c
+++ b/src/zabbix_server/poller/checks_agent.c
@@ -30,8 +30,6 @@ extern unsigned char	program_type;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_value_agent                                                  *
- *                                                                            *
  * Purpose: retrieve data from Zabbix agent                                   *
  *                                                                            *
  * Parameters: item - item we are interested in                               *
diff --git a/src/zabbix_server/poller/checks_aggregate.c b/src/zabbix_server/poller/checks_aggregate.c
index 9695ce7398b..70214a5e629 100644
--- a/src/zabbix_server/poller/checks_aggregate.c
+++ b/src/zabbix_server/poller/checks_aggregate.c
@@ -33,8 +33,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_min                                        *
- *                                                                            *
  * Purpose: calculate minimum value from the history value vector             *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -65,8 +63,6 @@ static void	evaluate_history_func_min(zbx_vector_history_record_t *values, int v
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_max                                        *
- *                                                                            *
  * Purpose: calculate maximum value from the history value vector             *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -97,8 +93,6 @@ static void	evaluate_history_func_max(zbx_vector_history_record_t *values, int v
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_sum                                        *
- *                                                                            *
  * Purpose: calculate sum of values from the history value vector             *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -127,8 +121,6 @@ static void	evaluate_history_func_sum(zbx_vector_history_record_t *values, int v
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_avg                                        *
- *                                                                            *
  * Purpose: calculate average value of values from the history value vector   *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -149,8 +141,6 @@ static void	evaluate_history_func_avg(zbx_vector_history_record_t *values, int v
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_count                                      *
- *                                                                            *
  * Purpose: calculate number of values in value vector                        *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -170,8 +160,6 @@ static void	evaluate_history_func_count(zbx_vector_history_record_t *values, int
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func_last                                       *
- *                                                                            *
  * Purpose: calculate the last (newest) value in value vector                 *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -185,8 +173,6 @@ static void	evaluate_history_func_last(zbx_vector_history_record_t *values, hist
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_history_func                                            *
- *                                                                            *
  * Purpose: calculate function with values from value vector                  *
  *                                                                            *
  * Parameters: values      - [IN] a vector containing history values          *
@@ -228,8 +214,6 @@ static void	evaluate_history_func(zbx_vector_history_record_t *values, int value
 
 /******************************************************************************
  *                                                                            *
- * Function: quote_string                                                     *
- *                                                                            *
  * Purpose: quotes string by enclosing it in double quotes and escaping       *
  *          double quotes inside string with '\'.                             *
  *                                                                            *
@@ -264,8 +248,6 @@ static void	quote_string(char **str, size_t sz_src)
 
 /******************************************************************************
  *                                                                            *
- * Function: aggregate_quote_groups                                           *
- *                                                                            *
  * Purpose: quotes the individual groups in the list if necessary             *
  *                                                                            *
  ******************************************************************************/
@@ -288,8 +270,6 @@ static void	aggregate_quote_groups(char **str, size_t *str_alloc, size_t *str_of
 
 /******************************************************************************
  *                                                                            *
- * Function: aggregate_get_items                                              *
- *                                                                            *
  * Purpose: get array of items specified by key for selected groups           *
  *          (including nested groups)                                         *
  *                                                                            *
@@ -378,8 +358,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: evaluate_aggregate                                               *
- *                                                                            *
  * Parameters: item      - [IN] aggregated item                               *
  *             grp_func  - [IN] one of ZBX_GRP_FUNC_*                         *
  *             groups    - [IN] list of host groups                           *
diff --git a/src/zabbix_server/poller/checks_db.c b/src/zabbix_server/poller/checks_db.c
index 9f48dd7628c..00475b51f69 100644
--- a/src/zabbix_server/poller/checks_db.c
+++ b/src/zabbix_server/poller/checks_db.c
@@ -26,8 +26,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: get_value_db                                                     *
- *                                                                            *
  * Purpose: retrieve data from database                                       *
  *                                                                            *
  * Parameters: item   - [IN] item we are interested in                        *
diff --git a/src/zabbix_server/poller/checks_external.c b/src/zabbix_server/poller/checks_external.c
index e920776a32b..4646f2b074d 100644
--- a/src/zabbix_server/poller/checks_external.c
+++ b/src/zabbix_server/poller/checks_external.c
@@ -27,8 +27,6 @@ extern char	*CONFIG_EXTERNALSCRIPTS;
 
 /******************************************************************************
  *                                                                            *
- * Function: get_value_external                                               *
- *                                                                            *
  * Purpose: retrieve data from script executed on Zabbix server               *
  *                                                                            *
  * Parameters: item - item we are interested in                               *
diff --git a/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c
index dae0dffdc3e..697c73d19c8 100644
--- a/src/zabbix_server/poller/checks_internal.c
+++ b/src/zabbix_server/poller/checks_internal.c
@@ -58,8 +58,6 @@ static int	compare_interfaces(const void *p1, const void *p2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_host_interfaces_discovery                                    *
- *                                                                            *
  * Purpose: get data of all network interfaces for a host from configuration  *
  *          cache and pack into JSON for LLD                                  *
  *                                                                            *
@@ -172,8 +170,6 @@ static int	zbx_host_interfaces_discovery(zbx_uint64_t hostid, struct zbx_json *j
 
 /******************************************************************************
  *                                                                            *
- * Function: get_value_internal                                               *
- *                                                                            *
  * Purpose: retrieve data from Zabbix server (internally supported items)     *
  *                                                                            *
  * Parameters: item - item we are interested in                               *
diff --git a/src/zabbix_server/poller/checks_internal_proxy.c b/src/zabbix_server/poller/checks_internal_proxy.c
index 29d8611d291..c18bdf29b58 100644
--- a/src/zabbix_server/poller/checks_internal_proxy.c
+++ b/src/zabbix_server/poller/checks_internal_proxy.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_value_internal_ext                                       *
- *                                                                            *
  * Purpose: processes program type (proxy) specific internal checks           *
  *                                                                            *
  * Parameters: param1  - [IN] the first parameter                             *
diff --git a/src/zabbix_server/poller/checks_internal_server.c b/src/zabbix_server/poller/checks_internal_server.c
index fed0221340d..c035805e1c6 100644
--- a/src/zabbix_server/poller/checks_internal_server.c
+++ b/src/zabbix_server/poller/checks_internal_server.c
@@ -26,8 +26,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_value_internal_ext                                       *
- *                                                                            *
  * Purpose: processes program type (server) specific internal checks          *
  *                                                                            *
  * Parameters: param1  - [IN] the first parameter                             *
diff --git a/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c
index effcc1fcacc..64dc051480e 100644
--- a/src/zabbix_server/poller/checks_simple.c
+++ b/src/zabbix_server/poller/checks_simple.c
@@ -140,8 +140,6 @@ static zbx_vmcheck_t	vmchecks[] =
 
 /******************************************************************************
  *                                                                            *
- * Function: get_vmware_function                                              *
- *                                                                            *
  * Purpose: Retrieves a handler of the item key                               *
  *                                                                            *
  * Parameters: key    - [IN] an item key (without parameters)                 *
diff --git a/src/zabbix_server/poller/checks_simple_vmware.c b/src/zabbix_server/poller/checks_simple_vmware.c
index b76a83ecc20..63e77650a00 100644
--- a/src/zabbix_server/poller/checks_simple_vmware.c
+++ b/src/zabbix_server/poller/checks_simple_vmware.c
@@ -60,8 +60,6 @@ static int	vmware_set_powerstate_result(AGENT_RESULT *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: hv_get                                                           *
- *                                                                            *
  * Purpose: return pointer to Hypervisor data from hashset with uuid          *
  *                                                                            *
  * Parameters: hvs  - [IN] the hashset with all Hypervisors                   *
@@ -86,8 +84,6 @@ static zbx_vmware_hv_t	*hv_get(zbx_hashset_t *hvs, const char *uuid)
 
 /******************************************************************************
  *                                                                            *
- * Function: ds_get                                                           *
- *                                                                            *
  * Purpose: return pointer to Datastore data from vector with id              *
  *                                                                            *
  * Parameters: dss - [IN] the vector with all Datastores                      *
@@ -193,8 +189,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_counter_value_by_id                           *
- *                                                                            *
  * Purpose: gets vmware performance counter value by its identifier           *
  *                                                                            *
  * Parameters: service   - [IN] the vmware service                            *
@@ -334,8 +328,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_counter_value_by_path                         *
- *                                                                            *
  * Purpose: gets vmware performance counter value by the path                 *
  *                                                                            *
  * Parameters: service  - [IN] the vmware service                             *
@@ -400,8 +392,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_vmware_service                                               *
- *                                                                            *
  * Purpose: gets vmware service object                                        *
  *                                                                            *
  * Parameters: url       - [IN] the vmware service URL                        *
@@ -460,8 +450,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_vcenter_vmprop                                               *
- *                                                                            *
  * Purpose: retrieves data from virtual machine details                       *
  *                                                                            *
  * Parameters: request   - [IN] the original request. The first parameter is  *
@@ -528,8 +516,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_vcenter_hvprop                                               *
- *                                                                            *
  * Purpose: retrieves hypervisor property                                     *
  *                                                                            *
  * Parameters: request   - [IN] the original request. The first parameter is  *
diff --git a/src/zabbix_server/poller/checks_snmp.c b/src/zabbix_server/poller/checks_snmp.c
index 1a7f333a4b8..2fed1b178f9 100644
--- a/src/zabbix_server/poller/checks_snmp.c
+++ b/src/zabbix_server/poller/checks_snmp.c
@@ -196,8 +196,6 @@ static char	*get_item_security_name(const DC_ITEM *item)
 
 /******************************************************************************
  *                                                                            *
- * Function: cache_get_snmp_index                                             *
- *                                                                            *
  * Purpose: retrieve index that matches value from the relevant index cache   *
  *                                                                            *
  * Parameters: item      - [IN] configuration of Zabbix item, contains        *
@@ -252,8 +250,6 @@ end:
 
 /******************************************************************************
  *                                                                            *
- * Function: cache_put_snmp_index                                             *
- *                                                                            *
  * Purpose: store the index-value pair in the relevant index cache            *
  *                                                                            *
  * Parameters: item      - [IN] configuration of Zabbix item, contains        *
@@ -319,8 +315,6 @@ static void	cache_put_snmp_index(const DC_ITEM *item, const char *snmp_oid, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: cache_del_snmp_index_subtree                                     *
- *                                                                            *
  * Purpose: delete index-value mappings from the specified index cache        *
  *                                                                            *
  * Parameters: item      - [IN] configuration of Zabbix item, contains        *
@@ -1028,8 +1022,6 @@ static int	zbx_oid_is_new(zbx_hashset_t *hs, size_t root_len, const oid *p_oid,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_snmp_walk                                                    *
- *                                                                            *
  * Purpose: retrieve information by walking an OID tree                       *
  *                                                                            *
  * Parameters: ss            - [IN] SNMP session handle                       *
@@ -1562,8 +1554,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_snmp_translate                                               *
- *                                                                            *
  * Purpose: translate well-known object identifiers into numeric form         *
  *                                                                            *
  ******************************************************************************/
@@ -1671,8 +1661,6 @@ static int	zbx_snmp_dobject_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_snmp_ddata_init                                              *
- *                                                                            *
  * Purpose: initializes snmp discovery data object                            *
  *                                                                            *
  * Parameters: data          - [IN] snmp discovery data object                *
@@ -1743,8 +1731,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_snmp_ddata_clean                                             *
- *                                                                            *
  * Purpose: releases data allocated by snmp discovery                         *
  *                                                                            *
  * Parameters: data - [IN] snmp discovery data object                         *
diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c
index 8216440bf94..fc88d4b8106 100644
--- a/src/zabbix_server/poller/poller.c
+++ b/src/zabbix_server/poller/poller.c
@@ -57,8 +57,6 @@ static volatile sig_atomic_t	snmp_cache_reload_requested;
 
 /******************************************************************************
  *                                                                            *
- * Function: update_interface_availability                                    *
- *                                                                            *
  * Purpose: write interface availability changes into database                *
  *                                                                            *
  * Parameters: data        - [IN/OUT] the serialized availability data        *
@@ -83,8 +81,6 @@ static int	update_interface_availability(unsigned char **data, size_t *data_allo
 
 /******************************************************************************
  *                                                                            *
- * Function: interface_get_availability                                       *
- *                                                                            *
  * Purpose: get interface availability data                                   *
  *                                                                            *
  * Parameters: dc_interface - [IN] the interface                              *
@@ -107,8 +103,6 @@ static void	interface_get_availability(const DC_INTERFACE *dc_interface, zbx_int
 
 /********************************************************************************
  *                                                                              *
- * Function: interface_set_availability                                         *
- *                                                                              *
  * Purpose: sets interface availability data                                    *
  *                                                                              *
  * Parameters: dc_interface - [IN/OUT] the interface                            *
@@ -153,8 +147,6 @@ static int	interface_availability_by_item_type(unsigned char item_type, unsigned
 
 /********************************************************************************
  *                                                                              *
- * Function: zbx_activate_item_interface                                        *
- *                                                                              *
  * Purpose: activate item interface                                             *
  *                                                                              *
  * Parameters: ts         - [IN] the timestamp                                  *
@@ -208,8 +200,6 @@ out:
 
 /********************************************************************************
  *                                                                              *
- * Function: zbx_deactivate_item_interface                                      *
- *                                                                              *
  * Purpose: deactivate item interface                                           *
  *                                                                              *
  * Parameters: ts         - [IN] the timestamp                                  *
@@ -784,8 +774,6 @@ void	zbx_clean_items(DC_ITEM *items, int num, AGENT_RESULT *results)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_values                                                       *
- *                                                                            *
  * Purpose: retrieve values of metrics from monitored hosts                   *
  *                                                                            *
  * Parameters: poller_type - [IN] poller type (ZBX_POLLER_TYPE_...)           *
diff --git a/src/zabbix_server/postinit.c b/src/zabbix_server/postinit.c
index 813c28397ce..b2135a22754 100644
--- a/src/zabbix_server/postinit.c
+++ b/src/zabbix_server/postinit.c
@@ -31,8 +31,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: get_trigger_count                                                *
- *                                                                            *
  * Purpose: gets the total number of triggers on system                       *
  *                                                                            *
  * Parameters:                                                                *
@@ -58,8 +56,6 @@ static int	get_trigger_count(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_historical_macro                                              *
- *                                                                            *
  * Purpose: checks if this is historical macro that cannot be expanded for    *
  *          bulk event name update                                            *
  *                                                                            *
@@ -81,8 +77,6 @@ static int	is_historical_macro(const char *macro)
 
 /******************************************************************************
  *                                                                            *
- * Function: convert_historical_macro                                         *
- *                                                                            *
  * Purpose: translates historical macro to lld macro format                   *
  *                                                                            *
  * Parameters: macro - [IN] the macro type (see ZBX_HIST_MACRO_* defines)     *
@@ -104,8 +98,6 @@ static const char	*convert_historical_macro(int macro)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocess_trigger_name                                          *
- *                                                                            *
  * Purpose: pre-process trigger name(description) by expanding non historical *
  *          macros                                                            *
  *                                                                            *
@@ -216,8 +208,6 @@ static void	preprocess_trigger_name(DB_TRIGGER *trigger, int *historical)
 
 /******************************************************************************
  *                                                                            *
- * Function: process_event_bulk_update                                        *
- *                                                                            *
  * Purpose: update event/problem names for a trigger with bulk request        *
  *                                                                            *
  * Parameters: trigger    - [IN] the trigger                                  *
@@ -267,8 +257,6 @@ static int	process_event_bulk_update(const DB_TRIGGER *trigger, char **sql, size
 
 /******************************************************************************
  *                                                                            *
- * Function: process_event_update                                             *
- *                                                                            *
  * Purpose: update event/problem names for a trigger with separate requests   *
  *          for each event                                                    *
  *                                                                            *
@@ -352,8 +340,6 @@ static int	process_event_update(const DB_TRIGGER *trigger, char **sql, size_t *s
 
 /******************************************************************************
  *                                                                            *
- * Function: update_event_names                                               *
- *                                                                            *
  * Purpose: update event names in events and problem tables                   *
  *                                                                            *
  * Return value: SUCCEED - the update was successful                          *
@@ -437,8 +423,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_postinit_tasks                                         *
- *                                                                            *
  * Purpose: process post initialization tasks                                 *
  *                                                                            *
  * Return value: SUCCEED - the update was successful                          *
diff --git a/src/zabbix_server/preprocessor/item_preproc.c b/src/zabbix_server/preprocessor/item_preproc.c
index 65a1b9931ee..29b5c858c2d 100644
--- a/src/zabbix_server/preprocessor/item_preproc.c
+++ b/src/zabbix_server/preprocessor/item_preproc.c
@@ -36,8 +36,6 @@
 extern zbx_es_t	es_engine;
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_numeric_type_hint                                   *
- *                                                                            *
  * Purpose: returns numeric type hint based on item value type                *
  *                                                                            *
  * Parameters: value_type - [IN] the item value type                          *
@@ -60,8 +58,6 @@ static int	item_preproc_numeric_type_hint(unsigned char value_type)
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_convert_value                                       *
- *                                                                            *
  * Purpose: convert variant value to the requested type                       *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to convert                         *
@@ -85,8 +81,6 @@ static int	item_preproc_convert_value(zbx_variant_t *value, unsigned char type,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_item_preproc_convert_value_to_numeric                        *
- *                                                                            *
  * Purpose: converts variant value to numeric                                 *
  *                                                                            *
  * Parameters: value_num  - [OUT] the converted value                         *
@@ -131,8 +125,6 @@ int	zbx_item_preproc_convert_value_to_numeric(zbx_variant_t *value_num, const zb
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_multiplier_variant                                  *
- *                                                                            *
  * Purpose: execute custom multiplier preprocessing operation on variant      *
  *          value type                                                        *
  *                                                                            *
@@ -180,8 +172,6 @@ static int	item_preproc_multiplier_variant(unsigned char value_type, zbx_variant
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_validate_notsupport                                 *
- *                                                                            *
  * Purpose: executes during notsupported item preprocessing                   *
  *                                                                            *
  * Return value: FAIL - for further error handling                            *
@@ -195,8 +185,6 @@ static int	item_preproc_validate_notsupport(char **errmsg)
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_multiplier                                          *
- *                                                                            *
  * Purpose: execute custom multiplier preprocessing operation                 *
  *                                                                            *
  * Parameters: value_type - [IN] the item type                                *
@@ -232,8 +220,6 @@ static int	item_preproc_multiplier(unsigned char value_type, zbx_variant_t *valu
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_delta_float                                         *
- *                                                                            *
  * Purpose: execute delta type preprocessing operation                        *
  *                                                                            *
  * Parameters: value         - [IN/OUT] the value to process                  *
@@ -272,8 +258,6 @@ static int	item_preproc_delta_float(zbx_variant_t *value, const zbx_timespec_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_delta_uint64                                        *
- *                                                                            *
  * Purpose: execute delta type preprocessing operation                        *
  *                                                                            *
  * Parameters: value         - [IN/OUT] the value to process                  *
@@ -312,8 +296,6 @@ static int	item_preproc_delta_uint64(zbx_variant_t *value, const zbx_timespec_t
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_delta                                               *
- *                                                                            *
  * Purpose: execute delta type preprocessing operation                        *
  *                                                                            *
  * Parameters: value_type    - [IN] the item value type                       *
@@ -371,8 +353,6 @@ static int	item_preproc_delta(unsigned char value_type, zbx_variant_t *value, co
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_delta_value                                         *
- *                                                                            *
  * Purpose: execute delta (simple change) preprocessing operation             *
  *                                                                            *
  * Parameters: value_type    - [IN] the item value type                       *
@@ -407,8 +387,6 @@ static int	item_preproc_delta_value(unsigned char value_type, zbx_variant_t *val
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_delta_speed                                         *
- *                                                                            *
  * Purpose: execute delta (speed per second) preprocessing operation          *
  *                                                                            *
  * Parameters: value_type    - [IN] the item value type                       *
@@ -443,8 +421,6 @@ static int	item_preproc_delta_speed(unsigned char value_type, zbx_variant_t *val
 
 /******************************************************************************
  *                                                                            *
- * Function: unescape_param                                                   *
- *                                                                            *
  * Purpose: copy first n chars from in to out, unescape escaped characters    *
  *          during copying                                                    *
  *                                                                            *
@@ -496,8 +472,6 @@ static void	unescape_param(int op_type, const char *in, int len, char *out)
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_trim                                                *
- *                                                                            *
  * Purpose: execute trim type preprocessing operation                         *
  *                                                                            *
  * Parameters: value   - [IN/OUT] the value to process                        *
@@ -529,8 +503,6 @@ static int item_preproc_trim(zbx_variant_t *value, unsigned char op_type, const
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_rtrim                                               *
- *                                                                            *
  * Purpose: execute right trim preprocessing operation                        *
  *                                                                            *
  * Parameters: value   - [IN/OUT] the value to process                        *
@@ -560,8 +532,6 @@ static int item_preproc_rtrim(zbx_variant_t *value, const char *params, char **e
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_ltrim                                               *
- *                                                                            *
  * Purpose: execute left trim preprocessing operation                         *
  *                                                                            *
  * Parameters: value   - [IN/OUT] the value to process                        *
@@ -591,8 +561,6 @@ static int item_preproc_ltrim(zbx_variant_t *value, const char *params, char **e
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_lrtrim                                              *
- *                                                                            *
  * Purpose: execute left and right trim preprocessing operation               *
  *                                                                            *
  * Parameters: value   - [IN/OUT] the value to process                        *
@@ -622,8 +590,6 @@ static int item_preproc_lrtrim(zbx_variant_t *value, const char *params, char **
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_2dec                                                *
- *                                                                            *
  * Purpose: execute decimal value conversion operation                        *
  *                                                                            *
  * Parameters: value   - [IN/OUT] the value to convert                        *
@@ -687,8 +653,6 @@ static int	item_preproc_2dec(zbx_variant_t *value, unsigned char op_type, char *
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_bool2dec                                            *
- *                                                                            *
  * Purpose: execute boolean to decimal value conversion operation             *
  *                                                                            *
  * Parameters: value   - [IN/OUT] the value to convert                        *
@@ -715,8 +679,6 @@ static int	item_preproc_bool2dec(zbx_variant_t *value, char **errmsg)
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_oct2dec                                             *
- *                                                                            *
  * Purpose: execute octal to decimal value conversion operation               *
  *                                                                            *
  * Parameters: value   - [IN/OUT] the value to convert                        *
@@ -743,8 +705,6 @@ static int	item_preproc_oct2dec(zbx_variant_t *value, char **errmsg)
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_hex2dec                                             *
- *                                                                            *
  * Purpose: execute hexadecimal to decimal value conversion operation         *
  *                                                                            *
  * Parameters: value   - [IN/OUT] the value to convert                        *
@@ -771,8 +731,6 @@ static int	item_preproc_hex2dec(zbx_variant_t *value, char **errmsg)
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_regsub_op                                           *
- *                                                                            *
  * Purpose: execute regular expression substitution operation                 *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -827,8 +785,6 @@ static int	item_preproc_regsub_op(zbx_variant_t *value, const char *params, char
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_regsub                                              *
- *                                                                            *
  * Purpose: execute regular expression substitution operation                 *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -862,8 +818,6 @@ static int	item_preproc_regsub(zbx_variant_t *value, const char *params, char **
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_jsonpath_op                                         *
- *                                                                            *
  * Purpose: execute jsonpath query                                            *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -902,8 +856,6 @@ static int	item_preproc_jsonpath_op(zbx_variant_t *value, const char *params, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_jsonpath                                            *
- *                                                                            *
  * Purpose: execute jsonpath query                                            *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -930,8 +882,6 @@ static int	item_preproc_jsonpath(zbx_variant_t *value, const char *params, char
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_xpath                                               *
- *                                                                            *
  * Purpose: execute xpath query                                               *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -960,8 +910,6 @@ static int	item_preproc_xpath(zbx_variant_t *value, const char *params, char **e
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_validate_range                                      *
- *                                                                            *
  * Purpose: validates value to be within the specified range                  *
  * Parameters: value_type - [IN] the item type                                *
  *             value      - [IN/OUT] the value to process                     *
@@ -1038,8 +986,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_validate_regex                                      *
- *                                                                            *
  * Purpose: validates value to match regular expression                       *
  * Parameters: value_type - [IN] the item type                                *
  *             value      - [IN/OUT] the value to process                     *
@@ -1095,8 +1041,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_validate_not_regex                                  *
- *                                                                            *
  * Purpose: validates value to not match regular expression                   *
  * Parameters: value_type - [IN] the item type                                *
  *             value      - [IN/OUT] the value to process                     *
@@ -1154,8 +1098,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_get_error_from_json                                 *
- *                                                                            *
  * Purpose: checks for presence of error field in json data                   *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -1210,8 +1152,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_get_error_from_xml                                  *
- *                                                                            *
  * Purpose: checks for presence of error field in XML data                    *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -1316,8 +1256,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_get_error_from_regex                                *
- *                                                                            *
  * Purpose: checks for presence of error pattern matching regular expression  *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -1380,8 +1318,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_throttle_value                                      *
- *                                                                            *
  * Purpose: throttles value by suppressing identical values                   *
  *                                                                            *
  * Parameters: value         - [IN/OUT] the value to process                  *
@@ -1414,8 +1350,6 @@ static int	item_preproc_throttle_value(zbx_variant_t *value, const zbx_timespec_
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_throttle_timed_value                                *
- *                                                                            *
  * Purpose: throttles value by suppressing identical values                   *
  *                                                                            *
  * Parameters: value         - [IN/OUT] the value to process                  *
@@ -1459,8 +1393,6 @@ static int	item_preproc_throttle_timed_value(zbx_variant_t *value, const zbx_tim
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_script                                              *
- *                                                                            *
  * Purpose: executes script passed with params                                *
  *                                                                            *
  * Parameters: value    - [IN/OUT] the value to process                       *
@@ -1523,8 +1455,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_prometheus_pattern                                  *
- *                                                                            *
  * Purpose: parse Prometheus format metrics                                   *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -1604,8 +1534,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_prometheus_to_json                                  *
- *                                                                            *
  * Purpose: convert Prometheus format metrics to JSON format                  *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -1638,8 +1566,6 @@ static int	item_preproc_prometheus_to_json(zbx_variant_t *value, const char *par
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_csv_to_json_add_field                               *
- *                                                                            *
  * Purpose: convert CSV format metrics to JSON format                         *
  *                                                                            *
  * Parameters: json    - [IN/OUT] json object                                 *
@@ -1714,8 +1640,6 @@ static int	item_preproc_csv_to_json_add_field(struct zbx_json *json, char ***nam
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_csv_to_json                                         *
- *                                                                            *
  * Purpose: convert CSV format metrics to JSON format                         *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -1972,8 +1896,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_xml_to_json                                         *
- *                                                                            *
  * Purpose: convert XML format value to JSON format                           *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -2001,8 +1923,6 @@ static int	item_preproc_xml_to_json(zbx_variant_t *value, char **errmsg)
 
 /******************************************************************************
  *                                                                            *
- * Function: item_preproc_str_replace                                         *
- *                                                                            *
  * Purpose: replace substrings in string                                      *
  *                                                                            *
  * Parameters: value  - [IN/OUT] the value to process                         *
@@ -2053,8 +1973,6 @@ static int	item_preproc_str_replace(zbx_variant_t *value, const char *params, ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_item_preproc                                                 *
- *                                                                            *
  * Purpose: execute preprocessing operation                                   *
  *                                                                            *
  * Parameters: cache         - [IN/OUT] the preprocessing cache               *
@@ -2174,8 +2092,6 @@ int	zbx_item_preproc(zbx_preproc_cache_t *cache, unsigned char value_type, zbx_v
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_item_preproc_handle_error                                    *
- *                                                                            *
  * Purpose: apply 'on fail' preprocessing error handler                       *
  *                                                                            *
  * Parameters: value         - [IN/OUT] the value                             *
@@ -2212,8 +2128,6 @@ int	zbx_item_preproc_handle_error(zbx_variant_t *value, const zbx_preproc_op_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_item_preproc_test                                            *
- *                                                                            *
  * Purpose: test preprocessing steps                                          *
  *                                                                            *
  * Parameters: value_type    - [IN] the item value type                       *
diff --git a/src/zabbix_server/preprocessor/preproc_cache.c b/src/zabbix_server/preprocessor/preproc_cache.c
index 3e6c6f862ee..259a2463529 100644
--- a/src/zabbix_server/preprocessor/preproc_cache.c
+++ b/src/zabbix_server/preprocessor/preproc_cache.c
@@ -26,8 +26,6 @@ ZBX_VECTOR_IMPL(ppcache, zbx_preproc_cache_ref_t);
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preproc_cache_get                                            *
- *                                                                            *
  * Purpose: get cache by preprocessing step type                              *
  *                                                                            *
  * Parameters: cache - [IN] the preprocessing cache                           *
@@ -52,8 +50,6 @@ void	*zbx_preproc_cache_get(zbx_preproc_cache_t *cache, unsigned char type)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preproc_cache_put                                            *
- *                                                                            *
  * Purpose: put preprocessing step cache into preprocessing cache             *
  *                                                                            *
  * Parameters: cache - [IN] the preprocessing cache                           *
@@ -76,8 +72,6 @@ void	zbx_preproc_cache_put(zbx_preproc_cache_t *cache, unsigned char type, void
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preproc_cache_init                                           *
- *                                                                            *
  * Purpose: initialize preprocessing cache                                    *
  *                                                                            *
  ******************************************************************************/
@@ -88,8 +82,6 @@ void	zbx_preproc_cache_init(zbx_preproc_cache_t *cache)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preproc_cache_clear                                          *
- *                                                                            *
  * Purpose: free resources allocated by preprocessing cache                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/preprocessor/preproc_manager.c b/src/zabbix_server/preprocessor/preproc_manager.c
index a5c44eab034..ffd3e99f101 100644
--- a/src/zabbix_server/preprocessor/preproc_manager.c
+++ b/src/zabbix_server/preprocessor/preproc_manager.c
@@ -184,8 +184,6 @@ static void	request_free_steps(zbx_preprocessing_request_t *request)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_sync_configuration                                  *
- *                                                                            *
  * Purpose: synchronize preprocessing manager with configuration cache data   *
  *                                                                            *
  * Parameters: manager - [IN] the manager to be synchronized                  *
@@ -258,8 +256,6 @@ static void	preprocessing_ar_to_variant(AGENT_RESULT *ar, zbx_variant_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_create_task                                         *
- *                                                                            *
  * Purpose: create preprocessing task for request                             *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -293,8 +289,6 @@ static zbx_uint32_t	preprocessor_create_task(zbx_preprocessing_manager_t *manage
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_set_request_state_done                              *
- *                                                                            *
  * Purpose: set request state to done and handle linked items                 *
  *                                                                            *
  * Parameters: manager    - [IN] preprocessing manager                        *
@@ -338,8 +332,6 @@ static	void	preprocessor_set_request_state_done(zbx_preprocessing_manager_t *man
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_create_dep_message                                  *
- *                                                                            *
  * Purpose: create message(s) for dependent item bulk preprocessing           *
  *                                                                            *
  * Parameters: manager  - [IN] preprocessing manager                          *
@@ -406,8 +398,6 @@ static int	preprocessor_create_dep_message(zbx_preprocessing_manager_t *manager,
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_dep_request_next_message                            *
- *                                                                            *
  * Purpose: returns next dependent item preprocessing message                 *
  *                                                                            *
  * Parameters: request - [IN] the dependent item preprocessing request        *
@@ -432,8 +422,6 @@ static int	preprocessor_dep_request_next_message(zbx_preprocessing_dep_request_t
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_get_next_task                                       *
- *                                                                            *
  * Purpose: gets next task to be sent to worker                               *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -525,8 +513,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_get_worker_by_client                                *
- *                                                                            *
  * Purpose: get worker data by IPC client                                     *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -561,8 +547,6 @@ static zbx_preprocessing_worker_t	*preprocessor_get_worker_by_client(zbx_preproc
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_get_free_worker                                     *
- *                                                                            *
  * Purpose: get worker without active preprocessing task                      *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -585,8 +569,6 @@ static zbx_preprocessing_worker_t	*preprocessor_get_free_worker(zbx_preprocessin
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_assign_tasks                                        *
- *                                                                            *
  * Purpose: assign available queued preprocessing tasks to free workers       *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -618,8 +600,6 @@ static void	preprocessor_assign_tasks(zbx_preprocessing_manager_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: preproc_item_value_clear                                         *
- *                                                                            *
  * Purpose: frees resources allocated by preprocessor item value              *
  *                                                                            *
  * Parameters: value - [IN] value to be freed                                 *
@@ -639,8 +619,6 @@ static void	preproc_item_value_clear(zbx_preproc_item_value_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_free_request                                        *
- *                                                                            *
  * Purpose: free preprocessing request                                        *
  *                                                                            *
  * Parameters: base - [IN] request data to be freed                           *
@@ -674,8 +652,6 @@ static void	preprocessor_free_request(zbx_preprocessing_request_base_t *base)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_free_direct_request                                 *
- *                                                                            *
  * Purpose: free preprocessing direct request                                 *
  *                                                                            *
  * Parameters: direct_request - [IN] forward data to be freed                 *
@@ -690,8 +666,6 @@ static void	preprocessor_free_direct_request(zbx_preprocessing_direct_request_t
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_flush_value                                         *
- *                                                                            *
  * Purpose: add new value to the local history cache or send to LLD manager   *
  *                                                                            *
  * Parameters: value - [IN] value to be added or sent                         *
@@ -742,8 +716,6 @@ static void	preprocessor_flush_dep_results(zbx_preprocessing_manager_t *manager,
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessing_flush_queue                                        *
- *                                                                            *
  * Purpose: add all sequential processed values from beginning of the queue   *
  *          to the local history cache                                        *
  *                                                                            *
@@ -819,8 +791,6 @@ static void	preproc_link_nodes(zbx_preprocessing_manager_t *manager, zbx_uint64_
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_link_items                                          *
- *                                                                            *
  * Purpose: create relation between item values within value queue            *
  *                                                                            *
  * Parameters: manager     - [IN] preprocessing manager                       *
@@ -858,8 +828,6 @@ static void	preprocessor_link_items(zbx_preprocessing_manager_t *manager, zbx_li
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_enqueue_dependent_value                             *
- *                                                                            *
  * Purpose: enqueue dependent items (if any) by preproc value                 *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -878,8 +846,6 @@ static void	preprocessor_enqueue_dependent_value(zbx_preprocessing_manager_t *ma
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_enqueue                                             *
- *                                                                            *
  * Purpose: enqueue preprocessing request                                     *
  *                                                                            *
  * Parameters: manage   - [IN] preprocessing manager                          *
@@ -1008,8 +974,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_enqueue_dependent                                   *
- *                                                                            *
  * Purpose: enqueue dependent items (if any)                                  *
  *                                                                            *
  * Parameters: manager      - [IN] preprocessing manager                      *
@@ -1072,8 +1036,6 @@ static void	preprocessor_enqueue_dependent(zbx_preprocessing_manager_t *manager,
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_add_request                                         *
- *                                                                            *
  * Purpose: handle new preprocessing request                                  *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1103,8 +1065,6 @@ static void	preprocessor_add_request(zbx_preprocessing_manager_t *manager, zbx_i
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_add_test_request                                    *
- *                                                                            *
  * Purpose: handle new preprocessing test request                             *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1132,8 +1092,6 @@ static void	preprocessor_add_test_request(zbx_preprocessing_manager_t *manager,
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_set_variant_result                                  *
- *                                                                            *
  * Purpose: get result data from variant and error message                    *
  *                                                                            *
  * Parameters: request - [IN/OUT] preprocessing request                       *
@@ -1248,8 +1206,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_add_result                                          *
- *                                                                            *
  * Purpose: handle preprocessing result                                       *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1327,8 +1283,6 @@ static void	preprocessor_add_result(zbx_preprocessing_manager_t *manager, zbx_ip
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_update_history                                      *
- *                                                                            *
  * Purpose: handle preprocessing result                                       *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1403,8 +1357,6 @@ static void	preprocessor_finalize_dep_results(zbx_preprocessing_manager_t *manag
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_add_dep_result                                      *
- *                                                                            *
  * Purpose: handle dependent item batch preprocessing result                  *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1435,8 +1387,6 @@ static void	preprocessor_process_dep_result(zbx_preprocessing_manager_t *manager
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_add_dep_result                                      *
- *                                                                            *
  * Purpose: handle next dependent item batch preprocessing result             *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1467,8 +1417,6 @@ static void	preprocessor_process_dep_result_cont(zbx_preprocessing_manager_t *ma
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_next_dep_request                                    *
- *                                                                            *
  * Purpose: handle dependent item batch preprocessing result                  *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1500,8 +1448,6 @@ static void	preprocessor_next_dep_request(zbx_preprocessing_manager_t *manager,
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_flush_test_result                                   *
- *                                                                            *
  * Purpose: handle preprocessing result                                       *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1648,8 +1594,6 @@ static	void	preprocessor_get_items_totals(zbx_preprocessing_manager_t *manager,
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_get_diag_stats                                      *
- *                                                                            *
  * Purpose: return diagnostic statistics                                      *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1675,8 +1619,6 @@ static void	preprocessor_get_diag_stats(zbx_preprocessing_manager_t *manager, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: preproc_sort_item_by_values_desc                                 *
- *                                                                            *
  * Purpose: compare item statistics by value                                  *
  *                                                                            *
  ******************************************************************************/
@@ -1748,8 +1690,6 @@ static	void	preprocessor_get_items_view(zbx_preprocessing_manager_t *manager, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_get_top_items                                       *
- *                                                                            *
  * Purpose: return diagnostic top view                                        *
  *                                                                            *
  * Parameters: manager - [IN] preprocessing manager                           *
@@ -1856,8 +1796,6 @@ static int	preproc_item_link_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_init_manager                                        *
- *                                                                            *
  * Purpose: initializes preprocessing manager                                 *
  *                                                                            *
  * Parameters: manager - [IN] the manager to initialize                       *
@@ -1885,8 +1823,6 @@ static void	preprocessor_init_manager(zbx_preprocessing_manager_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_register_worker                                     *
- *                                                                            *
  * Purpose: registers preprocessing worker                                    *
  *                                                                            *
  * Parameters: manager - [IN] the manager                                     *
@@ -1928,8 +1864,6 @@ static void preprocessor_register_worker(zbx_preprocessing_manager_t *manager, z
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_destroy_manager                                     *
- *                                                                            *
  * Purpose: destroy preprocessing manager                                     *
  *                                                                            *
  * Parameters: manager - [IN] the manager to destroy                          *
diff --git a/src/zabbix_server/preprocessor/preproc_worker.c b/src/zabbix_server/preprocessor/preproc_worker.c
index 295498e5e8d..3c211ace447 100644
--- a/src/zabbix_server/preprocessor/preproc_worker.c
+++ b/src/zabbix_server/preprocessor/preproc_worker.c
@@ -51,8 +51,6 @@ zbx_es_t	es_engine;
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_format_value                                              *
- *                                                                            *
  * Purpose: formats value in text format                                      *
  *                                                                            *
  * Parameters: value     - [IN] the value to format                           *
@@ -93,8 +91,6 @@ static void	worker_format_value(const zbx_variant_t *value, char **value_str)
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_format_result                                             *
- *                                                                            *
  * Purpose: formats one preprocessing step result                             *
  *                                                                            *
  * Parameters: step   - [IN] the preprocessing step number                    *
@@ -124,8 +120,6 @@ static void	worker_format_result(int step, const zbx_preproc_result_t *result, c
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_format_error                                              *
- *                                                                            *
  * Purpose: formats preprocessing error message                               *
  *                                                                            *
  * Parameters: value        - [IN] the input value                            *
@@ -203,8 +197,6 @@ static void	worker_format_error(const zbx_variant_t *value, zbx_preproc_result_t
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_item_preproc_execute                                      *
- *                                                                            *
  * Purpose: execute preprocessing steps                                       *
  *                                                                            *
  * Parameters: cache         - [IN/OUT] the preprocessing cache               *
@@ -296,8 +288,6 @@ static int	worker_item_preproc_execute(zbx_preproc_cache_t *cache, unsigned char
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_preprocess_value                                          *
- *                                                                            *
  * Purpose: handle item value preprocessing task                              *
  *                                                                            *
  * Parameters: socket  - [IN] IPC socket                                      *
@@ -379,8 +369,6 @@ static void	worker_preprocess_value(zbx_ipc_socket_t *socket, zbx_ipc_message_t
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_test_value                                                *
- *                                                                            *
  * Purpose: handle item value test preprocessing task                         *
  *                                                                            *
  * Parameters: socket  - [IN] IPC socket                                      *
@@ -443,11 +431,6 @@ static void	worker_test_value(zbx_ipc_socket_t *socket, zbx_ipc_message_t *messa
 	zbx_vector_ptr_destroy(&history_in);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: worker_dep_request_clear                                         *
- *                                                                            *
- ******************************************************************************/
 static void	worker_dep_request_clear(zbx_preproc_dep_request_t *request)
 {
 	zbx_variant_clear(&request->value);
@@ -457,8 +440,6 @@ static void	worker_dep_request_clear(zbx_preproc_dep_request_t *request)
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_preprocess_dep_items                                      *
- *                                                                            *
  * Purpose: preprocess dependent items                                        *
  *                                                                            *
  * Parameters: socket  - [IN] IPC socket                                      *
@@ -562,8 +543,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_process_dep_request                                       *
- *                                                                            *
  * Purpose: handle item value preprocessing request                           *
  *                                                                            *
  * Parameters: socket  - [IN] IPC socket                                      *
@@ -582,8 +561,6 @@ static void	worker_process_dep_request(zbx_ipc_socket_t *socket, zbx_ipc_message
 
 /******************************************************************************
  *                                                                            *
- * Function: worker_process_dep_request_cont                                  *
- *                                                                            *
  * Purpose: handle following item value preprocessing request                 *
  *                                                                            *
  * Parameters: socket  - [IN] IPC socket                                      *
diff --git a/src/zabbix_server/preprocessor/preprocessing.c b/src/zabbix_server/preprocessor/preprocessing.c
index 19ddd04ba65..850e5685685 100644
--- a/src/zabbix_server/preprocessor/preprocessing.c
+++ b/src/zabbix_server/preprocessor/preprocessing.c
@@ -106,8 +106,6 @@ static int	message_pack_fields(zbx_ipc_message_t *message, const zbx_packed_fiel
 
 /******************************************************************************
  *                                                                            *
- * Function: message_pack_data                                                *
- *                                                                            *
  * Purpose: helper for data packing based on defined format                   *
  *                                                                            *
  * Parameters: message - [OUT] IPC message, can be NULL for buffer size       *
@@ -137,8 +135,6 @@ static zbx_uint32_t	message_pack_data(zbx_ipc_message_t *message, zbx_packed_fie
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_pack_value                                          *
- *                                                                            *
  * Purpose: pack item value data into a single buffer that can be used in IPC *
  *                                                                            *
  * Parameters: message - [OUT] IPC message                                    *
@@ -200,8 +196,6 @@ static zbx_uint32_t	preprocessor_pack_value(zbx_ipc_message_t *message, zbx_prep
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_pack_variant                                        *
- *                                                                            *
  * Purpose: packs variant value for serialization                             *
  *                                                                            *
  * Parameters: fields - [OUT] the packed fields                               *
@@ -243,8 +237,6 @@ static int	preprocessor_pack_variant(zbx_packed_field_t *fields, const zbx_varia
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_pack_history                                        *
- *                                                                            *
  * Purpose: packs preprocessing history for serialization                     *
  *                                                                            *
  * Parameters: fields  - [OUT] the packed fields                              *
@@ -277,8 +269,6 @@ static int	preprocessor_pack_history(zbx_packed_field_t *fields, const zbx_vecto
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_pack_step                                           *
- *                                                                            *
  * Purpose: packs preprocessing step for serialization                        *
  *                                                                            *
  * Parameters: fields - [OUT] the packed fields                               *
@@ -303,8 +293,6 @@ static int	preprocessor_pack_step(zbx_packed_field_t *fields, const zbx_preproc_
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_pack_steps                                          *
- *                                                                            *
  * Purpose: packs preprocessing steps for serialization                       *
  *                                                                            *
  * Parameters: fields    - [OUT] the packed fields                            *
@@ -330,8 +318,6 @@ static int	preprocessor_pack_steps(zbx_packed_field_t *fields, const zbx_preproc
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocesser_unpack_variant                                      *
- *                                                                            *
  * Purpose: unpacks serialized variant value                                  *
  *                                                                            *
  * Parameters: data  - [IN] the serialized data                               *
@@ -371,8 +357,6 @@ static int	preprocesser_unpack_variant(const unsigned char *data, zbx_variant_t
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocesser_unpack_history                                      *
- *                                                                            *
  * Purpose: unpacks serialized preprocessing history                          *
  *                                                                            *
  * Parameters: data    - [IN] the serialized data                             *
@@ -412,8 +396,6 @@ static int	preprocesser_unpack_history(const unsigned char *data, zbx_vector_ptr
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_unpack_step                                         *
- *                                                                            *
  * Purpose: unpacks serialized preprocessing step                             *
  *                                                                            *
  * Parameters: data - [IN] the serialized data                                *
@@ -437,8 +419,6 @@ static int	preprocessor_unpack_step(const unsigned char *data, zbx_preproc_op_t
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_unpack_steps                                        *
- *                                                                            *
  * Purpose: unpacks serialized preprocessing steps                            *
  *                                                                            *
  * Parameters: data      - [IN] the serialized data                           *
@@ -468,8 +448,6 @@ static int	preprocessor_unpack_steps(const unsigned char *data, zbx_preproc_op_t
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_pack_task                                       *
- *                                                                            *
  * Purpose: pack preprocessing task data into a single buffer that can be     *
  *          used in IPC                                                       *
  *                                                                            *
@@ -528,8 +506,6 @@ zbx_uint32_t	zbx_preprocessor_pack_task(unsigned char **data, zbx_uint64_t itemi
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_append_packed_message                               *
- *                                                                            *
  * Purpose: pack fields into serialized message                               *
  *                                                                            *
  * Parameters: fields      - [IN] the fields to pack                          *
@@ -567,8 +543,6 @@ static int	preprocessor_append_packed_message(const zbx_packed_field_t *fields,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_pack_dep_request                                *
- *                                                                            *
  * Purpose: pack dependent item preprocessing fields into messages for        *
  *          sending to worker                                                 *
  *                                                                            *
@@ -661,8 +635,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_pack_result                                     *
- *                                                                            *
  * Purpose: pack preprocessing result data into a single buffer that can be   *
  *          used in IPC                                                       *
  *                                                                            *
@@ -704,8 +676,6 @@ zbx_uint32_t	zbx_preprocessor_pack_result(unsigned char **data, zbx_variant_t *v
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_free_dep_results                                *
- *                                                                            *
  * Purpose: free dependent item preprocessing response                        *
  *                                                                            *
  * Parameters: results     - [OUT] the preprocessing results                  *
@@ -835,8 +805,6 @@ void	zbx_preprocessor_result_append(zbx_preproc_result_buffer_t *buf, zbx_uint64
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_pack_test_result                                *
- *                                                                            *
  * Purpose: pack preprocessing result data into a single buffer that can be   *
  *          used in IPC                                                       *
  *                                                                            *
@@ -888,8 +856,6 @@ zbx_uint32_t	zbx_preprocessor_pack_test_result(unsigned char **data, const zbx_p
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_pack_diag_stats                                 *
- *                                                                            *
  * Purpose: pack diagnostic statistics data into a single buffer that can be  *
  *          used in IPC                                                       *
  * Parameters: data       - [OUT] memory buffer for packed data               *
@@ -933,8 +899,6 @@ zbx_uint32_t	zbx_preprocessor_pack_diag_stats(unsigned char **data, int total, i
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_pack_top_request                                *
- *                                                                            *
  * Purpose: pack top request data into a single buffer that can be used in IPC*
  *                                                                            *
  * Parameters: data  - [OUT] memory buffer for packed data                    *
@@ -955,8 +919,6 @@ zbx_uint32_t	zbx_preprocessor_pack_top_items_request(unsigned char **data, int l
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_pack_top_result                                 *
- *                                                                            *
  * Purpose: pack top result data into a single buffer that can be used in IPC *
  *                                                                            *
  * Parameters: data      - [OUT] memory buffer for packed data                *
@@ -997,8 +959,6 @@ zbx_uint32_t	zbx_preprocessor_pack_top_items_result(unsigned char **data, zbx_pr
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_value                                    *
- *                                                                            *
  * Purpose: unpack item value data from IPC data buffer                       *
  *                                                                            *
  * Parameters: value    - [OUT] unpacked item value                           *
@@ -1069,8 +1029,6 @@ zbx_uint32_t	zbx_preprocessor_unpack_value(zbx_preproc_item_value_t *value, unsi
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_task                                     *
- *                                                                            *
  * Purpose: unpack preprocessing task data from IPC data buffer               *
  *                                                                            *
  * Parameters: itemid        - [OUT] itemid                                   *
@@ -1112,8 +1070,6 @@ void	zbx_preprocessor_unpack_task(zbx_uint64_t *itemid, unsigned char *value_typ
 
 /******************************************************************************
  *                                                                            *
- * Function: free_steps                                                       *
- *                                                                            *
  * Purpose: free preprocessing steps                                          *
  *                                                                            *
  ******************************************************************************/
@@ -1131,8 +1087,6 @@ void	zbx_preprocessor_free_steps(zbx_preproc_op_t *steps, int steps_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_free_deps                                       *
- *                                                                            *
  * Purpose: free dependent item preprocessing request                         *
  *                                                                            *
  * Parameters: deps     - [OUT] the dependent items                           *
@@ -1155,8 +1109,6 @@ void	zbx_preprocessor_free_deps(zbx_preproc_dep_t *deps, int deps_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_unpack_dep                                          *
- *                                                                            *
  * Purpose: unpack dependent item preprocessing request                       *
  *                                                                            *
  * Parameters: data - [IN] serialized dependent item preprocessing data       *
@@ -1180,8 +1132,6 @@ static zbx_uint32_t	preprocessor_unpack_dep(const unsigned char *data, zbx_prepr
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_dep_task                                 *
- *                                                                            *
  * Purpose: unpack initial dependent item preprocessing request               *
  *                                                                            *
  * Parameters: ts        - [OUT] the value timestamp                          *
@@ -1214,8 +1164,6 @@ void	zbx_preprocessor_unpack_dep_task(zbx_timespec_t *ts, zbx_variant_t *value,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_dep_task_cont                            *
- *                                                                            *
  * Purpose: unpack following dependent item preprocessing request             *
  *                                                                            *
  * Parameters: ts       - [OUT] the value timestamp                           *
@@ -1242,8 +1190,6 @@ void	zbx_preprocessor_unpack_dep_task_cont(zbx_preproc_dep_t *deps, int *deps_nu
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_result                                   *
- *                                                                            *
  * Purpose: unpack preprocessing task data from IPC data buffer               *
  *                                                                            *
  * Parameters: value         - [OUT] result value                             *
@@ -1266,8 +1212,6 @@ void	zbx_preprocessor_unpack_result(zbx_variant_t *value, zbx_vector_ptr_t *hist
 
 /******************************************************************************
  *                                                                            *
- * Function: agent_result_set_value                                           *
- *                                                                            *
  * Purpose: convert variant value to AGENT_RESULT                             *
  *                                                                            *
  * Parameters: value      - [IN] the value to convert                         *
@@ -1343,8 +1287,6 @@ static void	agent_result_set_value(zbx_variant_t *value, zbx_item_value_type_t v
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_unpack_dep_result                                   *
- *                                                                            *
  * Purpose: unpack dependent item preprocessing result                        *
  *                                                                            *
  * Parameters: data   - [IN] IPC data buffer                                  *
@@ -1375,8 +1317,6 @@ static zbx_uint32_t	preprocessor_unpack_dep_result(const unsigned char *data, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_dep_result                               *
- *                                                                            *
  * Purpose: unpack preprocessing results                                      *
  *                                                                            *
  * Parameters: total_num   - [OUT] the total number of results                *
@@ -1403,8 +1343,6 @@ void	zbx_preprocessor_unpack_dep_result(int *total_num, int *results_num, zbx_pr
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_dep_result_cont                          *
- *                                                                            *
  * Purpose: unpack following preprocessing results                            *
  *                                                                            *
  * Parameters: results_num - [OUT] the number of results in this batch        *
@@ -1429,8 +1367,6 @@ void	zbx_preprocessor_unpack_dep_result_cont(int *results_num, zbx_preproc_dep_r
 }
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_test_result                              *
- *                                                                            *
  * Purpose: unpack preprocessing test data from IPC data buffer               *
  *                                                                            *
  * Parameters: results       - [OUT] the preprocessing step results           *
@@ -1467,8 +1403,6 @@ void	zbx_preprocessor_unpack_test_result(zbx_vector_ptr_t *results, zbx_vector_p
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_diag_stats                               *
- *                                                                            *
  * Purpose: unpack preprocessing test data from IPC data buffer               *
  *                                                                            *
  * Parameters: total      - [OUT] the number of values                        *
@@ -1499,8 +1433,6 @@ void	zbx_preprocessor_unpack_diag_stats(int *total, int *queued, int *processing
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_top_request                              *
- *                                                                            *
  * Purpose: unpack preprocessing test data from IPC data buffer               *
  *                                                                            *
  * Parameters: data  - [OUT] memory buffer for packed data                    *
@@ -1514,8 +1446,6 @@ void	zbx_preprocessor_unpack_top_request(int *limit, const unsigned char *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_top_request                              *
- *                                                                            *
  * Purpose: unpack preprocessing test data from IPC data buffer               *
  *                                                                            *
  * Parameters: items - [OUT] the item diag data                               *
@@ -1547,8 +1477,6 @@ void	zbx_preprocessor_unpack_top_result(zbx_vector_ptr_t *items, const unsigned
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_send                                                *
- *                                                                            *
  * Purpose: sends command to preprocessor manager                             *
  *                                                                            *
  * Parameters: code     - [IN] message code                                   *
@@ -1587,8 +1515,6 @@ static void	preprocessor_send(zbx_uint32_t code, unsigned char *data, zbx_uint32
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocess_item_value                                        *
- *                                                                            *
  * Purpose: perform item value preprocessing and dependent item processing    *
  *                                                                            *
  * Parameters: itemid          - [IN] the itemid                              *
@@ -1652,8 +1578,6 @@ void	zbx_preprocess_item_value(zbx_uint64_t itemid, zbx_uint64_t hostid, unsigne
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_flush                                           *
- *                                                                            *
  * Purpose: send flush command to preprocessing manager                       *
  *                                                                            *
  ******************************************************************************/
@@ -1671,8 +1595,6 @@ void	zbx_preprocessor_flush(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_get_queue_size                                  *
- *                                                                            *
  * Purpose: get queue size (enqueued value count) of preprocessing manager    *
  *                                                                            *
  * Return value: enqueued item count                                          *
@@ -1693,8 +1615,6 @@ zbx_uint64_t	zbx_preprocessor_get_queue_size(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preproc_op_free                                              *
- *                                                                            *
  * Purpose: frees preprocessing step                                          *
  *                                                                            *
  ******************************************************************************/
@@ -1707,8 +1627,6 @@ void	zbx_preproc_op_free(zbx_preproc_op_t *op)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preproc_result_free                                          *
- *                                                                            *
  * Purpose: frees preprocessing step test result                              *
  *                                                                            *
  ******************************************************************************/
@@ -1721,8 +1639,6 @@ void	zbx_preproc_result_free(zbx_preproc_result_t *result)
 
 /******************************************************************************
  *                                                                            *
- * Function: preprocessor_pack_test_request                                   *
- *                                                                            *
  * Purpose: packs preprocessing step request for serialization                *
  *                                                                            *
  * Return value: The size of packed data                                      *
@@ -1767,8 +1683,6 @@ static zbx_uint32_t	preprocessor_pack_test_request(unsigned char **data, unsigne
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_unpack_test_request                             *
- *                                                                            *
  * Purpose: unpack preprocessing test request data from IPC data buffer       *
  *                                                                            *
  * Parameters: value_type    - [OUT] item value type                          *
@@ -1798,8 +1712,6 @@ void	zbx_preprocessor_unpack_test_request(unsigned char *value_type, char **valu
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_test                                            *
- *                                                                            *
  * Purpose: tests item preprocessing with the specified input value and steps *
  *                                                                            *
  ******************************************************************************/
@@ -1832,8 +1744,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_get_diag_stats                                  *
- *                                                                            *
  * Purpose: get preprocessing manager diagnostic statistics                   *
  *                                                                            *
  ******************************************************************************/
@@ -1856,8 +1766,6 @@ int	zbx_preprocessor_get_diag_stats(int *total, int *queued, int *processing, in
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_get_top_items                                   *
- *                                                                            *
  * Purpose: get the top N items by the number of queued values                *
  *                                                                            *
  ******************************************************************************/
@@ -1885,8 +1793,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_get_top_items                                   *
- *                                                                            *
  * Purpose: get the top N items by the number of queued values                *
  *                                                                            *
  ******************************************************************************/
@@ -1897,8 +1803,6 @@ int	zbx_preprocessor_get_top_items(int limit, zbx_vector_ptr_t *items, char **er
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_preprocessor_get_top_oldest_preproc_items                    *
- *                                                                            *
  * Purpose: get the oldest items with preprocessing still in queue            *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/proxypoller/proxypoller.c b/src/zabbix_server/proxypoller/proxypoller.c
index 7310e63497d..158cf729c95 100644
--- a/src/zabbix_server/proxypoller/proxypoller.c
+++ b/src/zabbix_server/proxypoller/proxypoller.c
@@ -135,8 +135,6 @@ static void	disconnect_proxy(zbx_socket_t *sock)
 
 /******************************************************************************
  *                                                                            *
- * Function: get_data_from_proxy                                              *
- *                                                                            *
  * Purpose: get historical data from proxy                                    *
  *                                                                            *
  * Parameters: proxy   - [IN/OUT] proxy data                                  *
@@ -242,8 +240,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_send_configuration                                         *
- *                                                                            *
  * Purpose: sends configuration data to proxy                                 *
  *                                                                            *
  * Parameters: proxy - [IN/OUT] proxy data                                    *
@@ -347,8 +343,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_process_proxy_data                                         *
- *                                                                            *
  * Purpose: processes proxy data request                                      *
  *                                                                            *
  * Parameters: proxy  - [IN/OUT] proxy data                                   *
@@ -413,8 +407,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_get_data                                                   *
- *                                                                            *
  * Purpose: gets data from proxy ('proxy data' request)                       *
  *                                                                            *
  * Parameters: proxy  - [IN] proxy data                                       *
@@ -461,8 +453,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: proxy_get_tasks                                                  *
- *                                                                            *
  * Purpose: gets data from proxy ('proxy data' request)                       *
  *                                                                            *
  * Parameters: proxy - [IN/OUT] the proxy data                                *
@@ -501,8 +491,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_proxy                                                    *
- *                                                                            *
  * Purpose: retrieve values of metrics from monitored hosts                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/reporter/report_manager.c b/src/zabbix_server/reporter/report_manager.c
index de43ec2aaea..01c12a026b2 100644
--- a/src/zabbix_server/reporter/report_manager.c
+++ b/src/zabbix_server/reporter/report_manager.c
@@ -176,8 +176,6 @@ zbx_rm_writer_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_get_writer                                                    *
- *                                                                            *
  * Purpose: return writer with the specified client                           *
  *                                                                            *
  ******************************************************************************/
@@ -196,22 +194,12 @@ static	zbx_rm_writer_t	*rm_get_writer(zbx_rm_t *manager, const zbx_ipc_client_t
 	return NULL;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: rm_writer_free                                                   *
- *                                                                            *
- ******************************************************************************/
 static void	rm_writer_free(zbx_rm_writer_t *writer)
 {
 	zbx_ipc_client_close(writer->client);
 	zbx_free(writer);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: rm_report_compare_nextcheck                                      *
- *                                                                            *
- ******************************************************************************/
 static int	rm_report_compare_nextcheck(const void *d1, const void *d2)
 {
 	const zbx_binary_heap_elem_t	*e1 = (const zbx_binary_heap_elem_t *)d1;
@@ -220,11 +208,6 @@ static int	rm_report_compare_nextcheck(const void *d1, const void *d2)
 	return ((zbx_rm_report_t *)e1->data)->nextcheck - ((zbx_rm_report_t *)e2->data)->nextcheck;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: rm_report_clean                                                  *
- *                                                                            *
- ******************************************************************************/
 static void	rm_report_clean(zbx_rm_report_t *report)
 {
 	zbx_free(report->name);
@@ -238,11 +221,6 @@ static void	rm_report_clean(zbx_rm_report_t *report)
 	zbx_vector_uint64_destroy(&report->users_excl);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: rm_job_free                                                      *
- *                                                                            *
- ******************************************************************************/
 static void	rm_job_free(zbx_rm_job_t *job)
 {
 	if (NULL != job->client)
@@ -258,11 +236,6 @@ static void	rm_job_free(zbx_rm_job_t *job)
 	zbx_free(job);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: rm_batch_clean                                                   *
- *                                                                            *
- ******************************************************************************/
 static void	rm_batch_clean(zbx_rm_batch_t *batch)
 {
 	zbx_vector_ptr_clear_ext(&batch->jobs, (zbx_ptr_free_func_t)rm_job_free);
@@ -272,8 +245,6 @@ static void	rm_batch_clean(zbx_rm_batch_t *batch)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_init                                                          *
- *                                                                            *
  * Purpose: initializes report manager                                        *
  *                                                                            *
  * Parameters: manager - [IN] the manager to initialize                       *
@@ -319,8 +290,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_destroy                                                       *
- *                                                                            *
  * Purpose: destroys report manager                                           *
  *                                                                            *
  * Parameters: manager - [IN] the manager to destroy                          *
@@ -361,11 +330,9 @@ static void	rm_destroy(zbx_rm_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_register_writer                                               *
- *                                                                            *
  * Purpose: registers report writer                                           *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             client  - [IN] the connected writer                            *
  *             message - [IN] the received message                            *
  *                                                                            *
@@ -403,8 +370,6 @@ static void	rm_register_writer(zbx_rm_t *manager, zbx_ipc_client_t *client, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_time_to_urlfield                                              *
- *                                                                            *
  * Purpose: convert timestamp to range format used in URL query fields        *
  *                                                                            *
  * Parameters: tm - [IN] the timestamp                                        *
@@ -424,12 +389,10 @@ static char	*rm_time_to_urlfield(const struct tm *tm)
 
 /******************************************************************************
  *                                                                            *
- * Function: report_create_cookie                                             *
- *                                                                            *
  * Purpose: create zbx_session cookie for frontend authentication             *
  *                                                                            *
- * Parameters: manager   - [IN] the manager                                   *
- *             sessionid - [IN] the session id                                *
+ * Parameters: manager   - [IN]                                               *
+ *             sessionid - [IN]                                               *
  *                                                                            *
  * Return value: zbx_session cookie                                           *
  *                                                                            *
@@ -463,12 +426,10 @@ static char	*report_create_cookie(zbx_rm_t *manager, const char *sessionid)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_get_session                                                   *
- *                                                                            *
  * Purpose: get specified user session, creating one if necessary             *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
- *             userid  - [IN] the userid                                      *
+ * Parameters: manager - [IN]                                                 *
+ *             userid  - [IN]                                                 *
  *                                                                            *
  * Return value: session                                                      *
  *                                                                            *
@@ -524,11 +485,9 @@ static	zbx_rm_session_t	*rm_get_session(zbx_rm_t *manager, zbx_uint64_t userid)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_db_flush_sessions                                             *
- *                                                                            *
  * Purpose: flushes session lastaccess changes to database                    *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_db_flush_sessions(zbx_rm_t *manager)
@@ -568,11 +527,9 @@ static void	rm_db_flush_sessions(zbx_rm_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_db_flush_reports                                              *
- *                                                                            *
  * Purpose: flushes report state, lastaccess and error fields                 *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_db_flush_reports(zbx_rm_t *manager)
@@ -659,8 +616,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_get_report_range                                              *
- *                                                                            *
  * Purpose: calculate report range from report time and period                *
  *                                                                            *
  * Parameters: report_time - [IN] the report writing time                     *
@@ -692,12 +647,10 @@ static int	rm_get_report_range(int report_time, unsigned char period, struct tm
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_get_report_name                                               *
- *                                                                            *
  * Purpose: make report attachment name based on report name and timestamp    *
  *                                                                            *
  * Parameters: name        - [IN] the report name                             *
- *             report_time - [IN] the report time                             *
+ *             report_time - [IN]                                             *
  *                                                                            *
  * Return value: The report attachment name                                   *
  *                                                                            *
@@ -739,21 +692,20 @@ static char	*rm_get_report_name(const char *name, int report_time)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_create_job                                                    *
- *                                                                            *
  * Purpose: create new job to be processed by report writers                  *
  *                                                                            *
- * Parameters: manager       - [IN] the manager                               *
- *             report_name   - [IN] the report name                           *
+ * Parameters: manager       - [IN]                                           *
+ *             report_name   - [IN]                                           *
  *             dashboardid   - [IN] the dashboard to view                     *
  *             access_userid - [IN] the user accessing the dashboard          *
- *             report_time   - [IN] the report time                           *
+ *             report_time   - [IN]                                           *
  *             period        - [IN] the report period                         *
  *             userids       - [IN] the recipient user identifiers            *
  *             userids_num   - [IN] the number of recipients                  *
- *             report_width  - [IN] the report width                          *
- *             report_height - [IN] the report height                         *
+ *             report_width  - [IN]                                           *
+ *             report_height - [IN]                                           *
  *             params        - [IN] the viewing and processing parameters     *
+ *             error         - [OUT]                                          *
  *                                                                            *
  ******************************************************************************/
 static zbx_rm_job_t	*rm_create_job(zbx_rm_t *manager, const char *report_name, zbx_uint64_t dashboardid,
@@ -814,8 +766,6 @@ static zbx_rm_job_t	*rm_create_job(zbx_rm_t *manager, const char *report_name, z
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_update_report                                                 *
- *                                                                            *
  * Purpose: update report state, lastsent, error in cache                     *
  *                                                                            *
  * Parameters: manager - [IN] the report manager                              *
@@ -865,12 +815,11 @@ static void	rm_update_report(zbx_rm_t *manager, zbx_rm_report_t *report, int sta
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_report_calc_nextcheck                                         *
- *                                                                            *
  * Purpose: calculate time when report must be generated                      *
  *                                                                            *
- * Parameters: report - [IN] the report                                       *
+ * Parameters: report - [IN]                                                  *
  *             now    - [IN] the current time                                 *
+ *             error  - [OUT]                                                 *
  *                                                                            *
  ******************************************************************************/
 static int	rm_report_calc_nextcheck(const zbx_rm_report_t *report, int now, char **error)
@@ -902,11 +851,9 @@ static int	rm_report_calc_nextcheck(const zbx_rm_report_t *report, int now, char
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_report_update_params                                          *
- *                                                                            *
  * Purpose: update report parameters                                          *
  *                                                                            *
- * Parameters: report - [IN] the report                                       *
+ * Parameters: report - [IN]                                                  *
  *             params - [IN] the report parameters                            *
  *                                                                            *
  ******************************************************************************/
@@ -961,11 +908,9 @@ static void	rm_report_update_params(zbx_rm_report_t *report, zbx_vector_ptr_pair
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_report_update_users                                           *
- *                                                                            *
  * Purpose: update report recipient users                                     *
  *                                                                            *
- * Parameters: report     - [IN] the report                                   *
+ * Parameters: report     - [IN]                                              *
  *             users      - [IN] the recipient users                          *
  *             users_excl - [IN] the excluded user ids                        *
  *                                                                            *
@@ -983,11 +928,9 @@ static void	rm_report_update_users(zbx_rm_report_t *report, const zbx_vector_rec
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_report_update_usergroups                                      *
- *                                                                            *
  * Purpose: update report recipient user groups                               *
  *                                                                            *
- * Parameters: report     - [IN] the report                                   *
+ * Parameters: report     - [IN]                                              *
  *             usergroups - [IN] the recipient user groups                    *
  *                                                                            *
  ******************************************************************************/
@@ -999,11 +942,9 @@ static void	rm_report_update_usergroups(zbx_rm_report_t *report, const zbx_vecto
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_update_cache_settings                                         *
- *                                                                            *
  * Purpose: update general settings cache                                     *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_update_cache_settings(zbx_rm_t *manager)
@@ -1032,11 +973,9 @@ static void	rm_update_cache_settings(zbx_rm_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_is_report_active                                              *
- *                                                                            *
  * Purpose: check if the report is active based on the specified time         *
  *                                                                            *
- * Parameters: report - [IN] the report                                       *
+ * Parameters: report - [IN]                                                  *
  *             now    - [IN] the current  time                                *
  *                                                                            *
  * Return value: SUCCEED - the report is active                               *
@@ -1056,12 +995,10 @@ static int	rm_is_report_active(const zbx_rm_report_t *report, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_dequeue_report                                                *
- *                                                                            *
  * Purpose: remove report from queue if it was queued                         *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
- *             report  - [IN] the report                                      *
+ * Parameters: manager - [IN]                                                 *
+ *             report  - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_dequeue_report(zbx_rm_t *manager, zbx_rm_report_t *report)
@@ -1075,11 +1012,9 @@ static void	rm_dequeue_report(zbx_rm_t *manager, zbx_rm_report_t *report)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_update_cache_reports                                          *
- *                                                                            *
  * Purpose: update reports cache                                              *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             now     - [IN] the current time                                *
  *                                                                            *
  ******************************************************************************/
@@ -1234,11 +1169,9 @@ static void	rm_update_cache_reports(zbx_rm_t *manager, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_update_cache_report_param                                     *
- *                                                                            *
  * Purpose: update cached report parameters                                   *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_update_cache_reports_params(zbx_rm_t *manager)
@@ -1297,11 +1230,9 @@ static void	rm_update_cache_reports_params(zbx_rm_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_update_cache_reports_users                                    *
- *                                                                            *
  * Purpose: update cached report recipient users                              *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_update_cache_reports_users(zbx_rm_t *manager)
@@ -1371,11 +1302,9 @@ static void	rm_update_cache_reports_users(zbx_rm_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_update_cache_reports_usergroups                               *
- *                                                                            *
  * Purpose: update cached report recipient user groups                        *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_update_cache_reports_usergroups(zbx_rm_t *manager)
@@ -1434,11 +1363,9 @@ static void	rm_update_cache_reports_usergroups(zbx_rm_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_dump_cache                                                    *
- *                                                                            *
  * Purpose: dump cached reports into log                                      *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_dump_cache(zbx_rm_t *manager)
@@ -1523,11 +1450,9 @@ static void	rm_dump_cache(zbx_rm_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_update_cache                                                  *
- *                                                                            *
  * Purpose: update configuration and report cache                             *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  ******************************************************************************/
 static void	rm_update_cache(zbx_rm_t *manager)
@@ -1566,11 +1491,9 @@ static void	zbx_report_dst_free(zbx_report_dst_t *dst)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_get_report_dimensions                                         *
- *                                                                            *
  * Purpose: calculate report dimensions based on dashboard contents           *
  *                                                                            *
- * Parameters: dashboardid - [IN] the dashboard id                            *
+ * Parameters: dashboardid - [IN]                                             *
  *             width       - [OUT] the report width in pixels                 *
  *             height      - [OUT] the report height in pixels                *
  *                                                                            *
@@ -1611,13 +1534,11 @@ static void	rm_get_report_dimensions(zbx_uint64_t dashboardid, int *width, int *
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_writer_process_job                                            *
- *                                                                            *
  * Purpose: process job by sending it to writer                               *
  *                                                                            *
- * Parameters: writer - [IN] the writer                                       *
+ * Parameters: writer - [IN]                                                  *
  *             job    - [IN] the view to process                              *
- *             char   - [OUT] the error message                               *
+ *             error  - [OUT] the error message                               *
  *                                                                            *
  ******************************************************************************/
 static int	rm_writer_process_job(zbx_rm_writer_t *writer, zbx_rm_job_t *job, char **error)
@@ -1778,11 +1699,9 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_report_create_jobs                                            *
- *                                                                            *
  * Purpose: create jobs to process the report                                 *
  *                                                                            *
- * Parameters: manager       - [IN] the manager                               *
+ * Parameters: manager       - [IN]                                           *
  *             report        - [IN] the report to process                     *
  *             userid        - [IN] the recipient user id                     *
  *             access_userid - [IN] the user id used to create the report     *
@@ -1832,11 +1751,9 @@ static int	rm_jobs_add_user(zbx_rm_t *manager, zbx_rm_report_t *report, zbx_uint
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_report_create_usergroup_jobs                                  *
- *                                                                            *
  * Purpose: create user group based jobs                                      *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             report  - [IN] the report to process                           *
  *             now     - [IN] the current time                                *
  *             params  - [IN] the report parameters                           *
@@ -1910,11 +1827,9 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_report_create_jobs                                            *
- *                                                                            *
  * Purpose: create jobs to process the report                                 *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             report  - [IN] the report to process                           *
  *             now     - [IN] the current time                                *
  *             error   - [OUT] the error message                              *
@@ -2025,11 +1940,9 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_schedule_jobs                                                 *
- *                                                                            *
  * Purpose: process queue                                                     *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             now     - [IN] the current time                                *
  *                                                                            *
  * Return value: The number of scheduled jobs.                                *
@@ -2089,14 +2002,14 @@ static int	rm_schedule_jobs(zbx_rm_t *manager, int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_finish_job                                                    *
- *                                                                            *
  * Purpose: finish job                                                        *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
- *             job     - [IN] the job                                         *
- *             status  - [IN] the job status                                  *
- *             info    - [IN] additional information (errors)                 *
+ * Parameters: manager   - [IN]                                               *
+ *             job       - [IN]                                               *
+ *             status    - [IN] the job status                                *
+ *             error     -                                                    *
+ *             sent_num  -                                                    *
+ *             total_num -                                                    *
  *                                                                            *
  ******************************************************************************/
 static void	rm_finish_job(zbx_rm_t *manager, zbx_rm_job_t *job, int status, const char *error, int sent_num,
@@ -2180,8 +2093,6 @@ static void	rm_finish_job(zbx_rm_t *manager, zbx_rm_job_t *job, int status, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_send_test_error_result                                        *
- *                                                                            *
  * Purpose: send error result in response to test request                     *
  *                                                                            *
  * Parameters: client - [IN] the connected trapper                            *
@@ -2200,12 +2111,9 @@ static void	rm_send_test_error_result(zbx_ipc_client_t *client, const char *erro
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_process_jobs                                                  *
- *                                                                            *
  * Purpose: process queue                                                     *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
- *             now     - [IN] current time                                    *
+ * Parameters: manager - [IN]                                                 *
  *                                                                            *
  * Return value: The number of started jobs.                                  *
  *                                                                            *
@@ -2252,11 +2160,9 @@ static int	rm_process_jobs(zbx_rm_t *manager)
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_test_report                                                   *
- *                                                                            *
  * Purpose: test report                                                       *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             client  - [IN] the connected writer                            *
  *             message - [IN] the received message                            *
  *             error   - [IN] the error message                               *
@@ -2300,11 +2206,9 @@ static int	rm_test_report(zbx_rm_t *manager, zbx_ipc_client_t *client, zbx_ipc_m
 
 /******************************************************************************
  *                                                                            *
- * Function: rm_process_result                                                *
- *                                                                            *
  * Purpose: process report result message                                     *
  *                                                                            *
- * Parameters: manager - [IN] the manager                                     *
+ * Parameters: manager - [IN]                                                 *
  *             client  - [IN] the connected writer                            *
  *             message - [IN] the received message                            *
  *                                                                            *
diff --git a/src/zabbix_server/reporter/report_writer.c b/src/zabbix_server/reporter/report_writer.c
index 7d85f8926ca..4036e11169d 100644
--- a/src/zabbix_server/reporter/report_writer.c
+++ b/src/zabbix_server/reporter/report_writer.c
@@ -81,8 +81,6 @@ static char	*rw_curl_error(CURLcode err)
 
 /******************************************************************************
  *                                                                            *
- * Function: rw_get_report                                                    *
- *                                                                            *
  * Purpose: get report from web service                                       *
  *                                                                            *
  * Parameters: url         - [IN] the report url                              *
@@ -243,8 +241,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: rw_begin_report                                                  *
- *                                                                            *
  * Purpose: begin report dispatch                                             *
  *                                                                            *
  * Parameters: msg      - [IN] the begin report request message               *
@@ -306,8 +302,6 @@ static int	rw_begin_report(zbx_ipc_message_t *msg, zbx_alerter_dispatch_t *dispa
 
 /******************************************************************************
  *                                                                            *
- * Function: rw_send_report                                                   *
- *                                                                            *
  * Purpose: send report to the recipients using specified media type          *
  *                                                                            *
  * Parameters: msg      - [IN] the send report request message                *
@@ -348,8 +342,6 @@ static int	rw_send_report(zbx_ipc_message_t *msg, zbx_alerter_dispatch_t *dispat
 
 /******************************************************************************
  *                                                                            *
- * Function: rw_end_report                                                    *
- *                                                                            *
  * Purpose: finish report dispatch                                            *
  *                                                                            *
  * Parameters: dispatch - [IN] the alerter dispatch                           *
@@ -374,8 +366,6 @@ static int	rw_end_report(zbx_alerter_dispatch_t *dispatch, char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: rw_send_result                                                   *
- *                                                                            *
  * Purpose: send report result back to manager                                *
  *                                                                            *
  * Parameters: socket - [IN] the report manager IPC socket                    *
@@ -397,11 +387,6 @@ static void	rw_send_result(zbx_ipc_socket_t *socket, zbx_alerter_dispatch_t *dis
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: report_writer_thread                                             *
- *                                                                            *
- ******************************************************************************/
 ZBX_THREAD_ENTRY(report_writer_thread, args)
 {
 #define	ZBX_STAT_INTERVAL	5	/* if a process is busy and does not sleep then update status not faster than */
diff --git a/src/zabbix_server/scripts/scripts.c b/src/zabbix_server/scripts/scripts.c
index 020c19d4393..331227955fe 100644
--- a/src/zabbix_server/scripts/scripts.c
+++ b/src/zabbix_server/scripts/scripts.c
@@ -284,8 +284,6 @@ void	zbx_script_clean(zbx_script_t *script)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_webhook_params_pack_json                                     *
- *                                                                            *
  * Purpose: pack webhook script parameters into JSON                          *
  *                                                                            *
  * Parameters: params      - [IN] vector of pairs of pointers to parameter    *
@@ -314,8 +312,6 @@ void	zbx_webhook_params_pack_json(const zbx_vector_ptr_pair_t *params, char **pa
 
 /***********************************************************************************
  *                                                                                 *
- * Function: zbx_script_prepare                                                    *
- *                                                                                 *
  * Purpose: prepares user script                                                   *
  *                                                                                 *
  * Parameters: script        - [IN] the script to prepare                          *
@@ -380,8 +376,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: DBfetch_webhook_params                                           *
- *                                                                            *
  * Purpose: fetch webhook parameters                                          *
  *                                                                            *
  * Parameters:  scriptid  - [IN] the id of script to be executed              *
@@ -427,8 +421,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_script_execute                                               *
- *                                                                            *
  * Purpose: executing user scripts or remote commands                         *
  *                                                                            *
  * Parameters:  script         - [IN] the script to be executed               *
@@ -516,8 +508,6 @@ int	zbx_script_execute(const zbx_script_t *script, const DC_HOST *host, const ch
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_script_create_task                                           *
- *                                                                            *
  * Purpose: creates remote command task from a script                         *
  *                                                                            *
  * Return value:  the identifier of the created task or 0 in the case of      *
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index 987b2e76bd8..e4e972b1476 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -543,8 +543,6 @@ int	get_process_info_by_thread(int local_server_num, unsigned char *local_proces
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_set_defaults                                                 *
- *                                                                            *
  * Purpose: set configuration defaults                                        *
  *                                                                            *
  ******************************************************************************/
@@ -614,8 +612,6 @@ static void	zbx_set_defaults(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_validate_config                                              *
- *                                                                            *
  * Purpose: validate configuration parameters                                 *
  *                                                                            *
  ******************************************************************************/
@@ -742,8 +738,6 @@ static void	zbx_validate_config(ZBX_TASK_EX *task)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_load_config                                                  *
- *                                                                            *
  * Purpose: parse config file and update configuration parameters             *
  *                                                                            *
  * Comments: will terminate process if parsing fails                          *
@@ -990,8 +984,6 @@ static void	zbx_load_config(ZBX_TASK_EX *task)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_free_config                                                  *
- *                                                                            *
  * Purpose: free configuration memory                                         *
  *                                                                            *
  ******************************************************************************/
@@ -1002,8 +994,6 @@ static void	zbx_free_config(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: main                                                             *
- *                                                                            *
  * Purpose: executes server processes                                         *
  *                                                                            *
  ******************************************************************************/
@@ -1192,8 +1182,6 @@ static void	zbx_check_db(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: server_startup                                                   *
- *                                                                            *
  * Purpose: initialize shared resources and start processes                   *
  *                                                                            *
  ******************************************************************************/
@@ -1465,8 +1453,6 @@ static int	server_restart_logger(char **error)
 
 /******************************************************************************
  *                                                                            *
- * Function: server_teardown                                                  *
- *                                                                            *
  * Purpose: terminate processes and destroy shared resources                  *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/service/service_actions.c b/src/zabbix_server/service/service_actions.c
index 4728a15f33d..c6d4cf42fe0 100644
--- a/src/zabbix_server/service/service_actions.c
+++ b/src/zabbix_server/service/service_actions.c
@@ -23,8 +23,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: condition_match_service                                          *
- *                                                                            *
  * Purpose: match service update by service id                                *
  *                                                                            *
  ******************************************************************************/
@@ -41,8 +39,6 @@ static int	condition_match_service(const zbx_service_action_condition_t *conditi
 
 /******************************************************************************
  *                                                                            *
- * Function: condition_match_service_name                                     *
- *                                                                            *
  * Purpose: match service update by service name                              *
  *                                                                            *
  ******************************************************************************/
@@ -54,8 +50,6 @@ static int	condition_match_service_name(const zbx_service_action_condition_t *co
 
 /******************************************************************************
  *                                                                            *
- * Function: match_tags                                                       *
- *                                                                            *
  * Purpose: match tag/tag+value using the specified operator                  *
  *                                                                            *
  * Parameters: tags  - [IN] the tags to match                                 *
@@ -109,8 +103,6 @@ static int	match_tags(const zbx_vector_ptr_t *tags, const char *name, const char
 
 /******************************************************************************
  *                                                                            *
- * Function: condition_match_service_tag                                      *
- *                                                                            *
  * Purpose: match service update by service tag name                          *
  *                                                                            *
  ******************************************************************************/
@@ -122,8 +114,6 @@ static int	condition_match_service_tag(const zbx_service_action_condition_t *con
 
 /******************************************************************************
  *                                                                            *
- * Function: condition_match_service_tag_value                                *
- *                                                                            *
  * Purpose: match service update by service tag and its value                 *
  *                                                                            *
  ******************************************************************************/
@@ -135,8 +125,6 @@ static int	condition_match_service_tag_value(const zbx_service_action_condition_
 
 /******************************************************************************
  *                                                                            *
- * Function: service_update_match_condition                                   *
- *                                                                            *
  * Purpose: match service update by the specified condition                   *
  *                                                                            *
  ******************************************************************************/
@@ -169,8 +157,6 @@ static const char	*service_update_match_condition(const zbx_service_update_t *up
 
 /******************************************************************************
  *                                                                            *
- * Function: service_update_match_action                                      *
- *                                                                            *
  * Purpose: match service update against the specified action                 *
  *                                                                            *
  ******************************************************************************/
@@ -237,8 +223,6 @@ static int	service_update_match_action(const zbx_service_update_t *update, const
 
 /******************************************************************************
  *                                                                            *
- * Function: service_update_process_actions                                   *
- *                                                                            *
  * Purpose: match service update against service actions                      *
  *                                                                            *
  * Parameters: update    - [IN] the service update generated when service     *
diff --git a/src/zabbix_server/service/service_manager.c b/src/zabbix_server/service/service_manager.c
index 8fa5f950ab1..a9396ba334e 100644
--- a/src/zabbix_server/service/service_manager.c
+++ b/src/zabbix_server/service/service_manager.c
@@ -1215,8 +1215,6 @@ static void	service_problems_index_clean(void *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: service_get_status                                               *
- *                                                                            *
  * Purpose: get service status when calculating parent service status         *
  *                                                                            *
  * Parameters: service - [IN] the service                                     *
@@ -1266,8 +1264,6 @@ int	service_get_status(const zbx_service_t	*service, int *status)
 
 /******************************************************************************
  *                                                                            *
- * Function: its_updates_append                                               *
- *                                                                            *
  * Purpose: adds an update to the queue                                       *
  *                                                                            *
  * Parameters: updates   - [OUT] the update queue                             *
@@ -1313,8 +1309,6 @@ static zbx_service_update_t	*update_service(zbx_hashset_t *service_updates, zbx_
 
 /******************************************************************************
  *                                                                            *
- * Function: its_updates_compare                                              *
- *                                                                            *
  * Purpose: used to sort service updates by source id                         *
  *                                                                            *
  ******************************************************************************/
@@ -1327,8 +1321,6 @@ static int	its_updates_compare(const zbx_status_update_t **update1, const zbx_st
 
 /******************************************************************************
  *                                                                            *
- * Function: its_write_status_and_alarms                                      *
- *                                                                            *
  * Purpose: writes service status changes, generated service alarms, service  *
  *          problem changes into database                                     *
  *                                                                            *
@@ -1521,8 +1513,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: service_get_main_status                                          *
- *                                                                            *
  * Purpose: get service status by applying the main service status algorithm  *
  *                                                                            *
  * Parameters: service - [IN] the service                                     *
@@ -1579,8 +1569,6 @@ int	service_get_main_status(const zbx_service_t *service)
 
 /******************************************************************************
  *                                                                            *
- * Function: service_get_children_by_status                                   *
- *                                                                            *
  * Purpose: get children with status greater or equal to the specified        *
  *                                                                            *
  * Parameters: service      - [IN] the service                                *
@@ -1615,8 +1603,6 @@ static void	service_get_children_by_status(const zbx_service_t *service, int sta
 
 /******************************************************************************
  *                                                                            *
- * Function: services_get_weight                                              *
- *                                                                            *
  * Purpose: get total weight of all specified services                        *
  *                                                                            *
  ******************************************************************************/
@@ -1636,8 +1622,6 @@ static int	services_get_weight(const zbx_vector_ptr_t *services)
 
 /******************************************************************************
  *                                                                            *
- * Function: service_get_rule_status                                          *
- *                                                                            *
  * Purpose: get service status according to the specified rule                *
  *                                                                            *
  * Parameters: service - [IN] the service                                     *
@@ -1760,8 +1744,6 @@ static void	service_add_cause(zbx_vector_ptr_t *causes, zbx_service_t *service,
 
 /******************************************************************************
  *                                                                            *
- * Function: service_get_causes                                               *
- *                                                                            *
  * Purpose: get services that caused the target service to be in the          *
  *          specified severity state                                          *
  *                                                                            *
@@ -1926,8 +1908,6 @@ static void	service_get_causes(const zbx_service_t *service, int severity, zbx_v
 
 /******************************************************************************
  *                                                                            *
- * Function: service_get_rootcause_eventids                                   *
- *                                                                            *
  * Purpose: get root cause eventids for the service                           *
  *                                                                            *
  * Parameters: parent   - [IN] the service                                    *
@@ -1944,8 +1924,6 @@ void	service_get_rootcause_eventids(const zbx_service_t *parent, zbx_vector_uint
 
 /******************************************************************************
  *                                                                            *
- * Function: its_itservice_update_status                                      *
- *                                                                            *
  * Purpose: updates service and its parents statuses                          *
  *                                                                            *
  * Parameters: service    - [IN] the service to update                        *
@@ -2027,8 +2005,6 @@ static char	*service_get_event_name(zbx_service_manager_t *manager, const char *
 
 /******************************************************************************
  *                                                                            *
- * Function: db_create_service_events                                         *
- *                                                                            *
  * Purpose: create service events based on service updates                    *
  *                                                                            *
  * Parameters: manager - [IN] the service manager                             *
@@ -2154,8 +2130,6 @@ static const zbx_service_update_t	*get_update_by_serviceid(const zbx_vector_ptr_
 
 /******************************************************************************
  *                                                                            *
- * Function: db_get_service_problems                                          *
- *                                                                            *
  * Purpose: get open problems for the specified services                      *
  *                                                                            *
  * Parameters: manager         - [IN] the service manager                     *
@@ -2206,8 +2180,6 @@ zbx_service_recovery_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: db_resolve_service_events                                        *
- *                                                                            *
  * Purpose: resolve service events based on service updates                   *
  *                                                                            *
  * Parameters: manager - [IN] the service manager                             *
@@ -2355,8 +2327,6 @@ static int	compare_uint64_pair_second(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: db_update_service_events                                         *
- *                                                                            *
  * Purpose: create update escalations based on service updates                *
  *                                                                            *
  * Parameters: manager - [IN] the service manager                             *
@@ -2446,8 +2416,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: db_manage_service_events                                         *
- *                                                                            *
  * Purpose: generate and process service events in response to service        *
  *          updates                                                           *
  *                                                                            *
@@ -2929,8 +2897,6 @@ static void	process_parentlist(const zbx_ipc_message_t *message, zbx_service_man
 
 /******************************************************************************
  *                                                                            *
- * Function: service_update_event_severity                                    *
- *                                                                            *
  * Purpose: update cached service problem and queue service for update        *
  *                                                                            *
  ******************************************************************************/
@@ -2963,8 +2929,6 @@ static void	service_update_event_severity(zbx_service_manager_t *service_manager
 
 /******************************************************************************
  *                                                                            *
- * Function: db_update_service_problems                                       *
- *                                                                            *
  * Purpose: update service_problem table with the changed event severities    *
  *                                                                            *
  ******************************************************************************/
@@ -3005,8 +2969,6 @@ static int	db_update_service_problems(const zbx_vector_ptr_t *event_severities)
 
 /******************************************************************************
  *                                                                            *
- * Function: process_event_severities                                         *
- *                                                                            *
  * Purpose: update event severities, service statuses in cache and database   *
  *          according to the event severity changes during acknowledgment     *
  *                                                                            *
diff --git a/src/zabbix_server/snmptrapper/snmptrapper.c b/src/zabbix_server/snmptrapper/snmptrapper.c
index 39f07a1d38a..8b90f0f5fef 100644
--- a/src/zabbix_server/snmptrapper/snmptrapper.c
+++ b/src/zabbix_server/snmptrapper/snmptrapper.c
@@ -70,8 +70,6 @@ static void	DBupdate_lastsize(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: process_trap_for_interface                                       *
- *                                                                            *
  * Purpose: add trap to all matching items for the specified interface        *
  *                                                                            *
  * Return value: SUCCEED - a matching item was found                          *
@@ -228,8 +226,6 @@ next:
 
 /******************************************************************************
  *                                                                            *
- * Function: process_trap                                                     *
- *                                                                            *
  * Purpose: process a single trap                                             *
  *                                                                            *
  * Parameters: addr - [IN] address of the target interface(s)                 *
@@ -273,8 +269,6 @@ static void	process_trap(const char *addr, char *begin, char *end)
 
 /******************************************************************************
  *                                                                            *
- * Function: parse_traps                                                      *
- *                                                                            *
  * Purpose: split traps and process them with process_trap()                  *
  *                                                                            *
  ******************************************************************************/
@@ -381,8 +375,6 @@ static void	parse_traps(int flag)
 
 /******************************************************************************
  *                                                                            *
- * Function: delay_trap_logs                                                  *
- *                                                                            *
  * Purpose: delay SNMP trapper file related issue log entries for 60 seconds  *
  *          unless this is the first time this issue has occurred             *
  *                                                                            *
@@ -410,8 +402,6 @@ static void	delay_trap_logs(char *error, int log_level)
 
 /******************************************************************************
  *                                                                            *
- * Function: read_traps                                                       *
- *                                                                            *
  * Purpose: read the traps and then parse them with parse_traps()             *
  *                                                                            *
  ******************************************************************************/
@@ -455,8 +445,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: close_trap_file                                                  *
- *                                                                            *
  * Purpose: close trap file and reset lastsize                                *
  *                                                                            *
  * Comments: !!! do not reset lastsize elsewhere !!!                          *
@@ -474,8 +462,6 @@ static void	close_trap_file(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: open_trap_file                                                   *
- *                                                                            *
  * Purpose: open the trap file and get it's node number                       *
  *                                                                            *
  * Return value: file descriptor of the opened file or -1 otherwise           *
@@ -516,8 +502,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_latest_data                                                  *
- *                                                                            *
  * Purpose: Open the latest trap file. If the current file has been rotated,  *
  *          process that and then open the latest file.                       *
  *                                                                            *
@@ -593,8 +577,6 @@ static int	get_latest_data(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: main_snmptrapper_loop                                            *
- *                                                                            *
  * Purpose: SNMP trap reader's entry point                                    *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/taskmanager/proxy_tasks.c b/src/zabbix_server/taskmanager/proxy_tasks.c
index 3e83c10d06b..63c94a30d89 100644
--- a/src/zabbix_server/taskmanager/proxy_tasks.c
+++ b/src/zabbix_server/taskmanager/proxy_tasks.c
@@ -28,8 +28,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tm_get_remote_tasks                                          *
- *                                                                            *
  * Purpose: get tasks scheduled to be executed on a proxy                     *
  *                                                                            *
  * Parameters: tasks        - [OUT] the tasks to execute                      *
diff --git a/src/zabbix_server/taskmanager/taskmanager.c b/src/zabbix_server/taskmanager/taskmanager.c
index 1dd0ff3dca1..a2e084d0a42 100644
--- a/src/zabbix_server/taskmanager/taskmanager.c
+++ b/src/zabbix_server/taskmanager/taskmanager.c
@@ -41,8 +41,6 @@ extern ZBX_THREAD_LOCAL int		server_num, process_num;
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_execute_task_close_problem                                    *
- *                                                                            *
  * Purpose: close the specified problem event and remove task                 *
  *                                                                            *
  * Parameters: triggerid         - [IN] the source trigger id                 *
@@ -73,8 +71,6 @@ static void	tm_execute_task_close_problem(zbx_uint64_t taskid, zbx_uint64_t trig
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_try_task_close_problem                                        *
- *                                                                            *
  * Purpose: try to close problem by event acknowledgement action              *
  *                                                                            *
  * Parameters: taskid - [IN] the task identifier                              *
@@ -153,8 +149,6 @@ static int	tm_try_task_close_problem(zbx_uint64_t taskid)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_expire_remote_command                                         *
- *                                                                            *
  * Purpose: process expired remote command task                               *
  *                                                                            *
  ******************************************************************************/
@@ -195,8 +189,6 @@ static void	tm_expire_remote_command(zbx_uint64_t taskid)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_remote_command_result                                 *
- *                                                                            *
  * Purpose: process remote command result task                                *
  *                                                                            *
  * Return value: SUCCEED - the task was processed successfully                *
@@ -269,8 +261,6 @@ static int	tm_process_remote_command_result(zbx_uint64_t taskid)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_data_result                                           *
- *                                                                            *
  * Purpose: process data task result                                          *
  *                                                                            *
  ******************************************************************************/
@@ -310,8 +300,6 @@ static void	tm_process_data_result(zbx_uint64_t taskid)
 }
 /******************************************************************************
  *                                                                            *
- * Function: notify_service_manager                                           *
- *                                                                            *
  * Purpose: notify service manager about problem severity changes             *
  *                                                                            *
  ******************************************************************************/
@@ -353,8 +341,6 @@ static void	notify_service_manager(const zbx_vector_ptr_t *ack_tasks)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_acknowledgements                                      *
- *                                                                            *
  * Purpose: process acknowledgements for alerts sending                       *
  *                                                                            *
  * Return value: The number of successfully processed tasks                   *
@@ -435,8 +421,6 @@ static int	tm_process_acknowledgements(zbx_vector_uint64_t *ack_taskids)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_check_now                                             *
- *                                                                            *
  * Purpose: process check now tasks for item rescheduling                     *
  *                                                                            *
  * Return value: The number of successfully processed tasks                   *
@@ -581,8 +565,6 @@ static int	tm_process_check_now(zbx_vector_uint64_t *taskids)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_diaginfo                                              *
- *                                                                            *
  * Purpose: process diaginfo task                                             *
  *                                                                            *
  ******************************************************************************/
@@ -610,8 +592,6 @@ static void	tm_process_diaginfo(zbx_uint64_t taskid, const char *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_data                                                  *
- *                                                                            *
  * Purpose: process data tasks                                                *
  *                                                                            *
  * Return value: The number of successfully processed tasks                   *
@@ -689,8 +669,6 @@ static int	tm_process_data(zbx_vector_uint64_t *taskids)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_expire_generic_tasks                                          *
- *                                                                            *
  * Purpose: expires tasks that don't require specific expiration handling     *
  *                                                                            *
  * Return value: The number of successfully expired tasks                     *
@@ -711,8 +689,6 @@ static int	tm_expire_generic_tasks(zbx_vector_uint64_t *taskids)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_process_tasks                                                 *
- *                                                                            *
  * Purpose: process task manager tasks depending on task type                 *
  *                                                                            *
  * Return value: The number of successfully processed tasks                   *
@@ -814,8 +790,6 @@ static int	tm_process_tasks(int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: tm_remove_old_tasks                                              *
- *                                                                            *
  * Purpose: remove old done/expired tasks                                     *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c
index 795a438c0f8..7b2b094fccb 100644
--- a/src/zabbix_server/timer/timer.c
+++ b/src/zabbix_server/timer/timer.c
@@ -50,8 +50,6 @@ zbx_event_suppress_data_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: log_host_maintenance_update                                      *
- *                                                                            *
  * Purpose: log host maintenance changes                                      *
  *                                                                            *
  ******************************************************************************/
@@ -96,8 +94,6 @@ static void	log_host_maintenance_update(const zbx_host_maintenance_diff_t* diff)
 
 /******************************************************************************
  *                                                                            *
- * Function: db_update_host_maintenances                                      *
- *                                                                            *
  * Purpose: update host maintenance properties in database                    *
  *                                                                            *
  ******************************************************************************/
@@ -172,8 +168,6 @@ static void	db_update_host_maintenances(const zbx_vector_ptr_t *updates)
 
 /******************************************************************************
  *                                                                            *
- * Function: db_remove_expired_event_suppress_data                            *
- *                                                                            *
  * Purpose: remove expired event_suppress records                             *
  *                                                                            *
  ******************************************************************************/
@@ -186,8 +180,6 @@ static void	db_remove_expired_event_suppress_data(int now)
 
 /******************************************************************************
  *                                                                            *
- * Function: event_suppress_data_free                                         *
- *                                                                            *
  * Purpose: free event suppress data structure                                *
  *                                                                            *
  ******************************************************************************/
@@ -199,8 +191,6 @@ static void	event_suppress_data_free(zbx_event_suppress_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: event_queries_fetch                                              *
- *                                                                            *
  * Purpose: fetch events that need to be queried for maintenance              *
  *                                                                            *
  ******************************************************************************/
@@ -242,8 +232,6 @@ static void	event_queries_fetch(DB_RESULT result, zbx_vector_ptr_t *event_querie
 
 /******************************************************************************
  *                                                                            *
- * Function: db_get_query_events                                              *
- *                                                                            *
  * Purpose: get open, recently resolved and resolved problems with suppress   *
  *          data from database and prepare event query, event data structures *
  *                                                                            *
@@ -361,8 +349,6 @@ static void	db_get_query_events(zbx_vector_ptr_t *event_queries, zbx_vector_ptr_
 
 /******************************************************************************
  *                                                                            *
- * Function: db_update_event_suppress_data                                    *
- *                                                                            *
  * Purpose: create/update event suppress data to reflect latest maintenance   *
  *          changes in cache                                                  *
  *                                                                            *
@@ -530,8 +516,6 @@ cleanup:
 
 /******************************************************************************
  *                                                                            *
- * Function: db_update_host_maintenances                                      *
- *                                                                            *
  * Purpose: update host maintenance parameters in cache and database          *
  *                                                                            *
  ******************************************************************************/
@@ -576,8 +560,6 @@ static int	update_host_maintenances(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: timer_thread                                                     *
- *                                                                            *
  * Purpose: periodically processes maintenance                                *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/trapper/active.c b/src/zabbix_server/trapper/active.c
index 96ac51139f0..db0e42c3941 100644
--- a/src/zabbix_server/trapper/active.c
+++ b/src/zabbix_server/trapper/active.c
@@ -33,8 +33,6 @@ extern unsigned char	program_type;
 
 /******************************************************************************
  *                                                                            *
- * Function: db_register_host                                                 *
- *                                                                            *
  * Purpose: perform active agent auto registration                            *
  *                                                                            *
  * Parameters: host          - [IN] name of the host to be added or updated   *
@@ -140,8 +138,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_hostid_by_host                                               *
- *                                                                            *
  * Purpose: check for host name and return hostid                             *
  *                                                                            *
  * Parameters: sock          - [IN] open socket of server-agent connection    *
@@ -339,8 +335,6 @@ static void	get_list_of_active_checks(zbx_uint64_t hostid, zbx_vector_uint64_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: send_list_of_active_checks                                       *
- *                                                                            *
  * Purpose: send list of active checks to the host (older version agent)      *
  *                                                                            *
  * Parameters: sock - open socket of server-agent connection                  *
@@ -450,8 +444,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vector_str_append_uniq                                       *
- *                                                                            *
  * Purpose: append non duplicate string to the string vector                  *
  *                                                                            *
  * Parameters: vector - [IN/OUT] the string vector                            *
@@ -466,8 +458,6 @@ static void	zbx_vector_str_append_uniq(zbx_vector_str_t *vector, const char *str
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_itemkey_extract_global_regexps                               *
- *                                                                            *
  * Purpose: extract global regular expression names from item key             *
  *                                                                            *
  * Parameters: key     - [IN] the item key to parse                           *
@@ -520,8 +510,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: send_list_of_active_checks_json                                  *
- *                                                                            *
  * Purpose: send list of active checks to the host                            *
  *                                                                            *
  * Parameters: sock - open socket of server-agent connection                  *
diff --git a/src/zabbix_server/trapper/nodecommand.c b/src/zabbix_server/trapper/nodecommand.c
index 55e7d1dc7e4..18a7c92b635 100644
--- a/src/zabbix_server/trapper/nodecommand.c
+++ b/src/zabbix_server/trapper/nodecommand.c
@@ -33,8 +33,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: execute_remote_script                                            *
- *                                                                            *
  * Purpose: execute remote command and wait for the result                    *
  *                                                                            *
  * Return value:  SUCCEED - the remote command was executed successfully      *
@@ -187,8 +185,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_check_event_end_recovery_event                               *
- *                                                                            *
  * Purpose: check if the specified event id corresponds to a problem event    *
  *          caused by a trigger, find its recovery event (if it exists)       *
  *                                                                            *
@@ -225,8 +221,6 @@ static int	zbx_check_event_end_recovery_event(zbx_uint64_t eventid, zbx_uint64_t
 
 /******************************************************************************
  *                                                                            *
- * Function: execute_script                                                   *
- *                                                                            *
  * Purpose: executing command                                                 *
  *                                                                            *
  * Parameters:  scriptid - [IN] the id of a script to be executed             *
@@ -491,8 +485,6 @@ fail:
 
 /******************************************************************************
  *                                                                            *
- * Function: node_process_command                                             *
- *                                                                            *
  * Purpose: process command received from the frontend                        *
  *                                                                            *
  * Return value:  SUCCEED - processed successfully                            *
diff --git a/src/zabbix_server/trapper/proxyconfig.c b/src/zabbix_server/trapper/proxyconfig.c
index 657d43c3c79..16765761769 100644
--- a/src/zabbix_server/trapper/proxyconfig.c
+++ b/src/zabbix_server/trapper/proxyconfig.c
@@ -30,8 +30,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: send_proxyconfig                                                 *
- *                                                                            *
  * Purpose: send configuration tables to the proxy from server                *
  *          (for active proxies)                                              *
  *                                                                            *
@@ -123,8 +121,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: recv_proxyconfig                                                 *
- *                                                                            *
  * Purpose: receive configuration tables from server (passive proxies)        *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/trapper/proxydata.c b/src/zabbix_server/trapper/proxydata.c
index 08a0d9d0759..2870fce2283 100644
--- a/src/zabbix_server/trapper/proxydata.c
+++ b/src/zabbix_server/trapper/proxydata.c
@@ -93,8 +93,6 @@ int	zbx_send_proxy_data_response(const DC_PROXY *proxy, zbx_socket_t *sock, cons
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_recv_proxy_data                                              *
- *                                                                            *
  * Purpose: receive 'proxy data' request from proxy                           *
  *                                                                            *
  * Parameters: sock - [IN] the connection socket                              *
@@ -184,8 +182,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: send_data_to_server                                              *
- *                                                                            *
  * Purpose: sends data from proxy to server                                   *
  *                                                                            *
  * Parameters: sock  - [IN] the connection socket                             *
@@ -213,8 +209,6 @@ static int	send_data_to_server(zbx_socket_t *sock, char **buffer, size_t buffer_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_send_proxy_data                                              *
- *                                                                            *
  * Purpose: sends 'proxy data' request to server                              *
  *                                                                            *
  * Parameters: sock - [IN] the connection socket                              *
@@ -326,8 +320,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_send_task_data                                               *
- *                                                                            *
  * Purpose: sends 'proxy data' request to server                              *
  *                                                                            *
  * Parameters: sock - [IN] the connection socket                              *
diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c
index 708c4071f6f..1c14a07359a 100644
--- a/src/zabbix_server/trapper/trapper.c
+++ b/src/zabbix_server/trapper/trapper.c
@@ -106,8 +106,6 @@ zbx_status_section_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: recv_agenthistory                                                *
- *                                                                            *
  * Purpose: processes the received values from active agents                  *
  *                                                                            *
  ******************************************************************************/
@@ -138,8 +136,6 @@ static void	recv_agenthistory(zbx_socket_t *sock, struct zbx_json_parse *jp, zbx
 
 /******************************************************************************
  *                                                                            *
- * Function: recv_senderhistory                                               *
- *                                                                            *
  * Purpose: processes the received values from senders                        *
  *                                                                            *
  ******************************************************************************/
@@ -170,8 +166,6 @@ static void	recv_senderhistory(zbx_socket_t *sock, struct zbx_json_parse *jp, zb
 
 /******************************************************************************
  *                                                                            *
- * Function: recv_proxy_heartbeat                                             *
- *                                                                            *
  * Purpose: process heartbeat sent by proxy servers                           *
  *                                                                            *
  * Return value:  SUCCEED - processed successfully                            *
@@ -236,8 +230,6 @@ zbx_queue_stats_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: queue_stats_update                                               *
- *                                                                            *
  * Purpose: update queue stats with a new item delay                          *
  *                                                                            *
  * Parameters: stats   - [IN] the queue stats                                 *
@@ -262,8 +254,6 @@ static void	queue_stats_update(zbx_queue_stats_t *stats, int delay)
 
 /******************************************************************************
  *                                                                            *
- * Function: queue_stats_export                                               *
- *                                                                            *
  * Purpose: export queue stats to JSON format                                 *
  *                                                                            *
  * Parameters: queue_stats - [IN] a hashset containing item stats             *
@@ -306,8 +296,6 @@ static int	queue_compare_by_nextcheck_asc(zbx_queue_item_t **d1, zbx_queue_item_
 
 /******************************************************************************
  *                                                                            *
- * Function: recv_getqueue                                                    *
- *                                                                            *
  * Purpose: process queue request                                             *
  *                                                                            *
  * Parameters:  sock  - [IN] the request socket                               *
@@ -780,8 +768,6 @@ static void	status_stats_export(struct zbx_json *json, zbx_user_type_t access_le
 
 /******************************************************************************
  *                                                                            *
- * Function: recv_getstatus                                                   *
- *                                                                            *
  * Purpose: process status request                                            *
  *                                                                            *
  * Parameters:  sock  - [IN] the request socket                               *
@@ -872,8 +858,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: send_internal_stats_json                                         *
- *                                                                            *
  * Purpose: process Zabbix stats request                                      *
  *                                                                            *
  * Parameters: sock  - [IN] the request socket                                *
diff --git a/src/zabbix_server/trapper/trapper_auth.c b/src/zabbix_server/trapper/trapper_auth.c
index 42171eeeb8f..525ea88311a 100644
--- a/src/zabbix_server/trapper/trapper_auth.c
+++ b/src/zabbix_server/trapper/trapper_auth.c
@@ -28,8 +28,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: format_auth_token_hash                                           *
- *                                                                            *
  * Purpose: takes a string token, hashes it with sha-512 and then formats the *
  *          resulting binary into the printable hex string                    *
  *                                                                            *
@@ -59,8 +57,6 @@ static void	format_auth_token_hash(const char *auth_token, char *hash_res_string
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_get_user_from_json                                           *
- *                                                                            *
  * Purpose: authenticate and initialize user data from the supplied json      *
  *                                                                            *
  * Parameters: jp         - [IN] the request                                  *
diff --git a/src/zabbix_server/trapper/trapper_preproc.c b/src/zabbix_server/trapper/trapper_preproc.c
index f92bd491ace..b71e096df82 100644
--- a/src/zabbix_server/trapper/trapper_preproc.c
+++ b/src/zabbix_server/trapper/trapper_preproc.c
@@ -32,8 +32,6 @@ extern int	CONFIG_DOUBLE_PRECISION;
 
 /******************************************************************************
  *                                                                            *
- * Function: trapper_parse_preproc_test                                       *
- *                                                                            *
  * Purpose: parses preprocessing test request                                 *
  *                                                                            *
  * Parameters: jp           - [IN] the request                                *
@@ -229,8 +227,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: trapper_preproc_test_run                                         *
- *                                                                            *
  * Purpose: executes preprocessing test request                               *
  *                                                                            *
  * Parameters: jp    - [IN] the request                                       *
@@ -400,8 +396,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_trapper_preproc_test                                         *
- *                                                                            *
  * Purpose: processes preprocessing test request                              *
  *                                                                            *
  * Parameters: sock - [IN] the request source socket (frontend)               *
diff --git a/src/zabbix_server/trapper/trapper_server.c b/src/zabbix_server/trapper/trapper_server.c
index e63be268df9..fb907b93854 100644
--- a/src/zabbix_server/trapper/trapper_server.c
+++ b/src/zabbix_server/trapper/trapper_server.c
@@ -70,8 +70,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: recv_alert_send                                                  *
- *                                                                            *
  * Purpose: process alert send request that is used to test media types       *
  *                                                                            *
  * Parameters:  sock  - [IN] the request socket                               *
diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c
index c27afc42b34..86c9214c7b2 100644
--- a/src/zabbix_server/vmware/vmware.c
+++ b/src/zabbix_server/vmware/vmware.c
@@ -602,8 +602,6 @@ static size_t	curl_header_cb(void *ptr, size_t size, size_t nmemb, void *userdat
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_str_uint64_pair_free                                         *
- *                                                                            *
  * Purpose: free memory of vector element                                     *
  *                                                                            *
  ******************************************************************************/
@@ -614,8 +612,6 @@ static void	zbx_str_uint64_pair_free(zbx_str_uint64_pair_t data)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_str_uint64_pair_name_compare                                 *
- *                                                                            *
  * Purpose: sorting function to sort zbx_str_uint64_pair_t vector by name     *
  *                                                                            *
  ******************************************************************************/
@@ -629,8 +625,6 @@ int	zbx_str_uint64_pair_name_compare(const void *p1, const void *p2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_http_post                                                    *
- *                                                                            *
  * Purpose: abstracts the curl_easy_setopt/curl_easy_perform call pair        *
  *                                                                            *
  * Parameters: easyhandle - [IN] the CURL handle                              *
@@ -679,8 +673,6 @@ static int	zbx_http_post(CURL *easyhandle, const char *request, ZBX_HTTPPAGE **r
 }
 /******************************************************************************
  *                                                                            *
- * Function: zbx_soap_post                                                    *
- *                                                                            *
  * Purpose: unification of vmware web service call with SOAP error validation *
  *                                                                            *
  * Parameters: fn_parent  - [IN] the parent function name for Log records     *
@@ -781,8 +773,6 @@ static int	vmware_perf_entity_compare_func(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_free_perfvalue                                            *
- *                                                                            *
  * Purpose: frees perfvalue data structure                                    *
  *                                                                            *
  ******************************************************************************/
@@ -794,8 +784,6 @@ static void	vmware_free_perfvalue(zbx_vmware_perf_value_t *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_free_perfdata                                             *
- *                                                                            *
  * Purpose: frees perfdata data structure                                     *
  *                                                                            *
  ******************************************************************************/
@@ -812,8 +800,6 @@ static void	vmware_free_perfdata(zbx_vmware_perf_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: xml_read_props                                                   *
- *                                                                            *
  * Purpose: reads the vmware object properties by their xpaths from xml data  *
  *                                                                            *
  * Parameters: xdoc      - [IN] the xml document                              *
@@ -877,8 +863,6 @@ static char	**xml_read_props(xmlDoc *xdoc, const zbx_vmware_propmap_t *propmap,
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_counters_shared_copy                                      *
- *                                                                            *
  * Purpose: copies performance counter vector into shared memory hashset      *
  *                                                                            *
  * Parameters: dst - [IN] the destination hashset                             *
@@ -910,8 +894,6 @@ static void	vmware_counters_shared_copy(zbx_hashset_t *dst, const zbx_vector_ptr
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_vector_str_uint64_pair_shared_clean                       *
- *                                                                            *
  * Purpose: frees shared resources allocated to store instance performance    *
  *          counter values                                                    *
  *                                                                            *
@@ -935,8 +917,6 @@ static void	vmware_vector_str_uint64_pair_shared_clean(zbx_vector_str_uint64_pai
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_perf_counter_shared_free                                  *
- *                                                                            *
  * Purpose: frees shared resources allocated to store performance counter     *
  *          data                                                              *
  *                                                                            *
@@ -952,8 +932,6 @@ static void	vmware_perf_counter_shared_free(zbx_vmware_perf_counter_t *counter)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_entities_shared_clean_stats                               *
- *                                                                            *
  * Purpose: removes statistics data from vmware entities                      *
  *                                                                            *
  ******************************************************************************/
@@ -982,8 +960,6 @@ static void	vmware_entities_shared_clean_stats(zbx_hashset_t *entities)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_diskextent_shared_free                                    *
- *                                                                            *
  * Purpose: frees shared resources allocated to store diskextent data         *
  *                                                                            *
  * Parameters: diskextent   - [IN] the diskextent                             *
@@ -998,8 +974,6 @@ static void	vmware_diskextent_shared_free(zbx_vmware_diskextent_t *diskextent)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_datastore_shared_free                                     *
- *                                                                            *
  * Purpose: frees shared resources allocated to store datastore data          *
  *                                                                            *
  * Parameters: datastore   - [IN] the datastore                               *
@@ -1024,8 +998,6 @@ static void	vmware_datastore_shared_free(zbx_vmware_datastore_t *datastore)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_datacenter_shared_free                                    *
- *                                                                            *
  * Purpose: frees shared resources allocated to store datacenter data         *
  *                                                                            *
  * Parameters: datacenter   - [IN] the datacenter                             *
@@ -1041,8 +1013,6 @@ static void	vmware_datacenter_shared_free(zbx_vmware_datacenter_t *datacenter)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_props_shared_free                                         *
- *                                                                            *
  * Purpose: frees shared resources allocated to store properties list         *
  *                                                                            *
  * Parameters: props     - [IN] the properties list                           *
@@ -1067,8 +1037,6 @@ static void	vmware_props_shared_free(char **props, int props_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_dev_shared_free                                           *
- *                                                                            *
  * Purpose: frees shared resources allocated to store vm device data          *
  *                                                                            *
  * Parameters: dev   - [IN] the vm device                                     *
@@ -1087,8 +1055,6 @@ static void	vmware_dev_shared_free(zbx_vmware_dev_t *dev)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_fs_shared_free                                            *
- *                                                                            *
  * Purpose: frees shared resources allocated to store file system object      *
  *                                                                            *
  * Parameters: fs   - [IN] the file system                                    *
@@ -1104,8 +1070,6 @@ static void	vmware_fs_shared_free(zbx_vmware_fs_t *fs)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_vm_shared_free                                            *
- *                                                                            *
  * Purpose: frees shared resources allocated to store virtual machine         *
  *                                                                            *
  * Parameters: vm   - [IN] the virtual machine                                *
@@ -1132,8 +1096,6 @@ static void	vmware_vm_shared_free(zbx_vmware_vm_t *vm)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_dsname_shared_free                                        *
- *                                                                            *
  * Purpose: frees shared resources allocated to store datastore names data    *
  *                                                                            *
  * Parameters: dsname  - [IN] the datastore name                              *
@@ -1149,8 +1111,6 @@ static void	vmware_dsname_shared_free(zbx_vmware_dsname_t *dsname)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_hv_shared_clean                                           *
- *                                                                            *
  * Purpose: frees shared resources allocated to store vmware hypervisor       *
  *                                                                            *
  * Parameters: hv   - [IN] the vmware hypervisor                              *
@@ -1190,8 +1150,6 @@ static void	vmware_hv_shared_clean(zbx_vmware_hv_t *hv)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_cluster_shared_free                                       *
- *                                                                            *
  * Purpose: frees shared resources allocated to store vmware cluster          *
  *                                                                            *
  * Parameters: cluster   - [IN] the vmware cluster                            *
@@ -1213,8 +1171,6 @@ static void	vmware_cluster_shared_free(zbx_vmware_cluster_t *cluster)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_event_shared_free                                         *
- *                                                                            *
  * Purpose: frees shared resources allocated to store vmware event            *
  *                                                                            *
  * Parameters: event - [IN] the vmware event                                  *
@@ -1230,8 +1186,6 @@ static void	vmware_event_shared_free(zbx_vmware_event_t *event)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_data_shared_free                                          *
- *                                                                            *
  * Purpose: frees shared resources allocated to store vmware service data     *
  *                                                                            *
  * Parameters: data   - [IN] the vmware service data                          *
@@ -1272,8 +1226,6 @@ static void	vmware_data_shared_free(zbx_vmware_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_shared_perf_entity_clean                                  *
- *                                                                            *
  * Purpose: cleans resources allocated by vmware performance entity in vmware *
  *          cache                                                             *
  *                                                                            *
@@ -1293,8 +1245,6 @@ static void	vmware_shared_perf_entity_clean(zbx_vmware_perf_entity_t *entity)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_counter_shared_clean                                      *
- *                                                                            *
  * Purpose: frees resources allocated by vmware performance counter           *
  *                                                                            *
  * Parameters: counter - [IN] the performance counter to free                 *
@@ -1307,8 +1257,6 @@ static void	vmware_counter_shared_clean(zbx_vmware_counter_t *counter)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_shared_free                                       *
- *                                                                            *
  * Purpose: frees shared resources allocated to store vmware service          *
  *                                                                            *
  * Parameters: data   - [IN] the vmware service data                          *
@@ -1353,8 +1301,6 @@ static void	vmware_service_shared_free(zbx_vmware_service_t *service)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_cluster_shared_dup                                        *
- *                                                                            *
  * Purpose: copies vmware cluster object into shared memory                   *
  *                                                                            *
  * Parameters: src   - [IN] the vmware cluster object                         *
@@ -1376,8 +1322,6 @@ static zbx_vmware_cluster_t	*vmware_cluster_shared_dup(const zbx_vmware_cluster_
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_event_shared_dup                                          *
- *                                                                            *
  * Purpose: copies vmware event object into shared memory                     *
  *                                                                            *
  * Parameters: src - [IN] the vmware event object                             *
@@ -1399,8 +1343,6 @@ static zbx_vmware_event_t	*vmware_event_shared_dup(const zbx_vmware_event_t *src
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_diskextent_shared_dup                                     *
- *                                                                            *
  * Purpose: copies vmware hypervisor diskextent object into shared memory     *
  *                                                                            *
  * Parameters: src   - [IN] the vmware diskextent object                      *
@@ -1421,8 +1363,6 @@ static zbx_vmware_diskextent_t	*vmware_diskextent_shared_dup(const zbx_vmware_di
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_datastore_shared_dup                                      *
- *                                                                            *
  * Purpose: copies vmware hypervisor datastore object into shared memory      *
  *                                                                            *
  * Parameters: src   - [IN] the vmware datastore object                       *
@@ -1468,8 +1408,6 @@ static zbx_vmware_datastore_t	*vmware_datastore_shared_dup(const zbx_vmware_data
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_datacenter_shared_dup                                     *
- *                                                                            *
  * Purpose: copies vmware datacenter object into shared memory                *
  *                                                                            *
  * Parameters: src   - [IN] the vmware datacenter object                      *
@@ -1490,8 +1428,6 @@ static zbx_vmware_datacenter_t	*vmware_datacenter_shared_dup(const zbx_vmware_da
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_dev_shared_dup                                            *
- *                                                                            *
  * Purpose: copies vmware virtual machine device object into shared memory    *
  *                                                                            *
  * Parameters: src   - [IN] the vmware device object                          *
@@ -1513,8 +1449,6 @@ static zbx_vmware_dev_t	*vmware_dev_shared_dup(const zbx_vmware_dev_t *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_fs_shared_dup                                             *
- *                                                                            *
  * Purpose: copies vmware virtual machine file system object into shared      *
  *          memory                                                            *
  *                                                                            *
@@ -1537,8 +1471,6 @@ static zbx_vmware_fs_t	*vmware_fs_shared_dup(const zbx_vmware_fs_t *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_props_shared_dup                                          *
- *                                                                            *
  * Purpose: copies object properties list into shared memory                  *
  *                                                                            *
  * Parameters: src       - [IN] the properties list                           *
@@ -1562,8 +1494,6 @@ static char	**vmware_props_shared_dup(char ** const src, int props_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_vm_shared_dup                                             *
- *                                                                            *
  * Purpose: copies vmware virtual machine object into shared memory           *
  *                                                                            *
  * Parameters: src   - [IN] the vmware virtual machine object                 *
@@ -1598,8 +1528,6 @@ static zbx_vmware_vm_t	*vmware_vm_shared_dup(const zbx_vmware_vm_t *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_dsname_shared_dup                                         *
- *                                                                            *
  * Purpose: copies vmware hypervisor datastore name object into shared memory *
  *                                                                            *
  * Parameters: src   - [IN] the vmware datastore name object                  *
@@ -1629,8 +1557,6 @@ static zbx_vmware_dsname_t	*vmware_dsname_shared_dup(const zbx_vmware_dsname_t *
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_hv_shared_copy                                            *
- *                                                                            *
  * Purpose: copies vmware hypervisor object into shared memory                *
  *                                                                            *
  * Parameters: dst - [OUT] the vmware hypervisor object into shared memory    *
@@ -1665,8 +1591,6 @@ static	void	vmware_hv_shared_copy(zbx_vmware_hv_t *dst, const zbx_vmware_hv_t *s
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_data_shared_dup                                           *
- *                                                                            *
  * Purpose: copies vmware data object into shared memory                      *
  *                                                                            *
  * Parameters: src   - [IN] the vmware data object                            *
@@ -1741,8 +1665,6 @@ static zbx_vmware_data_t	*vmware_data_shared_dup(zbx_vmware_data_t *src)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_diskextent_free                                           *
- *                                                                            *
  * Purpose: frees resources allocated to store diskextent data                *
  *                                                                            *
  * Parameters: diskextent   - [IN] the diskextent                             *
@@ -1756,8 +1678,6 @@ static void	vmware_diskextent_free(zbx_vmware_diskextent_t *diskextent)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_datastore_free                                            *
- *                                                                            *
  * Purpose: frees resources allocated to store datastore data                 *
  *                                                                            *
  * Parameters: datastore   - [IN] the datastore                               *
@@ -1779,8 +1699,6 @@ static void	vmware_datastore_free(zbx_vmware_datastore_t *datastore)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_datacenter_free                                           *
- *                                                                            *
  * Purpose: frees resources allocated to store datacenter data                *
  *                                                                            *
  * Parameters: datacenter   - [IN] the datacenter                             *
@@ -1795,8 +1713,6 @@ static void	vmware_datacenter_free(zbx_vmware_datacenter_t *datacenter)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_props_free                                                *
- *                                                                            *
  * Purpose: frees shared resources allocated to store properties list         *
  *                                                                            *
  * Parameters: props     - [IN] the properties list                           *
@@ -1818,8 +1734,6 @@ static void	vmware_props_free(char **props, int props_num)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_dev_free                                                  *
- *                                                                            *
  * Purpose: frees resources allocated to store vm device object               *
  *                                                                            *
  * Parameters: dev   - [IN] the vm device                                     *
@@ -1834,8 +1748,6 @@ static void	vmware_dev_free(zbx_vmware_dev_t *dev)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_fs_free                                                   *
- *                                                                            *
  * Purpose: frees resources allocated to store vm file system object          *
  *                                                                            *
  * Parameters: fs    - [IN] the file system                                   *
@@ -1849,8 +1761,6 @@ static void	vmware_fs_free(zbx_vmware_fs_t *fs)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_vm_free                                                   *
- *                                                                            *
  * Purpose: frees resources allocated to store virtual machine                *
  *                                                                            *
  * Parameters: vm   - [IN] the virtual machine                                *
@@ -1872,8 +1782,6 @@ static void	vmware_vm_free(zbx_vmware_vm_t *vm)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_dsname_free                                               *
- *                                                                            *
  * Purpose: frees resources allocated to store Datastore name data            *
  *                                                                            *
  * Parameters: dsname   - [IN] the Datastore name                             *
@@ -1888,8 +1796,6 @@ static void	vmware_dsname_free(zbx_vmware_dsname_t *dsname)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_hv_clean                                                  *
- *                                                                            *
  * Purpose: frees resources allocated to store vmware hypervisor              *
  *                                                                            *
  * Parameters: hv   - [IN] the vmware hypervisor                              *
@@ -1915,8 +1821,6 @@ static void	vmware_hv_clean(zbx_vmware_hv_t *hv)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_cluster_free                                              *
- *                                                                            *
  * Purpose: frees resources allocated to store vmware cluster                 *
  *                                                                            *
  * Parameters: cluster   - [IN] the vmware cluster                            *
@@ -1932,8 +1836,6 @@ static void	vmware_cluster_free(zbx_vmware_cluster_t *cluster)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_event_free                                                *
- *                                                                            *
  * Purpose: frees resources allocated to store vmware event                   *
  *                                                                            *
  * Parameters: event - [IN] the vmware event                                  *
@@ -1947,8 +1849,6 @@ static void	vmware_event_free(zbx_vmware_event_t *event)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_data_free                                                 *
- *                                                                            *
  * Purpose: frees resources allocated to store vmware service data            *
  *                                                                            *
  * Parameters: data   - [IN] the vmware service data                          *
@@ -1983,8 +1883,6 @@ static void	vmware_data_free(zbx_vmware_data_t *data)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_counter_free                                              *
- *                                                                            *
  * Purpose: frees vmware performance counter and the resources allocated by   *
  *          it                                                                *
  *                                                                            *
@@ -1999,8 +1897,6 @@ static void	vmware_counter_free(zbx_vmware_counter_t *counter)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_authenticate                                      *
- *                                                                            *
  * Purpose: authenticates vmware service                                      *
  *                                                                            *
  * Parameters: service    - [IN] the vmware service                           *
@@ -2121,8 +2017,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_logout                                            *
- *                                                                            *
  * Purpose: Close unused connection with vCenter                              *
  *                                                                            *
  * Parameters: service    - [IN] the vmware service                           *
@@ -2218,8 +2112,6 @@ static void	zbx_property_collection_free(zbx_property_collection_iter *iter)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_contents                                      *
- *                                                                            *
  * Purpose: retrieves vmware service instance contents                        *
  *                                                                            *
  * Parameters: easyhandle - [IN] the CURL handle                              *
@@ -2265,8 +2157,6 @@ static	int	vmware_service_get_contents(CURL *easyhandle, char **version, char **
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_perf_counter_refreshrate                      *
- *                                                                            *
  * Purpose: get the performance counter refreshrate for the specified entity  *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -2337,8 +2227,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_perf_counters                                 *
- *                                                                            *
  * Purpose: get the performance counter ids                                   *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -2516,8 +2404,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_vm_get_nic_devices                                        *
- *                                                                            *
  * Purpose: gets virtual machine network interface devices                    *
  *                                                                            *
  * Parameters: vm      - [OUT] the virtual machine                            *
@@ -2575,8 +2461,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_vm_get_disk_devices                                       *
- *                                                                            *
  * Purpose: gets virtual machine virtual disk devices                         *
  *                                                                            *
  * Parameters: vm      - [OUT] the virtual machine                            *
@@ -2706,8 +2590,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_vm_get_file_systems                                       *
- *                                                                            *
  * Purpose: gets the parameters of virtual machine disks                      *
  *                                                                            *
  * Parameters: vm      - [OUT] the virtual machine                            *
@@ -2769,8 +2651,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_vm_data                                       *
- *                                                                            *
  * Purpose: gets the virtual machine data                                     *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -2864,8 +2744,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_vm_folder                                     *
- *                                                                            *
  * Purpose: convert vm folder id to chain of folder names divided by '/'      *
  *                                                                            *
  * Parameters: xdoc      - [IN] the xml with all vm details                   *
@@ -2922,8 +2800,6 @@ static int	vmware_service_get_vm_folder(xmlDoc *xdoc, char **vm_folder)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_create_vm                                         *
- *                                                                            *
  * Purpose: create virtual machine object                                     *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -2995,8 +2871,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_refresh_datastore_info                            *
- *                                                                            *
  * Purpose: Refreshes all storage related information including free-space,   *
  *          capacity, and detailed usage of virtual machines.                 *
  *                                                                            *
@@ -3032,8 +2906,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_diskextents_list                              *
- *                                                                            *
  * Purpose: retrieves a list of vmware service datastore diskextents          *
  *                                                                            *
  * Parameters: doc        - [IN] XML document                                 *
@@ -3099,8 +2971,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_create_datastore                                  *
- *                                                                            *
  * Purpose: create vmware hypervisor datastore object                         *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -3227,8 +3097,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_hv_data                                       *
- *                                                                            *
  * Purpose: gets the vmware hypervisor data                                   *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -3317,8 +3185,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_hv_get_parent_data                                        *
- *                                                                            *
  * Purpose: gets the vmware hypervisor datacenter, parent folder or cluster   *
  *          name                                                              *
  *                                                                            *
@@ -3458,8 +3324,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_hv_get_multipath_data                             *
- *                                                                            *
  * Purpose: gets the vmware hypervisor data about ds multipath                *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -3541,8 +3405,6 @@ static int	vmware_service_hv_get_multipath_data(const zbx_vmware_service_t *serv
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_ds_name_compare                                           *
- *                                                                            *
  * Purpose: sorting function to sort Datastore vector by name                 *
  *                                                                            *
  ******************************************************************************/
@@ -3556,8 +3418,6 @@ int	vmware_ds_name_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_ds_id_compare                                             *
- *                                                                            *
  * Purpose: sorting function to sort Datastore vector by id                   *
  *                                                                            *
  ******************************************************************************/
@@ -3571,8 +3431,6 @@ static int	vmware_ds_id_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_dc_id_compare                                             *
- *                                                                            *
  * Purpose: sorting function to sort Datacenter vector by id                  *
  *                                                                            *
  ******************************************************************************/
@@ -3585,8 +3443,6 @@ static int	vmware_dc_id_compare(const void *d1, const void *d2)
 }
 
 /******************************************************************************
- * Function: vmware_hv_get_ds_access                                          *
- *                                                                            *
  * Purpose: populate array of values from a xml data                          *
  *                                                                            *
  * Parameters: xdoc   - [IN] XML document                                     *
@@ -3667,8 +3523,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_dsname_compare                                            *
- *                                                                            *
  * Purpose: sorting function to sort Datastore names vector by name           *
  *                                                                            *
  ******************************************************************************/
@@ -3682,8 +3536,6 @@ int	vmware_dsname_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_init_hv                                           *
- *                                                                            *
  * Purpose: initialize vmware hypervisor object                               *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -3856,8 +3708,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_datacenters_list                              *
- *                                                                            *
  * Purpose: retrieves a list of vmware service datacenters                    *
  *                                                                            *
  * Parameters: doc          - [IN] XML document                               *
@@ -3926,8 +3776,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_hv_ds_dc_list                                 *
- *                                                                            *
  * Purpose: retrieves a list of all vmware service hypervisor ids             *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -4121,8 +3969,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_event_session                                 *
- *                                                                            *
  * Purpose: retrieves event session name                                      *
  *                                                                            *
  * Parameters: service        - [IN] the vmware service                       *
@@ -4174,8 +4020,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_reset_event_history_collector                     *
- *                                                                            *
  * Purpose: resets "scrollable view" to the latest events                     *
  *                                                                            *
  * Parameters: easyhandle     - [IN] the CURL handle                          *
@@ -4221,8 +4065,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_read_previous_events                              *
- *                                                                            *
  * Purpose: reads events from "scrollable view" and moves it back in time     *
  *                                                                            *
  * Parameters: easyhandle     - [IN] the CURL handle                          *
@@ -4270,8 +4112,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_event_latestpage                              *
- *                                                                            *
  * Purpose: reads events from "latest page" and moves it back in time         *
  *                                                                            *
  * Parameters: service        - [IN] the vmware service                       *
@@ -4331,8 +4171,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_destroy_event_session                             *
- *                                                                            *
  * Purpose: destroys event session                                            *
  *                                                                            *
  * Parameters: easyhandle     - [IN] the CURL handle                          *
@@ -4376,8 +4214,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_put_event_data                                    *
- *                                                                            *
  * Purpose: read event data by id from xml and put to array of events         *
  *                                                                            *
  * Parameters: events    - [IN/OUT] the array of parsed events                *
@@ -4495,8 +4331,6 @@ static int	vmware_service_put_event_data(zbx_vector_ptr_t *events, zbx_id_xmlnod
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_parse_event_data                                  *
- *                                                                            *
  * Purpose: parse multiple events data                                        *
  *                                                                            *
  * Parameters: events     - [IN/OUT] the array of parsed events               *
@@ -4632,8 +4466,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_event_data                                    *
- *                                                                            *
  * Purpose: retrieves event data                                              *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -4749,8 +4581,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_last_event_data                               *
- *                                                                            *
  * Purpose: retrieves data only last event                                    *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -4854,8 +4684,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_clusters                                      *
- *                                                                            *
  * Purpose: retrieves a list of vmware service clusters                       *
  *                                                                            *
  * Parameters: easyhandle   - [IN] the CURL handle                            *
@@ -5006,8 +4834,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_cluster_status                                *
- *                                                                            *
  * Purpose: retrieves status of the specified vmware cluster                  *
  *                                                                            *
  * Parameters: easyhandle   - [IN] the CURL handle                            *
@@ -5068,8 +4894,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_cluster_list                                  *
- *                                                                            *
  * Purpose: creates list of vmware cluster objects                            *
  *                                                                            *
  * Parameters: easyhandle   - [IN] the CURL handle                            *
@@ -5136,8 +4960,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: get_default_maxquerymetrics_for_vcenter                          *
- *                                                                            *
  * Purpose: get statically defined default value for maxquerymetrics for      *
  *          vcenter when it could not be retrieved from soap, depending on    *
  *          vcenter version (https://kb.vmware.com/s/article/2107096)         *
@@ -5159,8 +4981,6 @@ static unsigned int	get_default_maxquerymetrics_for_vcenter(const zbx_vmware_ser
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_get_maxquerymetrics                               *
- *                                                                            *
  * Purpose: get vpxd.stats.maxquerymetrics parameter from vcenter only        *
  *                                                                            *
  * Parameters: easyhandle   - [IN] the CURL handle                            *
@@ -5236,8 +5056,6 @@ out:
 }
 /******************************************************************************
  *                                                                            *
- * Function: vmware_counters_add_new                                          *
- *                                                                            *
  * Purpose: creates a new performance counter object in shared memory and     *
  *          adds to the specified vector                                      *
  *                                                                            *
@@ -5262,8 +5080,6 @@ static void	vmware_counters_add_new(zbx_vector_ptr_t *counters, zbx_uint64_t cou
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_initialize                                        *
- *                                                                            *
  * Purpose: initializes vmware service object                                 *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -5364,8 +5180,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_add_perf_entity                                   *
- *                                                                            *
  * Purpose: adds entity to vmware service performance entity list             *
  *                                                                            *
  * Parameters: service  - [IN] the vmware service                             *
@@ -5421,8 +5235,6 @@ static void	vmware_service_add_perf_entity(zbx_vmware_service_t *service, const
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_update_perf_entities                              *
- *                                                                            *
  * Purpose: adds new or remove old entities (hypervisors, virtual machines)   *
  *          from service performance entity list                              *
  *                                                                            *
@@ -5504,8 +5316,6 @@ static void	vmware_service_update_perf_entities(zbx_vmware_service_t *service)
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_update                                            *
- *                                                                            *
  * Purpose: updates object with a new data from vmware service                *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -5804,8 +5614,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_process_perf_entity_data                          *
- *                                                                            *
  * Purpose: updates vmware performance statistics data                        *
  *                                                                            *
  * Parameters: perfdata  - [OUT] the performance counter values               *
@@ -5895,8 +5703,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_parse_perf_data                                   *
- *                                                                            *
  * Purpose: updates vmware performance statistics data                        *
  *                                                                            *
  * Parameters: perfdata - [OUT] performance entity data                       *
@@ -5951,8 +5757,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_perf_data_add_error                                       *
- *                                                                            *
  * Purpose: adds error for the specified perf entity                          *
  *                                                                            *
  * Parameters: perfdata - [OUT] the collected performance counter data        *
@@ -5982,8 +5786,6 @@ static void	vmware_perf_data_add_error(zbx_vector_ptr_t *perfdata, const char *t
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_copy_perf_data                                    *
- *                                                                            *
  * Purpose: copies vmware performance statistics of specified service         *
  *                                                                            *
  * Parameters: service  - [IN] the vmware service                             *
@@ -6038,8 +5840,6 @@ static void	vmware_service_copy_perf_data(zbx_vmware_service_t *service, zbx_vec
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_retrieve_perf_counters                            *
- *                                                                            *
  * Purpose: retrieves performance counter values from vmware service          *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -6172,8 +5972,6 @@ static void	vmware_service_retrieve_perf_counters(zbx_vmware_service_t *service,
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_update_perf                                       *
- *                                                                            *
  * Purpose: updates vmware statistics data                                    *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -6336,8 +6134,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: vmware_service_remove                                            *
- *                                                                            *
  * Purpose: removes vmware service                                            *
  *                                                                            *
  * Parameters: service      - [IN] the vmware service                         *
@@ -6368,8 +6164,6 @@ static void	vmware_service_remove(zbx_vmware_service_t *service)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_get_service                                           *
- *                                                                            *
  * Purpose: gets vmware service object                                        *
  *                                                                            *
  * Parameters: url      - [IN] the vmware service URL                         *
@@ -6451,8 +6245,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_service_get_counterid                                 *
- *                                                                            *
  * Purpose: gets vmware performance counter id and unit info by the path      *
  *                                                                            *
  * Parameters: service   - [IN] the vmware service                            *
@@ -6495,8 +6287,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_service_add_perf_counter                              *
- *                                                                            *
  * Purpose: start monitoring performance counter of the specified entity      *
  *                                                                            *
  * Parameters: service   - [IN] the vmware service                            *
@@ -6549,8 +6339,6 @@ int	zbx_vmware_service_add_perf_counter(zbx_vmware_service_t *service, const cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_service_get_perf_entity                               *
- *                                                                            *
  * Purpose: gets performance entity by type and id                            *
  *                                                                            *
  * Parameters: service - [IN] the vmware service                              *
@@ -6577,8 +6365,6 @@ zbx_vmware_perf_entity_t	*zbx_vmware_service_get_perf_entity(zbx_vmware_service_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_init                                                  *
- *                                                                            *
  * Purpose: initializes vmware collector service                              *
  *                                                                            *
  * Comments: This function must be called before worker threads are forked.   *
@@ -6624,8 +6410,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_destroy                                               *
- *                                                                            *
  * Purpose: destroys vmware collector service                                 *
  *                                                                            *
  ******************************************************************************/
@@ -6653,8 +6437,6 @@ void	zbx_vmware_destroy(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: main_vmware_loop                                                 *
- *                                                                            *
  * Purpose: the vmware collector main loop                                    *
  *                                                                            *
  ******************************************************************************/
@@ -6816,8 +6598,6 @@ ZBX_THREAD_ENTRY(vmware_thread, args)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_lock                                                  *
- *                                                                            *
  * Purpose: locks vmware collector                                            *
  *                                                                            *
  ******************************************************************************/
@@ -6828,8 +6608,6 @@ void	zbx_vmware_lock(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_unlock                                                *
- *                                                                            *
  * Purpose: unlocks vmware collector                                          *
  *                                                                            *
  ******************************************************************************/
@@ -6840,8 +6618,6 @@ void	zbx_vmware_unlock(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vmware_get_statistics                                        *
- *                                                                            *
  * Purpose: gets vmware collector statistics                                  *
  *                                                                            *
  * Parameters: stats   - [OUT] the vmware collector statistics                *
@@ -6872,8 +6648,6 @@ int	zbx_vmware_get_statistics(zbx_vmware_stats_t *stats)
  */
 /******************************************************************************
  *                                                                            *
- * Function: libxml_handle_error                                              *
- *                                                                            *
  * Purpose: libxml2 callback function for error handle                        *
  *                                                                            *
  * Parameters: user_data - [IN/OUT] the user context                          *
@@ -6888,8 +6662,6 @@ static void	libxml_handle_error(void *user_data, xmlErrorPtr err)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_xml_try_read_value                                           *
- *                                                                            *
  * Purpose: retrieve a value from xml data and return status of operation     *
  *                                                                            *
  * Parameters: data   - [IN] XML data                                         *
@@ -6960,8 +6732,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_xml_read_node_value                                          *
- *                                                                            *
  * Purpose: retrieve a value from xml data relative to the specified node     *
  *                                                                            *
  * Parameters: doc    - [IN] the XML document                                 *
@@ -7012,8 +6782,6 @@ clean:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_xml_read_doc_value                                           *
- *                                                                            *
  * Purpose: retrieve a value from xml document relative to the root node      *
  *                                                                            *
  * Parameters: xdoc   - [IN] the XML document                                 *
@@ -7033,8 +6801,6 @@ static char	*zbx_xml_read_doc_value(xmlDoc *xdoc, const char *xpath)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_xml_read_doc_num                                             *
- *                                                                            *
  * Purpose: retrieves numeric xpath value                                     *
  *                                                                            *
  * Parameters: xdoc  - [IN] xml document                                      *
@@ -7071,8 +6837,6 @@ out:
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_xml_read_values                                              *
- *                                                                            *
  * Purpose: populate array of values from a xml data                          *
  *                                                                            *
  * Parameters: xdoc   - [IN] XML document                                     *
diff --git a/templates/app/activemq_jmx/README.md b/templates/app/activemq_jmx/README.md
index 2c0802f938e..539b58268da 100644
--- a/templates/app/activemq_jmx/README.md
+++ b/templates/app/activemq_jmx/README.md
@@ -3,14 +3,13 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official JMX Template for Apache ActiveMQ.
 
 
 This template was tested on:
 
 - Apache ActiveMQ, version 5.15.5
-- Zabbix, version 5.4
 
 ## Setup
 
@@ -39,7 +38,7 @@ No specific Zabbix configuration is required.
 |{$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.TIME} |<p>Time during which there may be no consumers in destination. Can be used with destination name as context.</p> |`10m` |
 |{$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH} |<p>Minimum amount of producers for destination. Can be used with destination name as context.</p> |`1` |
 |{$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME} |<p>Time during which there may be no producers on destination. Can be used with destination name as context.</p> |`10m` |
-|{$ACTIVEMQ.EXPIRIED.WARN} |<p>Threshold for expiried messages count. Can be used with destination name as context.</p> |`0` |
+|{$ACTIVEMQ.EXPIRED.WARN} |<p>Threshold for expired messages count. Can be used with destination name as context.</p> |`0` |
 |{$ACTIVEMQ.LLD.FILTER.BROKER.MATCHES} |<p>Filter of discoverable discovered brokers</p> |`.*` |
 |{$ACTIVEMQ.LLD.FILTER.BROKER.NOT_MATCHES} |<p>Filter to exclude discovered brokers</p> |`CHANGE IF NEEDED` |
 |{$ACTIVEMQ.LLD.FILTER.DESTINATION.MATCHES} |<p>Filter of discoverable discovered destinations</p> |`.*` |
@@ -71,8 +70,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Brokers discovery |<p>Discovery of brokers</p> |JMX |jmx.discovery[beans,"org.apache.activemq:type=Broker,brokerName=*"]<p>**Filter**:</p>FORMULA A and B<p>- A: {#JMXBROKERNAME} MATCHES_REGEX `{$ACTIVEMQ.LLD.FILTER.BROKER.MATCHES}`</p><p>- B: {#JMXBROKERNAME} NOT_MATCHES_REGEX `{$ACTIVEMQ.LLD.FILTER.BROKER.NOT_MATCHES}`</p> |
-|Destinations discovery |<p>Discovery of destinations</p> |JMX |jmx.discovery[beans,"org.apache.activemq:type=Broker,brokerName=*,destinationType=*,destinationName=*"]<p>**Filter**:</p>FORMULA A and B<p>- A: {#JMXDESTINATIONNAME} MATCHES_REGEX `{$ACTIVEMQ.LLD.FILTER.DESTINATION.MATCHES}`</p><p>- B: {#JMXDESTINATIONNAME} NOT_MATCHES_REGEX `{$ACTIVEMQ.LLD.FILTER.DESTINATION.NOT_MATCHES}`</p> |
+|Brokers discovery |<p>Discovery of brokers</p> |JMX |jmx.discovery[beans,"org.apache.activemq:type=Broker,brokerName=*"]<p>**Filter**:</p>FORMULA A and B<p>- {#JMXBROKERNAME} MATCHES_REGEX `{$ACTIVEMQ.LLD.FILTER.BROKER.MATCHES}`</p><p>- {#JMXBROKERNAME} NOT_MATCHES_REGEX `{$ACTIVEMQ.LLD.FILTER.BROKER.NOT_MATCHES}`</p> |
+|Destinations discovery |<p>Discovery of destinations</p> |JMX |jmx.discovery[beans,"org.apache.activemq:type=Broker,brokerName=*,destinationType=*,destinationName=*"]<p>**Filter**:</p>FORMULA A and B<p>- {#JMXDESTINATIONNAME} MATCHES_REGEX `{$ACTIVEMQ.LLD.FILTER.DESTINATION.MATCHES}`</p><p>- {#JMXDESTINATIONNAME} NOT_MATCHES_REGEX `{$ACTIVEMQ.LLD.FILTER.DESTINATION.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -86,8 +85,8 @@ There are no template links in this template.
 |ActiveMQ |Broker {#JMXBROKERNAME}: Storage usage in percents |<p>Percent of store limit used.</p> |JMX |jmx[{#JMXOBJ},StorePercentUsage] |
 |ActiveMQ |Broker {#JMXBROKERNAME}: Temp limit |<p>Disk limit, in bytes, used for non-persistent messages and temporary data before producers are blocked.</p> |JMX |jmx[{#JMXOBJ},TempLimit]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |ActiveMQ |Broker {#JMXBROKERNAME}: Temp usage in percents |<p>Percent of temp limit used.</p> |JMX |jmx[{#JMXOBJ},TempPercentUsage] |
-|ActiveMQ |Broker {#JMXBROKERNAME}: Messages enqueue rate |<p>Rate of messages that have been sent to the broker.</p> |JMX |jmx[{#JMXOBJ},TotalEnqueueCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|ActiveMQ |Broker {#JMXBROKERNAME}: Messages dequeue rate |<p>Rate of messages that have been delivered by the broker and acknowledged by consumers.</p> |JMX |jmx[{#JMXOBJ},TotalDequeueCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|ActiveMQ |Broker {#JMXBROKERNAME}: Messages enqueue rate |<p>Rate of messages that have been sent to the broker.</p> |JMX |jmx[{#JMXOBJ},TotalEnqueueCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|ActiveMQ |Broker {#JMXBROKERNAME}: Messages dequeue rate |<p>Rate of messages that have been delivered by the broker and acknowledged by consumers.</p> |JMX |jmx[{#JMXOBJ},TotalDequeueCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |ActiveMQ |Broker {#JMXBROKERNAME}: Consumers count total |<p>Number of consumers attached to this broker.</p> |JMX |jmx[{#JMXOBJ},TotalConsumerCount] |
 |ActiveMQ |Broker {#JMXBROKERNAME}: Producers count total |<p>Number of producers attached to this broker.</p> |JMX |jmx[{#JMXOBJ},TotalProducerCount] |
 |ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Consumers count |<p>Number of consumers attached to this destination.</p> |JMX |jmx[{#JMXOBJ},ConsumerCount] |
@@ -95,8 +94,8 @@ There are no template links in this template.
 |ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Producers count |<p>Number of producers attached to this destination.</p> |JMX |jmx[{#JMXOBJ},ProducerCount] |
 |ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Producers count total on {#JMXBROKERNAME} |<p>Number of producers attached to the broker of this destination. Used to suppress destination's triggers when the count of producers on the broker is lower than threshold.</p> |JMX |jmx["org.apache.activemq:type=Broker,brokerName={#JMXBROKERNAME}",{$ACTIVEMQ.TOTAL.PRODUCERS.COUNT: "{#JMXDESTINATIONNAME}"}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 {$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH}`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Memory usage in percents |<p>The percentage of the memory limit used.</p> |JMX |jmx[{#JMXOBJ},MemoryPercentUsage] |
-|ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Messages enqueue rate |<p>Rate of messages that have been sent to the destination.</p> |JMX |jmx[{#JMXOBJ},EnqueueCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Messages dequeue rate |<p>Rate of messages that has been acknowledged (and removed) from the destination.</p> |JMX |jmx[{#JMXOBJ},DequeueCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Messages enqueue rate |<p>Rate of messages that have been sent to the destination.</p> |JMX |jmx[{#JMXOBJ},EnqueueCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Messages dequeue rate |<p>Rate of messages that has been acknowledged (and removed) from the destination.</p> |JMX |jmx[{#JMXOBJ},DequeueCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Queue size |<p>Number of messages on this destination, including any that have been dispatched but not acknowledged.</p> |JMX |jmx[{#JMXOBJ},QueueSize] |
 |ActiveMQ |{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Expired messages count |<p>Number of messages that have been expired.</p> |JMX |jmx[{#JMXOBJ},ExpiredCount]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 
@@ -104,24 +103,24 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Broker {#JMXBROKERNAME}: Version has been changed |<p>Broker {#JMXBROKERNAME} version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},BrokerVersion].diff()}=1 and {TEMPLATE_NAME:jmx[{#JMXOBJ},BrokerVersion].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Broker {#JMXBROKERNAME}: Broker has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},UptimeMillis].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Broker {#JMXBROKERNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.WARN:"{#JMXBROKERNAME}"}%) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ}, MemoryPercentUsage].min({$ACTIVEMQ.MEM.TIME:"{#JMXBROKERNAME}"})}>{$ACTIVEMQ.MEM.MAX.WARN:"{#JMXBROKERNAME}"}` |AVERAGE |<p>**Depends on**:</p><p>- Broker {#JMXBROKERNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}%)</p> |
-|Broker {#JMXBROKERNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}%) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ}, MemoryPercentUsage].min({$ACTIVEMQ.MEM.TIME:"{#JMXBROKERNAME}"})}>{$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}` |HIGH | |
-|Broker {#JMXBROKERNAME}: Storage usage is too high (over {$ACTIVEMQ.STORE.MAX.WARN:"{#JMXBROKERNAME}"}%) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},StorePercentUsage].min({$ACTIVEMQ.STORE.TIME:"{#JMXBROKERNAME}"})}>{$ACTIVEMQ.STORE.MAX.WARN:"{#JMXBROKERNAME}"}` |AVERAGE |<p>**Depends on**:</p><p>- Broker {#JMXBROKERNAME}: Storage usage is too high (over {$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}%)</p> |
-|Broker {#JMXBROKERNAME}: Storage usage is too high (over {$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}%) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},StorePercentUsage].min({$ACTIVEMQ.STORE.TIME:"{#JMXBROKERNAME}"})}>{$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}` |HIGH | |
-|Broker {#JMXBROKERNAME}: Temp usage is too high (over {$ACTIVEMQ.TEMP.MAX.WARN:"{#JMXBROKERNAME}"}%) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},TempPercentUsage].min({$ACTIVEMQ.TEMP.TIME:"{#JMXBROKERNAME}"})}>{$ACTIVEMQ.TEMP.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Broker {#JMXBROKERNAME}: Temp usage is too high (over {$ACTIVEMQ.TEMP.MAX.WARN:"{#JMXBROKERNAME}"}%)</p> |
-|Broker {#JMXBROKERNAME}: Temp usage is too high (over {$ACTIVEMQ.TEMP.MAX.WARN:"{#JMXBROKERNAME}"}%) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},TempPercentUsage].min({$ACTIVEMQ.TEMP.TIME:"{#JMXBROKERNAME}"})}>{$ACTIVEMQ.TEMP.MAX.HIGH}` |HIGH | |
-|Broker {#JMXBROKERNAME}: Message enqueue rate is higher than dequeue rate for {$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXBROKERNAME}"} |<p>Enqueue rate is higher than dequeue rate. It may indicate performance problems.</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},TotalEnqueueCount].avg({$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXBROKERNAME}"})}>{Apache ActiveMQ by JMX:jmx[{#JMXOBJ},TotalEnqueueCount].avg({$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXBROKERNAME}"})}` |AVERAGE | |
-|Broker {#JMXBROKERNAME}: Consumers count is too low (below {$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH:"{#JMXBROKERNAME}"} for {$ACTIVEMQ.BROKER.CONSUMERS.MIN.TIME:"{#JMXBROKERNAME}"}) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},TotalConsumerCount].max({$ACTIVEMQ.BROKER.CONSUMERS.MIN.TIME:"{#JMXBROKERNAME}"})}<{$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH:"{#JMXBROKERNAME}"}` |HIGH | |
-|Broker {#JMXBROKERNAME}: Producers count is too low (below {$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"} for {$ACTIVEMQ.BROKER.PRODUCERS.MIN.TIME:"{#JMXBROKERNAME}"}) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},TotalProducerCount].max({$ACTIVEMQ.BROKER.PRODUCERS.MIN.TIME:"{#JMXBROKERNAME}"})}<{$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"}` |HIGH | |
-|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Consumers count is too low (below {$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.TIME:"{#JMXDESTINATIONNAME}"}) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},ConsumerCount].max({$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})}<{$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} and {Apache ActiveMQ by JMX:jmx["org.apache.activemq:type=Broker,brokerName={#JMXBROKERNAME}",{$ACTIVEMQ.TOTAL.CONSUMERS.COUNT: "{#JMXDESTINATIONNAME}"}].last()}>{$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH:"{#JMXBROKERNAME}"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:jmx[{#JMXOBJ},ConsumerCount].min({$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})}>={$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"}` |AVERAGE |<p>Manual close: YES</p> |
-|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Producers count is too low (below {$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME:"{#JMXDESTINATIONNAME}"}) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},ProducerCount].max({$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})}<{$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} and {Apache ActiveMQ by JMX:jmx["org.apache.activemq:type=Broker,brokerName={#JMXBROKERNAME}",{$ACTIVEMQ.TOTAL.PRODUCERS.COUNT: "{#JMXDESTINATIONNAME}"}].last()}>{$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:jmx[{#JMXOBJ},ProducerCount].min({$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})}>={$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"}` |AVERAGE |<p>Manual close: YES</p> |
-|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.WARN:"{#JMXDESTINATIONNAME}"}%) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},MemoryPercentUsage].last()}>{$ACTIVEMQ.MEM.MAX.WARN:"{#JMXDESTINATIONNAME}"}` |AVERAGE | |
-|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXDESTINATIONNAME}"}%) |<p>-</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},MemoryPercentUsage].last()}>{$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXDESTINATIONNAME}"}` |HIGH | |
-|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Message enqueue rate is higher than dequeue rate for {$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"} |<p>Enqueue rate is higher than dequeue rate. It may indicate performance problems.</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},EnqueueCount].avg({$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"})}>{Apache ActiveMQ by JMX:jmx[{#JMXOBJ},DequeueCount].avg({$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"})}` |AVERAGE | |
-|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Queue size higher than {$ACTIVEMQ.QUEUE.WARN:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.QUEUE.TIME:"{#JMXDESTINATIONNAME}"} |<p>Queue size is higher than threshold. It may indicate performance problems.</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},QueueSize].min({$ACTIVEMQ.QUEUE.TIME:"{#JMXDESTINATIONNAME}"})}>{$ACTIVEMQ.QUEUE.WARN:"{#JMXDESTINATIONNAME}"} and {$ACTIVEMQ.QUEUE.ENABLED:"{#JMXDESTINATIONNAME}"}=1` |AVERAGE | |
-|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Expired messages count higher than {$ACTIVEMQ.EXPIRIED.WARN:"{#JMXDESTINATIONNAME}"} |<p>This metric represents the number of messages that expired before they could be delivered. If you expect all messages to be delivered and acknowledged within a certain amount of time, you can set an expiration for each message, and investigate if your ExpiredCount metric rises above zero.</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},ExpiredCount].last()}>{$ACTIVEMQ.EXPIRIED.WARN:"{#JMXDESTINATIONNAME}"}` |AVERAGE | |
+|Broker {#JMXBROKERNAME}: Version has been changed |<p>Broker {#JMXBROKERNAME} version has changed. Ack to close.</p> |`last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},BrokerVersion],#1)<>last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},BrokerVersion],#2) and length(last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},BrokerVersion]))>0` |INFO |<p>Manual close: YES</p> |
+|Broker {#JMXBROKERNAME}: Broker has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},UptimeMillis])<10m` |INFO |<p>Manual close: YES</p> |
+|Broker {#JMXBROKERNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.WARN:"{#JMXBROKERNAME}"}%) |<p>-</p> |`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ}, MemoryPercentUsage],{$ACTIVEMQ.MEM.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.MEM.MAX.WARN:"{#JMXBROKERNAME}"}` |AVERAGE |<p>**Depends on**:</p><p>- Broker {#JMXBROKERNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}%)</p> |
+|Broker {#JMXBROKERNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}%) |<p>-</p> |`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ}, MemoryPercentUsage],{$ACTIVEMQ.MEM.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}` |HIGH | |
+|Broker {#JMXBROKERNAME}: Storage usage is too high (over {$ACTIVEMQ.STORE.MAX.WARN:"{#JMXBROKERNAME}"}%) |<p>-</p> |`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},StorePercentUsage],{$ACTIVEMQ.STORE.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.STORE.MAX.WARN:"{#JMXBROKERNAME}"}` |AVERAGE |<p>**Depends on**:</p><p>- Broker {#JMXBROKERNAME}: Storage usage is too high (over {$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}%)</p> |
+|Broker {#JMXBROKERNAME}: Storage usage is too high (over {$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}%) |<p>-</p> |`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},StorePercentUsage],{$ACTIVEMQ.STORE.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}` |HIGH | |
+|Broker {#JMXBROKERNAME}: Temp usage is too high (over {$ACTIVEMQ.TEMP.MAX.WARN:"{#JMXBROKERNAME}"}%) |<p>-</p> |`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TempPercentUsage],{$ACTIVEMQ.TEMP.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.TEMP.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Broker {#JMXBROKERNAME}: Temp usage is too high (over {$ACTIVEMQ.TEMP.MAX.WARN:"{#JMXBROKERNAME}"}%)</p> |
+|Broker {#JMXBROKERNAME}: Temp usage is too high (over {$ACTIVEMQ.TEMP.MAX.WARN:"{#JMXBROKERNAME}"}%) |<p>-</p> |`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TempPercentUsage],{$ACTIVEMQ.TEMP.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.TEMP.MAX.HIGH}` |HIGH | |
+|Broker {#JMXBROKERNAME}: Message enqueue rate is higher than dequeue rate for {$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXBROKERNAME}"} |<p>Enqueue rate is higher than dequeue rate. It may indicate performance problems.</p> |`avg(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TotalEnqueueCount],{$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXBROKERNAME}"})>avg(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TotalEnqueueCount],{$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXBROKERNAME}"})` |AVERAGE | |
+|Broker {#JMXBROKERNAME}: Consumers count is too low (below {$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH:"{#JMXBROKERNAME}"} for {$ACTIVEMQ.BROKER.CONSUMERS.MIN.TIME:"{#JMXBROKERNAME}"}) |<p>-</p> |`max(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TotalConsumerCount],{$ACTIVEMQ.BROKER.CONSUMERS.MIN.TIME:"{#JMXBROKERNAME}"})<{$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH:"{#JMXBROKERNAME}"}` |HIGH | |
+|Broker {#JMXBROKERNAME}: Producers count is too low (below {$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"} for {$ACTIVEMQ.BROKER.PRODUCERS.MIN.TIME:"{#JMXBROKERNAME}"}) |<p>-</p> |`max(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TotalProducerCount],{$ACTIVEMQ.BROKER.PRODUCERS.MIN.TIME:"{#JMXBROKERNAME}"})<{$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"}` |HIGH | |
+|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Consumers count is too low (below {$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.TIME:"{#JMXDESTINATIONNAME}"}) |<p>-</p> |`max(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},ConsumerCount],{$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})<{$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} and last(/Apache ActiveMQ by JMX/jmx["org.apache.activemq:type=Broker,brokerName={#JMXBROKERNAME}",{$ACTIVEMQ.TOTAL.CONSUMERS.COUNT: "{#JMXDESTINATIONNAME}"}])>{$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH:"{#JMXBROKERNAME}"}`<p>Recovery expression:</p>`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},ConsumerCount],{$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})>={$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"}` |AVERAGE |<p>Manual close: YES</p> |
+|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Producers count is too low (below {$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME:"{#JMXDESTINATIONNAME}"}) |<p>-</p> |`max(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},ProducerCount],{$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})<{$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} and last(/Apache ActiveMQ by JMX/jmx["org.apache.activemq:type=Broker,brokerName={#JMXBROKERNAME}",{$ACTIVEMQ.TOTAL.PRODUCERS.COUNT: "{#JMXDESTINATIONNAME}"}])>{$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"}`<p>Recovery expression:</p>`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},ProducerCount],{$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})>={$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"}` |AVERAGE |<p>Manual close: YES</p> |
+|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.WARN:"{#JMXDESTINATIONNAME}"}%) |<p>-</p> |`last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},MemoryPercentUsage])>{$ACTIVEMQ.MEM.MAX.WARN:"{#JMXDESTINATIONNAME}"}` |AVERAGE | |
+|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXDESTINATIONNAME}"}%) |<p>-</p> |`last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},MemoryPercentUsage])>{$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXDESTINATIONNAME}"}` |HIGH | |
+|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Message enqueue rate is higher than dequeue rate for {$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"} |<p>Enqueue rate is higher than dequeue rate. It may indicate performance problems.</p> |`avg(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},EnqueueCount],{$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"})>avg(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},DequeueCount],{$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"})` |AVERAGE | |
+|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Queue size higher than {$ACTIVEMQ.QUEUE.WARN:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.QUEUE.TIME:"{#JMXDESTINATIONNAME}"} |<p>Queue size is higher than threshold. It may indicate performance problems.</p> |`min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},QueueSize],{$ACTIVEMQ.QUEUE.TIME:"{#JMXDESTINATIONNAME}"})>{$ACTIVEMQ.QUEUE.WARN:"{#JMXDESTINATIONNAME}"} and {$ACTIVEMQ.QUEUE.ENABLED:"{#JMXDESTINATIONNAME}"}=1` |AVERAGE | |
+|{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Expired messages count higher than {$ACTIVEMQ.EXPIRED.WARN:"{#JMXDESTINATIONNAME}"} |<p>This metric represents the number of messages that expired before they could be delivered. If you expect all messages to be delivered and acknowledged within a certain amount of time, you can set an expiration for each message, and investigate if your ExpiredCount metric rises above zero.</p> |`last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},ExpiredCount])>{$ACTIVEMQ.EXPIRED.WARN:"{#JMXDESTINATIONNAME}"}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/activemq_jmx/template_app_activemq_jmx.yaml b/templates/app/activemq_jmx/template_app_activemq_jmx.yaml
index 8b797bf0cfc..92a6919f658 100644
--- a/templates/app/activemq_jmx/template_app_activemq_jmx.yaml
+++ b/templates/app/activemq_jmx/template_app_activemq_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:19Z'
+  version: '6.0'
+  date: '2021-12-14T17:43:19Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/411049-discussion-thread-for-official-zabbix-template-amq
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -551,8 +551,8 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: a498405c5b764c1ea9f0e151adf94ed7
-                  expression: 'last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},ExpiredCount])>{$ACTIVEMQ.EXPIRIED.WARN:"{#JMXDESTINATIONNAME}"}'
-                  name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Expired messages count higher than {$ACTIVEMQ.EXPIRIED.WARN:"{#JMXDESTINATIONNAME}"}'
+                  expression: 'last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},ExpiredCount])>{$ACTIVEMQ.EXPIRED.WARN:"{#JMXDESTINATIONNAME}"}'
+                  name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Expired messages count higher than {$ACTIVEMQ.EXPIRED.WARN:"{#JMXDESTINATIONNAME}"}'
                   priority: AVERAGE
                   description: 'This metric represents the number of messages that expired before they could be delivered. If you expect all messages to be delivered and acknowledged within a certain amount of time, you can set an expiration for each message, and investigate if your ExpiredCount metric rises above zero.'
             -
@@ -719,9 +719,9 @@ zabbix_export:
           value: 10m
           description: 'Time during which there may be no producers on destination. Can be used with destination name as context.'
         -
-          macro: '{$ACTIVEMQ.EXPIRIED.WARN}'
+          macro: '{$ACTIVEMQ.EXPIRED.WARN}'
           value: '0'
-          description: 'Threshold for expiried messages count. Can be used with destination name as context.'
+          description: 'Threshold for expired messages count. Can be used with destination name as context.'
         -
           macro: '{$ACTIVEMQ.LLD.FILTER.BROKER.MATCHES}'
           value: '.*'
diff --git a/templates/app/apache_agent/README.md b/templates/app/apache_agent/README.md
index a55f8284ffb..c85c7f3ede0 100644
--- a/templates/app/apache_agent/README.md
+++ b/templates/app/apache_agent/README.md
@@ -110,8 +110,8 @@ There are no template links in this template.
 |Apache |Apache: Service ping |<p>-</p> |ZABBIX_PASSIVE |net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |Apache |Apache: Service response time |<p>-</p> |ZABBIX_PASSIVE |net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"] |
 |Apache |Apache: Total bytes |<p>Total bytes served</p> |DEPENDENT |apache.bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total kBytes"]`</p><p>- MULTIPLIER: `1024`</p> |
-|Apache |Apache: Bytes per second |<p>Calculated as change rate for 'Total bytes' stat.</p><p>BytesPerSec is not used, as it counts average since last Apache server start.</p> |DEPENDENT |apache.bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total kBytes"]`</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND |
-|Apache |Apache: Requests per second |<p>Calculated as change rate for 'Total requests' stat.</p><p>ReqPerSec is not used, as it counts average since last Apache server start.</p> |DEPENDENT |apache.requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total Accesses"]`</p><p>- CHANGE_PER_SECOND |
+|Apache |Apache: Bytes per second |<p>Calculated as change rate for 'Total bytes' stat.</p><p>BytesPerSec is not used, as it counts average since last Apache server start.</p> |DEPENDENT |apache.bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total kBytes"]`</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND</p> |
+|Apache |Apache: Requests per second |<p>Calculated as change rate for 'Total requests' stat.</p><p>ReqPerSec is not used, as it counts average since last Apache server start.</p> |DEPENDENT |apache.requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total Accesses"]`</p><p>- CHANGE_PER_SECOND</p> |
 |Apache |Apache: Total requests |<p>A total number of accesses</p> |DEPENDENT |apache.requests<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total Accesses"]`</p> |
 |Apache |Apache: Uptime |<p>Service uptime in seconds</p> |DEPENDENT |apache.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.ServerUptimeSeconds`</p> |
 |Apache |Apache: Version |<p>Service version</p> |DEPENDENT |apache.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.ServerVersion`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
@@ -138,18 +138,18 @@ There are no template links in this template.
 |Apache |Apache: Connections total |<p>Number of total connections</p> |DEPENDENT |apache.connections[total{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.ConnsTotal`</p> |
 |Apache |Apache: Bytes per request |<p>Average number of client requests per second</p> |DEPENDENT |apache.bytes[per_request{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.BytesPerReq`</p> |
 |Apache |Apache: Number of async processes |<p>Number of async processes</p> |DEPENDENT |apache.process[num{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Processes`</p> |
-|Zabbix_raw_items |Apache: Get status |<p>Getting data from a machine-readable version of the Apache status page.</p><p>https://httpd.apache.org/docs/current/mod/mod_status.html</p> |ZABBIX_PASSIVE |web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
+|Zabbix_raw_items |Apache: Get status |<p>Getting data from a machine-readable version of the Apache status page.</p><p>https://httpd.apache.org/docs/current/mod/mod_status.html</p> |ZABBIX_PASSIVE |web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Apache: Service is down |<p>-</p> |`{TEMPLATE_NAME:net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"].last()}=0` |AVERAGE |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Process is not running</p> |
-|Apache: Service response time is too high (over {$APACHE.RESPONSE_TIME.MAX.WARN}s for 5m) |<p>-</p> |`{TEMPLATE_NAME:net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"].min(5m)}>{$APACHE.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Process is not running</p><p>- Apache: Service is down</p> |
-|Apache: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:apache.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Apache: Version has changed (new version: {ITEM.VALUE}) |<p>Apache version has changed. Ack to close.</p> |`{TEMPLATE_NAME:apache.version.diff()}=1 and {TEMPLATE_NAME:apache.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Apache: Process is not running |<p>-</p> |`{TEMPLATE_NAME:proc.num["{$APACHE.PROCESS_NAME}"].last()}=0` |HIGH | |
-|Apache: Failed to fetch status page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`{TEMPLATE_NAME:web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"].nodata(30m)}=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Process is not running</p><p>- Apache: Service is down</p> |
+|Apache: Service is down |<p>-</p> |`last(/Apache by Zabbix agent/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Process is not running</p> |
+|Apache: Service response time is too high (over {$APACHE.RESPONSE_TIME.MAX.WARN}s for 5m) |<p>-</p> |`min(/Apache by Zabbix agent/net.tcp.service.perf[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"],5m)>{$APACHE.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Process is not running</p><p>- Apache: Service is down</p> |
+|Apache: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Apache by Zabbix agent/apache.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Apache: Version has changed (new version: {ITEM.VALUE}) |<p>Apache version has changed. Ack to close.</p> |`last(/Apache by Zabbix agent/apache.version,#1)<>last(/Apache by Zabbix agent/apache.version,#2) and length(last(/Apache by Zabbix agent/apache.version))>0` |INFO |<p>Manual close: YES</p> |
+|Apache: Process is not running |<p>-</p> |`last(/Apache by Zabbix agent/proc.num["{$APACHE.PROCESS_NAME}"])=0` |HIGH | |
+|Apache: Failed to fetch status page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Apache by Zabbix agent/web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"],30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Process is not running</p><p>- Apache: Service is down</p> |
 
 ## Feedback
 
diff --git a/templates/app/apache_agent/template_app_apache_agent.yaml b/templates/app/apache_agent/template_app_apache_agent.yaml
index 809513581d1..19ccddde01a 100644
--- a/templates/app/apache_agent/template_app_apache_agent.yaml
+++ b/templates/app/apache_agent/template_app_apache_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-22T16:33:40Z'
+  version: '6.0'
+  date: '2021-12-15T07:17:09Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,7 +16,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384764-discussion-thread-for-official-zabbix-template-apache
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/apache_http/README.md b/templates/app/apache_http/README.md
index 80aabc98d06..0c2b1c712b9 100644
--- a/templates/app/apache_http/README.md
+++ b/templates/app/apache_http/README.md
@@ -105,8 +105,8 @@ There are no template links in this template.
 |Apache |Apache: Service ping |<p>-</p> |SIMPLE |net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |Apache |Apache: Service response time |<p>-</p> |SIMPLE |net.tcp.service.perf[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"] |
 |Apache |Apache: Total bytes |<p>Total bytes served</p> |DEPENDENT |apache.bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total kBytes"]`</p><p>- MULTIPLIER: `1024`</p> |
-|Apache |Apache: Bytes per second |<p>Calculated as change rate for 'Total bytes' stat.</p><p>BytesPerSec is not used, as it counts average since last Apache server start.</p> |DEPENDENT |apache.bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total kBytes"]`</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND |
-|Apache |Apache: Requests per second |<p>Calculated as change rate for 'Total requests' stat.</p><p>ReqPerSec is not used, as it counts average since last Apache server start.</p> |DEPENDENT |apache.requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total Accesses"]`</p><p>- CHANGE_PER_SECOND |
+|Apache |Apache: Bytes per second |<p>Calculated as change rate for 'Total bytes' stat.</p><p>BytesPerSec is not used, as it counts average since last Apache server start.</p> |DEPENDENT |apache.bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total kBytes"]`</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND</p> |
+|Apache |Apache: Requests per second |<p>Calculated as change rate for 'Total requests' stat.</p><p>ReqPerSec is not used, as it counts average since last Apache server start.</p> |DEPENDENT |apache.requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total Accesses"]`</p><p>- CHANGE_PER_SECOND</p> |
 |Apache |Apache: Total requests |<p>A total number of accesses</p> |DEPENDENT |apache.requests<p>**Preprocessing**:</p><p>- JSONPATH: `$["Total Accesses"]`</p> |
 |Apache |Apache: Uptime |<p>Service uptime in seconds</p> |DEPENDENT |apache.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.ServerUptimeSeconds`</p> |
 |Apache |Apache: Version |<p>Service version</p> |DEPENDENT |apache.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.ServerVersion`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
@@ -129,17 +129,17 @@ There are no template links in this template.
 |Apache |Apache: Connections total |<p>Number of total connections</p> |DEPENDENT |apache.connections[total{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.ConnsTotal`</p> |
 |Apache |Apache: Bytes per request |<p>Average number of client requests per second</p> |DEPENDENT |apache.bytes[per_request{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.BytesPerReq`</p> |
 |Apache |Apache: Number of async processes |<p>Number of async processes</p> |DEPENDENT |apache.process[num{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Processes`</p> |
-|Zabbix_raw_items |Apache: Get status |<p>Getting data from a machine-readable version of the Apache status page.</p><p>https://httpd.apache.org/docs/current/mod/mod_status.html</p> |HTTP_AGENT |apache.get_status<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
+|Zabbix_raw_items |Apache: Get status |<p>Getting data from a machine-readable version of the Apache status page.</p><p>https://httpd.apache.org/docs/current/mod/mod_status.html</p> |HTTP_AGENT |apache.get_status<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Apache: Service is down |<p>-</p> |`{TEMPLATE_NAME:net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"].last()}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Apache: Service response time is too high (over {$APACHE.RESPONSE_TIME.MAX.WARN}s for 5m) |<p>-</p> |`{TEMPLATE_NAME:net.tcp.service.perf[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"].min(5m)}>{$APACHE.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Service is down</p> |
-|Apache: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:apache.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Apache: Version has changed (new version: {ITEM.VALUE}) |<p>Apache version has changed. Ack to close.</p> |`{TEMPLATE_NAME:apache.version.diff()}=1 and {TEMPLATE_NAME:apache.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Apache: Failed to fetch status page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`{TEMPLATE_NAME:apache.get_status.nodata(30m)}=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Service is down</p> |
+|Apache: Service is down |<p>-</p> |`last(/Apache by HTTP/net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|Apache: Service response time is too high (over {$APACHE.RESPONSE_TIME.MAX.WARN}s for 5m) |<p>-</p> |`min(/Apache by HTTP/net.tcp.service.perf[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"],5m)>{$APACHE.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Service is down</p> |
+|Apache: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Apache by HTTP/apache.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Apache: Version has changed (new version: {ITEM.VALUE}) |<p>Apache version has changed. Ack to close.</p> |`last(/Apache by HTTP/apache.version,#1)<>last(/Apache by HTTP/apache.version,#2) and length(last(/Apache by HTTP/apache.version))>0` |INFO |<p>Manual close: YES</p> |
+|Apache: Failed to fetch status page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Apache by HTTP/apache.get_status,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Apache: Service is down</p> |
 
 ## Feedback
 
diff --git a/templates/app/apache_http/template_app_apache_http.yaml b/templates/app/apache_http/template_app_apache_http.yaml
index 21d7753af59..1a95e245d83 100644
--- a/templates/app/apache_http/template_app_apache_http.yaml
+++ b/templates/app/apache_http/template_app_apache_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-22T16:33:44Z'
+  version: '6.0'
+  date: '2021-12-15T06:56:33Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,7 +16,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384764-discussion-thread-for-official-zabbix-template-apache
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/aranet/README.md b/templates/app/aranet/README.md
deleted file mode 100644
index 93dd28b564c..00000000000
--- a/templates/app/aranet/README.md
+++ /dev/null
@@ -1,79 +0,0 @@
-
-# Aranet Cloud
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/http) for basic instructions.
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                                    | Description                                   | Default                    |
-|-----------------------------------------|-----------------------------------------------|----------------------------|
-| {$ARANET.API.ENDPOINT}                  | <p>Aranet Cloud API endpoint</p>              | `https://aranet.cloud/api` |
-| {$ARANET.API.PASSWORD}                  | <p>Aranet Cloud password</p>                  | `<PUT YOUR PASSWORD>`      |
-| {$ARANET.API.SPACE_NAME}                | <p>Aranet Cloud space name</p>                | `<PUT YOUR SPACE NAME>`    |
-| {$ARANET.API.USERNAME}                  | <p>Aranet Cloud username</p>                  | `<PUT YOUR USERNAME>`      |
-| {$ARANET.BATT.VOLTAGE.MIN.CRIT}         | <p>Battery voltage critical threshold</p>     | `2`                        |
-| {$ARANET.BATT.VOLTAGE.MIN.WARN}         | <p>Battery voltage warning threshold</p>      | `1`                        |
-| {$ARANET.CO2.MAX.CRIT}                  | <p>CO2 critical threshold</p>                 | `1000`                     |
-| {$ARANET.CO2.MAX.WARN}                  | <p>CO2 warning threshold</p>                  | `600`                      |
-| {$ARANET.HUMIDITY.MAX.WARN}             | <p>Maximum humidity threshold</p>             | `70`                       |
-| {$ARANET.HUMIDITY.MIN.WARN}             | <p>Minimum humidity threshold</p>             | `20`                       |
-| {$ARANET.LLD.FILTER.SENSOR.MATCHES}     | <p>Filter of discoverable sensors</p>         | `.+`                       |
-| {$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES} | <p>Filter to exclude discoverable sensors</p> | `CHANGE_IF_NEEDED`         |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-| Name                                   | Description                                                        | Type      | Key and additional info                                                                                                                                                                                                                                                                |
-|----------------------------------------|--------------------------------------------------------------------|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Temperature sensors discovery          | <p>Discovery for Aranet Cloud temperature sensors</p>              | DEPENDENT | aranet.temp.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Temperature`</p>                                 |
-| Humidity sensors discovery             | <p>Discovery for Aranet Cloud humidity sensors</p>                 | DEPENDENT | aranet.humidity.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Humidity`</p>                                |
-| RSSI sensors discovery                 | <p>Discovery for Aranet Cloud RSSI sensors</p>                     | DEPENDENT | aranet.rssi.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `RSSI`</p>                                        |
-| Battery voltage sensors discovery      | <p>Discovery for Aranet Cloud battery voltage sensors</p>          | DEPENDENT | aranet.battery.voltage.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Battery voltage`</p>                  |
-| CO2 sensors discovery                  | <p>Discovery for Aranet Cloud CO2 sensors</p>                      | DEPENDENT | aranet.co2.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `CO₂`</p>                                          |
-| Atmospheric pressure sensors discovery | <p>Discovery for Aranet Cloud atmospheric pressure sensors</p>     | DEPENDENT | aranet.pressure.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Atmospheric Pressure`</p>                    |
-| Voltage sensors discovery              | <p>Discovery for Aranet Cloud voltage sensors</p>                  | DEPENDENT | aranet.voltage.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Voltage`</p>                                  |
-| Weight sensors discovery               | <p>Discovery for Aranet Cloud weight sensors</p>                   | DEPENDENT | aranet.weight.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Weight`</p>                                    |
-| Volumetric Water Content discovery     | <p>Discovery for Aranet Cloud volumetric Water Content sensors</p> | DEPENDENT | aranet.olumetric.water.content.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Volumetric Water Content`</p> |
-| PPFD sensors discovery                 | <p>Discovery for Aranet Cloud PPFD sensors</p>                     | DEPENDENT | aranet.ppfd.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `PPFD`</p>                                        |
-| Distance sensors discovery             | <p>Discovery for Aranet Cloud distance sensors</p>                 | DEPENDENT | aranet.distance.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Distance`</p>                                |
-| Illuminance sensors discovery          | <p>Discovery for Aranet Cloud illuminance sensors</p>              | DEPENDENT | aranet.illuminance.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Illuminance`</p>                          |
-| pH sensors discovery                   | <p>Discovery for Aranet Cloud pH sensors</p>                       | DEPENDENT | aranet.ph.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `pH`</p>                                            |
-| Current sensors discovery              | <p>Discovery for Aranet Cloud current sensors</p>                  | DEPENDENT | aranet.current.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.MATCHES}`</p><p>- B: {#SENSOR} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR.NOT_MATCHES}`</p><p>- C: {#METRIC} MATCHES_REGEX `Current`</p>                                  |
-
-## Items collected
-
-| Group            | Name                      | Description                               | Type      | Key and additional info                                                                                                                                      |
-|------------------|---------------------------|-------------------------------------------|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Zabbix_raw_items | Aranet: Sensors discovery | <p>Discovery for Aranet Cloud sensors</p> | DEPENDENT | aranet.sensor.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-| Zabbix_raw_items | Aranet: Get data          |                                           | SCRIPT    | aranet.get_data                                                                                                                                              |
-
-## Triggers
-
-| Name                                                                                                                       | Description | Expression                                                                                              | Severity | Dependencies and additional info                                                                                                                          |
-|----------------------------------------------------------------------------------------------------------------------------|-------------|---------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|
-| {#METRIC}: Low humidity on "{#SENSOR}" (below {$ARANET.HUMIDITY.MIN.WARN:"{#SENSOR}"}{#UNIT} for 5m)                       | <p>-</p>    | `{TEMPLATE_NAME:aranet.humidity["{#ID}"].max(5m)} < {$ARANET.HUMIDITY.MIN.WARN:"{#SENSOR}"}`            | WARNING  | <p>**Depends on**:</p><p>- {#METRIC}: High humidity on "{#SENSOR}" (over {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR}"}{#UNIT} for 5m)</p>                       |
-| {#METRIC}: High humidity on "{#SENSOR}" (over {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR}"}{#UNIT} for 5m)                       | <p>-</p>    | `{TEMPLATE_NAME:aranet.humidity["{#ID}"].min(5m)} > {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR}"}`            | HIGH     |                                                                                                                                                           |
-| {#METRIC}: Low battery voltage on "{#SENSOR}" (below {$ARANET.BATT.VOLTAGE.MIN.WARN:"{#SENSOR}"}{#UNIT} for 5m)            | <p>-</p>    | `{TEMPLATE_NAME:aranet.battery.voltage["{#ID}"].max(5m)} < {$ARANET.BATT.VOLTAGE.MIN.WARN:"{#SENSOR}"}` | WARNING  | <p>**Depends on**:</p><p>- {#METRIC}: Critically low battery voltage on "{#SENSOR}" (below {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR}"}{#UNIT} for 5m)</p> |
-| {#METRIC}: Critically low battery voltage on "{#SENSOR}" (below {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR}"}{#UNIT} for 5m) | <p>-</p>    | `{TEMPLATE_NAME:aranet.battery.voltage["{#ID}"].max(5m)} < {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR}"}` | HIGH     |                                                                                                                                                           |
-| {#METRIC}: High CO2 level on "{#SENSOR}" (over {$ARANET.CO2.MAX.WARN:"{#SENSOR}"}{#UNIT} for 5m)                           | <p>-</p>    | `{TEMPLATE_NAME:aranet.co2["{#ID}"].min(5m)} > {$ARANET.CO2.MAX.WARN:"{#SENSOR}"}`                      | WARNING  | <p>**Depends on**:</p><p>- {#METRIC}: Critically high CO2 level on "{#SENSOR}" (over {$ARANET.CO2.MAX.CRIT:"{#SENSOR}"}{#UNIT} for 5m)</p>                |
-| {#METRIC}: Critically high CO2 level on "{#SENSOR}" (over {$ARANET.CO2.MAX.CRIT:"{#SENSOR}"}{#UNIT} for 5m)                | <p>-</p>    | `{TEMPLATE_NAME:aranet.co2["{#ID}"].min(5m)} > {$ARANET.CO2.MAX.CRIT:"{#SENSOR}"}`                      | HIGH     |                                                                                                                                                           |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/app/aranet_http/README.md b/templates/app/aranet_http/README.md
new file mode 100644
index 00000000000..c716bd428fa
--- /dev/null
+++ b/templates/app/aranet_http/README.md
@@ -0,0 +1,113 @@
+
+# Aranet Cloud
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/http) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$ARANET.API.ENDPOINT} |<p>Aranet Cloud API endpoint.</p> |`https://aranet.cloud/api` |
+|{$ARANET.API.PASSWORD} |<p>Aranet Cloud password.</p> |`<PUT YOUR PASSWORD>` |
+|{$ARANET.API.SPACE_NAME} |<p>Aranet Cloud organization name.</p> |`<PUT YOUR SPACE NAME>` |
+|{$ARANET.API.USERNAME} |<p>Aranet Cloud username.</p> |`<PUT YOUR USERNAME>` |
+|{$ARANET.BATT.VOLTAGE.MIN.CRIT} |<p>Battery voltage critical threshold.</p> |`2` |
+|{$ARANET.BATT.VOLTAGE.MIN.WARN} |<p>Battery voltage warning threshold.</p> |`1` |
+|{$ARANET.CO2.MAX.CRIT} |<p>CO2 critical threshold.</p> |`1000` |
+|{$ARANET.CO2.MAX.WARN} |<p>CO2 warning threshold.</p> |`600` |
+|{$ARANET.HUMIDITY.MAX.WARN} |<p>Maximum humidity threshold.</p> |`70` |
+|{$ARANET.HUMIDITY.MIN.WARN} |<p>Minimum humidity threshold.</p> |`20` |
+|{$ARANET.LAST_UPDATE.MAX.WARN} |<p>Data update delay threshold.</p> |`1h` |
+|{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES} |<p>Filter of discoverable sensors by gateway id.</p> |`.+` |
+|{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES} |<p>Filter of discoverable sensors by gateway name.</p> |`.+` |
+|{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES} |<p>Filter to exclude discoverable sensors by gateway name.</p> |`CHANGE_IF_NEEDED` |
+|{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES} |<p>Filter of discoverable sensors by id.</p> |`.+` |
+|{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES} |<p>Filter of discoverable sensors by name.</p> |`.+` |
+|{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES} |<p>Filter to exclude discoverable sensors by name.</p> |`CHANGE_IF_NEEDED` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature discovery |<p>Discovery for Aranet Cloud temperature sensors</p> |DEPENDENT |aranet.temp.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Temperature`</p> |
+|Humidity discovery |<p>Discovery for Aranet Cloud humidity sensors</p> |DEPENDENT |aranet.humidity.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Humidity`</p> |
+|RSSI discovery |<p>Discovery for Aranet Cloud RSSI sensors</p> |DEPENDENT |aranet.rssi.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `RSSI`</p> |
+|Battery voltage discovery |<p>Discovery for Aranet Cloud Battery voltage sensors</p> |DEPENDENT |aranet.battery.voltage.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Battery voltage`</p> |
+|CO2 discovery |<p>Discovery for Aranet Cloud CO2 sensors</p> |DEPENDENT |aranet.co2.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `CO₂`</p> |
+|Atmospheric pressure discovery |<p>Discovery for Aranet Cloud atmospheric pressure sensors</p> |DEPENDENT |aranet.pressure.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Atmospheric Pressure`</p> |
+|Voltage discovery |<p>Discovery for Aranet Cloud Voltage sensors</p> |DEPENDENT |aranet.voltage.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Voltage`</p> |
+|Weight discovery |<p>Discovery for Aranet Cloud Weight sensors</p> |DEPENDENT |aranet.weight.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Weight`</p> |
+|Volumetric Water Content discovery |<p>Discovery for Aranet Cloud Volumetric Water Content sensors</p> |DEPENDENT |aranet.volum_water_content.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Volumetric Water Content`</p> |
+|PPFD discovery |<p>Discovery for Aranet Cloud PPFD sensors</p> |DEPENDENT |aranet.ppfd.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `PPFD`</p> |
+|Distance discovery |<p>Discovery for Aranet Cloud Distance sensors</p> |DEPENDENT |aranet.distance.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Distance`</p> |
+|Illuminance discovery |<p>Discovery for Aranet Cloud Illuminance sensors</p> |DEPENDENT |aranet.illuminance.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Illuminance`</p> |
+|pH discovery |<p>Discovery for Aranet Cloud pH sensors</p> |DEPENDENT |aranet.ph.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `pH`</p> |
+|Current discovery |<p>Discovery for Aranet Cloud Current sensors</p> |DEPENDENT |aranet.current.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Current`</p> |
+|Soil Dielectric Permittivity discovery |<p>Discovery for Aranet Cloud Soil Dielectric Permittivity sensors</p> |DEPENDENT |aranet.soil_dielectric_perm.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Soil Dielectric Permittivity`</p> |
+|Soil Electrical Conductivity discovery |<p>Discovery for Aranet Cloud Soil Electrical Conductivity sensors</p> |DEPENDENT |aranet.soil_electric_cond.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Soil Electrical Conductivity`</p> |
+|Pore Electrical Conductivity discovery |<p>Discovery for Aranet Cloud Pore Electrical Conductivity sensors</p> |DEPENDENT |aranet.pore_electric_cond.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Pore Electrical Conductivity`</p> |
+|Pulses discovery |<p>Discovery for Aranet Cloud Pulses sensors</p> |DEPENDENT |aranet.pulses.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Pulses`</p> |
+|Pulses Cumulative discovery |<p>Discovery for Aranet Cloud Pulses Cumulative sensors</p> |DEPENDENT |aranet.pulses_cumulative.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Pulses Cumulative`</p> |
+|Differential Pressure discovery |<p>Discovery for Aranet Cloud Differential Pressure sensors</p> |DEPENDENT |aranet.diff_pressure.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Differential Pressure`</p> |
+|Last update discovery |<p>Discovery for Aranet Cloud Last update metric</p> |DEPENDENT |aranet.last_update.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}`</p><p>- {#SENSOR_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}`</p><p>- {#SENSOR_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}`</p><p>- {#GATEWAY_NAME} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}`</p><p>- {#GATEWAY_NAME} NOT_MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}`</p><p>- {#GATEWAY_ID} MATCHES_REGEX `{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}`</p><p>- {#METRIC} MATCHES_REGEX `Last update`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.temp["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.humidity["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.rssi["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.battery.voltage["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.co2["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.pressure["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.voltage["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.weight["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.volumetric.water.content["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.ppfd["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.distance["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.illuminance["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.ph["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.current["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.soil_dielectric_perm["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.soil_electric_cond["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.pore_electric_cond["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.pulses["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.pulses_cumulative["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.diff_pressure["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p> |
+|Aranet |{#METRIC}: [{#GATEWAY_NAME}] {#SENSOR_NAME} |<p>-</p> |DEPENDENT |aranet.last_update["{#GATEWAY_ID}", "{#SENSOR_ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.id == "{#SENSOR_ID}" && @.name == "{#SENSOR_NAME}")].metrics[?(@.name == "{#METRIC}")].value.first()`</p><p>- JAVASCRIPT: `return Math.floor(Date.now()/1000 - Number(value));`</p> |
+|Zabbix_raw_items |Aranet: Sensors discovery |<p>Discovery for Aranet Cloud sensors</p> |DEPENDENT |aranet.sensor.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Zabbix_raw_items |Aranet: Get data |<p>-</p> |SCRIPT |aranet.get_data<p>**Expression**:</p>`The text is too long. Please see the template.` |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#METRIC}: Low humidity on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (below {$ARANET.HUMIDITY.MIN.WARN:"{#SENSOR_NAME}"}{#UNIT} for 5m) | |`max(/Aranet Cloud/aranet.humidity["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) < {$ARANET.HUMIDITY.MIN.WARN:"{#SENSOR_NAME}"}` |WARNING |<p>**Depends on**:</p><p>- {#METRIC}: High humidity on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR_NAME}"}{#UNIT} for 5m)</p> |
+|{#METRIC}: High humidity on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR_NAME}"}{#UNIT} for 5m) | |`min(/Aranet Cloud/aranet.humidity["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) > {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR_NAME}"}` |HIGH | |
+|{#METRIC}: Low battery voltage on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (below {$ARANET.BATT.VOLTAGE.MIN.WARN:"{#SENSOR_NAME}"}{#UNIT} for 5m) |<p>-</p> |`max(/Aranet Cloud/aranet.battery.voltage["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) < {$ARANET.BATT.VOLTAGE.MIN.WARN:"{#SENSOR_NAME}"}` |WARNING |<p>**Depends on**:</p><p>- {#METRIC}: Critically low battery voltage on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (below {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR_NAME}"}{#UNIT} for 5m)</p> |
+|{#METRIC}: Critically low battery voltage on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (below {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR_NAME}"}{#UNIT} for 5m) |<p>-</p> |`max(/Aranet Cloud/aranet.battery.voltage["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) < {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR_NAME}"}` |HIGH | |
+|{#METRIC}: High CO2 level on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.CO2.MAX.WARN:"{#SENSOR_NAME}"}{#UNIT} for 5m) |<p>-</p> |`min(/Aranet Cloud/aranet.co2["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) > {$ARANET.CO2.MAX.WARN:"{#SENSOR_NAME}"}` |WARNING |<p>**Depends on**:</p><p>- {#METRIC}: Critically high CO2 level on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.CO2.MAX.CRIT:"{#SENSOR_NAME}"}{#UNIT} for 5m)</p> |
+|{#METRIC}: Critically high CO2 level on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.CO2.MAX.CRIT:"{#SENSOR_NAME}"}{#UNIT} for 5m) |<p>-</p> |`min(/Aranet Cloud/aranet.co2["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) > {$ARANET.CO2.MAX.CRIT:"{#SENSOR_NAME}"}` |HIGH | |
+|{#METRIC}: Sensor data "[{#GATEWAY_NAME}] {#SENSOR_NAME}" is not updated (more than {$ARANET.LAST_UPDATE.MAX.WARN:"{#SENSOR_NAME}"}) |<p>-</p> |`last(/Aranet Cloud/aranet.last_update["{#GATEWAY_ID}", "{#SENSOR_ID}"]) > {$ARANET.LAST_UPDATE.MAX.WARN:"{#SENSOR_NAME}"}` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/app/aranet/aranet_cloud.yaml b/templates/app/aranet_http/template_app_aranet_http.yaml
index 8dd99489fe7..dab42f5926a 100644
--- a/templates/app/aranet/aranet_cloud.yaml
+++ b/templates/app/aranet_http/template_app_aranet_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:19Z'
+  version: '6.0'
+  date: '2021-12-15T13:50:35Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: af21edc47557400583e537904ea632aa
       template: 'Aranet Cloud'
       name: 'Aranet Cloud'
-      description: 'Template tooling version used: 0.38'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Applications
@@ -1729,57 +1729,68 @@ zabbix_export:
         -
           macro: '{$ARANET.API.ENDPOINT}'
           value: 'https://aranet.cloud/api'
+          description: 'Aranet Cloud API endpoint.'
         -
           macro: '{$ARANET.API.PASSWORD}'
           value: '<PUT YOUR PASSWORD>'
+          description: 'Aranet Cloud password.'
         -
           macro: '{$ARANET.API.SPACE_NAME}'
           value: '<PUT YOUR SPACE NAME>'
+          description: 'Aranet Cloud organization name.'
         -
           macro: '{$ARANET.API.USERNAME}'
           value: '<PUT YOUR USERNAME>'
+          description: 'Aranet Cloud username.'
         -
           macro: '{$ARANET.BATT.VOLTAGE.MIN.CRIT}'
           value: '2'
+          description: 'Battery voltage critical threshold.'
         -
           macro: '{$ARANET.BATT.VOLTAGE.MIN.WARN}'
           value: '1'
+          description: 'Battery voltage warning threshold.'
         -
           macro: '{$ARANET.CO2.MAX.CRIT}'
           value: '1000'
+          description: 'CO2 critical threshold.'
         -
           macro: '{$ARANET.CO2.MAX.WARN}'
           value: '600'
+          description: 'CO2 warning threshold.'
         -
           macro: '{$ARANET.HUMIDITY.MAX.WARN}'
           value: '70'
+          description: 'Maximum humidity threshold.'
         -
           macro: '{$ARANET.HUMIDITY.MIN.WARN}'
           value: '20'
+          description: 'Minimum humidity threshold.'
         -
           macro: '{$ARANET.LAST_UPDATE.MAX.WARN}'
           value: 1h
+          description: 'Data update delay threshold.'
         -
           macro: '{$ARANET.LLD.FILTER.GATEWAY_ID.MATCHES}'
           value: .+
-          description: 'Filter of discoverable sensors by gateway id'
+          description: 'Filter of discoverable sensors by gateway id.'
         -
           macro: '{$ARANET.LLD.FILTER.GATEWAY_NAME.MATCHES}'
           value: .+
-          description: 'Filter of discoverable sensors by gateway name'
+          description: 'Filter of discoverable sensors by gateway name.'
         -
           macro: '{$ARANET.LLD.FILTER.GATEWAY_NAME.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
-          description: 'Filter to exclude discoverable sensors by gateway name'
+          description: 'Filter to exclude discoverable sensors by gateway name.'
         -
           macro: '{$ARANET.LLD.FILTER.SENSOR_ID.MATCHES}'
           value: .+
-          description: 'Filter of discoverable sensors by id'
+          description: 'Filter of discoverable sensors by id.'
         -
           macro: '{$ARANET.LLD.FILTER.SENSOR_NAME.MATCHES}'
           value: .+
-          description: 'Filter of discoverable sensors by name'
+          description: 'Filter of discoverable sensors by name.'
         -
           macro: '{$ARANET.LLD.FILTER.SENSOR_NAME.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
-          description: 'Filter to exclude discoverable sensors by name'
+          description: 'Filter to exclude discoverable sensors by name.'
diff --git a/templates/app/ceph_agent2/README.md b/templates/app/ceph_agent2/README.md
index 057afc1703e..77a15b75eb2 100644
--- a/templates/app/ceph_agent2/README.md
+++ b/templates/app/ceph_agent2/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Ceph cluster by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -57,10 +57,10 @@ There are no template links in this template.
 |Ceph |Ceph: Number of Monitors |<p>Number of Monitors configured in Ceph cluster</p> |DEPENDENT |ceph.num_mon<p>**Preprocessing**:</p><p>- JSONPATH: `$.num_mon`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Ceph |Ceph: Overall cluster status |<p>Overall Ceph cluster status, eg 0 - HEALTH_OK, 1 - HEALTH_WARN or 2 - HEALTH_ERR</p> |DEPENDENT |ceph.overall_status<p>**Preprocessing**:</p><p>- JSONPATH: `$.overall_status`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |Ceph |Ceph: Minimum Mon release version |<p>min_mon_release_name</p> |DEPENDENT |ceph.min_mon_release_name<p>**Preprocessing**:</p><p>- JSONPATH: `$.min_mon_release_name`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Ceph |Ceph: Ceph Read bandwidth |<p>Global read Bytes per second</p> |DEPENDENT |ceph.rd_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.rd_bytes`</p><p>- CHANGE_PER_SECOND |
-|Ceph |Ceph: Ceph Write bandwidth |<p>Global write Bytes per second</p> |DEPENDENT |ceph.wr_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.wr_bytes`</p><p>- CHANGE_PER_SECOND |
+|Ceph |Ceph: Ceph Read bandwidth |<p>Global read Bytes per second</p> |DEPENDENT |ceph.rd_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.rd_bytes`</p><p>- CHANGE_PER_SECOND</p> |
+|Ceph |Ceph: Ceph Write bandwidth |<p>Global write Bytes per second</p> |DEPENDENT |ceph.wr_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.wr_bytes`</p><p>- CHANGE_PER_SECOND</p> |
 |Ceph |Ceph: Ceph Read operations per sec |<p>Global read operations per second</p> |DEPENDENT |ceph.rd_ops.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.rd_ops`</p> |
-|Ceph |Ceph: Ceph Write operations per sec |<p>Global write operations per second</p> |DEPENDENT |ceph.wr_ops.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.wr_ops`</p><p>- CHANGE_PER_SECOND |
+|Ceph |Ceph: Ceph Write operations per sec |<p>Global write operations per second</p> |DEPENDENT |ceph.wr_ops.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.wr_ops`</p><p>- CHANGE_PER_SECOND</p> |
 |Ceph |Ceph: Total bytes available |<p>Total bytes available in Ceph cluster</p> |DEPENDENT |ceph.total_avail_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_avail_bytes`</p> |
 |Ceph |Ceph: Total bytes |<p>Total (RAW) capacity of Ceph cluster in bytes</p> |DEPENDENT |ceph.total_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_bytes`</p> |
 |Ceph |Ceph: Total bytes used |<p>Total bytes used in Ceph cluster</p> |DEPENDENT |ceph.total_used_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_used_bytes`</p> |
@@ -111,10 +111,10 @@ There are no template links in this template.
 |Ceph |Ceph: [{#POOLNAME}] Pool RAW Used |<p>Bytes used in pool including copies made.</p> |DEPENDENT |ceph.pool["{#POOLNAME}",stored_raw]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].stored_raw`</p> |
 |Ceph |Ceph: [{#POOLNAME}] Pool Percent Used |<p>Percentage of storage used per pool</p> |DEPENDENT |ceph.pool["{#POOLNAME}",percent_used]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].percent_used`</p> |
 |Ceph |Ceph: [{#POOLNAME}] Pool objects |<p>Number of objects in the pool.</p> |DEPENDENT |ceph.pool["{#POOLNAME}",objects]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].objects`</p> |
-|Ceph |Ceph: [{#POOLNAME}] Pool Read bandwidth |<p>Per-pool read Bytes/second</p> |DEPENDENT |ceph.pool["{#POOLNAME}",rd_bytes.rate]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].rd_bytes`</p><p>- CHANGE_PER_SECOND |
-|Ceph |Ceph: [{#POOLNAME}] Pool Write bandwidth |<p>Per-pool write Bytes/second</p> |DEPENDENT |ceph.pool["{#POOLNAME}",wr_bytes.rate]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].wr_bytes`</p><p>- CHANGE_PER_SECOND |
-|Ceph |Ceph: [{#POOLNAME}] Pool Read operations |<p>Per-pool read operations/second</p> |DEPENDENT |ceph.pool["{#POOLNAME}",rd_ops.rate]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].rd_ops`</p><p>- CHANGE_PER_SECOND |
-|Ceph |Ceph: [{#POOLNAME}] Pool Write operations |<p>Per-pool write operations/second</p> |DEPENDENT |ceph.pool["{#POOLNAME}",wr_ops.rate]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].wr_ops`</p><p>- CHANGE_PER_SECOND |
+|Ceph |Ceph: [{#POOLNAME}] Pool Read bandwidth |<p>Per-pool read Bytes/second</p> |DEPENDENT |ceph.pool["{#POOLNAME}",rd_bytes.rate]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].rd_bytes`</p><p>- CHANGE_PER_SECOND</p> |
+|Ceph |Ceph: [{#POOLNAME}] Pool Write bandwidth |<p>Per-pool write Bytes/second</p> |DEPENDENT |ceph.pool["{#POOLNAME}",wr_bytes.rate]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].wr_bytes`</p><p>- CHANGE_PER_SECOND</p> |
+|Ceph |Ceph: [{#POOLNAME}] Pool Read operations |<p>Per-pool read operations/second</p> |DEPENDENT |ceph.pool["{#POOLNAME}",rd_ops.rate]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].rd_ops`</p><p>- CHANGE_PER_SECOND</p> |
+|Ceph |Ceph: [{#POOLNAME}] Pool Write operations |<p>Per-pool write operations/second</p> |DEPENDENT |ceph.pool["{#POOLNAME}",wr_ops.rate]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pools["{#POOLNAME}"].wr_ops`</p><p>- CHANGE_PER_SECOND</p> |
 |Zabbix_raw_items |Ceph: Get overall cluster status | |ZABBIX_PASSIVE |ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"] |
 |Zabbix_raw_items |Ceph: Get OSD stats | |ZABBIX_PASSIVE |ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"] |
 |Zabbix_raw_items |Ceph: Get OSD dump | |ZABBIX_PASSIVE |ceph.osd.dump["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"] |
@@ -124,13 +124,13 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Ceph: Can not connect to cluster |<p>Connection to Ceph RESTful module is broken (if there is any error presented including AUTH and configuration issues).</p> |`{TEMPLATE_NAME:ceph.ping["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"].last()}=0` |AVERAGE | |
-|Ceph: Cluster in ERROR state |<p>-</p> |`{TEMPLATE_NAME:ceph.overall_status.last()}=2` |AVERAGE |<p>Manual close: YES</p> |
-|Ceph: Cluster in WARNING state |<p>-</p> |`{TEMPLATE_NAME:ceph.overall_status.last()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:ceph.overall_status.last()}=0` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Ceph: Cluster in ERROR state</p> |
-|Ceph: Minimum monitor release version has changed (new version: {ITEM.VALUE}) |<p>Ceph version has changed. Ack to close.</p> |`{TEMPLATE_NAME:ceph.min_mon_release_name.diff()}=1 and {TEMPLATE_NAME:ceph.min_mon_release_name.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Ceph: OSD osd.{#OSDNAME} is down |<p>OSD osd.{#OSDNAME} is marked "down" in the osdmap.</p><p>The OSD daemon may have been stopped, or peer OSDs may be unable to reach the OSD over the network.</p> |`{TEMPLATE_NAME:ceph.osd[{#OSDNAME},up].last()} = 0` |AVERAGE | |
-|Ceph: OSD osd.{#OSDNAME} is full |<p>-</p> |`{TEMPLATE_NAME:ceph.osd[{#OSDNAME},fill].min(15m)} > {Ceph by Zabbix Agent2:ceph.osd_full_ratio.last()}*100` |AVERAGE | |
-|Ceph: Ceph OSD osd.{#OSDNAME} is near full |<p>-</p> |`{TEMPLATE_NAME:ceph.osd[{#OSDNAME},fill].min(15m)} > {Ceph by Zabbix Agent2:ceph.osd_nearfull_ratio.last()}*100` |WARNING |<p>**Depends on**:</p><p>- Ceph: OSD osd.{#OSDNAME} is full</p> |
+|Ceph: Can not connect to cluster |<p>Connection to Ceph RESTful module is broken (if there is any error presented including AUTH and configuration issues).</p> |`last(/Ceph by Zabbix agent 2/ceph.ping["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"])=0` |AVERAGE | |
+|Ceph: Cluster in ERROR state |<p>-</p> |`last(/Ceph by Zabbix agent 2/ceph.overall_status)=2` |AVERAGE |<p>Manual close: YES</p> |
+|Ceph: Cluster in WARNING state |<p>-</p> |`last(/Ceph by Zabbix agent 2/ceph.overall_status)=1`<p>Recovery expression:</p>`last(/Ceph by Zabbix agent 2/ceph.overall_status)=0` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Ceph: Cluster in ERROR state</p> |
+|Ceph: Minimum monitor release version has changed (new version: {ITEM.VALUE}) |<p>Ceph version has changed. Ack to close.</p> |`last(/Ceph by Zabbix agent 2/ceph.min_mon_release_name,#1)<>last(/Ceph by Zabbix agent 2/ceph.min_mon_release_name,#2) and length(last(/Ceph by Zabbix agent 2/ceph.min_mon_release_name))>0` |INFO |<p>Manual close: YES</p> |
+|Ceph: OSD osd.{#OSDNAME} is down |<p>OSD osd.{#OSDNAME} is marked "down" in the osdmap.</p><p>The OSD daemon may have been stopped, or peer OSDs may be unable to reach the OSD over the network.</p> |`last(/Ceph by Zabbix agent 2/ceph.osd[{#OSDNAME},up]) = 0` |AVERAGE | |
+|Ceph: OSD osd.{#OSDNAME} is full |<p>-</p> |`min(/Ceph by Zabbix agent 2/ceph.osd[{#OSDNAME},fill],15m) > last(/Ceph by Zabbix agent 2/ceph.osd_full_ratio)*100` |AVERAGE | |
+|Ceph: Ceph OSD osd.{#OSDNAME} is near full |<p>-</p> |`min(/Ceph by Zabbix agent 2/ceph.osd[{#OSDNAME},fill],15m) > last(/Ceph by Zabbix agent 2/ceph.osd_nearfull_ratio)*100` |WARNING |<p>**Depends on**:</p><p>- Ceph: OSD osd.{#OSDNAME} is full</p> |
 
 ## Feedback
 
diff --git a/templates/app/ceph_agent2/template_app_ceph_agent2.yaml b/templates/app/ceph_agent2/template_app_ceph_agent2.yaml
index 9cc6394fb92..0ecd8725045 100644
--- a/templates/app/ceph_agent2/template_app_ceph_agent2.yaml
+++ b/templates/app/ceph_agent2/template_app_ceph_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:15Z'
+  version: '6.0'
+  date: '2021-12-15T06:56:38Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/410059-discussion-thread-for-official-zabbix-template-ceph
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/certificate_agent2/README.md b/templates/app/certificate_agent2/README.md
index 6063ebcedc6..a4de43cd2f9 100644
--- a/templates/app/certificate_agent2/README.md
+++ b/templates/app/certificate_agent2/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor TLS/SSL certificate on the website by Zabbix agent 2 that works without any external scripts.
 Zabbix agent 2 with the WebCertificate plugin requests certificate using the web.certificate.get key and returns
 JSON with certificate attributes.
@@ -64,9 +64,9 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Cert: SSL certificate is invalid |<p>SSL certificate has expired or it is issued for another domain.</p> |`find(/TEMPLATE_NAME/cert.validation,,"like","invalid")=1` |HIGH | |
-|Cert: SSL certificate expires soon (less than {$CERT.EXPIRY.WARN} days) |<p>The SSL certificate should be updated or it will become untrusted.</p> |`(last(/TEMPLATE_NAME/cert.not_after) - now()) / 86400 < {$CERT.EXPIRY.WARN}` |WARNING |<p>**Depends on**:</p><p>- Cert: SSL certificate is invalid</p> |
-|Cert: Fingerprint has changed (new version: {ITEM.VALUE}) |<p>The SSL certificate fingerprint has changed. If you did not update the certificate, it may mean your certificate has been hacked. Ack to close.</p><p>There could be multiple valid certificates on some installations. In this case, the trigger will have a false positive. You can ignore it or disable the trigger.</p> |`last(/TEMPLATE_NAME/cert.sha1_fingerprint) <> last(/TEMPLATE_NAME/cert.sha1_fingerprint,#2)` |INFO |<p>Manual close: YES</p> |
+|Cert: SSL certificate is invalid |<p>SSL certificate has expired or it is issued for another domain.</p> |`find(/Website certificate by Zabbix agent 2/cert.validation,,"like","invalid")=1` |HIGH | |
+|Cert: SSL certificate expires soon (less than {$CERT.EXPIRY.WARN} days) |<p>The SSL certificate should be updated or it will become untrusted.</p> |`(last(/Website certificate by Zabbix agent 2/cert.not_after) - now()) / 86400 < {$CERT.EXPIRY.WARN}` |WARNING |<p>**Depends on**:</p><p>- Cert: SSL certificate is invalid</p> |
+|Cert: Fingerprint has changed (new version: {ITEM.VALUE}) |<p>The SSL certificate fingerprint has changed. If you did not update the certificate, it may mean your certificate has been hacked. Ack to close.</p><p>There could be multiple valid certificates on some installations. In this case, the trigger will have a false positive. You can ignore it or disable the trigger.</p> |`last(/Website certificate by Zabbix agent 2/cert.sha1_fingerprint) <> last(/Website certificate by Zabbix agent 2/cert.sha1_fingerprint,#2)` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/app/certificate_agent2/template_app_certificate_agent2.yaml b/templates/app/certificate_agent2/template_app_certificate_agent2.yaml
index 9ee2a54a4f9..ddb10ec80f9 100644
--- a/templates/app/certificate_agent2/template_app_certificate_agent2.yaml
+++ b/templates/app/certificate_agent2/template_app_certificate_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-08-09T16:55:44Z'
+  version: '6.0'
+  date: '2021-12-15T07:19:56Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,7 +16,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/428309-discussion-thread-for-official-zabbix-template-tls-ssl-certificates-monitoring
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/cloudflare_http/README.md b/templates/app/cloudflare_http/README.md
index 806dd44870e..8d269673bd0 100644
--- a/templates/app/cloudflare_http/README.md
+++ b/templates/app/cloudflare_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Cloudflare to watch your web traffic and DNS metrics.
 It works without any external scripts and uses the Script item.
 
@@ -76,8 +76,8 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Cloudflare: Cached bandwidth is too low (less than {$CLOUDFLARE.CACHED_BANDWIDTH.MIN.WARN}% for 3 last measurements) | |`max(/TEMPLATE_NAME/cloudflare.bandwidth.cache_hit_ratio,#3) < {$CLOUDFLARE.CACHED_BANDWIDTH.MIN.WARN}` |WARNING | |
-|Cloudflare: Ratio of non-2xx responses is too high (more than {$CLOUDFLARE.ERRORS.MAX.WARN}% for 3 last measurements) |<p>A large number of errors can indicate a malfunction of the site.</p> |`min(/TEMPLATE_NAME/cloudflare.requests.others_ratio,#3) > {$CLOUDFLARE.ERRORS.MAX.WARN}` |AVERAGE | |
+|Cloudflare: Cached bandwidth is too low (less than {$CLOUDFLARE.CACHED_BANDWIDTH.MIN.WARN}% for 3 last measurements) | |`max(/Cloudflare by HTTP/cloudflare.bandwidth.cache_hit_ratio,#3) < {$CLOUDFLARE.CACHED_BANDWIDTH.MIN.WARN}` |WARNING | |
+|Cloudflare: Ratio of non-2xx responses is too high (more than {$CLOUDFLARE.ERRORS.MAX.WARN}% for 3 last measurements) |<p>A large number of errors can indicate a malfunction of the site.</p> |`min(/Cloudflare by HTTP/cloudflare.requests.others_ratio,#3) > {$CLOUDFLARE.ERRORS.MAX.WARN}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/cloudflare_http/template_app_cloudflare_http.yaml b/templates/app/cloudflare_http/template_app_cloudflare_http.yaml
index 73afead30a8..0eda686af53 100644
--- a/templates/app/cloudflare_http/template_app_cloudflare_http.yaml
+++ b/templates/app/cloudflare_http/template_app_cloudflare_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-27T10:10:26Z'
+  version: '6.0'
+  date: '2021-12-15T06:56:45Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         The template to monitor Cloudflare to see your web traffic and DNS metrics. It works without any external scripts and uses Script item.
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -972,14 +972,6 @@ zabbix_export:
                       name: source_type
                       value: '0'
                     -
-                      type: INTEGER
-                      name: columns
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: rows
-                      value: '1'
-                    -
                       type: GRAPH
                       name: graphid
                       value:
@@ -996,14 +988,6 @@ zabbix_export:
                       name: source_type
                       value: '0'
                     -
-                      type: INTEGER
-                      name: columns
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: rows
-                      value: '1'
-                    -
                       type: GRAPH
                       name: graphid
                       value:
@@ -1020,14 +1004,6 @@ zabbix_export:
                       name: source_type
                       value: '0'
                     -
-                      type: INTEGER
-                      name: columns
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: rows
-                      value: '1'
-                    -
                       type: GRAPH
                       name: graphid
                       value:
@@ -1045,14 +1021,6 @@ zabbix_export:
                       name: source_type
                       value: '0'
                     -
-                      type: INTEGER
-                      name: columns
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: rows
-                      value: '1'
-                    -
                       type: GRAPH
                       name: graphid
                       value:
@@ -1069,14 +1037,6 @@ zabbix_export:
                       name: source_type
                       value: '0'
                     -
-                      type: INTEGER
-                      name: columns
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: rows
-                      value: '1'
-                    -
                       type: GRAPH
                       name: graphid
                       value:
@@ -1094,14 +1054,6 @@ zabbix_export:
                       name: source_type
                       value: '0'
                     -
-                      type: INTEGER
-                      name: columns
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: rows
-                      value: '1'
-                    -
                       type: GRAPH
                       name: graphid
                       value:
@@ -1118,14 +1070,6 @@ zabbix_export:
                       name: source_type
                       value: '0'
                     -
-                      type: INTEGER
-                      name: columns
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: rows
-                      value: '1'
-                    -
                       type: GRAPH
                       name: graphid
                       value:
diff --git a/templates/app/docker/README.md b/templates/app/docker/README.md
index d7628c5f230..e9c419e6dc5 100644
--- a/templates/app/docker/README.md
+++ b/templates/app/docker/README.md
@@ -3,11 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Docker engine by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `Docker by Zabbix agent 2` — collects metrics by polling zabbix-agent2.
+Template `Docker by Zabbix agent 2` — collects metrics by polling zabbix-agent2.
 
 
 
@@ -45,8 +45,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Images discovery |<p>Discovery for images metrics</p> |ZABBIX_PASSIVE |docker.images.discovery<p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$DOCKER.LLD.FILTER.IMAGE.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$DOCKER.LLD.FILTER.IMAGE.NOT_MATCHES}`</p> |
-|Containers discovery |<p>Discovery for containers metrics</p><p>Parameter:</p><p>true  - Returns all containers</p><p>false - Returns only running containers</p> |ZABBIX_PASSIVE |docker.containers.discovery[false]<p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$DOCKER.LLD.FILTER.CONTAINER.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$DOCKER.LLD.FILTER.CONTAINER.NOT_MATCHES}`</p> |
+|Images discovery |<p>Discovery for images metrics</p> |ZABBIX_PASSIVE |docker.images.discovery<p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$DOCKER.LLD.FILTER.IMAGE.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$DOCKER.LLD.FILTER.IMAGE.NOT_MATCHES}`</p> |
+|Containers discovery |<p>Discovery for containers metrics</p><p>Parameter:</p><p>true  - Returns all containers</p><p>false - Returns only running containers</p> |ZABBIX_PASSIVE |docker.containers.discovery[false]<p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$DOCKER.LLD.FILTER.CONTAINER.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$DOCKER.LLD.FILTER.CONTAINER.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -59,19 +59,19 @@ There are no template links in this template.
 |Docker |Docker: Containers paused |<p>Total number of containers paused on this host</p> |DEPENDENT |docker.containers.paused<p>**Preprocessing**:</p><p>- JSONPATH: `$.ContainersPaused`</p> |
 |Docker |Docker: Images total |<p>Number of images with intermediate image layers</p> |DEPENDENT |docker.images.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.Images`</p> |
 |Docker |Docker: Storage driver |<p>Docker storage driver </p><p> https://docs.docker.com/storage/storagedriver/</p> |DEPENDENT |docker.driver<p>**Preprocessing**:</p><p>- JSONPATH: `$.Driver`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: Memory limit enabled |<p>-</p> |DEPENDENT |docker.mem_limit.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.MemoryLimit`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: Swap limit enabled |<p>-</p> |DEPENDENT |docker.swap_limit.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.SwapLimit`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: Kernel memory enabled |<p>-</p> |DEPENDENT |docker.kernel_mem.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.KernelMemory`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: Kernel memory TCP enabled |<p>-</p> |DEPENDENT |docker.kernel_mem_tcp.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.KernelMemoryTCP`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: CPU CFS Period enabled |<p>https://docs.docker.com/config/containers/resource_constraints/#configure-the-default-cfs-scheduler</p> |DEPENDENT |docker.cpu_cfs_period.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.CpuCfsPeriod`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: CPU CFS Quota enabled |<p>https://docs.docker.com/config/containers/resource_constraints/#configure-the-default-cfs-scheduler</p> |DEPENDENT |docker.cpu_cfs_quota.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.CpuCfsQuota`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: CPU Shares enabled |<p>https://docs.docker.com/config/containers/resource_constraints/#configure-the-default-cfs-scheduler</p> |DEPENDENT |docker.cpu_shares.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPUShares`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: CPU Set enabled |<p>https://docs.docker.com/config/containers/resource_constraints/#configure-the-default-cfs-scheduler</p> |DEPENDENT |docker.cpu_set.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPUSet`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: Pids limit enabled |<p>-</p> |DEPENDENT |docker.pids_limit.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.PidsLimit`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: IPv4 Forwarding enabled |<p>-</p> |DEPENDENT |docker.ipv4_forwarding.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.IPv4Forwarding`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: Debug enabled |<p>-</p> |DEPENDENT |docker.debug.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.Debug`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: Memory limit enabled |<p>-</p> |DEPENDENT |docker.mem_limit.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.MemoryLimit`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: Swap limit enabled |<p>-</p> |DEPENDENT |docker.swap_limit.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.SwapLimit`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: Kernel memory enabled |<p>-</p> |DEPENDENT |docker.kernel_mem.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.KernelMemory`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: Kernel memory TCP enabled |<p>-</p> |DEPENDENT |docker.kernel_mem_tcp.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.KernelMemoryTCP`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: CPU CFS Period enabled |<p>https://docs.docker.com/config/containers/resource_constraints/#configure-the-default-cfs-scheduler</p> |DEPENDENT |docker.cpu_cfs_period.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.CpuCfsPeriod`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: CPU CFS Quota enabled |<p>https://docs.docker.com/config/containers/resource_constraints/#configure-the-default-cfs-scheduler</p> |DEPENDENT |docker.cpu_cfs_quota.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.CpuCfsQuota`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: CPU Shares enabled |<p>https://docs.docker.com/config/containers/resource_constraints/#configure-the-default-cfs-scheduler</p> |DEPENDENT |docker.cpu_shares.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPUShares`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: CPU Set enabled |<p>https://docs.docker.com/config/containers/resource_constraints/#configure-the-default-cfs-scheduler</p> |DEPENDENT |docker.cpu_set.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPUSet`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: Pids limit enabled |<p>-</p> |DEPENDENT |docker.pids_limit.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.PidsLimit`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: IPv4 Forwarding enabled |<p>-</p> |DEPENDENT |docker.ipv4_forwarding.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.IPv4Forwarding`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: Debug enabled |<p>-</p> |DEPENDENT |docker.debug.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.Debug`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Docker: Nfd |<p>Number of used File Descriptors</p> |DEPENDENT |docker.nfd<p>**Preprocessing**:</p><p>- JSONPATH: `$.NFd`</p> |
-|Docker |Docker: OomKill disabled |<p>-</p> |DEPENDENT |docker.oomkill.disabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.OomKillDisable`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: OomKill disabled |<p>-</p> |DEPENDENT |docker.oomkill.disabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.OomKillDisable`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Docker: Goroutines |<p>Number of goroutines</p> |DEPENDENT |docker.goroutines<p>**Preprocessing**:</p><p>- JSONPATH: `$.NGoroutines`</p> |
 |Docker |Docker: Logging driver |<p>-</p> |DEPENDENT |docker.logging_driver<p>**Preprocessing**:</p><p>- JSONPATH: `$.LoggingDriver`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Docker: Cgroup driver |<p>-</p> |DEPENDENT |docker.cgroup_driver<p>**Preprocessing**:</p><p>- JSONPATH: `$.CgroupDriver`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
@@ -86,7 +86,7 @@ There are no template links in this template.
 |Docker |Docker: Name |<p>-</p> |DEPENDENT |docker.name<p>**Preprocessing**:</p><p>- JSONPATH: `$.Name`</p> |
 |Docker |Docker: Server version |<p>-</p> |DEPENDENT |docker.server_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.ServerVersion`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Docker: Default runtime |<p>-</p> |DEPENDENT |docker.default_runtime<p>**Preprocessing**:</p><p>- JSONPATH: `$.DefaultRuntime`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Docker |Docker: Live restore enabled |<p>-</p> |DEPENDENT |docker.live_restore.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.LiveRestoreEnabled`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Docker |Docker: Live restore enabled |<p>-</p> |DEPENDENT |docker.live_restore.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.LiveRestoreEnabled`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Docker: Layers size |<p>-</p> |DEPENDENT |docker.layers_size<p>**Preprocessing**:</p><p>- JSONPATH: `$.LayersSize`</p> |
 |Docker |Docker: Images size |<p>-</p> |DEPENDENT |docker.images_size<p>**Preprocessing**:</p><p>- JSONPATH: `$.Images[*].Size.sum()`</p> |
 |Docker |Docker: Containers size |<p>-</p> |DEPENDENT |docker.containers_size<p>**Preprocessing**:</p><p>- JSONPATH: `$.Containers[*].SizeRw.sum()`</p> |
@@ -95,10 +95,10 @@ There are no template links in this template.
 |Docker |Image {#NAME}: Created |<p>-</p> |DEPENDENT |docker.image.created["{#ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Id == "{#ID}")].Created.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Image {#NAME}: Size |<p>-</p> |DEPENDENT |docker.image.size["{#ID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Id == "{#ID}")].Size.first()`</p> |
 |Docker |Container {#NAME}: Get stats |<p>Get container stats based on resource usage</p> |ZABBIX_PASSIVE |docker.container_stats["{#NAME}"] |
-|Docker |Container {#NAME}: CPU total usage per second |<p>-</p> |DEPENDENT |docker.container_stats.cpu_usage.total.rate["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.cpu_usage.total_usage`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `1.0E-9`</p> |
+|Docker |Container {#NAME}: CPU total usage per second |<p>-</p> |DEPENDENT |docker.container_stats.cpu_usage.total.rate["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.cpu_usage.total_usage`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `1.0E-9`</p> |
 |Docker |Container {#NAME}: CPU percent usage |<p>-</p> |DEPENDENT |docker.container_stats.cpu_pct_usage["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.cpu_usage.percent_usage`</p> |
-|Docker |Container {#NAME}: CPU kernelmode usage per second |<p>-</p> |DEPENDENT |docker.container_stats.cpu_usage.kernel.rate["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.cpu_usage.usage_in_kernelmode`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `1.0E-9`</p> |
-|Docker |Container {#NAME}: CPU usermode usage per second |<p>-</p> |DEPENDENT |docker.container_stats.cpu_usage.user.rate["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.cpu_usage.usage_in_usermode`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `1.0E-9`</p> |
+|Docker |Container {#NAME}: CPU kernelmode usage per second |<p>-</p> |DEPENDENT |docker.container_stats.cpu_usage.kernel.rate["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.cpu_usage.usage_in_kernelmode`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `1.0E-9`</p> |
+|Docker |Container {#NAME}: CPU usermode usage per second |<p>-</p> |DEPENDENT |docker.container_stats.cpu_usage.user.rate["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.cpu_usage.usage_in_usermode`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `1.0E-9`</p> |
 |Docker |Container {#NAME}: Online CPUs |<p>-</p> |DEPENDENT |docker.container_stats.online_cpus["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.online_cpus`</p> |
 |Docker |Container {#NAME}: Throttling periods |<p>Number of periods with throttling active</p> |DEPENDENT |docker.container_stats.cpu_usage.throttling_periods["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.throttling_data.periods`</p> |
 |Docker |Container {#NAME}: Throttled periods |<p>Number of periods when the container hits its throttling limit</p> |DEPENDENT |docker.container_stats.cpu_usage.throttled_periods["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.cpu_stats.throttling_data.throttled_periods`</p> |
@@ -108,24 +108,24 @@ There are no template links in this template.
 |Docker |Container {#NAME}: Memory commit bytes |<p>-</p> |DEPENDENT |docker.container_stats.memory.commit_bytes["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.memory_stats.commitbytes`</p> |
 |Docker |Container {#NAME}: Memory commit peak bytes |<p>-</p> |DEPENDENT |docker.container_stats.memory.commit_peak_bytes["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.memory_stats.commitpeakbytes`</p> |
 |Docker |Container {#NAME}: Memory private working set |<p>-</p> |DEPENDENT |docker.container_stats.memory.private_working_set["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.memory_stats.privateworkingset`</p> |
-|Docker |Container {#NAME}: Networks bytes received per second |<p>-</p> |DEPENDENT |docker.networks.rx_bytes["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].rx_bytes.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Docker |Container {#NAME}: Networks packets received per second |<p>-</p> |DEPENDENT |docker.networks.rx_packets["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].rx_packets.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Docker |Container {#NAME}: Networks errors received per second |<p>-</p> |DEPENDENT |docker.networks.rx_errors["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].rx_errors.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Docker |Container {#NAME}: Networks incoming packets dropped per second |<p>-</p> |DEPENDENT |docker.networks.rx_dropped["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].rx_dropped.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Docker |Container {#NAME}: Networks bytes sent per second |<p>-</p> |DEPENDENT |docker.networks.tx_bytes["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].tx_bytes.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Docker |Container {#NAME}: Networks packets sent per second |<p>-</p> |DEPENDENT |docker.networks.tx_packets["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].tx_packets.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Docker |Container {#NAME}: Networks errors sent per second |<p>-</p> |DEPENDENT |docker.networks.tx_errors["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].tx_errors.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Docker |Container {#NAME}: Networks outgoing packets dropped per second |<p>-</p> |DEPENDENT |docker.networks.tx_dropped["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].tx_dropped.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
+|Docker |Container {#NAME}: Networks bytes received per second |<p>-</p> |DEPENDENT |docker.networks.rx_bytes["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].rx_bytes.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Docker |Container {#NAME}: Networks packets received per second |<p>-</p> |DEPENDENT |docker.networks.rx_packets["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].rx_packets.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Docker |Container {#NAME}: Networks errors received per second |<p>-</p> |DEPENDENT |docker.networks.rx_errors["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].rx_errors.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Docker |Container {#NAME}: Networks incoming packets dropped per second |<p>-</p> |DEPENDENT |docker.networks.rx_dropped["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].rx_dropped.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Docker |Container {#NAME}: Networks bytes sent per second |<p>-</p> |DEPENDENT |docker.networks.tx_bytes["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].tx_bytes.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Docker |Container {#NAME}: Networks packets sent per second |<p>-</p> |DEPENDENT |docker.networks.tx_packets["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].tx_packets.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Docker |Container {#NAME}: Networks errors sent per second |<p>-</p> |DEPENDENT |docker.networks.tx_errors["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].tx_errors.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Docker |Container {#NAME}: Networks outgoing packets dropped per second |<p>-</p> |DEPENDENT |docker.networks.tx_dropped["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.networks[*].tx_dropped.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
 |Docker |Container {#NAME}: Get info |<p>Return low-level information about a container</p> |ZABBIX_PASSIVE |docker.container_info["{#NAME}"] |
 |Docker |Container {#NAME}: Created |<p>-</p> |DEPENDENT |docker.container_info.created["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Created`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Container {#NAME}: Image |<p>-</p> |DEPENDENT |docker.container_info.image["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Names[0] == "{#NAME}")].Image.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Container {#NAME}: Restart count |<p>-</p> |DEPENDENT |docker.container_info.restart_count["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.RestartCount`</p> |
 |Docker |Container {#NAME}: Status |<p>-</p> |DEPENDENT |docker.container_info.state.status["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Status`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Docker |Container {#NAME}: Running |<p>-</p> |DEPENDENT |docker.container_info.state.running["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Running`</p><p>- BOOL_TO_DECIMAL |
-|Docker |Container {#NAME}: Paused |<p>-</p> |DEPENDENT |docker.container_info.state.paused["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Paused`</p><p>- BOOL_TO_DECIMAL |
-|Docker |Container {#NAME}: Restarting |<p>-</p> |DEPENDENT |docker.container_info.state.restarting["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Restarting`</p><p>- BOOL_TO_DECIMAL |
-|Docker |Container {#NAME}: OOMKilled |<p>-</p> |DEPENDENT |docker.container_info.state.oomkilled["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.OOMKilled`</p><p>- BOOL_TO_DECIMAL |
-|Docker |Container {#NAME}: Dead |<p>-</p> |DEPENDENT |docker.container_info.state.dead["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Dead`</p><p>- BOOL_TO_DECIMAL |
+|Docker |Container {#NAME}: Running |<p>-</p> |DEPENDENT |docker.container_info.state.running["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Running`</p><p>- BOOL_TO_DECIMAL</p> |
+|Docker |Container {#NAME}: Paused |<p>-</p> |DEPENDENT |docker.container_info.state.paused["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Paused`</p><p>- BOOL_TO_DECIMAL</p> |
+|Docker |Container {#NAME}: Restarting |<p>-</p> |DEPENDENT |docker.container_info.state.restarting["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Restarting`</p><p>- BOOL_TO_DECIMAL</p> |
+|Docker |Container {#NAME}: OOMKilled |<p>-</p> |DEPENDENT |docker.container_info.state.oomkilled["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.OOMKilled`</p><p>- BOOL_TO_DECIMAL</p> |
+|Docker |Container {#NAME}: Dead |<p>-</p> |DEPENDENT |docker.container_info.state.dead["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Dead`</p><p>- BOOL_TO_DECIMAL</p> |
 |Docker |Container {#NAME}: Pid |<p>-</p> |DEPENDENT |docker.container_info.state.pid["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Pid`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Container {#NAME}: Exit code |<p>-</p> |DEPENDENT |docker.container_info.state.exitcode["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.ExitCode`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Docker |Container {#NAME}: Error |<p>-</p> |DEPENDENT |docker.container_info.state.error["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.State.Error`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
@@ -140,15 +140,15 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Docker: Service is down |<p>-</p> |`{TEMPLATE_NAME:docker.ping.last()}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Docker: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`{TEMPLATE_NAME:docker.name.nodata(30m)}=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Docker: Service is down</p> |
-|Docker: Version has changed (new version: {ITEM.VALUE}) |<p>Docker version has changed. Ack to close.</p> |`{TEMPLATE_NAME:docker.server_version.diff()}=1 and {TEMPLATE_NAME:docker.server_version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Container {#NAME}: Container has been stopped with error code |<p>-</p> |`{TEMPLATE_NAME:docker.container_info.state.exitcode["{#NAME}"].last()}>0 and {Docker App by Zabbix agent 2:docker.container_info.state.running["{#NAME}"].last()}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Container {#NAME}: An error has occurred in the container |<p>Container {#NAME} has an error. Ack to close.</p> |`{TEMPLATE_NAME:docker.container_info.state.error["{#NAME}"].diff()}=1 and {TEMPLATE_NAME:docker.container_info.state.error["{#NAME}"].strlen()}>0` |WARNING |<p>Manual close: YES</p> |
+|Docker: Service is down |<p>-</p> |`last(/Docker by Zabbix agent 2/docker.ping)=0` |AVERAGE |<p>Manual close: YES</p> |
+|Docker: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/Docker by Zabbix agent 2/docker.name,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Docker: Service is down</p> |
+|Docker: Version has changed (new version: {ITEM.VALUE}) |<p>Docker version has changed. Ack to close.</p> |`last(/Docker by Zabbix agent 2/docker.server_version,#1)<>last(/Docker by Zabbix agent 2/docker.server_version,#2) and length(last(/Docker by Zabbix agent 2/docker.server_version))>0` |INFO |<p>Manual close: YES</p> |
+|Container {#NAME}: Container has been stopped with error code |<p>-</p> |`last(/Docker by Zabbix agent 2/docker.container_info.state.exitcode["{#NAME}"])>0 and last(/Docker by Zabbix agent 2/docker.container_info.state.running["{#NAME}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|Container {#NAME}: An error has occurred in the container |<p>Container {#NAME} has an error. Ack to close.</p> |`last(/Docker by Zabbix agent 2/docker.container_info.state.error["{#NAME}"],#1)<>last(/Docker by Zabbix agent 2/docker.container_info.state.error["{#NAME}"],#2) and length(last(/Docker by Zabbix agent 2/docker.container_info.state.error["{#NAME}"]))>0` |WARNING |<p>Manual close: YES</p> |
 
 ## 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]().
+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/435429-discussion-thread-for-official-zabbix-template-docker).
 
diff --git a/templates/app/docker/template_app_docker.yaml b/templates/app/docker/template_app_docker.yaml
index 728692ed918..0497a3d38ad 100644
--- a/templates/app/docker/template_app_docker.yaml
+++ b/templates/app/docker/template_app_docker.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-09-27T08:22:43Z'
+  version: '6.0'
+  date: '2021-12-15T08:07:14Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,9 +13,9 @@ zabbix_export:
       description: |
         Get Docker engine metrics from plugin for the New Zabbix Agent (zabbix-agent2).
         
-        You can discuss this template or leave feedback on our forum 
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/435429-discussion-thread-for-official-zabbix-template-docker
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/elasticsearch_http/README.md b/templates/app/elasticsearch_http/README.md
index 4296e4666a1..dc7a19d0d32 100644
--- a/templates/app/elasticsearch_http/README.md
+++ b/templates/app/elasticsearch_http/README.md
@@ -3,10 +3,10 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Elasticsearch by Zabbix that work without any external scripts.
 It works with both standalone and cluster instances.
-The metrics are collected in one pass remotely using an HTTP agent. 
+The metrics are collected in one pass remotely using an HTTP agent.
 They are getting values from REST API _cluster/health, _cluster/stats, _nodes/stats requests.
 
 
@@ -29,19 +29,19 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                       | Description                                                                          | Default |
-|--------------------------------------------|--------------------------------------------------------------------------------------|---------|
-| {$ELASTICSEARCH.FETCH_LATENCY.MAX.WARN}    | <p>Maximum of fetch latency in milliseconds for trigger expression.</p>              | `100`   |
-| {$ELASTICSEARCH.FLUSH_LATENCY.MAX.WARN}    | <p>Maximum of flush latency in milliseconds for trigger expression.</p>              | `100`   |
-| {$ELASTICSEARCH.HEAP_USED.MAX.CRIT}        | <p>The maximum percent in the use of JVM heap for critically trigger expression.</p> | `95`    |
-| {$ELASTICSEARCH.HEAP_USED.MAX.WARN}        | <p>The maximum percent in the use of JVM heap for warning trigger expression.</p>    | `85`    |
-| {$ELASTICSEARCH.INDEXING_LATENCY.MAX.WARN} | <p>Maximum of indexing latency in milliseconds for trigger expression.</p>           | `100`   |
-| {$ELASTICSEARCH.PASSWORD}                  | <p>The password of the Elasticsearch.</p>                                            | ``      |
-| {$ELASTICSEARCH.PORT}                      | <p>The port of the Elasticsearch host.</p>                                           | `9200`  |
-| {$ELASTICSEARCH.QUERY_LATENCY.MAX.WARN}    | <p>Maximum of query latency in milliseconds for trigger expression.</p>              | `100`   |
-| {$ELASTICSEARCH.RESPONSE_TIME.MAX.WARN}    | <p>The ES cluster maximum response time in seconds for trigger expression.</p>       | `10s`   |
-| {$ELASTICSEARCH.SCHEME}                    | <p>The scheme of the Elasticsearch (http/https).</p>                                 | `http`  |
-| {$ELASTICSEARCH.USERNAME}                  | <p>The username of the Elasticsearch.</p>                                            | ``      |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$ELASTICSEARCH.FETCH_LATENCY.MAX.WARN} |<p>Maximum of fetch latency in milliseconds for trigger expression.</p> |`100` |
+|{$ELASTICSEARCH.FLUSH_LATENCY.MAX.WARN} |<p>Maximum of flush latency in milliseconds for trigger expression.</p> |`100` |
+|{$ELASTICSEARCH.HEAP_USED.MAX.CRIT} |<p>The maximum percent in the use of JVM heap for critically trigger expression.</p> |`95` |
+|{$ELASTICSEARCH.HEAP_USED.MAX.WARN} |<p>The maximum percent in the use of JVM heap for warning trigger expression.</p> |`85` |
+|{$ELASTICSEARCH.INDEXING_LATENCY.MAX.WARN} |<p>Maximum of indexing latency in milliseconds for trigger expression.</p> |`100` |
+|{$ELASTICSEARCH.PASSWORD} |<p>The password of the Elasticsearch.</p> |`` |
+|{$ELASTICSEARCH.PORT} |<p>The port of the Elasticsearch host.</p> |`9200` |
+|{$ELASTICSEARCH.QUERY_LATENCY.MAX.WARN} |<p>Maximum of query latency in milliseconds for trigger expression.</p> |`100` |
+|{$ELASTICSEARCH.RESPONSE_TIME.MAX.WARN} |<p>The ES cluster maximum response time in seconds for trigger expression.</p> |`10s` |
+|{$ELASTICSEARCH.SCHEME} |<p>The scheme of the Elasticsearch (http/https).</p> |`http` |
+|{$ELASTICSEARCH.USERNAME} |<p>The username of the Elasticsearch.</p> |`` |
 
 ## Template links
 
@@ -49,109 +49,109 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                    | Description                        | Type       | Key and additional info                                                                                               |
-|-------------------------|------------------------------------|------------|-----------------------------------------------------------------------------------------------------------------------|
-| Cluster nodes discovery | <p>Discovery ES cluster nodes.</p> | HTTP_AGENT | es.nodes.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.[*]`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Cluster nodes discovery |<p>Discovery ES cluster nodes.</p> |HTTP_AGENT |es.nodes.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.[*]`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 
 ## Items collected
 
-| Group            | Name                                                        | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | Type       | Key and additional info                                                                                                                                                                                                                                                     |
-|------------------|-------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| ES_cluster       | ES: Service status                                          | <p>Checks if the service is running and accepting TCP connections.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                   | SIMPLE     | net.tcp.service["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                                                        |
-| ES_cluster       | ES: Service response time                                   | <p>Checks performance of the TCP service.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SIMPLE     | net.tcp.service.perf["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"]                                                                                                                                                                                       |
-| ES_cluster       | ES: Cluster health status                                   | <p>Health status of the cluster, based on the state of its primary and replica shards. Statuses are:</p><p>green</p><p>All shards are assigned.</p><p>yellow</p><p>All primary shards are assigned, but one or more replica shards are unassigned. If a node in the cluster fails, some data could be unavailable until that node is repaired.</p><p>red</p><p>One or more primary shards are unassigned, so some data is unavailable. This can occur briefly during cluster startup as primary shards are assigned.</p> | DEPENDENT  | es.cluster.status<p>**Preprocessing**:</p><p>- JSONPATH: `$.status`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                          |
-| ES_cluster       | ES: Number of nodes                                         | <p>The number of nodes within the cluster.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT  | es.cluster.number_of_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.number_of_nodes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                                         |
-| ES_cluster       | ES: Number of data nodes                                    | <p>The number of nodes that are dedicated to data nodes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT  | es.cluster.number_of_data_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.number_of_data_nodes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                               |
-| ES_cluster       | ES: Number of relocating shards                             | <p>The number of shards that are under relocation.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT  | es.cluster.relocating_shards<p>**Preprocessing**:</p><p>- JSONPATH: `$.relocating_shards`</p>                                                                                                                                                                               |
-| ES_cluster       | ES: Number of initializing shards                           | <p>The number of shards that are under initialization.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT  | es.cluster.initializing_shards<p>**Preprocessing**:</p><p>- JSONPATH: `$.initializing_shards`</p>                                                                                                                                                                           |
-| ES_cluster       | ES: Number of unassigned shards                             | <p>The number of shards that are not allocated.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT  | es.cluster.unassigned_shards<p>**Preprocessing**:</p><p>- JSONPATH: `$.unassigned_shards`</p>                                                                                                                                                                               |
-| ES_cluster       | ES: Delayed unassigned shards                               | <p>The number of shards whose allocation has been delayed by the timeout settings.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT  | es.cluster.delayed_unassigned_shards<p>**Preprocessing**:</p><p>- JSONPATH: `$.delayed_unassigned_shards`</p>                                                                                                                                                               |
-| ES_cluster       | ES: Number of pending tasks                                 | <p>The number of cluster-level changes that have not yet been executed.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                              | DEPENDENT  | es.cluster.number_of_pending_tasks<p>**Preprocessing**:</p><p>- JSONPATH: `$.number_of_pending_tasks`</p>                                                                                                                                                                   |
-| ES_cluster       | ES: Task max waiting in queue                               | <p>The time expressed in seconds since the earliest initiated task is waiting for being performed.</p>                                                                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT  | es.cluster.task_max_waiting_in_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.task_max_waiting_in_queue_millis`</p><p>- MULTIPLIER: `0.001`</p>                                                                                                                            |
-| ES_cluster       | ES: Inactive shards percentage                              | <p>The ratio of inactive shards in the cluster expressed as a percentage.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT  | es.cluster.inactive_shards_percent_as_number<p>**Preprocessing**:</p><p>- JSONPATH: `$.active_shards_percent_as_number`</p><p>- JAVASCRIPT: `return (100 - value)`</p>                                                                                                      |
-| ES_cluster       | ES: Cluster uptime                                          | <p>Uptime duration in seconds since JVM has last started.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT  | es.nodes.jvm.max_uptime[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.jvm.max_uptime_in_millis`</p><p>- MULTIPLIER: `0.001`</p>                                                                                                                               |
-| ES_cluster       | ES: Number of non-deleted documents                         | <p>The total number of non-deleted documents across all primary shards assigned to the selected nodes.</p><p>This number is based on the documents in Lucene segments and may include the documents from nested fields.</p>                                                                                                                                                                                                                                                                                              | DEPENDENT  | es.indices.docs.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.indices.docs.count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                                           |
-| ES_cluster       | ES: Indices with shards assigned to nodes                   | <p>The total number of indices with shards assigned to the selected nodes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT  | es.indices.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.indices.count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                                                     |
-| ES_cluster       | ES: Total size of all file stores                           | <p>The total size in bytes of all file stores across all selected nodes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT  | es.nodes.fs.total_in_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.fs.total_in_bytes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                                 |
-| ES_cluster       | ES: Total available size to JVM in all file stores          | <p>The total number of bytes available to JVM in the file stores across all selected nodes.</p><p>Depending on OS or process-level restrictions, this number may be less than nodes.fs.free_in_byes. </p><p>This is the actual amount of free disk space the selected Elasticsearch nodes can use.</p>                                                                                                                                                                                                                   | DEPENDENT  | es.nodes.fs.available_in_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.fs.available_in_bytes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                         |
-| ES_cluster       | ES: Nodes with the data role                                | <p>The number of selected nodes with the data role.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | es.nodes.count.data<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.count.data`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                                               |
-| ES_cluster       | ES: Nodes with the ingest role                              | <p>The number of selected nodes with the ingest role.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT  | es.nodes.count.ingest<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.count.ingest`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                                           |
-| ES_cluster       | ES: Nodes with the master role                              | <p>The number of selected nodes with the master role.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT  | es.nodes.count.master<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.count.master`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                                                           |
-| ES_cluster       | ES {#ES.NODE}: Total size                                   | <p>Total size (in bytes) of all file stores.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT  | es.node.fs.total.total_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].fs.total.total_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                             |
-| ES_cluster       | ES {#ES.NODE}: Total available size                         | <p>The total number of bytes available to this Java virtual machine on all file stores. </p><p>Depending on OS or process level restrictions, this might appear less than fs.total.free_in_bytes. </p><p>This is the actual amount of free disk space the Elasticsearch node can utilize.</p>                                                                                                                                                                                                                            | DEPENDENT  | es.node.fs.total.available_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].fs.total.available_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                     |
-| ES_cluster       | ES {#ES.NODE}: Node uptime                                  | <p>JVM uptime in seconds.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT  | es.node.jvm.uptime[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.uptime_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p>                                                                                                           |
-| ES_cluster       | ES {#ES.NODE}: Maximum JVM memory available for use         | <p>The maximum amount of memory, in bytes, available for use by the heap.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT  | es.node.jvm.mem.heap_max_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.mem.heap_max_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                         |
-| ES_cluster       | ES {#ES.NODE}: Amount of JVM heap currently in use          | <p>The memory, in bytes, currently in use by the heap.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT  | es.node.jvm.mem.heap_used_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.mem.heap_used_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                       |
-| ES_cluster       | ES {#ES.NODE}: Percent of JVM heap currently in use         | <p>The percentage of memory currently in use by the heap.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT  | es.node.jvm.mem.heap_used_percent[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.mem.heap_used_percent.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                         |
-| ES_cluster       | ES {#ES.NODE}: Amount of JVM heap committed                 | <p>The amount of memory, in bytes, available for use by the heap.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | es.node.jvm.mem.heap_committed_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.mem.heap_committed_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                             |
-| ES_cluster       | ES {#ES.NODE}: Number of open HTTP connections              | <p>The number of currently open HTTP connections for the node.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT  | es.node.http.current_open[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].http.current_open.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                         |
-| ES_cluster       | ES {#ES.NODE}: Rate of HTTP connections opened              | <p>The number of HTTP connections opened for the node per second.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | es.node.http.opened.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].http.total_opened.first()`</p><p>- CHANGE_PER_SECOND                                                                                                              |
-| ES_cluster       | ES {#ES.NODE}: Time spent throttling operations             | <p>Time in seconds spent throttling operations for the last measuring span.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT  | es.node.indices.indexing.throttle_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.indexing.throttle_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE                                                 |
-| ES_cluster       | ES {#ES.NODE}: Time spent throttling recovery operations    | <p>Time in seconds spent throttling recovery operations for the last measuring span.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT  | es.node.indices.recovery.throttle_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.recovery.throttle_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE                                                 |
-| ES_cluster       | ES {#ES.NODE}: Time spent throttling merge operations       | <p>Time in seconds spent throttling merge operations for the last measuring span.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | es.node.indices.merges.total_throttled_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.merges.total_throttled_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE                                       |
-| ES_cluster       | ES {#ES.NODE}: Rate of queries                              | <p>The number of query operations per second.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | DEPENDENT  | es.node.indices.search.query.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_total.first()`</p><p>- CHANGE_PER_SECOND                                                                                            |
-| ES_cluster       | ES {#ES.NODE}: Time spent performing query                  | <p>Time in seconds spent performing query operations for the last measuring span.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | es.node.indices.search.query_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE                                                           |
-| ES_cluster       | ES {#ES.NODE}: Query latency                                | <p>The average query latency calculated by sampling the total number of queries and the total elapsed time at regular intervals.</p>                                                                                                                                                                                                                                                                                                                                                                                     | CALCULATED | es.node.indices.search.query_latency[{#ES.NODE}]<p>**Expression**:</p>`change(es.node.indices.search.query_time_in_millis[{#ES.NODE}]) /  ( change(es.node.indices.search.query_total[{#ES.NODE}]) + (change(es.node.indices.search.query_total[{#ES.NODE}]) = 0) ) `       |
-| ES_cluster       | ES {#ES.NODE}: Current query operations                     | <p>The number of query operations currently running.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT  | es.node.indices.search.query_current[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_current.first()`</p>                                                                                                             |
-| ES_cluster       | ES {#ES.NODE}: Rate of fetch                                | <p>The number of fetch operations per second.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | DEPENDENT  | es.node.indices.search.fetch.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_total.first()`</p><p>- CHANGE_PER_SECOND                                                                                            |
-| ES_cluster       | ES {#ES.NODE}: Time spent performing fetch                  | <p>Time in seconds spent performing fetch operations for the last measuring span.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | es.node.indices.search.fetch_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE                                                           |
-| ES_cluster       | ES {#ES.NODE}: Fetch latency                                | <p>The average fetch latency calculated by sampling the total number of fetches and the total elapsed time at regular intervals.</p>                                                                                                                                                                                                                                                                                                                                                                                     | CALCULATED | es.node.indices.search.fetch_latency[{#ES.NODE}]<p>**Expression**:</p>`change(es.node.indices.search.fetch_time_in_millis[{#ES.NODE}]) / ( change(es.node.indices.search.fetch_total[{#ES.NODE}]) + (change(es.node.indices.search.fetch_total[{#ES.NODE}]) = 0) )`         |
-| ES_cluster       | ES {#ES.NODE}: Current fetch operations                     | <p>The number of fetch operations currently running.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT  | es.node.indices.search.fetch_current[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_current.first()`</p>                                                                                                             |
-| ES_cluster       | ES {#ES.NODE}: Write thread pool executor tasks completed   | <p>The number of tasks completed by the write thread pool executor.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | es.node.thread_pool.write.completed.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.write.completed.first()`</p><p>- CHANGE_PER_SECOND                                                                                    |
-| ES_cluster       | ES {#ES.NODE}: Write thread pool active threads             | <p>The number of active threads in the write thread pool.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT  | es.node.thread_pool.write.active[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.write.active.first()`</p>                                                                                                                     |
-| ES_cluster       | ES {#ES.NODE}: Write thread pool tasks in queue             | <p>The number of tasks in queue for the write thread pool.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT  | es.node.thread_pool.write.queue[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.write.queue.first()`</p>                                                                                                                       |
-| ES_cluster       | ES {#ES.NODE}: Write thread pool executor tasks rejected    | <p>The number of tasks rejected by the write thread pool executor.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT  | es.node.thread_pool.write.rejected.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.write.rejected.first()`</p><p>- CHANGE_PER_SECOND                                                                                      |
-| ES_cluster       | ES {#ES.NODE}: Search thread pool executor tasks completed  | <p>The number of tasks completed by the search thread pool executor.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT  | es.node.thread_pool.search.completed.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.search.completed.first()`</p><p>- CHANGE_PER_SECOND                                                                                  |
-| ES_cluster       | ES {#ES.NODE}: Search thread pool active threads            | <p>The number of active threads in the search thread pool.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT  | es.node.thread_pool.search.active[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.search.active.first()`</p>                                                                                                                   |
-| ES_cluster       | ES {#ES.NODE}: Search thread pool tasks in queue            | <p>The number of tasks in queue for the search thread pool.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT  | es.node.thread_pool.search.queue[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.search.queue.first()`</p>                                                                                                                     |
-| ES_cluster       | ES {#ES.NODE}: Search thread pool executor tasks rejected   | <p>The number of tasks rejected by the search thread pool executor.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | es.node.thread_pool.search.rejected.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.search.rejected.first()`</p><p>- CHANGE_PER_SECOND                                                                                    |
-| ES_cluster       | ES {#ES.NODE}: Refresh thread pool executor tasks completed | <p>The number of tasks completed by the refresh thread pool executor.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT  | es.node.thread_pool.refresh.completed.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.refresh.completed.first()`</p><p>- CHANGE_PER_SECOND                                                                                |
-| ES_cluster       | ES {#ES.NODE}: Refresh thread pool active threads           | <p>The number of active threads in the refresh thread pool.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT  | es.node.thread_pool.refresh.active[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.refresh.active.first()`</p>                                                                                                                 |
-| ES_cluster       | ES {#ES.NODE}: Refresh thread pool tasks in queue           | <p>The number of tasks in queue for the refresh thread pool.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT  | es.node.thread_pool.refresh.queue[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.refresh.queue.first()`</p>                                                                                                                   |
-| ES_cluster       | ES {#ES.NODE}: Refresh thread pool executor tasks rejected  | <p>The number of tasks rejected by the refresh thread pool executor.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT  | es.node.thread_pool.refresh.rejected.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.refresh.rejected.first()`</p><p>- CHANGE_PER_SECOND                                                                                  |
-| ES_cluster       | ES {#ES.NODE}: Indexing latency                             | <p>The average indexing latency calculated from the available index_total and index_time_in_millis metrics.</p>                                                                                                                                                                                                                                                                                                                                                                                                          | CALCULATED | es.node.indices.indexing.index_latency[{#ES.NODE}]<p>**Expression**:</p>`change(es.node.indices.indexing.index_time_in_millis[{#ES.NODE}]) / ( change(es.node.indices.indexing.index_total[{#ES.NODE}]) + (change(es.node.indices.indexing.index_total[{#ES.NODE}]) = 0) )` |
-| ES_cluster       | ES {#ES.NODE}: Current indexing operations                  | <p>The number of indexing operations currently running.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                              | DEPENDENT  | es.node.indices.indexing.index_current[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.indexing.index_current.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                               |
-| ES_cluster       | ES {#ES.NODE}: Flush latency                                | <p>The average flush latency calculated from the available flush.total and flush.total_time_in_millis metrics.</p>                                                                                                                                                                                                                                                                                                                                                                                                       | CALCULATED | es.node.indices.flush.latency[{#ES.NODE}]<p>**Expression**:</p>`change(es.node.indices.flush.total_time_in_millis[{#ES.NODE}]) / ( change(es.node.indices.flush.total[{#ES.NODE}]) + (change(es.node.indices.flush.total[{#ES.NODE}]) = 0) )`                               |
-| ES_cluster       | ES {#ES.NODE}: Rate of index refreshes                      | <p>The number of refresh operations per second.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT  | es.node.indices.refresh.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.refresh.total.first()`</p><p>- CHANGE_PER_SECOND                                                                                                      |
-| ES_cluster       | ES {#ES.NODE}: Time spent performing refresh                | <p>Time in seconds spent performing refresh operations for the last measuring span.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | es.node.indices.refresh.time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.refresh.total_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE                                                               |
-| Zabbix_raw_items | ES: Get cluster health                                      | <p>Returns the health status of a cluster.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | HTTP_AGENT | es.cluster.get_health                                                                                                                                                                                                                                                       |
-| Zabbix_raw_items | ES: Get cluster stats                                       | <p>Returns cluster statistics.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | HTTP_AGENT | es.cluster.get_stats                                                                                                                                                                                                                                                        |
-| Zabbix_raw_items | ES: Get nodes stats                                         | <p>Returns cluster nodes statistics.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | HTTP_AGENT | es.nodes.get_stats                                                                                                                                                                                                                                                          |
-| Zabbix_raw_items | ES {#ES.NODE}: Total number of query                        | <p>The total number of query operations.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT  | es.node.indices.search.query_total[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_total.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                       |
-| Zabbix_raw_items | ES {#ES.NODE}: Total time spent performing query            | <p>Time in milliseconds spent performing query operations.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT  | es.node.indices.search.query_time_in_millis[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_time_in_millis.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                     |
-| Zabbix_raw_items | ES {#ES.NODE}: Total number of fetch                        | <p>The total number of fetch operations.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT  | es.node.indices.search.fetch_total[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_total.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                       |
-| Zabbix_raw_items | ES {#ES.NODE}: Total time spent performing fetch            | <p>Time in milliseconds spent performing fetch operations.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT  | es.node.indices.search.fetch_time_in_millis[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_time_in_millis.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                     |
-| Zabbix_raw_items | ES {#ES.NODE}: Total number of indexing                     | <p>The total number of indexing operations.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT  | es.node.indices.indexing.index_total[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.indexing.index_total.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                   |
-| Zabbix_raw_items | ES {#ES.NODE}: Total time spent performing indexing         | <p>Total time in milliseconds spent performing indexing operations.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | es.node.indices.indexing.index_time_in_millis[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.indexing.index_time_in_millis.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                 |
-| Zabbix_raw_items | ES {#ES.NODE}: Total number of index flushes to disk        | <p>The total number of flush operations.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT  | es.node.indices.flush.total[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.flush.total.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                     |
-| Zabbix_raw_items | ES {#ES.NODE}: Total time spent on flushing indices to disk | <p>Total time in milliseconds spent performing flush operations.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT  | es.node.indices.flush.total_time_in_millis[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.flush.total_time_in_millis.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                       |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|ES_cluster |ES: Service status |<p>Checks if the service is running and accepting TCP connections.</p> |SIMPLE |net.tcp.service["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|ES_cluster |ES: Service response time |<p>Checks performance of the TCP service.</p> |SIMPLE |net.tcp.service.perf["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"] |
+|ES_cluster |ES: Cluster health status |<p>Health status of the cluster, based on the state of its primary and replica shards. Statuses are:</p><p>green</p><p>All shards are assigned.</p><p>yellow</p><p>All primary shards are assigned, but one or more replica shards are unassigned. If a node in the cluster fails, some data could be unavailable until that node is repaired.</p><p>red</p><p>One or more primary shards are unassigned, so some data is unavailable. This can occur briefly during cluster startup as primary shards are assigned.</p> |DEPENDENT |es.cluster.status<p>**Preprocessing**:</p><p>- JSONPATH: `$.status`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Number of nodes |<p>The number of nodes within the cluster.</p> |DEPENDENT |es.cluster.number_of_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.number_of_nodes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Number of data nodes |<p>The number of nodes that are dedicated to data nodes.</p> |DEPENDENT |es.cluster.number_of_data_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.number_of_data_nodes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Number of relocating shards |<p>The number of shards that are under relocation.</p> |DEPENDENT |es.cluster.relocating_shards<p>**Preprocessing**:</p><p>- JSONPATH: `$.relocating_shards`</p> |
+|ES_cluster |ES: Number of initializing shards |<p>The number of shards that are under initialization.</p> |DEPENDENT |es.cluster.initializing_shards<p>**Preprocessing**:</p><p>- JSONPATH: `$.initializing_shards`</p> |
+|ES_cluster |ES: Number of unassigned shards |<p>The number of shards that are not allocated.</p> |DEPENDENT |es.cluster.unassigned_shards<p>**Preprocessing**:</p><p>- JSONPATH: `$.unassigned_shards`</p> |
+|ES_cluster |ES: Delayed unassigned shards |<p>The number of shards whose allocation has been delayed by the timeout settings.</p> |DEPENDENT |es.cluster.delayed_unassigned_shards<p>**Preprocessing**:</p><p>- JSONPATH: `$.delayed_unassigned_shards`</p> |
+|ES_cluster |ES: Number of pending tasks |<p>The number of cluster-level changes that have not yet been executed.</p> |DEPENDENT |es.cluster.number_of_pending_tasks<p>**Preprocessing**:</p><p>- JSONPATH: `$.number_of_pending_tasks`</p> |
+|ES_cluster |ES: Task max waiting in queue |<p>The time expressed in seconds since the earliest initiated task is waiting for being performed.</p> |DEPENDENT |es.cluster.task_max_waiting_in_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.task_max_waiting_in_queue_millis`</p><p>- MULTIPLIER: `0.001`</p> |
+|ES_cluster |ES: Inactive shards percentage |<p>The ratio of inactive shards in the cluster expressed as a percentage.</p> |DEPENDENT |es.cluster.inactive_shards_percent_as_number<p>**Preprocessing**:</p><p>- JSONPATH: `$.active_shards_percent_as_number`</p><p>- JAVASCRIPT: `return (100 - value)`</p> |
+|ES_cluster |ES: Cluster uptime |<p>Uptime duration in seconds since JVM has last started.</p> |DEPENDENT |es.nodes.jvm.max_uptime[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.jvm.max_uptime_in_millis`</p><p>- MULTIPLIER: `0.001`</p> |
+|ES_cluster |ES: Number of non-deleted documents |<p>The total number of non-deleted documents across all primary shards assigned to the selected nodes.</p><p>This number is based on the documents in Lucene segments and may include the documents from nested fields.</p> |DEPENDENT |es.indices.docs.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.indices.docs.count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Indices with shards assigned to nodes |<p>The total number of indices with shards assigned to the selected nodes.</p> |DEPENDENT |es.indices.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.indices.count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Total size of all file stores |<p>The total size in bytes of all file stores across all selected nodes.</p> |DEPENDENT |es.nodes.fs.total_in_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.fs.total_in_bytes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Total available size to JVM in all file stores |<p>The total number of bytes available to JVM in the file stores across all selected nodes.</p><p>Depending on OS or process-level restrictions, this number may be less than nodes.fs.free_in_byes.</p><p>This is the actual amount of free disk space the selected Elasticsearch nodes can use.</p> |DEPENDENT |es.nodes.fs.available_in_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.fs.available_in_bytes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Nodes with the data role |<p>The number of selected nodes with the data role.</p> |DEPENDENT |es.nodes.count.data<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.count.data`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Nodes with the ingest role |<p>The number of selected nodes with the ingest role.</p> |DEPENDENT |es.nodes.count.ingest<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.count.ingest`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES: Nodes with the master role |<p>The number of selected nodes with the master role.</p> |DEPENDENT |es.nodes.count.master<p>**Preprocessing**:</p><p>- JSONPATH: `$.nodes.count.master`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES {#ES.NODE}: Total size |<p>Total size (in bytes) of all file stores.</p> |DEPENDENT |es.node.fs.total.total_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].fs.total.total_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|ES_cluster |ES {#ES.NODE}: Total available size |<p>The total number of bytes available to this Java virtual machine on all file stores.</p><p>Depending on OS or process level restrictions, this might appear less than fs.total.free_in_bytes.</p><p>This is the actual amount of free disk space the Elasticsearch node can utilize.</p> |DEPENDENT |es.node.fs.total.available_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].fs.total.available_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES {#ES.NODE}: Node uptime |<p>JVM uptime in seconds.</p> |DEPENDENT |es.node.jvm.uptime[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.uptime_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p> |
+|ES_cluster |ES {#ES.NODE}: Maximum JVM memory available for use |<p>The maximum amount of memory, in bytes, available for use by the heap.</p> |DEPENDENT |es.node.jvm.mem.heap_max_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.mem.heap_max_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|ES_cluster |ES {#ES.NODE}: Amount of JVM heap currently in use |<p>The memory, in bytes, currently in use by the heap.</p> |DEPENDENT |es.node.jvm.mem.heap_used_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.mem.heap_used_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES {#ES.NODE}: Percent of JVM heap currently in use |<p>The percentage of memory currently in use by the heap.</p> |DEPENDENT |es.node.jvm.mem.heap_used_percent[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.mem.heap_used_percent.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES {#ES.NODE}: Amount of JVM heap committed |<p>The amount of memory, in bytes, available for use by the heap.</p> |DEPENDENT |es.node.jvm.mem.heap_committed_in_bytes[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].jvm.mem.heap_committed_in_bytes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES {#ES.NODE}: Number of open HTTP connections |<p>The number of currently open HTTP connections for the node.</p> |DEPENDENT |es.node.http.current_open[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].http.current_open.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES {#ES.NODE}: Rate of HTTP connections opened |<p>The number of HTTP connections opened for the node per second.</p> |DEPENDENT |es.node.http.opened.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].http.total_opened.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Time spent throttling operations |<p>Time in seconds spent throttling operations for the last measuring span.</p> |DEPENDENT |es.node.indices.indexing.throttle_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.indexing.throttle_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE</p> |
+|ES_cluster |ES {#ES.NODE}: Time spent throttling recovery operations |<p>Time in seconds spent throttling recovery operations for the last measuring span.</p> |DEPENDENT |es.node.indices.recovery.throttle_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.recovery.throttle_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE</p> |
+|ES_cluster |ES {#ES.NODE}: Time spent throttling merge operations |<p>Time in seconds spent throttling merge operations for the last measuring span.</p> |DEPENDENT |es.node.indices.merges.total_throttled_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.merges.total_throttled_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE</p> |
+|ES_cluster |ES {#ES.NODE}: Rate of queries |<p>The number of query operations per second.</p> |DEPENDENT |es.node.indices.search.query.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_total.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Time spent performing query |<p>Time in seconds spent performing query operations for the last measuring span.</p> |DEPENDENT |es.node.indices.search.query_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE</p> |
+|ES_cluster |ES {#ES.NODE}: Query latency |<p>The average query latency calculated by sampling the total number of queries and the total elapsed time at regular intervals.</p> |CALCULATED |es.node.indices.search.query_latency[{#ES.NODE}]<p>**Expression**:</p>`change(//es.node.indices.search.query_time_in_millis[{#ES.NODE}]) /  ( change(//es.node.indices.search.query_total[{#ES.NODE}]) + (change(//es.node.indices.search.query_total[{#ES.NODE}]) = 0) ) ` |
+|ES_cluster |ES {#ES.NODE}: Current query operations |<p>The number of query operations currently running.</p> |DEPENDENT |es.node.indices.search.query_current[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_current.first()`</p> |
+|ES_cluster |ES {#ES.NODE}: Rate of fetch |<p>The number of fetch operations per second.</p> |DEPENDENT |es.node.indices.search.fetch.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_total.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Time spent performing fetch |<p>Time in seconds spent performing fetch operations for the last measuring span.</p> |DEPENDENT |es.node.indices.search.fetch_time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE</p> |
+|ES_cluster |ES {#ES.NODE}: Fetch latency |<p>The average fetch latency calculated by sampling the total number of fetches and the total elapsed time at regular intervals.</p> |CALCULATED |es.node.indices.search.fetch_latency[{#ES.NODE}]<p>**Expression**:</p>`change(//es.node.indices.search.fetch_time_in_millis[{#ES.NODE}]) / ( change(//es.node.indices.search.fetch_total[{#ES.NODE}]) + (change(//es.node.indices.search.fetch_total[{#ES.NODE}]) = 0) )` |
+|ES_cluster |ES {#ES.NODE}: Current fetch operations |<p>The number of fetch operations currently running.</p> |DEPENDENT |es.node.indices.search.fetch_current[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_current.first()`</p> |
+|ES_cluster |ES {#ES.NODE}: Write thread pool executor tasks completed |<p>The number of tasks completed by the write thread pool executor.</p> |DEPENDENT |es.node.thread_pool.write.completed.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.write.completed.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Write thread pool active threads |<p>The number of active threads in the write thread pool.</p> |DEPENDENT |es.node.thread_pool.write.active[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.write.active.first()`</p> |
+|ES_cluster |ES {#ES.NODE}: Write thread pool tasks in queue |<p>The number of tasks in queue for the write thread pool.</p> |DEPENDENT |es.node.thread_pool.write.queue[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.write.queue.first()`</p> |
+|ES_cluster |ES {#ES.NODE}: Write thread pool executor tasks rejected |<p>The number of tasks rejected by the write thread pool executor.</p> |DEPENDENT |es.node.thread_pool.write.rejected.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.write.rejected.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Search thread pool executor tasks completed |<p>The number of tasks completed by the search thread pool executor.</p> |DEPENDENT |es.node.thread_pool.search.completed.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.search.completed.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Search thread pool active threads |<p>The number of active threads in the search thread pool.</p> |DEPENDENT |es.node.thread_pool.search.active[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.search.active.first()`</p> |
+|ES_cluster |ES {#ES.NODE}: Search thread pool tasks in queue |<p>The number of tasks in queue for the search thread pool.</p> |DEPENDENT |es.node.thread_pool.search.queue[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.search.queue.first()`</p> |
+|ES_cluster |ES {#ES.NODE}: Search thread pool executor tasks rejected |<p>The number of tasks rejected by the search thread pool executor.</p> |DEPENDENT |es.node.thread_pool.search.rejected.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.search.rejected.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Refresh thread pool executor tasks completed |<p>The number of tasks completed by the refresh thread pool executor.</p> |DEPENDENT |es.node.thread_pool.refresh.completed.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.refresh.completed.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Refresh thread pool active threads |<p>The number of active threads in the refresh thread pool.</p> |DEPENDENT |es.node.thread_pool.refresh.active[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.refresh.active.first()`</p> |
+|ES_cluster |ES {#ES.NODE}: Refresh thread pool tasks in queue |<p>The number of tasks in queue for the refresh thread pool.</p> |DEPENDENT |es.node.thread_pool.refresh.queue[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.refresh.queue.first()`</p> |
+|ES_cluster |ES {#ES.NODE}: Refresh thread pool executor tasks rejected |<p>The number of tasks rejected by the refresh thread pool executor.</p> |DEPENDENT |es.node.thread_pool.refresh.rejected.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].thread_pool.refresh.rejected.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Indexing latency |<p>The average indexing latency calculated from the available index_total and index_time_in_millis metrics.</p> |CALCULATED |es.node.indices.indexing.index_latency[{#ES.NODE}]<p>**Expression**:</p>`change(//es.node.indices.indexing.index_time_in_millis[{#ES.NODE}]) / ( change(//es.node.indices.indexing.index_total[{#ES.NODE}]) + (change(//es.node.indices.indexing.index_total[{#ES.NODE}]) = 0) )` |
+|ES_cluster |ES {#ES.NODE}: Current indexing operations |<p>The number of indexing operations currently running.</p> |DEPENDENT |es.node.indices.indexing.index_current[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.indexing.index_current.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|ES_cluster |ES {#ES.NODE}: Flush latency |<p>The average flush latency calculated from the available flush.total and flush.total_time_in_millis metrics.</p> |CALCULATED |es.node.indices.flush.latency[{#ES.NODE}]<p>**Expression**:</p>`change(//es.node.indices.flush.total_time_in_millis[{#ES.NODE}]) / ( change(//es.node.indices.flush.total[{#ES.NODE}]) + (change(//es.node.indices.flush.total[{#ES.NODE}]) = 0) )` |
+|ES_cluster |ES {#ES.NODE}: Rate of index refreshes |<p>The number of refresh operations per second.</p> |DEPENDENT |es.node.indices.refresh.rate[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.refresh.total.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|ES_cluster |ES {#ES.NODE}: Time spent performing refresh |<p>Time in seconds spent performing refresh operations for the last measuring span.</p> |DEPENDENT |es.node.indices.refresh.time[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.refresh.total_time_in_millis.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- SIMPLE_CHANGE</p> |
+|Zabbix_raw_items |ES: Get cluster health |<p>Returns the health status of a cluster.</p> |HTTP_AGENT |es.cluster.get_health |
+|Zabbix_raw_items |ES: Get cluster stats |<p>Returns cluster statistics.</p> |HTTP_AGENT |es.cluster.get_stats |
+|Zabbix_raw_items |ES: Get nodes stats |<p>Returns cluster nodes statistics.</p> |HTTP_AGENT |es.nodes.get_stats |
+|Zabbix_raw_items |ES {#ES.NODE}: Total number of query |<p>The total number of query operations.</p> |DEPENDENT |es.node.indices.search.query_total[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_total.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |ES {#ES.NODE}: Total time spent performing query |<p>Time in milliseconds spent performing query operations.</p> |DEPENDENT |es.node.indices.search.query_time_in_millis[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.query_time_in_millis.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |ES {#ES.NODE}: Total number of fetch |<p>The total number of fetch operations.</p> |DEPENDENT |es.node.indices.search.fetch_total[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_total.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |ES {#ES.NODE}: Total time spent performing fetch |<p>Time in milliseconds spent performing fetch operations.</p> |DEPENDENT |es.node.indices.search.fetch_time_in_millis[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.search.fetch_time_in_millis.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |ES {#ES.NODE}: Total number of indexing |<p>The total number of indexing operations.</p> |DEPENDENT |es.node.indices.indexing.index_total[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.indexing.index_total.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |ES {#ES.NODE}: Total time spent performing indexing |<p>Total time in milliseconds spent performing indexing operations.</p> |DEPENDENT |es.node.indices.indexing.index_time_in_millis[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.indexing.index_time_in_millis.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |ES {#ES.NODE}: Total number of index flushes to disk |<p>The total number of flush operations.</p> |DEPENDENT |es.node.indices.flush.total[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.flush.total.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |ES {#ES.NODE}: Total time spent on flushing indices to disk |<p>Total time in milliseconds spent performing flush operations.</p> |DEPENDENT |es.node.indices.flush.total_time_in_millis[{#ES.NODE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$..[?(@.name=='{#ES.NODE}')].indices.flush.total_time_in_millis.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 
 ## Triggers
 
-| Name                                                                                                     | Description                                                                                                                                                                                                                                                                                                        | Expression                                                                                                                                                                                                                                                   | Severity | Dependencies and additional info                                                                                                        |
-|----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| ES: Service is down                                                                                      | <p>The service is unavailable or does not accept TCP connections.</p>                                                                                                                                                                                                                                              | `{TEMPLATE_NAME:net.tcp.service["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"].last()}=0`                                                                                                                                                  | AVERAGE  | <p>Manual close: YES</p>                                                                                                                |
-| ES: Service response time is too high (over {$ELASTICSEARCH.RESPONSE_TIME.MAX.WARN} for 5m)              | <p>The performance of the TCP service is very low.</p>                                                                                                                                                                                                                                                             | `{TEMPLATE_NAME:net.tcp.service.perf["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"].min(5m)}>{$ELASTICSEARCH.RESPONSE_TIME.MAX.WARN}`                                                                                                      | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- ES: Service is down</p>                                                              |
-| ES: Health is YELLOW                                                                                     | <p>All primary shards are assigned, but one or more replica shards are unassigned. </p><p>If a node in the cluster fails, some data could be unavailable until that node is repaired.</p>                                                                                                                          | `{TEMPLATE_NAME:es.cluster.status.last()}=1`                                                                                                                                                                                                                 | AVERAGE  |                                                                                                                                         |
-| ES: Health is RED                                                                                        | <p>One or more primary shards are unassigned, so some data is unavailable. </p><p>This can occur briefly during cluster startup as primary shards are assigned.</p>                                                                                                                                                | `{TEMPLATE_NAME:es.cluster.status.last()}=2`                                                                                                                                                                                                                 | HIGH     |                                                                                                                                         |
-| ES: Health is UNKNOWN                                                                                    | <p>The health status of the cluster is unknown or cannot be obtained.</p>                                                                                                                                                                                                                                          | `{TEMPLATE_NAME:es.cluster.status.last()}=255`                                                                                                                                                                                                               | HIGH     |                                                                                                                                         |
-| ES: The number of nodes within the cluster has decreased                                                 |                                                                                                                                                                                                                                                                                                                    | `{TEMPLATE_NAME:es.cluster.number_of_nodes.change()}<0`                                                                                                                                                                                                      | INFO     | <p>Manual close: YES</p>                                                                                                                |
-| ES: The number of nodes within the cluster has increased                                                 |                                                                                                                                                                                                                                                                                                                    | `{TEMPLATE_NAME:es.cluster.number_of_nodes.change()}>0`                                                                                                                                                                                                      | INFO     | <p>Manual close: YES</p>                                                                                                                |
-| ES: Cluster has the initializing shards                                                                  | <p>The cluster has the initializing shards longer than 10 minutes.</p>                                                                                                                                                                                                                                             | `{TEMPLATE_NAME:es.cluster.initializing_shards.min(10m)}>0`                                                                                                                                                                                                  | AVERAGE  |                                                                                                                                         |
-| ES: Cluster has the unassigned shards                                                                    | <p>The cluster has the unassigned shards longer than 10 minutes.</p>                                                                                                                                                                                                                                               | `{TEMPLATE_NAME:es.cluster.unassigned_shards.min(10m)}>0`                                                                                                                                                                                                    | AVERAGE  |                                                                                                                                         |
-| ES: Cluster has been restarted (uptime < 10m)                                                            | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                              | `{TEMPLATE_NAME:es.nodes.jvm.max_uptime[{#ES.NODE}].last()}<10m`                                                                                                                                                                                             | INFO     | <p>Manual close: YES</p>                                                                                                                |
-| ES: Cluster does not have enough space for resharding                                                    | <p>There is not enough disk space for index resharding.</p>                                                                                                                                                                                                                                                        | `({Elasticsearch Cluster by HTTP:es.nodes.fs.total_in_bytes.last()}-{TEMPLATE_NAME:es.nodes.fs.available_in_bytes.last()})/({Elasticsearch Cluster by HTTP:es.cluster.number_of_data_nodes.last()}-1)>{TEMPLATE_NAME:es.nodes.fs.available_in_bytes.last()}` | HIGH     |                                                                                                                                         |
-| ES: Cluster has only two master nodes                                                                    | <p>The cluster has only two nodes with a master role and will be unavailable if one of them breaks.</p>                                                                                                                                                                                                            | `{TEMPLATE_NAME:es.nodes.count.master.last()}=2`                                                                                                                                                                                                             | DISASTER |                                                                                                                                         |
-| ES {#ES.NODE}: Node {#ES.NODE} has been restarted (uptime < 10m)                                         | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                              | `{TEMPLATE_NAME:es.node.jvm.uptime[{#ES.NODE}].last()}<10m`                                                                                                                                                                                                  | INFO     | <p>Manual close: YES</p>                                                                                                                |
-| ES {#ES.NODE}: Percent of JVM heap in use is high (over {$ELASTICSEARCH.HEAP_USED.MAX.WARN}% for 1h)     | <p>This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation. </p><p>To address this problem, you can either increase your heap size (as long as it remains below the recommended </p><p>guidelines stated above), or scale out the cluster by adding more nodes.</p>  | `{TEMPLATE_NAME:es.node.jvm.mem.heap_used_percent[{#ES.NODE}].min(1h)}>{$ELASTICSEARCH.HEAP_USED.MAX.WARN}`                                                                                                                                                  | WARNING  | <p>**Depends on**:</p><p>- ES {#ES.NODE}: Percent of JVM heap in use is critical (over {$ELASTICSEARCH.HEAP_USED.MAX.CRIT}% for 1h)</p> |
-| ES {#ES.NODE}: Percent of JVM heap in use is critical (over {$ELASTICSEARCH.HEAP_USED.MAX.CRIT}% for 1h) | <p>This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation. </p><p>To address this problem, you can either increase your heap size (as long as it remains below the recommended </p><p>guidelines stated above), or scale out the cluster by adding more nodes.</p>  | `{TEMPLATE_NAME:es.node.jvm.mem.heap_used_percent[{#ES.NODE}].min(1h)}>{$ELASTICSEARCH.HEAP_USED.MAX.CRIT}`                                                                                                                                                  | HIGH     |                                                                                                                                         |
-| ES {#ES.NODE}: Query latency is too high (over {$ELASTICSEARCH.QUERY_LATENCY.MAX.WARN}ms for 5m)         | <p>If latency exceeds a threshold, look for potential resource bottlenecks, or investigate whether you need to optimize your queries.</p>                                                                                                                                                                          | `{TEMPLATE_NAME:es.node.indices.search.query_latency[{#ES.NODE}].min(5m)}>{$ELASTICSEARCH.QUERY_LATENCY.MAX.WARN}`                                                                                                                                           | WARNING  |                                                                                                                                         |
-| ES {#ES.NODE}: Fetch latency is too high (over {$ELASTICSEARCH.FETCH_LATENCY.MAX.WARN}ms for 5m)         | <p>The fetch phase should typically take much less time than the query phase. If you notice this metric consistently increasing, </p><p>this could indicate a problem with slow disks, enriching of documents (highlighting the relevant text in search results, etc.), </p><p>or requesting too many results.</p> | `{TEMPLATE_NAME:es.node.indices.search.fetch_latency[{#ES.NODE}].min(5m)}>{$ELASTICSEARCH.FETCH_LATENCY.MAX.WARN}`                                                                                                                                           | WARNING  |                                                                                                                                         |
-| ES {#ES.NODE}: Write thread pool executor has the rejected tasks (for 5m)                                | <p>The number of tasks rejected by the write thread pool executor is over 0 for 5m.</p>                                                                                                                                                                                                                            | `{TEMPLATE_NAME:es.node.thread_pool.write.rejected.rate[{#ES.NODE}].min(5m)}>0`                                                                                                                                                                              | WARNING  |                                                                                                                                         |
-| ES {#ES.NODE}: Search thread pool executor has the rejected tasks (for 5m)                               | <p>The number of tasks rejected by the search thread pool executor is over 0 for 5m.</p>                                                                                                                                                                                                                           | `{TEMPLATE_NAME:es.node.thread_pool.search.rejected.rate[{#ES.NODE}].min(5m)}>0`                                                                                                                                                                             | WARNING  |                                                                                                                                         |
-| ES {#ES.NODE}: Refresh thread pool executor has the rejected tasks (for 5m)                              | <p>The number of tasks rejected by the refresh thread pool executor is over 0 for 5m.</p>                                                                                                                                                                                                                          | `{TEMPLATE_NAME:es.node.thread_pool.refresh.rejected.rate[{#ES.NODE}].min(5m)}>0`                                                                                                                                                                            | WARNING  |                                                                                                                                         |
-| ES {#ES.NODE}: Indexing latency is too high (over {$ELASTICSEARCH.INDEXING_LATENCY.MAX.WARN}ms for 5m)   | <p>If the latency is increasing, it may indicate that you are indexing too many documents at the same time (Elasticsearch’s documentation </p><p>recommends starting with a bulk indexing size of 5 to 15 megabytes and increasing slowly from there).</p>                                                         | `{TEMPLATE_NAME:es.node.indices.indexing.index_latency[{#ES.NODE}].min(5m)}>{$ELASTICSEARCH.INDEXING_LATENCY.MAX.WARN}`                                                                                                                                      | WARNING  |                                                                                                                                         |
-| ES {#ES.NODE}: Flush latency is too high (over {$ELASTICSEARCH.FLUSH_LATENCY.MAX.WARN}ms for 5m)         | <p>If you see this metric increasing steadily, it may indicate a problem with slow disks; this problem may escalate </p><p>and eventually prevent you from being able to add new information to your index.</p>                                                                                                    | `{TEMPLATE_NAME:es.node.indices.flush.latency[{#ES.NODE}].min(5m)}>{$ELASTICSEARCH.FLUSH_LATENCY.MAX.WARN}`                                                                                                                                                  | WARNING  |                                                                                                                                         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|ES: Service is down |<p>The service is unavailable or does not accept TCP connections.</p> |`last(/Elasticsearch Cluster by HTTP/net.tcp.service["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|ES: Service response time is too high (over {$ELASTICSEARCH.RESPONSE_TIME.MAX.WARN} for 5m) |<p>The performance of the TCP service is very low.</p> |`min(/Elasticsearch Cluster by HTTP/net.tcp.service.perf["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"],5m)>{$ELASTICSEARCH.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- ES: Service is down</p> |
+|ES: Health is YELLOW |<p>All primary shards are assigned, but one or more replica shards are unassigned.</p><p>If a node in the cluster fails, some data could be unavailable until that node is repaired.</p> |`last(/Elasticsearch Cluster by HTTP/es.cluster.status)=1` |AVERAGE | |
+|ES: Health is RED |<p>One or more primary shards are unassigned, so some data is unavailable.</p><p>This can occur briefly during cluster startup as primary shards are assigned.</p> |`last(/Elasticsearch Cluster by HTTP/es.cluster.status)=2` |HIGH | |
+|ES: Health is UNKNOWN |<p>The health status of the cluster is unknown or cannot be obtained.</p> |`last(/Elasticsearch Cluster by HTTP/es.cluster.status)=255` |HIGH | |
+|ES: The number of nodes within the cluster has decreased |<p>-</p> |`change(/Elasticsearch Cluster by HTTP/es.cluster.number_of_nodes)<0` |INFO |<p>Manual close: YES</p> |
+|ES: The number of nodes within the cluster has increased |<p>-</p> |`change(/Elasticsearch Cluster by HTTP/es.cluster.number_of_nodes)>0` |INFO |<p>Manual close: YES</p> |
+|ES: Cluster has the initializing shards |<p>The cluster has the initializing shards longer than 10 minutes.</p> |`min(/Elasticsearch Cluster by HTTP/es.cluster.initializing_shards,10m)>0` |AVERAGE | |
+|ES: Cluster has the unassigned shards |<p>The cluster has the unassigned shards longer than 10 minutes.</p> |`min(/Elasticsearch Cluster by HTTP/es.cluster.unassigned_shards,10m)>0` |AVERAGE | |
+|ES: Cluster has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Elasticsearch Cluster by HTTP/es.nodes.jvm.max_uptime[{#ES.NODE}])<10m` |INFO |<p>Manual close: YES</p> |
+|ES: Cluster does not have enough space for resharding |<p>There is not enough disk space for index resharding.</p> |`(last(/Elasticsearch Cluster by HTTP/es.nodes.fs.total_in_bytes)-last(/Elasticsearch Cluster by HTTP/es.nodes.fs.available_in_bytes))/(last(/Elasticsearch Cluster by HTTP/es.cluster.number_of_data_nodes)-1)>last(/Elasticsearch Cluster by HTTP/es.nodes.fs.available_in_bytes)` |HIGH | |
+|ES: Cluster has only two master nodes |<p>The cluster has only two nodes with a master role and will be unavailable if one of them breaks.</p> |`last(/Elasticsearch Cluster by HTTP/es.nodes.count.master)=2` |DISASTER | |
+|ES {#ES.NODE}: Node {#ES.NODE} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Elasticsearch Cluster by HTTP/es.node.jvm.uptime[{#ES.NODE}])<10m` |INFO |<p>Manual close: YES</p> |
+|ES {#ES.NODE}: Percent of JVM heap in use is high (over {$ELASTICSEARCH.HEAP_USED.MAX.WARN}% for 1h) |<p>This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation.</p><p>To address this problem, you can either increase your heap size (as long as it remains below the recommended</p><p>guidelines stated above), or scale out the cluster by adding more nodes.</p> |`min(/Elasticsearch Cluster by HTTP/es.node.jvm.mem.heap_used_percent[{#ES.NODE}],1h)>{$ELASTICSEARCH.HEAP_USED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- ES {#ES.NODE}: Percent of JVM heap in use is critical (over {$ELASTICSEARCH.HEAP_USED.MAX.CRIT}% for 1h)</p> |
+|ES {#ES.NODE}: Percent of JVM heap in use is critical (over {$ELASTICSEARCH.HEAP_USED.MAX.CRIT}% for 1h) |<p>This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation.</p><p>To address this problem, you can either increase your heap size (as long as it remains below the recommended</p><p>guidelines stated above), or scale out the cluster by adding more nodes.</p> |`min(/Elasticsearch Cluster by HTTP/es.node.jvm.mem.heap_used_percent[{#ES.NODE}],1h)>{$ELASTICSEARCH.HEAP_USED.MAX.CRIT}` |HIGH | |
+|ES {#ES.NODE}: Query latency is too high (over {$ELASTICSEARCH.QUERY_LATENCY.MAX.WARN}ms for 5m) |<p>If latency exceeds a threshold, look for potential resource bottlenecks, or investigate whether you need to optimize your queries.</p> |`min(/Elasticsearch Cluster by HTTP/es.node.indices.search.query_latency[{#ES.NODE}],5m)>{$ELASTICSEARCH.QUERY_LATENCY.MAX.WARN}` |WARNING | |
+|ES {#ES.NODE}: Fetch latency is too high (over {$ELASTICSEARCH.FETCH_LATENCY.MAX.WARN}ms for 5m) |<p>The fetch phase should typically take much less time than the query phase. If you notice this metric consistently increasing,</p><p>this could indicate a problem with slow disks, enriching of documents (highlighting the relevant text in search results, etc.),</p><p>or requesting too many results.</p> |`min(/Elasticsearch Cluster by HTTP/es.node.indices.search.fetch_latency[{#ES.NODE}],5m)>{$ELASTICSEARCH.FETCH_LATENCY.MAX.WARN}` |WARNING | |
+|ES {#ES.NODE}: Write thread pool executor has the rejected tasks (for 5m) |<p>The number of tasks rejected by the write thread pool executor is over 0 for 5m.</p> |`min(/Elasticsearch Cluster by HTTP/es.node.thread_pool.write.rejected.rate[{#ES.NODE}],5m)>0` |WARNING | |
+|ES {#ES.NODE}: Search thread pool executor has the rejected tasks (for 5m) |<p>The number of tasks rejected by the search thread pool executor is over 0 for 5m.</p> |`min(/Elasticsearch Cluster by HTTP/es.node.thread_pool.search.rejected.rate[{#ES.NODE}],5m)>0` |WARNING | |
+|ES {#ES.NODE}: Refresh thread pool executor has the rejected tasks (for 5m) |<p>The number of tasks rejected by the refresh thread pool executor is over 0 for 5m.</p> |`min(/Elasticsearch Cluster by HTTP/es.node.thread_pool.refresh.rejected.rate[{#ES.NODE}],5m)>0` |WARNING | |
+|ES {#ES.NODE}: Indexing latency is too high (over {$ELASTICSEARCH.INDEXING_LATENCY.MAX.WARN}ms for 5m) |<p>If the latency is increasing, it may indicate that you are indexing too many documents at the same time (Elasticsearch’s documentation</p><p>recommends starting with a bulk indexing size of 5 to 15 megabytes and increasing slowly from there).</p> |`min(/Elasticsearch Cluster by HTTP/es.node.indices.indexing.index_latency[{#ES.NODE}],5m)>{$ELASTICSEARCH.INDEXING_LATENCY.MAX.WARN}` |WARNING | |
+|ES {#ES.NODE}: Flush latency is too high (over {$ELASTICSEARCH.FLUSH_LATENCY.MAX.WARN}ms for 5m) |<p>If you see this metric increasing steadily, it may indicate a problem with slow disks; this problem may escalate</p><p>and eventually prevent you from being able to add new information to your index.</p> |`min(/Elasticsearch Cluster by HTTP/es.node.indices.flush.latency[{#ES.NODE}],5m)>{$ELASTICSEARCH.FLUSH_LATENCY.MAX.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml b/templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml
index 96ff080fb3a..b0346327245 100644
--- a/templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml
+++ b/templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:18Z'
+  version: '6.0'
+  date: '2021-12-15T06:56:53Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         The template to monitor Elasticsearch by Zabbix that work without any external scripts.
         It works with both standalone and cluster instances.
-        The metrics are collected in one pass remotely using an HTTP agent. 
+        The metrics are collected in one pass remotely using an HTTP agent.
         They are getting values from REST API _cluster/health, _cluster/stats, _nodes/stats requests.
         You can set {$ELASTICSEARCH.USERNAME} and {$ELASTICSEARCH.PASSWORD} macros in the template for using on the host level.
         If you use an atypical location ES API, don't forget to change the macros {$ELASTICSEARCH.SCHEME},{$ELASTICSEARCH.PORT}.
@@ -21,7 +21,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/399473-discussion-thread-for-official-zabbix-template-for-elasticsearch
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -59,7 +59,6 @@ zabbix_export:
           description: 'Returns the health status of a cluster.'
           timeout: 15s
           url: '{$ELASTICSEARCH.SCHEME}://{HOST.CONN}:{$ELASTICSEARCH.PORT}/_cluster/health?timeout=5s'
-          status_codes: ''
           tags:
             -
               tag: Application
@@ -276,7 +275,7 @@ zabbix_export:
               name: 'ES: Health is RED'
               priority: HIGH
               description: |
-                One or more primary shards are unassigned, so some data is unavailable. 
+                One or more primary shards are unassigned, so some data is unavailable.
                 This can occur briefly during cluster startup as primary shards are assigned.
             -
               uuid: 33a6ef13f7b240768841919482709411
@@ -290,7 +289,7 @@ zabbix_export:
               name: 'ES: Health is YELLOW'
               priority: AVERAGE
               description: |
-                All primary shards are assigned, but one or more replica shards are unassigned. 
+                All primary shards are assigned, but one or more replica shards are unassigned.
                 If a node in the cluster fails, some data could be unavailable until that node is repaired.
         -
           uuid: 2295e2ba3d4949feb3519ac85ba6ff86
@@ -477,7 +476,7 @@ zabbix_export:
           units: B
           description: |
             The total number of bytes available to JVM in the file stores across all selected nodes.
-            Depending on OS or process-level restrictions, this number may be less than nodes.fs.free_in_byes. 
+            Depending on OS or process-level restrictions, this number may be less than nodes.fs.free_in_byes.
             This is the actual amount of free disk space the selected Elasticsearch nodes can use.
           preprocessing:
             -
@@ -641,8 +640,8 @@ zabbix_export:
               history: 7d
               units: B
               description: |
-                The total number of bytes available to this Java virtual machine on all file stores. 
-                Depending on OS or process level restrictions, this might appear less than fs.total.free_in_bytes. 
+                The total number of bytes available to this Java virtual machine on all file stores.
+                Depending on OS or process level restrictions, this might appear less than fs.total.free_in_bytes.
                 This is the actual amount of free disk space the Elasticsearch node can utilize.
               preprocessing:
                 -
@@ -752,7 +751,7 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Flush latency is too high (over {$ELASTICSEARCH.FLUSH_LATENCY.MAX.WARN}ms for 5m)'
                   priority: WARNING
                   description: |
-                    If you see this metric increasing steadily, it may indicate a problem with slow disks; this problem may escalate 
+                    If you see this metric increasing steadily, it may indicate a problem with slow disks; this problem may escalate
                     and eventually prevent you from being able to add new information to your index.
             -
               uuid: 8e270dfff9c84d2a96a134dd6d86533b
@@ -845,7 +844,7 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Indexing latency is too high (over {$ELASTICSEARCH.INDEXING_LATENCY.MAX.WARN}ms for 5m)'
                   priority: WARNING
                   description: |
-                    If the latency is increasing, it may indicate that you are indexing too many documents at the same time (Elasticsearch’s documentation 
+                    If the latency is increasing, it may indicate that you are indexing too many documents at the same time (Elasticsearch’s documentation
                     recommends starting with a bulk indexing size of 5 to 15 megabytes and increasing slowly from there).
             -
               uuid: f471dad45ff149b09a479963cb616fc2
@@ -1100,8 +1099,8 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Fetch latency is too high (over {$ELASTICSEARCH.FETCH_LATENCY.MAX.WARN}ms for 5m)'
                   priority: WARNING
                   description: |
-                    The fetch phase should typically take much less time than the query phase. If you notice this metric consistently increasing, 
-                    this could indicate a problem with slow disks, enriching of documents (highlighting the relevant text in search results, etc.), 
+                    The fetch phase should typically take much less time than the query phase. If you notice this metric consistently increasing,
+                    this could indicate a problem with slow disks, enriching of documents (highlighting the relevant text in search results, etc.),
                     or requesting too many results.
             -
               uuid: a10e7dca72c8411a9b7fdcbeb676017e
@@ -1426,8 +1425,8 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Percent of JVM heap in use is critical (over {$ELASTICSEARCH.HEAP_USED.MAX.CRIT}% for 1h)'
                   priority: HIGH
                   description: |
-                    This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation. 
-                    To address this problem, you can either increase your heap size (as long as it remains below the recommended 
+                    This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation.
+                    To address this problem, you can either increase your heap size (as long as it remains below the recommended
                     guidelines stated above), or scale out the cluster by adding more nodes.
                 -
                   uuid: bbba4a577a2c4328b2392fdeb1ff9bb4
@@ -1435,8 +1434,8 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Percent of JVM heap in use is high (over {$ELASTICSEARCH.HEAP_USED.MAX.WARN}% for 1h)'
                   priority: WARNING
                   description: |
-                    This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation. 
-                    To address this problem, you can either increase your heap size (as long as it remains below the recommended 
+                    This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation.
+                    To address this problem, you can either increase your heap size (as long as it remains below the recommended
                     guidelines stated above), or scale out the cluster by adding more nodes.
                   dependencies:
                     -
diff --git a/templates/app/etcd_http/README.md b/templates/app/etcd_http/README.md
index 3217fbfbb0d..8da57d53312 100644
--- a/templates/app/etcd_http/README.md
+++ b/templates/app/etcd_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Etcd by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -23,15 +23,15 @@ This template was tested on:
 1. Import template into Zabbix
 2. After importing template make sure that etcd allows for metric collection.
   Test by running: `curl -L http://localhost:2379/metrics`
-3. Check if etcd is accessible from Zabbix proxy or Zabbix server depending on where you are planning to do the monitoring. 
-  To verify run `curl -L  http://<etcd_node_adress>:2379/metrics`
-4. Add the template to each node with etcd. 
-  By default template use client port. You can configure metrics endpoint location by --listen-metrics-urls flag (See [etcd docs](https://github.com/etcd-io/website/blob/master/content/docs/v3.4.0/op-guide/configuration.md#--listen-metrics-urls)). 
-  
-  If you have specified a non-standard port for etcd, don't forget change macros {$ETCD.SCHEME}, {$ETCD.PORT}. 
-  
-  If you need it, you can set {$ETCD.USERNAME} and {$ETCD.PASSWORD} macros in the template for using on the host level. 
-  
+3. Check if etcd is accessible from Zabbix proxy or Zabbix server depending on where you are planning to do the monitoring.
+  To verify run `curl -L  http://<etcd_node_address>:2379/metrics`
+4. Add the template to each node with etcd.
+  By default template use client port. You can configure metrics endpoint location by --listen-metrics-urls flag (See [etcd docs](https://github.com/etcd-io/website/blob/master/content/docs/v3.4.0/op-guide/configuration.md#--listen-metrics-urls)).
+
+  If you have specified a non-standard port for etcd, don't forget change macros {$ETCD.SCHEME}, {$ETCD.PORT}.
+
+  If you need it, you can set {$ETCD.USERNAME} and {$ETCD.PASSWORD} macros in the template for using on the host level.
+
   Test availability: `zabbix_get -s etcd-host -k etcd.health`
 
 Besides, see the macros section as it will set the trigger values.
@@ -43,21 +43,21 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                              | Description                                                                                                | Default               |
-|-----------------------------------|------------------------------------------------------------------------------------------------------------|-----------------------|
-| {$ETCD.GRPC.ERRORS.MAX.WARN}      | <p>Maximum number of gRPC requests failures</p>                                                            | `1`                   |
-| {$ETCD.GRPC_CODE.MATCHES}         | <p>Filter of discoverable gRPC codes https://github.com/grpc/grpc/blob/master/doc/statuscodes.md</p>       | `.*`                  |
-| {$ETCD.GRPC_CODE.NOT_MATCHES}     | <p>Filter to exclude discovered gRPC codes https://github.com/grpc/grpc/blob/master/doc/statuscodes.md</p> | `CHANGE_IF_NEEDED`    |
-| {$ETCD.GRPC_CODE.TRIGGER.MATCHES} | <p>Filter of discoverable gRPC codes which will be create triggers</p>                                     | `Aborted|Unavailable` |
-| {$ETCD.HTTP.FAIL.MAX.WARN}        | <p>Maximum number of HTTP requests failures</p>                                                            | `2`                   |
-| {$ETCD.LEADER.CHANGES.MAX.WARN}   | <p>Maximum number of leader changes</p>                                                                    | `5`                   |
-| {$ETCD.OPEN.FDS.MAX.WARN}         | <p>Maximum percentage of used file descriptors</p>                                                         | `90`                  |
-| {$ETCD.PASSWORD}                  | <p>-</p>                                                                                                   | ``                    |
-| {$ETCD.PORT}                      | <p>The port of Etcd API endpoint</p>                                                                       | `2379`                |
-| {$ETCD.PROPOSAL.FAIL.MAX.WARN}    | <p>Maximum number of proposal failures</p>                                                                 | `2`                   |
-| {$ETCD.PROPOSAL.PENDING.MAX.WARN} | <p>Maximum number of proposals in queue</p>                                                                | `5`                   |
-| {$ETCD.SCHEME}                    | <p>Request scheme which may be http or https</p>                                                           | `http`                |
-| {$ETCD.USER}                      | <p>-</p>                                                                                                   | ``                    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$ETCD.GRPC.ERRORS.MAX.WARN} |<p>Maximum number of gRPC requests failures.</p> |`1` |
+|{$ETCD.GRPC_CODE.MATCHES} |<p>Filter of discoverable gRPC codes https://github.com/grpc/grpc/blob/master/doc/statuscodes.md.</p> |`.*` |
+|{$ETCD.GRPC_CODE.NOT_MATCHES} |<p>Filter to exclude discovered gRPC codes https://github.com/grpc/grpc/blob/master/doc/statuscodes.md.</p> |`CHANGE_IF_NEEDED` |
+|{$ETCD.GRPC_CODE.TRIGGER.MATCHES} |<p>Filter of discoverable gRPC codes which will be create triggers.</p> |`Aborted|Unavailable` |
+|{$ETCD.HTTP.FAIL.MAX.WARN} |<p>Maximum number of HTTP requests failures.</p> |`2` |
+|{$ETCD.LEADER.CHANGES.MAX.WARN} |<p>Maximum number of leader changes.</p> |`5` |
+|{$ETCD.OPEN.FDS.MAX.WARN} |<p>Maximum percentage of used file descriptors.</p> |`90` |
+|{$ETCD.PASSWORD} |<p>-</p> |`` |
+|{$ETCD.PORT} |<p>The port of Etcd API endpoint.</p> |`2379` |
+|{$ETCD.PROPOSAL.FAIL.MAX.WARN} |<p>Maximum number of proposal failures.</p> |`2` |
+|{$ETCD.PROPOSAL.PENDING.MAX.WARN} |<p>Maximum number of proposals in queue.</p> |`5` |
+|{$ETCD.SCHEME} |<p>Request scheme which may be http or https.</p> |`http` |
+|{$ETCD.USER} |<p>-</p> |`` |
 
 ## Template links
 
@@ -65,77 +65,76 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                 | Description | Type      | Key and additional info                                                                                                                                                                                                                                                                                                                                                                |
-|----------------------|-------------|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| gRPC codes discovery |             | DEPENDENT | etcd.grpc_code.discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_handled_total`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- A: {#GRPC.CODE} NOT_MATCHES_REGEX `{$ETCD.GRPC_CODE.NOT_MATCHES}`</p><p>- B: {#GRPC.CODE} MATCHES_REGEX `{$ETCD.GRPC_CODE.MATCHES}`</p> |
-| Peers discovery      |             | DEPENDENT | etcd.peer.discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_network_peer_sent_bytes_total`</p>                                                                                                                                                                                                                                                                          |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|gRPC codes discovery |<p>-</p> |DEPENDENT |etcd.grpc_code.discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_handled_total`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- {#GRPC.CODE} NOT_MATCHES_REGEX `{$ETCD.GRPC_CODE.NOT_MATCHES}`</p><p>- {#GRPC.CODE} MATCHES_REGEX `{$ETCD.GRPC_CODE.MATCHES}`</p><p>**Overrides:**</p><p>trigger<br> - {#GRPC.CODE} MATCHES_REGEX `{$ETCD.GRPC_CODE.TRIGGER.MATCHES}`<br>  - TRIGGER_PROTOTYPE LIKE `Too many failed gRPC requests` - DISCOVER</p> |
+|Peers discovery |<p>-</p> |DEPENDENT |etcd.peer.discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_network_peer_sent_bytes_total`</p> |
 
 ## Items collected
 
-| Group            | Name                                                    | Description                                                                                         | Type       | Key and additional info                                                                                                                                                                                                                  |
-|------------------|---------------------------------------------------------|-----------------------------------------------------------------------------------------------------|------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Etcd             | Etcd: Service's TCP port state                          | <p>-</p>                                                                                            | SIMPLE     | net.tcp.service["{$ETCD.SCHEME}","{HOST.CONN}","{$ETCD.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                                       |
-| Etcd             | Etcd: Node health                                       | <p>-</p>                                                                                            | HTTP_AGENT | etcd.health<p>**Preprocessing**:</p><p>- JSONPATH: `$.health`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                                         |
-| Etcd             | Etcd: Server is a leader                                | <p>Whether or not this member is a leader. 1 if is, 0 otherwise.</p>                                | DEPENDENT  | etcd.is.leader<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_is_leader `</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                             |
-| Etcd             | Etcd: Server has a leader                               | <p>Whether or not a leader exists. 1 is existence, 0 is not.</p>                                    | DEPENDENT  | etcd.has.leader<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_has_leader `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                                |
-| Etcd             | Etcd: Leader changes                                    | <p>The the number of leader changes the member has seen since its start.</p>                        | DEPENDENT  | etcd.leader.changes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_leader_changes_seen_total `</p>                                                                                                                        |
-| Etcd             | Etcd: Proposals committed per second                    | <p>The number of consensus proposals committed.</p>                                                 | DEPENDENT  | etcd.proposals.committed.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_proposals_committed_total `</p><p>- CHANGE_PER_SECOND                                                                                        |
-| Etcd             | Etcd: Proposals applied per second                      | <p>The number of consensus proposals applied.</p>                                                   | DEPENDENT  | etcd.proposals.applied.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_proposals_applied_total `</p><p>- CHANGE_PER_SECOND                                                                                            |
-| Etcd             | Etcd: Proposals failed per second                       | <p>The number of failed proposals seen.</p>                                                         | DEPENDENT  | etcd.proposals.failed.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_proposals_failed_total `</p><p>- CHANGE_PER_SECOND                                                                                              |
-| Etcd             | Etcd: Proposals pending                                 | <p>The current number of pending proposals to commit.</p>                                           | DEPENDENT  | etcd.proposals.pending<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_proposals_pending `</p>                                                                                                                             |
-| Etcd             | Etcd: Reads per second                                  | <p>Number of reads action by (get/getRecursive), local to this member.</p>                          | DEPENDENT  | etcd.reads.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_debugging_store_reads_total`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                                           |
-| Etcd             | Etcd: Writes per second                                 | <p>Number of writes (e.g. set/compareAndDelete) seen by this member.</p>                            | DEPENDENT  | etcd.writes.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_debugging_store_writes_total`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                                         |
-| Etcd             | Etcd: Client gRPC received bytes per second             | <p>The number of bytes received from grpc clients per second</p>                                    | DEPENDENT  | etcd.network.grpc.received.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_client_grpc_received_bytes_total `</p><p>- CHANGE_PER_SECOND                                                                              |
-| Etcd             | Etcd: Client gRPC sent bytes per second                 | <p>The number of bytes sent from grpc clients per second</p>                                        | DEPENDENT  | etcd.network.grpc.sent.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_client_grpc_sent_bytes_total `</p><p>- CHANGE_PER_SECOND                                                                                      |
-| Etcd             | Etcd: HTTP requests received                            | <p>Number of requests received into the system (successfully parsed and authd).</p>                 | DEPENDENT  | etcd.http.requests.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_http_received_total`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                                           |
-| Etcd             | Etcd: HTTP 5XX                                          | <p>Number of handle failures of requests (non-watches), by method (GET/PUT etc.), and code 5XX.</p> | DEPENDENT  | etcd.http.requests.5xx.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_http_failed_total{code=~"5.+"}`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                            |
-| Etcd             | Etcd: HTTP 4XX                                          | <p>Number of handle failures of requests (non-watches), by method (GET/PUT etc.), and code 4XX.</p> | DEPENDENT  | etcd.http.requests.4xx.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_http_failed_total{code=~"4.+"}`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                            |
-| Etcd             | Etcd: RPCs received per second                          | <p>The number of RPC stream messages received on the server.</p>                                    | DEPENDENT  | etcd.grpc.received.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_msg_received_total`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                                     |
-| Etcd             | Etcd: RPCs sent per second                              | <p>The number of gRPC stream messages sent by the server.</p>                                       | DEPENDENT  | etcd.grpc.sent.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_msg_sent_total`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                                             |
-| Etcd             | Etcd: RPCs started per second                           | <p>The number of RPCs started on the server.</p>                                                    | DEPENDENT  | etcd.grpc.started.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_started_total`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                                           |
-| Etcd             | Etcd: Server version                                    | <p>Version of the Etcd server.</p>                                                                  | DEPENDENT  | etcd.server.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.etcdserver`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                  |
-| Etcd             | Etcd: Cluster version                                   | <p>Version of the Etcd cluster.</p>                                                                 | DEPENDENT  | etcd.cluster.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.etcdcluster`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                |
-| Etcd             | Etcd: DB size                                           | <p>Total size of the underlying database.</p>                                                       | DEPENDENT  | etcd.db.size<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_db_total_size_in_bytes `</p>                                                                                                                          |
-| Etcd             | Etcd: Keys compacted per second                         | <p>The number of DB keys compacted per second.</p>                                                  | DEPENDENT  | etcd.keys.compacted.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_db_compaction_keys_total `</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                                 |
-| Etcd             | Etcd: Keys expired per second                           | <p>The number of expired keys per second.</p>                                                       | DEPENDENT  | etcd.keys.expired.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_store_expires_total `</p><p>- CHANGE_PER_SECOND                                                                                                  |
-| Etcd             | Etcd: Keys total                                        | <p>Total number of keys.</p>                                                                        | DEPENDENT  | etcd.keys.total<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_keys_total `</p>                                                                                                                                   |
-| Etcd             | Etcd: Uptime                                            | <p>Etcd server uptime.</p>                                                                          | DEPENDENT  | etcd.uptime<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_start_time_seconds `</p><p>- JAVASCRIPT: `//use boottime to calculate uptime return (Math.floor(Date.now()/1000)-Number(value));`</p>                              |
-| Etcd             | Etcd: Virtual memory                                    | <p>Virtual memory size in bytes.</p>                                                                | DEPENDENT  | etcd.virtual.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_virtual_memory_bytes `</p>                                                                                                                                  |
-| Etcd             | Etcd: Resident memory                                   | <p>Resident memory size in bytes.</p>                                                               | DEPENDENT  | etcd.res.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_resident_memory_bytes `</p>                                                                                                                                     |
-| Etcd             | Etcd: CPU                                               | <p>Total user and system CPU time spent in seconds.</p>                                             | DEPENDENT  | etcd.cpu.util<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_cpu_seconds_total `</p><p>- CHANGE_PER_SECOND                                                                                                                    |
-| Etcd             | Etcd: Open file descriptors                             | <p>Number of open file descriptors.</p>                                                             | DEPENDENT  | etcd.open.fds<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_open_fds `</p>                                                                                                                                                   |
-| Etcd             | Etcd: Maximum open file descriptors                     | <p>The Maximum number of open file descriptors.</p>                                                 | DEPENDENT  | etcd.max.fds<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_max_fds `</p>                                                                                                                                                     |
-| Etcd             | Etcd: Deletes per second                                | <p>The number of deletes seen by this member per second.</p>                                        | DEPENDENT  | etcd.delete.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_delete_total `</p><p>- CHANGE_PER_SECOND                                                                                                          |
-| Etcd             | Etcd: PUT per second                                    | <p>The number of puts seen by this member per second.</p>                                           | DEPENDENT  | etcd.put.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_put_total `</p><p>- CHANGE_PER_SECOND                                                                                                                |
-| Etcd             | Etcd: Range per second                                  | <p>The number of ranges seen by this member per second.</p>                                         | DEPENDENT  | etcd.range.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_range_total `</p><p>- CHANGE_PER_SECOND                                                                                                            |
-| Etcd             | Etcd: Transaction per second                            | <p>The number of transactions seen by this member per second.</p>                                   | DEPENDENT  | etcd.txn.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_range_total `</p><p>- CHANGE_PER_SECOND                                                                                                              |
-| Etcd             | Etcd: Events sent per second                            | <p>The number of events sent by this member per second</p>                                          | DEPENDENT  | etcd.events.sent.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_events_total `</p><p>- CHANGE_PER_SECOND                                                                                                     |
-| Etcd             | Etcd: Pending events                                    | <p>Total number of pending events to be sent.</p>                                                   | DEPENDENT  | etcd.events.sent.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_pending_events_total `</p>                                                                                                                   |
-| Etcd             | Etcd: RPCs completed with code {#GRPC.CODE}             | <p>The number of RPCs completed on the server with grpc_code {#GRPC.CODE}</p>                       | DEPENDENT  | etcd.grpc.handled.rate[{#GRPC.CODE}]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_handled_total{grpc_method="{#GRPC.CODE}"}`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND |
-| Etcd             | Etcd: Etcd peer {#ETCD.PEER}: Bytes sent                | <p>The number of bytes sent to peer with ID {#ETCD.PEER}</p>                                        | DEPENDENT  | etcd.bytes.sent.rate[{#ETCD.PEER}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_peer_sent_bytes_total{To="{#ETCD.PEER}"} `</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                              |
-| Etcd             | Etcd: Etcd peer {#ETCD.PEER}: Bytes received            | <p>The number of bytes received from peer with ID {#ETCD.PEER}</p>                                  | DEPENDENT  | etcd.bytes.received.rate[{#ETCD.PEER}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_peer_received_bytes_total{From="{#ETCD.PEER}"} `</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                    |
-| Etcd             | Etcd: Etcd peer {#ETCD.PEER}: Send failures             | <p>The number of send failures from peer with ID {#ETCD.PEER}</p>                                   | DEPENDENT  | etcd.sent.fail.rate[{#ETCD.PEER}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_peer_sent_failures_total{To="{#ETCD.PEER}"} `</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                            |
-| Etcd             | Etcd: Etcd peer {#ETCD.PEER}: Receive failures failures | <p>The number of receive failures from the peer with ID {#ETCD.PEER}</p>                            | DEPENDENT  | etcd.received.fail.rate[{#ETCD.PEER}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_peer_received_failures_total{To="{#ETCD.PEER}"} `</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                    |
-| Zabbix_raw_items | Etcd: Get node metrics                                  | <p>-</p>                                                                                            | HTTP_AGENT | etcd.get_metrics                                                                                                                                                                                                                         |
-| Zabbix_raw_items | Etcd: Get version                                       | <p>-</p>                                                                                            | HTTP_AGENT | etcd.get_version                                                                                                                                                                                                                         |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Etcd |Etcd: Service's TCP port state |<p>-</p> |SIMPLE |net.tcp.service["{$ETCD.SCHEME}","{HOST.CONN}","{$ETCD.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Etcd |Etcd: Node health |<p>-</p> |HTTP_AGENT |etcd.health<p>**Preprocessing**:</p><p>- JSONPATH: `$.health`</p><p>- BOOL_TO_DECIMAL</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Etcd |Etcd: Server is a leader |<p>Whether or not this member is a leader. 1 if is, 0 otherwise.</p> |DEPENDENT |etcd.is.leader<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_is_leader`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Etcd |Etcd: Server has a leader |<p>Whether or not a leader exists. 1 is existence, 0 is not.</p> |DEPENDENT |etcd.has.leader<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_has_leader`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Etcd |Etcd: Leader changes |<p>The the number of leader changes the member has seen since its start.</p> |DEPENDENT |etcd.leader.changes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_leader_changes_seen_total`</p> |
+|Etcd |Etcd: Proposals committed per second |<p>The number of consensus proposals committed.</p> |DEPENDENT |etcd.proposals.committed.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_proposals_committed_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Proposals applied per second |<p>The number of consensus proposals applied.</p> |DEPENDENT |etcd.proposals.applied.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_proposals_applied_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Proposals failed per second |<p>The number of failed proposals seen.</p> |DEPENDENT |etcd.proposals.failed.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_proposals_failed_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Proposals pending |<p>The current number of pending proposals to commit.</p> |DEPENDENT |etcd.proposals.pending<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_server_proposals_pending`</p> |
+|Etcd |Etcd: Reads per second |<p>Number of reads action by (get/getRecursive), local to this member.</p> |DEPENDENT |etcd.reads.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_debugging_store_reads_total`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Writes per second |<p>Number of writes (e.g. set/compareAndDelete) seen by this member.</p> |DEPENDENT |etcd.writes.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_debugging_store_writes_total`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Client gRPC received bytes per second |<p>The number of bytes received from grpc clients per second.</p> |DEPENDENT |etcd.network.grpc.received.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_client_grpc_received_bytes_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Client gRPC sent bytes per second |<p>The number of bytes sent from grpc clients per second.</p> |DEPENDENT |etcd.network.grpc.sent.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_client_grpc_sent_bytes_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: HTTP requests received |<p>Number of requests received into the system (successfully parsed and authd).</p> |DEPENDENT |etcd.http.requests.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_http_received_total`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: HTTP 5XX |<p>Number of handle failures of requests (non-watches), by method (GET/PUT etc.), and code 5XX.</p> |DEPENDENT |etcd.http.requests.5xx.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_http_failed_total{code=~"5.+"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: HTTP 4XX |<p>Number of handle failures of requests (non-watches), by method (GET/PUT etc.), and code 4XX.</p> |DEPENDENT |etcd.http.requests.4xx.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `etcd_http_failed_total{code=~"4.+"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: RPCs received per second |<p>The number of RPC stream messages received on the server.</p> |DEPENDENT |etcd.grpc.received.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_msg_received_total`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: RPCs sent per second |<p>The number of gRPC stream messages sent by the server.</p> |DEPENDENT |etcd.grpc.sent.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_msg_sent_total`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: RPCs started per second |<p>The number of RPCs started on the server.</p> |DEPENDENT |etcd.grpc.started.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_started_total`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Server version |<p>Version of the Etcd server.</p> |DEPENDENT |etcd.server.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.etcdserver`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Etcd |Etcd: Cluster version |<p>Version of the Etcd cluster.</p> |DEPENDENT |etcd.cluster.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.etcdcluster`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Etcd |Etcd: DB size |<p>Total size of the underlying database.</p> |DEPENDENT |etcd.db.size<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_db_total_size_in_bytes`</p> |
+|Etcd |Etcd: Keys compacted per second |<p>The number of DB keys compacted per second.</p> |DEPENDENT |etcd.keys.compacted.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_db_compaction_keys_total`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Keys expired per second |<p>The number of expired keys per second.</p> |DEPENDENT |etcd.keys.expired.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_store_expires_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Keys total |<p>Total number of keys.</p> |DEPENDENT |etcd.keys.total<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_keys_total`</p> |
+|Etcd |Etcd: Uptime |<p>Etcd server uptime.</p> |DEPENDENT |etcd.uptime<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_start_time_seconds`</p><p>- JAVASCRIPT: `//use boottime to calculate uptime return (Math.floor(Date.now()/1000)-Number(value)); `</p> |
+|Etcd |Etcd: Virtual memory |<p>Virtual memory size in bytes.</p> |DEPENDENT |etcd.virtual.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_virtual_memory_bytes`</p> |
+|Etcd |Etcd: Resident memory |<p>Resident memory size in bytes.</p> |DEPENDENT |etcd.res.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_resident_memory_bytes`</p> |
+|Etcd |Etcd: CPU |<p>Total user and system CPU time spent in seconds.</p> |DEPENDENT |etcd.cpu.util<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_cpu_seconds_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Open file descriptors |<p>Number of open file descriptors.</p> |DEPENDENT |etcd.open.fds<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_open_fds`</p> |
+|Etcd |Etcd: Maximum open file descriptors |<p>The Maximum number of open file descriptors.</p> |DEPENDENT |etcd.max.fds<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_max_fds`</p> |
+|Etcd |Etcd: Deletes per second |<p>The number of deletes seen by this member per second.</p> |DEPENDENT |etcd.delete.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_delete_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: PUT per second |<p>The number of puts seen by this member per second.</p> |DEPENDENT |etcd.put.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_put_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Range per second |<p>The number of ranges seen by this member per second.</p> |DEPENDENT |etcd.range.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_range_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Transaction per second |<p>The number of transactions seen by this member per second.</p> |DEPENDENT |etcd.txn.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_range_total`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Pending events |<p>Total number of pending events to be sent.</p> |DEPENDENT |etcd.events.sent.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_debugging_mvcc_pending_events_total`</p> |
+|Etcd |Etcd: RPCs completed with code {#GRPC.CODE} |<p>The number of RPCs completed on the server with grpc_code {#GRPC.CODE}.</p> |DEPENDENT |etcd.grpc.handled.rate[{#GRPC.CODE}]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `grpc_server_handled_total{grpc_method="{#GRPC.CODE}"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Etcd peer {#ETCD.PEER}: Bytes sent |<p>The number of bytes sent to peer with ID {#ETCD.PEER}.</p> |DEPENDENT |etcd.bytes.sent.rate[{#ETCD.PEER}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_peer_sent_bytes_total{To="{#ETCD.PEER}"}`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Etcd peer {#ETCD.PEER}: Bytes received |<p>The number of bytes received from peer with ID {#ETCD.PEER}.</p> |DEPENDENT |etcd.bytes.received.rate[{#ETCD.PEER}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_peer_received_bytes_total{From="{#ETCD.PEER}"}`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Etcd peer {#ETCD.PEER}: Send failures |<p>The number of send failures from peer with ID {#ETCD.PEER}.</p> |DEPENDENT |etcd.sent.fail.rate[{#ETCD.PEER}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_peer_sent_failures_total{To="{#ETCD.PEER}"}`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Etcd |Etcd: Etcd peer {#ETCD.PEER}: Receive failures failures |<p>The number of receive failures from the peer with ID {#ETCD.PEER}.</p> |DEPENDENT |etcd.received.fail.rate[{#ETCD.PEER}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `etcd_network_peer_received_failures_total{To="{#ETCD.PEER}"}`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_raw_items |Etcd: Get node metrics |<p>-</p> |HTTP_AGENT |etcd.get_metrics |
+|Zabbix_raw_items |Etcd: Get version |<p>-</p> |HTTP_AGENT |etcd.get_version |
 
 ## Triggers
 
-| Name                                                                                                  | Description                                                                                                                                                                                                                                        | Expression                                                                                               | Severity | Dependencies and additional info                                                    |
-|-------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------|
-| Etcd: Service is unavailable                                                                          | <p>-</p>                                                                                                                                                                                                                                           | `{TEMPLATE_NAME:net.tcp.service["{$ETCD.SCHEME}","{HOST.CONN}","{$ETCD.PORT}"].last()}=0`                | AVERAGE  | <p>Manual close: YES</p>                                                            |
-| Etcd: Node healthcheck failed                                                                         | <p>https://etcd.io/docs/v3.4.0/op-guide/monitoring/#health-check</p>                                                                                                                                                                               | `{TEMPLATE_NAME:etcd.health.last()}=0`                                                                   | AVERAGE  | <p>**Depends on**:</p><p>- Etcd: Service is unavailable</p>                         |
-| Etcd: Failed to fetch info data (or no data for 30m)                                                  | <p>Zabbix has not received data for items for the last 30 minutes</p>                                                                                                                                                                              | `{TEMPLATE_NAME:etcd.is.leader.nodata(30m)}=1`                                                           | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Etcd: Service is unavailable</p> |
-| Etcd: Member has no leader                                                                            | <p>"If a member does not have a leader, it is totally unavailable."</p>                                                                                                                                                                            | `{TEMPLATE_NAME:etcd.has.leader.last()}=0`                                                               | AVERAGE  |                                                                                     |
-| Etcd: Instance has seen too many leader changes (over {$ETCD.LEADER.CHANGES.MAX.WARN} for 15m)'       | <p>Rapid leadership changes impact the performance of etcd significantly. It also signals that the leader is unstable, perhaps due to network connectivity issues or excessive load hitting the etcd cluster.</p>                                  | `{TEMPLATE_NAME:etcd.leader.changes.delta(15m)}>{$ETCD.LEADER.CHANGES.MAX.WARN}`                         | WARNING  |                                                                                     |
-| Etcd: Too many proposal failures (over {$ETCD.PROPOSAL.FAIL.MAX.WARN} for 5m)'                        | <p>"Normally related to two issues: temporary failures related to a leader election or </p><p>longer downtime caused by a loss of quorum in the cluster."</p>                                                                                      | `{TEMPLATE_NAME:etcd.proposals.failed.rate.min(5m)}>{$ETCD.PROPOSAL.FAIL.MAX.WARN}`                      | WARNING  |                                                                                     |
-| Etcd: Too many proposals are queued to commit (over {$ETCD.PROPOSAL.PENDING.MAX.WARN} for 5m)'        | <p>"Rising pending proposals suggests there is a high client load or the member cannot commit proposals."</p>                                                                                                                                      | `{TEMPLATE_NAME:etcd.proposals.pending.min(5m)}>{$ETCD.PROPOSAL.PENDING.MAX.WARN}`                       | WARNING  |                                                                                     |
-| Etcd: Too many HTTP requests failures (over {$ETCD.HTTP.FAIL.MAX.WARN} for 5m)'                       | <p>"Too many reqvests failed on etcd instance with 5xx HTTP code"</p>                                                                                                                                                                              | `{TEMPLATE_NAME:etcd.http.requests.5xx.rate.min(5m)}>{$ETCD.HTTP.FAIL.MAX.WARN}`                         | WARNING  |                                                                                     |
-| Etcd: Server version has changed (new version: {ITEM.VALUE})                                          | <p>Etcd version has changed. Ack to close.</p>                                                                                                                                                                                                     | `{TEMPLATE_NAME:etcd.server.version.diff()}=1 and {TEMPLATE_NAME:etcd.server.version.strlen()}>0`        | INFO     | <p>Manual close: YES</p>                                                            |
-| Etcd: Cluster version has changed (new version: {ITEM.VALUE})                                         | <p>Etcd version has changed. Ack to close.</p>                                                                                                                                                                                                     | `{TEMPLATE_NAME:etcd.cluster.version.diff()}=1 and {TEMPLATE_NAME:etcd.cluster.version.strlen()}>0`      | INFO     | <p>Manual close: YES</p>                                                            |
-| Etcd: has been restarted (uptime < 10m)                                                               | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                              | `{TEMPLATE_NAME:etcd.uptime.last()}<10m`                                                                 | INFO     | <p>Manual close: YES</p>                                                            |
-| Etcd: Current number of open files is too high (over {$ETCD.OPEN.FDS.MAX.WARN}% for 5m)               | <p>"Heavy file descriptor usage (i.e., near the process’s file descriptor limit) indicates a potential file descriptor exhaustion issue. </p><p>If the file descriptors are exhausted, etcd may panic because it cannot create new WAL files."</p> | `{TEMPLATE_NAME:etcd.open.fds.min(5m)}/{Etcd by HTTP:etcd.max.fds.last()}*100>{$ETCD.OPEN.FDS.MAX.WARN}` | WARNING  |                                                                                     |
-| Etcd: Too many failed gRPC requests with code: {#GRPC.CODE} (over {$ETCD.GRPC.ERRORS.MAX.WARN} in 5m) | <p>-</p>                                                                                                                                                                                                                                           | `{TEMPLATE_NAME:etcd.grpc.handled.rate[{#GRPC.CODE}].min(5m)}>{$ETCD.GRPC.ERRORS.MAX.WARN}`              | WARNING  |                                                                                     |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Etcd: Service is unavailable |<p>-</p> |`last(/Etcd by HTTP/net.tcp.service["{$ETCD.SCHEME}","{HOST.CONN}","{$ETCD.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|Etcd: Node healthcheck failed |<p>https://etcd.io/docs/v3.4.0/op-guide/monitoring/#health-check</p> |`last(/Etcd by HTTP/etcd.health)=0` |AVERAGE |<p>**Depends on**:</p><p>- Etcd: Service is unavailable</p> |
+|Etcd: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Etcd by HTTP/etcd.is.leader,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Etcd: Service is unavailable</p> |
+|Etcd: Member has no leader |<p>If a member does not have a leader, it is totally unavailable.</p> |`last(/Etcd by HTTP/etcd.has.leader)=0` |AVERAGE | |
+|Etcd: Instance has seen too many leader changes (over {$ETCD.LEADER.CHANGES.MAX.WARN} for 15m)' |<p>Rapid leadership changes impact the performance of etcd significantly. It also signals that the leader is unstable, perhaps due to network connectivity issues or excessive load hitting the etcd cluster.</p> |`(max(/Etcd by HTTP/etcd.leader.changes,15m)-min(/Etcd by HTTP/etcd.leader.changes,15m))>{$ETCD.LEADER.CHANGES.MAX.WARN}` |WARNING | |
+|Etcd: Too many proposal failures (over {$ETCD.PROPOSAL.FAIL.MAX.WARN} for 5m)' |<p>Normally related to two issues: temporary failures related to a leader election or longer downtime caused by a loss of quorum in the cluster.</p> |`min(/Etcd by HTTP/etcd.proposals.failed.rate,5m)>{$ETCD.PROPOSAL.FAIL.MAX.WARN}` |WARNING | |
+|Etcd: Too many proposals are queued to commit (over {$ETCD.PROPOSAL.PENDING.MAX.WARN} for 5m)' |<p>Rising pending proposals suggests there is a high client load or the member cannot commit proposals.</p> |`min(/Etcd by HTTP/etcd.proposals.pending,5m)>{$ETCD.PROPOSAL.PENDING.MAX.WARN}` |WARNING | |
+|Etcd: Too many HTTP requests failures (over {$ETCD.HTTP.FAIL.MAX.WARN} for 5m)' |<p>Too many requests failed on etcd instance with 5xx HTTP code.</p> |`min(/Etcd by HTTP/etcd.http.requests.5xx.rate,5m)>{$ETCD.HTTP.FAIL.MAX.WARN}` |WARNING | |
+|Etcd: Server version has changed (new version: {ITEM.VALUE}) |<p>Etcd version has changed. Ack to close.</p> |`last(/Etcd by HTTP/etcd.server.version,#1)<>last(/Etcd by HTTP/etcd.server.version,#2) and length(last(/Etcd by HTTP/etcd.server.version))>0` |INFO |<p>Manual close: YES</p> |
+|Etcd: Cluster version has changed (new version: {ITEM.VALUE}) |<p>Etcd version has changed. Ack to close.</p> |`last(/Etcd by HTTP/etcd.cluster.version,#1)<>last(/Etcd by HTTP/etcd.cluster.version,#2) and length(last(/Etcd by HTTP/etcd.cluster.version))>0` |INFO |<p>Manual close: YES</p> |
+|Etcd: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Etcd by HTTP/etcd.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Etcd: Current number of open files is too high (over {$ETCD.OPEN.FDS.MAX.WARN}% for 5m) |<p>Heavy file descriptor usage (i.e., near the process's file descriptor limit) indicates a potential file descriptor exhaustion issue.</p><p>If the file descriptors are exhausted, etcd may panic because it cannot create new WAL files.</p> |`min(/Etcd by HTTP/etcd.open.fds,5m)/last(/Etcd by HTTP/etcd.max.fds)*100>{$ETCD.OPEN.FDS.MAX.WARN}` |WARNING | |
+|Etcd: Too many failed gRPC requests with code: {#GRPC.CODE} (over {$ETCD.GRPC.ERRORS.MAX.WARN} in 5m) |<p>-</p> |`min(/Etcd by HTTP/etcd.grpc.handled.rate[{#GRPC.CODE}],5m)>{$ETCD.GRPC.ERRORS.MAX.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/etcd_http/template_app_etcd_http.yaml b/templates/app/etcd_http/template_app_etcd_http.yaml
index 44fe1c6c1c7..97c3639ab7a 100644
--- a/templates/app/etcd_http/template_app_etcd_http.yaml
+++ b/templates/app/etcd_http/template_app_etcd_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-13T12:28:02Z'
+  date: '2022-01-10T07:38:28Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Get Etcd metrics by HTTP agent.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -310,7 +310,7 @@ zabbix_export:
               expression: 'last(/Etcd by HTTP/etcd.has.leader)=0'
               name: 'Etcd: Member has no leader'
               priority: AVERAGE
-              description: '"If a member does not have a leader, it is totally unavailable."'
+              description: 'If a member does not have a leader, it is totally unavailable.'
         -
           uuid: 3fde4db8b9684ba4b56ba915e48957b5
           name: 'Etcd: Node health'
@@ -338,7 +338,6 @@ zabbix_export:
               parameters:
                 - 10m
           url: '{$ETCD.SCHEME}://{HOST.CONN}:{$ETCD.PORT}/health'
-          status_codes: ''
           tags:
             -
               tag: Application
@@ -427,7 +426,7 @@ zabbix_export:
               expression: 'min(/Etcd by HTTP/etcd.http.requests.5xx.rate,5m)>{$ETCD.HTTP.FAIL.MAX.WARN}'
               name: 'Etcd: Too many HTTP requests failures (over {$ETCD.HTTP.FAIL.MAX.WARN} for 5m)'''
               priority: WARNING
-              description: '"Too many reqvests failed on etcd instance with 5xx HTTP code"'
+              description: 'Too many requests failed on etcd instance with 5xx HTTP code.'
         -
           uuid: 2a19db1c58ee4a509061fcb1b557c1a3
           name: 'Etcd: HTTP requests received'
@@ -496,7 +495,7 @@ zabbix_export:
               expression: 'nodata(/Etcd by HTTP/etcd.is.leader,30m)=1'
               name: 'Etcd: Failed to fetch info data (or no data for 30m)'
               priority: WARNING
-              description: 'Zabbix has not received data for items for the last 30 minutes'
+              description: 'Zabbix has not received data for items for the last 30 minutes.'
               manual_close: 'YES'
               dependencies:
                 -
@@ -636,7 +635,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           units: Bps
-          description: 'The number of bytes received from grpc clients per second'
+          description: 'The number of bytes received from grpc clients per second.'
           preprocessing:
             -
               type: PROMETHEUS_PATTERN
@@ -663,7 +662,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           units: Bps
-          description: 'The number of bytes sent from grpc clients per second'
+          description: 'The number of bytes sent from grpc clients per second.'
           preprocessing:
             -
               type: PROMETHEUS_PATTERN
@@ -787,9 +786,7 @@ zabbix_export:
               expression: 'min(/Etcd by HTTP/etcd.proposals.failed.rate,5m)>{$ETCD.PROPOSAL.FAIL.MAX.WARN}'
               name: 'Etcd: Too many proposal failures (over {$ETCD.PROPOSAL.FAIL.MAX.WARN} for 5m)'''
               priority: WARNING
-              description: |
-                "Normally related to two issues: temporary failures related to a leader election or 
-                longer downtime caused by a loss of quorum in the cluster."
+              description: 'Normally related to two issues: temporary failures related to a leader election or longer downtime caused by a loss of quorum in the cluster.'
         -
           uuid: 1c506ff69e7b4564a6d95fd35b1a11fd
           name: 'Etcd: Proposals pending'
@@ -817,7 +814,7 @@ zabbix_export:
               expression: 'min(/Etcd by HTTP/etcd.proposals.pending,5m)>{$ETCD.PROPOSAL.PENDING.MAX.WARN}'
               name: 'Etcd: Too many proposals are queued to commit (over {$ETCD.PROPOSAL.PENDING.MAX.WARN} for 5m)'''
               priority: WARNING
-              description: '"Rising pending proposals suggests there is a high client load or the member cannot commit proposals."'
+              description: 'Rising pending proposals suggests there is a high client load or the member cannot commit proposals.'
         -
           uuid: bd7398507c274bfab53339380df16761
           name: 'Etcd: PUT per second'
@@ -1135,7 +1132,7 @@ zabbix_export:
               history: 7d
               value_type: FLOAT
               units: rps
-              description: 'The number of RPCs completed on the server with grpc_code {#GRPC.CODE}'
+              description: 'The number of RPCs completed on the server with grpc_code {#GRPC.CODE}.'
               preprocessing:
                 -
                   type: PROMETHEUS_TO_JSON
@@ -1224,7 +1221,7 @@ zabbix_export:
               history: 7d
               value_type: FLOAT
               units: Bps
-              description: 'The number of bytes received from peer with ID {#ETCD.PEER}'
+              description: 'The number of bytes received from peer with ID {#ETCD.PEER}.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -1253,7 +1250,7 @@ zabbix_export:
               history: 7d
               value_type: FLOAT
               units: Bps
-              description: 'The number of bytes sent to peer with ID {#ETCD.PEER}'
+              description: 'The number of bytes sent to peer with ID {#ETCD.PEER}.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -1282,7 +1279,7 @@ zabbix_export:
               history: 7d
               value_type: FLOAT
               units: rps
-              description: 'The number of receive failures from the peer with ID {#ETCD.PEER}'
+              description: 'The number of receive failures from the peer with ID {#ETCD.PEER}.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -1311,7 +1308,7 @@ zabbix_export:
               history: 7d
               value_type: FLOAT
               units: rps
-              description: 'The number of send failures from peer with ID {#ETCD.PEER}'
+              description: 'The number of send failures from peer with ID {#ETCD.PEER}.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -1346,49 +1343,49 @@ zabbix_export:
         -
           macro: '{$ETCD.GRPC.ERRORS.MAX.WARN}'
           value: '1'
-          description: 'Maximum number of gRPC requests failures'
+          description: 'Maximum number of gRPC requests failures.'
         -
           macro: '{$ETCD.GRPC_CODE.MATCHES}'
           value: '.*'
-          description: 'Filter of discoverable gRPC codes https://github.com/grpc/grpc/blob/master/doc/statuscodes.md'
+          description: 'Filter of discoverable gRPC codes https://github.com/grpc/grpc/blob/master/doc/statuscodes.md.'
         -
           macro: '{$ETCD.GRPC_CODE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
-          description: 'Filter to exclude discovered gRPC codes https://github.com/grpc/grpc/blob/master/doc/statuscodes.md'
+          description: 'Filter to exclude discovered gRPC codes https://github.com/grpc/grpc/blob/master/doc/statuscodes.md.'
         -
           macro: '{$ETCD.GRPC_CODE.TRIGGER.MATCHES}'
           value: Aborted|Unavailable
-          description: 'Filter of discoverable gRPC codes which will be create triggers'
+          description: 'Filter of discoverable gRPC codes which will be create triggers.'
         -
           macro: '{$ETCD.HTTP.FAIL.MAX.WARN}'
           value: '2'
-          description: 'Maximum number of HTTP requests failures'
+          description: 'Maximum number of HTTP requests failures.'
         -
           macro: '{$ETCD.LEADER.CHANGES.MAX.WARN}'
           value: '5'
-          description: 'Maximum number of leader changes'
+          description: 'Maximum number of leader changes.'
         -
           macro: '{$ETCD.OPEN.FDS.MAX.WARN}'
           value: '90'
-          description: 'Maximum percentage of used file descriptors'
+          description: 'Maximum percentage of used file descriptors.'
         -
           macro: '{$ETCD.PASSWORD}'
         -
           macro: '{$ETCD.PORT}'
           value: '2379'
-          description: 'The port of Etcd API endpoint'
+          description: 'The port of Etcd API endpoint.'
         -
           macro: '{$ETCD.PROPOSAL.FAIL.MAX.WARN}'
           value: '2'
-          description: 'Maximum number of proposal failures'
+          description: 'Maximum number of proposal failures.'
         -
           macro: '{$ETCD.PROPOSAL.PENDING.MAX.WARN}'
           value: '5'
-          description: 'Maximum number of proposals in queue'
+          description: 'Maximum number of proposals in queue.'
         -
           macro: '{$ETCD.SCHEME}'
           value: http
-          description: 'Request scheme which may be http or https'
+          description: 'Request scheme which may be http or https.'
         -
           macro: '{$ETCD.USER}'
       valuemaps:
@@ -1429,8 +1426,8 @@ zabbix_export:
       name: 'Etcd: Current number of open files is too high (over {$ETCD.OPEN.FDS.MAX.WARN}% for 5m)'
       priority: WARNING
       description: |
-        "Heavy file descriptor usage (i.e., near the process’s file descriptor limit) indicates a potential file descriptor exhaustion issue. 
-        If the file descriptors are exhausted, etcd may panic because it cannot create new WAL files."
+        Heavy file descriptor usage (i.e., near the process's file descriptor limit) indicates a potential file descriptor exhaustion issue.
+        If the file descriptors are exhausted, etcd may panic because it cannot create new WAL files.
   graphs:
     -
       uuid: 18baccd03c0f4814a42d32b51334787d
diff --git a/templates/app/exchange/README.md b/templates/app/exchange/README.md
index bd738c2c0c1..90a3e5a12b0 100644
--- a/templates/app/exchange/README.md
+++ b/templates/app/exchange/README.md
@@ -3,14 +3,13 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official Template for Microsoft Exchange Server 2016.
 
 
 This template was tested on:
 
 - Microsoft Exchange Server, version 2016 CU18
-- Zabbix, version 5.4
 
 ## Setup
 
@@ -60,7 +59,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Databases discovery |<p>Discovery of Exchange databases.</p> |ZABBIX_PASSIVE |perf_instance.discovery["MSExchange Active Manager"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
+|Databases discovery |<p>Discovery of Exchange databases.</p> |ZABBIX_PASSIVE |perf_instance.discovery["MSExchange Active Manager"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Web services discovery |<p>Discovery of Exchange web services.</p> |ZABBIX_PASSIVE |perf_instance_en.discovery["Web Service"] |
 |LDAP discovery |<p>Discovery of domain controller.</p> |ZABBIX_PASSIVE |perf_instance_en.discovery["MSExchange ADAccess Domain Controllers"] |
 
@@ -100,16 +99,16 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Information Store [{#INSTANCE}]: Page faults is too high (>{$MS.EXCHANGE.DB.FAULTS.WARN} for {$MS.EXCHANGE.DB.FAULTS.TIME}) |<p>Too much page faults stalls for database "{#INSTANCE}". This counter should be 0 on production servers.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database({#INF.STORE})\Database Page Fault Stalls/sec", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.DB.FAULTS.TIME})}>{$MS.EXCHANGE.DB.FAULTS.WARN}` |AVERAGE | |
-|Information Store [{#INSTANCE}]: Log records stalls is too high (>{$MS.EXCHANGE.LOG.STALLS.WARN} for {$MS.EXCHANGE.LOG.STALLS.TIME}) |<p>Stalled log records too high. The average value should be less than 10 threads waiting.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database({#INF.STORE})\Log Record Stalls/sec", {$MS.EXCHANGE.PERF.INTERVAL}].avg({$MS.EXCHANGE.LOG.STALLS.TIME})}>{$MS.EXCHANGE.LOG.STALLS.WARN}` |AVERAGE | |
-|Information Store [{#INSTANCE}]: RPC Requests latency is too high (>{$MS.EXCHANGE.RPC.WARN}s for {$MS.EXCHANGE.RPC.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchangeIS Store({#INSTANCE})\RPC Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.RPC.TIME})}>{$MS.EXCHANGE.RPC.WARN}` |WARNING | |
-|Information Store [{#INSTANCE}]: RPC Requests total count is too high (>{$MS.EXCHANGE.RPC.COUNT.WARN} for {$MS.EXCHANGE.RPC.COUNT.TIME}) |<p>Should be below 70 at all times.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchangeIS Store({#INSTANCE})\RPC requests", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.RPC.COUNT.TIME})}>{$MS.EXCHANGE.RPC.COUNT.WARN}` |WARNING | |
-|Database Counters [{#INSTANCE}]: Average read time latency is too high (>{$MS.EXCHANGE.DB.ACTIVE.READ.WARN}s for {$MS.EXCHANGE.DB.ACTIVE.READ.TIME}) |<p>Should be less than 20ms on average.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Attached) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.DB.ACTIVE.READ.TIME})}>{$MS.EXCHANGE.DB.ACTIVE.READ.WARN}` |WARNING | |
-|Database Counters [{#INSTANCE}]: Average read time latency is too high (>{$MS.EXCHANGE.DB.PASSIVE.READ.WARN}s for {$MS.EXCHANGE.DB.PASSIVE.READ.TIME}) |<p>Should be less than 200ms on average.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.DB.PASSIVE.READ.TIME})}>{$MS.EXCHANGE.DB.PASSIVE.READ.WARN}` |WARNING | |
-|Database Counters [{#INSTANCE}]: Average write time latency is too high for {$MS.EXCHANGE.DB.ACTIVE.WRITE.TIME} |<p>Should be less than 50ms on average.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Writes (Attached) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.DB.ACTIVE.WRITE.TIME})}>{$MS.EXCHANGE.DB.ACTIVE.WRITE.WARN}` |WARNING | |
-|Database Counters [{#INSTANCE}]: Average write time latency is higher than read time latency for {$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME} |<p>Should be less than the read latency for the same instance, as measured by the MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency counter.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Writes (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].avg({$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME})}>{Microsoft Exchange Server 2016 by Zabbix agent:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].avg({$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME})}` |WARNING | |
-|Domain Controller [{#INSTANCE}]: LDAP read time is too high (>{$MS.EXCHANGE.LDAP.WARN}s for {$MS.EXCHANGE.LDAP.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange ADAccess Domain Controllers({#INSTANCE})\LDAP Read Time", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.LDAP.TIME})}>{$MS.EXCHANGE.LDAP.WARN}` |AVERAGE | |
-|Domain Controller [{#INSTANCE}]: LDAP search time is too high (>{$MS.EXCHANGE.LDAP.WARN}s for {$MS.EXCHANGE.LDAP.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange ADAccess Domain Controllers({#INSTANCE})\LDAP Search Time", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.LDAP.TIME})}>{$MS.EXCHANGE.LDAP.WARN}` |AVERAGE | |
+|Information Store [{#INSTANCE}]: Page faults is too high (>{$MS.EXCHANGE.DB.FAULTS.WARN} for {$MS.EXCHANGE.DB.FAULTS.TIME}) |<p>Too much page faults stalls for database "{#INSTANCE}". This counter should be 0 on production servers.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange Database({#INF.STORE})\Database Page Fault Stalls/sec", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.FAULTS.TIME})>{$MS.EXCHANGE.DB.FAULTS.WARN}` |AVERAGE | |
+|Information Store [{#INSTANCE}]: Log records stalls is too high (>{$MS.EXCHANGE.LOG.STALLS.WARN} for {$MS.EXCHANGE.LOG.STALLS.TIME}) |<p>Stalled log records too high. The average value should be less than 10 threads waiting.</p> |`avg(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange Database({#INF.STORE})\Log Record Stalls/sec", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.LOG.STALLS.TIME})>{$MS.EXCHANGE.LOG.STALLS.WARN}` |AVERAGE | |
+|Information Store [{#INSTANCE}]: RPC Requests latency is too high (>{$MS.EXCHANGE.RPC.WARN}s for {$MS.EXCHANGE.RPC.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchangeIS Store({#INSTANCE})\RPC Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.RPC.TIME})>{$MS.EXCHANGE.RPC.WARN}` |WARNING | |
+|Information Store [{#INSTANCE}]: RPC Requests total count is too high (>{$MS.EXCHANGE.RPC.COUNT.WARN} for {$MS.EXCHANGE.RPC.COUNT.TIME}) |<p>Should be below 70 at all times.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchangeIS Store({#INSTANCE})\RPC requests", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.RPC.COUNT.TIME})>{$MS.EXCHANGE.RPC.COUNT.WARN}` |WARNING | |
+|Database Counters [{#INSTANCE}]: Average read time latency is too high (>{$MS.EXCHANGE.DB.ACTIVE.READ.WARN}s for {$MS.EXCHANGE.DB.ACTIVE.READ.TIME}) |<p>Should be less than 20ms on average.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Attached) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.ACTIVE.READ.TIME})>{$MS.EXCHANGE.DB.ACTIVE.READ.WARN}` |WARNING | |
+|Database Counters [{#INSTANCE}]: Average read time latency is too high (>{$MS.EXCHANGE.DB.PASSIVE.READ.WARN}s for {$MS.EXCHANGE.DB.PASSIVE.READ.TIME}) |<p>Should be less than 200ms on average.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.PASSIVE.READ.TIME})>{$MS.EXCHANGE.DB.PASSIVE.READ.WARN}` |WARNING | |
+|Database Counters [{#INSTANCE}]: Average write time latency is too high for {$MS.EXCHANGE.DB.ACTIVE.WRITE.TIME} |<p>Should be less than 50ms on average.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Writes (Attached) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.ACTIVE.WRITE.TIME})>{$MS.EXCHANGE.DB.ACTIVE.WRITE.WARN}` |WARNING | |
+|Database Counters [{#INSTANCE}]: Average write time latency is higher than read time latency for {$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME} |<p>Should be less than the read latency for the same instance, as measured by the MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency counter.</p> |`avg(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Writes (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME})>avg(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME})` |WARNING | |
+|Domain Controller [{#INSTANCE}]: LDAP read time is too high (>{$MS.EXCHANGE.LDAP.WARN}s for {$MS.EXCHANGE.LDAP.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange ADAccess Domain Controllers({#INSTANCE})\LDAP Read Time", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.LDAP.TIME})>{$MS.EXCHANGE.LDAP.WARN}` |AVERAGE | |
+|Domain Controller [{#INSTANCE}]: LDAP search time is too high (>{$MS.EXCHANGE.LDAP.WARN}s for {$MS.EXCHANGE.LDAP.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent/perf_counter_en["\MSExchange ADAccess Domain Controllers({#INSTANCE})\LDAP Search Time", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.LDAP.TIME})>{$MS.EXCHANGE.LDAP.WARN}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/exchange/template_app_exchange.yaml b/templates/app/exchange/template_app_exchange.yaml
index 7d89376751c..9390d1cba60 100644
--- a/templates/app/exchange/template_app_exchange.yaml
+++ b/templates/app/exchange/template_app_exchange.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:16Z'
+  version: '6.0'
+  date: '2021-12-15T06:56:58Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415007-discussion-thread-for-official-zabbix-template-microsoft-exchange
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/exchange_active/README.md b/templates/app/exchange_active/README.md
index 4e9df732299..0f5625d5887 100644
--- a/templates/app/exchange_active/README.md
+++ b/templates/app/exchange_active/README.md
@@ -3,14 +3,13 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official Template for Microsoft Exchange Server 2016.
 
 
 This template was tested on:
 
 - Microsoft Exchange Server, version 2016 CU18
-- Zabbix, version 5.4
 
 ## Setup
 
@@ -60,7 +59,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Databases discovery |<p>Discovery of Exchange databases.</p> |ZABBIX_ACTIVE |perf_instance.discovery["MSExchange Active Manager"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
+|Databases discovery |<p>Discovery of Exchange databases.</p> |ZABBIX_ACTIVE |perf_instance.discovery["MSExchange Active Manager"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Web services discovery |<p>Discovery of Exchange web services.</p> |ZABBIX_ACTIVE |perf_instance_en.discovery["Web Service"] |
 |LDAP discovery |<p>Discovery of domain controller.</p> |ZABBIX_ACTIVE |perf_instance_en.discovery["MSExchange ADAccess Domain Controllers"] |
 
@@ -100,16 +99,16 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Information Store [{#INSTANCE}]: Page faults is too high (>{$MS.EXCHANGE.DB.FAULTS.WARN} for {$MS.EXCHANGE.DB.FAULTS.TIME}) |<p>Too much page faults stalls for database "{#INSTANCE}". This counter should be 0 on production servers.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database({#INF.STORE})\Database Page Fault Stalls/sec", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.DB.FAULTS.TIME})}>{$MS.EXCHANGE.DB.FAULTS.WARN}` |AVERAGE | |
-|Information Store [{#INSTANCE}]: Log records stalls is too high (>{$MS.EXCHANGE.LOG.STALLS.WARN} for {$MS.EXCHANGE.LOG.STALLS.TIME}) |<p>Stalled log records too high. The average value should be less than 10 threads waiting.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database({#INF.STORE})\Log Record Stalls/sec", {$MS.EXCHANGE.PERF.INTERVAL}].avg({$MS.EXCHANGE.LOG.STALLS.TIME})}>{$MS.EXCHANGE.LOG.STALLS.WARN}` |AVERAGE | |
-|Information Store [{#INSTANCE}]: RPC Requests latency is too high (>{$MS.EXCHANGE.RPC.WARN}s for {$MS.EXCHANGE.RPC.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchangeIS Store({#INSTANCE})\RPC Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.RPC.TIME})}>{$MS.EXCHANGE.RPC.WARN}` |WARNING | |
-|Information Store [{#INSTANCE}]: RPC Requests total count is too high (>{$MS.EXCHANGE.RPC.COUNT.WARN} for {$MS.EXCHANGE.RPC.COUNT.TIME}) |<p>Should be below 70 at all times.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchangeIS Store({#INSTANCE})\RPC requests", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.RPC.COUNT.TIME})}>{$MS.EXCHANGE.RPC.COUNT.WARN}` |WARNING | |
-|Database Counters [{#INSTANCE}]: Average read time latency is too high (>{$MS.EXCHANGE.DB.ACTIVE.READ.WARN}s for {$MS.EXCHANGE.DB.ACTIVE.READ.TIME}) |<p>Should be less than 20ms on average.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Attached) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.DB.ACTIVE.READ.TIME})}>{$MS.EXCHANGE.DB.ACTIVE.READ.WARN}` |WARNING | |
-|Database Counters [{#INSTANCE}]: Average read time latency is too high (>{$MS.EXCHANGE.DB.PASSIVE.READ.WARN}s for {$MS.EXCHANGE.DB.PASSIVE.READ.TIME}) |<p>Should be less than 200ms on average.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.DB.PASSIVE.READ.TIME})}>{$MS.EXCHANGE.DB.PASSIVE.READ.WARN}` |WARNING | |
-|Database Counters [{#INSTANCE}]: Average write time latency is too high for {$MS.EXCHANGE.DB.ACTIVE.WRITE.TIME} |<p>Should be less than 50ms on average.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Writes (Attached) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.DB.ACTIVE.WRITE.TIME})}>{$MS.EXCHANGE.DB.ACTIVE.WRITE.WARN}` |WARNING | |
-|Database Counters [{#INSTANCE}]: Average write time latency is higher than read time latency for {$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME} |<p>Should be less than the read latency for the same instance, as measured by the MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency counter.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Writes (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].avg({$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME})}>{Microsoft Exchange Server 2016 by Zabbix agent active:perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}].avg({$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME})}` |WARNING | |
-|Domain Controller [{#INSTANCE}]: LDAP read time is too high (>{$MS.EXCHANGE.LDAP.WARN}s for {$MS.EXCHANGE.LDAP.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange ADAccess Domain Controllers({#INSTANCE})\LDAP Read Time", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.LDAP.TIME})}>{$MS.EXCHANGE.LDAP.WARN}` |AVERAGE | |
-|Domain Controller [{#INSTANCE}]: LDAP search time is too high (>{$MS.EXCHANGE.LDAP.WARN}s for {$MS.EXCHANGE.LDAP.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`{TEMPLATE_NAME:perf_counter_en["\MSExchange ADAccess Domain Controllers({#INSTANCE})\LDAP Search Time", {$MS.EXCHANGE.PERF.INTERVAL}].min({$MS.EXCHANGE.LDAP.TIME})}>{$MS.EXCHANGE.LDAP.WARN}` |AVERAGE | |
+|Information Store [{#INSTANCE}]: Page faults is too high (>{$MS.EXCHANGE.DB.FAULTS.WARN} for {$MS.EXCHANGE.DB.FAULTS.TIME}) |<p>Too much page faults stalls for database "{#INSTANCE}". This counter should be 0 on production servers.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange Database({#INF.STORE})\Database Page Fault Stalls/sec", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.FAULTS.TIME})>{$MS.EXCHANGE.DB.FAULTS.WARN}` |AVERAGE | |
+|Information Store [{#INSTANCE}]: Log records stalls is too high (>{$MS.EXCHANGE.LOG.STALLS.WARN} for {$MS.EXCHANGE.LOG.STALLS.TIME}) |<p>Stalled log records too high. The average value should be less than 10 threads waiting.</p> |`avg(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange Database({#INF.STORE})\Log Record Stalls/sec", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.LOG.STALLS.TIME})>{$MS.EXCHANGE.LOG.STALLS.WARN}` |AVERAGE | |
+|Information Store [{#INSTANCE}]: RPC Requests latency is too high (>{$MS.EXCHANGE.RPC.WARN}s for {$MS.EXCHANGE.RPC.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchangeIS Store({#INSTANCE})\RPC Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.RPC.TIME})>{$MS.EXCHANGE.RPC.WARN}` |WARNING | |
+|Information Store [{#INSTANCE}]: RPC Requests total count is too high (>{$MS.EXCHANGE.RPC.COUNT.WARN} for {$MS.EXCHANGE.RPC.COUNT.TIME}) |<p>Should be below 70 at all times.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchangeIS Store({#INSTANCE})\RPC requests", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.RPC.COUNT.TIME})>{$MS.EXCHANGE.RPC.COUNT.WARN}` |WARNING | |
+|Database Counters [{#INSTANCE}]: Average read time latency is too high (>{$MS.EXCHANGE.DB.ACTIVE.READ.WARN}s for {$MS.EXCHANGE.DB.ACTIVE.READ.TIME}) |<p>Should be less than 20ms on average.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Attached) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.ACTIVE.READ.TIME})>{$MS.EXCHANGE.DB.ACTIVE.READ.WARN}` |WARNING | |
+|Database Counters [{#INSTANCE}]: Average read time latency is too high (>{$MS.EXCHANGE.DB.PASSIVE.READ.WARN}s for {$MS.EXCHANGE.DB.PASSIVE.READ.TIME}) |<p>Should be less than 200ms on average.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.PASSIVE.READ.TIME})>{$MS.EXCHANGE.DB.PASSIVE.READ.WARN}` |WARNING | |
+|Database Counters [{#INSTANCE}]: Average write time latency is too high for {$MS.EXCHANGE.DB.ACTIVE.WRITE.TIME} |<p>Should be less than 50ms on average.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Writes (Attached) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.ACTIVE.WRITE.TIME})>{$MS.EXCHANGE.DB.ACTIVE.WRITE.WARN}` |WARNING | |
+|Database Counters [{#INSTANCE}]: Average write time latency is higher than read time latency for {$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME} |<p>Should be less than the read latency for the same instance, as measured by the MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency counter.</p> |`avg(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Writes (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME})>avg(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange Database ==> Instances({#INF.STORE}/_Total)\I/O Database Reads (Recovery) Average Latency", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.DB.PASSIVE.WRITE.TIME})` |WARNING | |
+|Domain Controller [{#INSTANCE}]: LDAP read time is too high (>{$MS.EXCHANGE.LDAP.WARN}s for {$MS.EXCHANGE.LDAP.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange ADAccess Domain Controllers({#INSTANCE})\LDAP Read Time", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.LDAP.TIME})>{$MS.EXCHANGE.LDAP.WARN}` |AVERAGE | |
+|Domain Controller [{#INSTANCE}]: LDAP search time is too high (>{$MS.EXCHANGE.LDAP.WARN}s for {$MS.EXCHANGE.LDAP.TIME}) |<p>Should be less than 50ms at all times, with spikes less than 100ms.</p> |`min(/Microsoft Exchange Server 2016 by Zabbix agent active/perf_counter_en["\MSExchange ADAccess Domain Controllers({#INSTANCE})\LDAP Search Time", {$MS.EXCHANGE.PERF.INTERVAL}],{$MS.EXCHANGE.LDAP.TIME})>{$MS.EXCHANGE.LDAP.WARN}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/exchange_active/template_app_exchange_active.yaml b/templates/app/exchange_active/template_app_exchange_active.yaml
index 40c0d528907..a36d89c698c 100644
--- a/templates/app/exchange_active/template_app_exchange_active.yaml
+++ b/templates/app/exchange_active/template_app_exchange_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:24Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:00Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415007-discussion-thread-for-official-zabbix-template-microsoft-exchange
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/generic_java_jmx/README.md b/templates/app/generic_java_jmx/README.md
index 33ee31493f0..27c46b0b762 100644
--- a/templates/app/generic_java_jmx/README.md
+++ b/templates/app/generic_java_jmx/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official JMX Template from Zabbix distribution. Could be useful for many Java Applications (JMX).
 
 
@@ -18,18 +18,18 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                          | Description                                                                                                                    | Default |
-|-------------------------------|--------------------------------------------------------------------------------------------------------------------------------|---------|
-| {$JMX.CPU.LOAD.MAX}           | <p>A threshold in percent for CPU utilization trigger.</p>                                                                     | `85`    |
-| {$JMX.CPU.LOAD.TIME}          | <p>The time during which the CPU utilization may exceed the threshold.</p>                                                     | `5m`    |
-| {$JMX.FILE.DESCRIPTORS.MAX}   | <p>A threshold in percent for file descriptors count trigger.</p>                                                              | `85`    |
-| {$JMX.FILE.DESCRIPTORS.TIME}  | <p>The time during which the file descriptors count may exceed the threshold.</p>                                              | `3m`    |
-| {$JMX.HEAP.MEM.USAGE.MAX}     | <p>A threshold in percent for Heap memory utilization trigger.</p>                                                             | `85`    |
-| {$JMX.HEAP.MEM.USAGE.TIME}    | <p>The time during which the Heap memory utilization may exceed the threshold.</p>                                             | `10m`   |
-| {$JMX.MP.USAGE.MAX}           | <p>A threshold in percent for memory pools utilization trigger. Use a context to change the threshold for a specific pool.</p> | `85`    |
-| {$JMX.MP.USAGE.TIME}          | <p>The time during which the memory pools utilization may exceed the threshold.</p>                                            | `10m`   |
-| {$JMX.NONHEAP.MEM.USAGE.MAX}  | <p>A threshold in percent for Non-heap memory utilization trigger.</p>                                                         | `85`    |
-| {$JMX.NONHEAP.MEM.USAGE.TIME} | <p>The time during which the Non-heap memory utilization may exceed the threshold.</p>                                         | `10m`   |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$JMX.CPU.LOAD.MAX} |<p>A threshold in percent for CPU utilization trigger.</p> |`85` |
+|{$JMX.CPU.LOAD.TIME} |<p>The time during which the CPU utilization may exceed the threshold.</p> |`5m` |
+|{$JMX.FILE.DESCRIPTORS.MAX} |<p>A threshold in percent for file descriptors count trigger.</p> |`85` |
+|{$JMX.FILE.DESCRIPTORS.TIME} |<p>The time during which the file descriptors count may exceed the threshold.</p> |`3m` |
+|{$JMX.HEAP.MEM.USAGE.MAX} |<p>A threshold in percent for Heap memory utilization trigger.</p> |`85` |
+|{$JMX.HEAP.MEM.USAGE.TIME} |<p>The time during which the Heap memory utilization may exceed the threshold.</p> |`10m` |
+|{$JMX.MP.USAGE.MAX} |<p>A threshold in percent for memory pools utilization trigger. Use a context to change the threshold for a specific pool.</p> |`85` |
+|{$JMX.MP.USAGE.TIME} |<p>The time during which the memory pools utilization may exceed the threshold.</p> |`10m` |
+|{$JMX.NONHEAP.MEM.USAGE.MAX} |<p>A threshold in percent for Non-heap memory utilization trigger.</p> |`85` |
+|{$JMX.NONHEAP.MEM.USAGE.TIME} |<p>The time during which the Non-heap memory utilization may exceed the threshold.</p> |`10m` |
 
 ## Template links
 
@@ -40,85 +40,85 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group | Name                                                                       | Description                                                                                                                                                                                                                                                                                                              | Type | Key and additional info                                                                                                                                                          |
-|-------|----------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| JMX   | ClassLoading: Loaded class count                                           | <p>Displays number of classes that are currently loaded in the Java virtual machine.</p>                                                                                                                                                                                                                                 | JMX  | jmx["java.lang:type=ClassLoading","LoadedClassCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                        |
-| JMX   | ClassLoading: Total loaded class count                                     | <p>Displays the total number of classes that have been loaded since the Java virtual machine has started execution.</p>                                                                                                                                                                                                  | JMX  | jmx["java.lang:type=ClassLoading","TotalLoadedClassCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                   |
-| JMX   | ClassLoading: Unloaded class count                                         | <p>Displays the total number of classes that have been loaded since the Java virtual machine has started execution.</p>                                                                                                                                                                                                  | JMX  | jmx["java.lang:type=ClassLoading","UnloadedClassCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                      |
-| JMX   | Compilation: Name of the current JIT compiler                              | <p>Displays the total number of classes unloaded since the Java virtual machine has started execution.</p>                                                                                                                                                                                                               | JMX  | jmx["java.lang:type=Compilation","Name"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p>                                                                     |
-| JMX   | Compilation: Accumulated time spent                                        | <p>Displays the approximate accumulated elapsed time spent in compilation, in seconds.</p>                                                                                                                                                                                                                               | JMX  | jmx["java.lang:type=Compilation","TotalCompilationTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                         |
-| JMX   | GarbageCollector: ConcurrentMarkSweep number of collections per second     | <p>Displays the total number of collections that have occurred per second.</p>                                                                                                                                                                                                                                           | JMX  | jmx["java.lang:type=GarbageCollector,name=ConcurrentMarkSweep","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                 |
-| JMX   | GarbageCollector: ConcurrentMarkSweep accumulated time spent in collection | <p>Displays the approximate accumulated collection elapsed time, in seconds.</p>                                                                                                                                                                                                                                         | JMX  | jmx["java.lang:type=GarbageCollector,name=ConcurrentMarkSweep","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
-| JMX   | GarbageCollector: Copy number of collections per second                    | <p>Displays the total number of collections that have occurred per second.</p>                                                                                                                                                                                                                                           | JMX  | jmx["java.lang:type=GarbageCollector,name=Copy","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                                |
-| JMX   | GarbageCollector: Copy accumulated time spent in collection                | <p>Displays the approximate accumulated collection elapsed time, in seconds.</p>                                                                                                                                                                                                                                         | JMX  | jmx["java.lang:type=GarbageCollector,name=Copy","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                |
-| JMX   | GarbageCollector: MarkSweepCompact number of collections per second        | <p>Displays the total number of collections that have occurred per second.</p>                                                                                                                                                                                                                                           | JMX  | jmx["java.lang:type=GarbageCollector,name=MarkSweepCompact","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                    |
-| JMX   | GarbageCollector: MarkSweepCompact accumulated time spent in collection    | <p>Displays the approximate accumulated collection elapsed time, in seconds.</p>                                                                                                                                                                                                                                         | JMX  | jmx["java.lang:type=GarbageCollector,name=MarkSweepCompact","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>    |
-| JMX   | GarbageCollector: ParNew number of collections per second                  | <p>Displays the total number of collections that have occurred per second.</p>                                                                                                                                                                                                                                           | JMX  | jmx["java.lang:type=GarbageCollector,name=ParNew","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                              |
-| JMX   | GarbageCollector: ParNew accumulated time spent in collection              | <p>Displays the approximate accumulated collection elapsed time, in seconds.</p>                                                                                                                                                                                                                                         | JMX  | jmx["java.lang:type=GarbageCollector,name=ParNew","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>              |
-| JMX   | GarbageCollector: PS MarkSweep number of collections per second            | <p>Displays the total number of collections that have occurred per second.</p>                                                                                                                                                                                                                                           | JMX  | jmx["java.lang:type=GarbageCollector,name=PS MarkSweep","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                        |
-| JMX   | GarbageCollector: PS MarkSweep accumulated time spent in collection        | <p>Displays the approximate accumulated collection elapsed time, in seconds.</p>                                                                                                                                                                                                                                         | JMX  | jmx["java.lang:type=GarbageCollector,name=PS MarkSweep","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>        |
-| JMX   | GarbageCollector: PS Scavenge number of collections per second             | <p>Displays the total number of collections that have occurred per second.</p>                                                                                                                                                                                                                                           | JMX  | jmx["java.lang:type=GarbageCollector,name=PS Scavenge","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                         |
-| JMX   | GarbageCollector: PS Scavenge accumulated time spent in collection         | <p>Displays the approximate accumulated collection elapsed time, in seconds.</p>                                                                                                                                                                                                                                         | JMX  | jmx["java.lang:type=GarbageCollector,name=PS Scavenge","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>         |
-| JMX   | Memory: Heap memory committed                                              | <p>Current heap memory allocated. This amount of memory is guaranteed for the Java virtual machine to use.</p>                                                                                                                                                                                                           | JMX  | jmx["java.lang:type=Memory","HeapMemoryUsage.committed"]                                                                                                                         |
-| JMX   | Memory: Heap memory maximum size                                           | <p>Maximum amount of heap that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p>            | JMX  | jmx["java.lang:type=Memory","HeapMemoryUsage.max"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                           |
-| JMX   | Memory: Heap memory used                                                   | <p>Current memory usage outside the heap.</p>                                                                                                                                                                                                                                                                            | JMX  | jmx["java.lang:type=Memory","HeapMemoryUsage.used"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                          |
-| JMX   | Memory: Non-Heap memory committed                                          | <p>Current memory allocated outside the heap. This amount of memory is guaranteed for the Java virtual machine to use.</p>                                                                                                                                                                                               | JMX  | jmx["java.lang:type=Memory","NonHeapMemoryUsage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                  |
-| JMX   | Memory: Non-Heap memory maximum size                                       | <p>Maximum amount of non-heap memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> | JMX  | jmx["java.lang:type=Memory","NonHeapMemoryUsage.max"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                        |
-| JMX   | Memory: Non-Heap memory used                                               | <p>Current memory usage outside the heap</p>                                                                                                                                                                                                                                                                             | JMX  | jmx["java.lang:type=Memory","NonHeapMemoryUsage.used"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                       |
-| JMX   | Memory: Object pending finalization count                                  | <p>The approximate number of objects for which finalization is pending.</p>                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=Memory","ObjectPendingFinalizationCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                |
-| JMX   | MemoryPool: CMS Old Gen committed                                          | <p>Current memory allocated</p>                                                                                                                                                                                                                                                                                          | JMX  | jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                          |
-| JMX   | MemoryPool: CMS Old Gen maximum size                                       | <p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p>          | JMX  | jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.max"]                                                                                                                    |
-| JMX   | MemoryPool: CMS Old Gen used                                               | <p>Current memory usage</p>                                                                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.used"]                                                                                                                   |
-| JMX   | MemoryPool: CMS Perm Gen committed                                         | <p>Current memory allocated</p>                                                                                                                                                                                                                                                                                          | JMX  | jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                         |
-| JMX   | MemoryPool: CMS Perm Gen maximum size                                      | <p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p>          | JMX  | jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.max"]                                                                                                                   |
-| JMX   | MemoryPool: CMS Perm Gen used                                              | <p>Current memory usage</p>                                                                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.used"]                                                                                                                  |
-| JMX   | MemoryPool: Code Cache committed                                           | <p>Current memory allocated</p>                                                                                                                                                                                                                                                                                          | JMX  | jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                           |
-| JMX   | MemoryPool: CodeCache maximum size                                         | <p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p>          | JMX  | jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.max"]                                                                                                                     |
-| JMX   | MemoryPool: Code Cache used                                                | <p>Current memory usage</p>                                                                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.used"]                                                                                                                    |
-| JMX   | MemoryPool: Perm Gen committed                                             | <p>Current memory allocated</p>                                                                                                                                                                                                                                                                                          | JMX  | jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                             |
-| JMX   | MemoryPool: Perm Gen maximum size                                          | <p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p>          | JMX  | jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.max"]                                                                                                                       |
-| JMX   | MemoryPool: Perm Gen used                                                  | <p>Current memory usage</p>                                                                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.used"]                                                                                                                      |
-| JMX   | MemoryPool: PS Old Gen                                                     | <p>Current memory allocated</p>                                                                                                                                                                                                                                                                                          | JMX  | jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                           |
-| JMX   | MemoryPool: PS Old Gen maximum size                                        | <p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p>          | JMX  | jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.max"]                                                                                                                     |
-| JMX   | MemoryPool: PS Old Gen used                                                | <p>Current memory usage</p>                                                                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.used"]                                                                                                                    |
-| JMX   | MemoryPool: PS Perm Gen committed                                          | <p>Current memory allocated</p>                                                                                                                                                                                                                                                                                          | JMX  | jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                          |
-| JMX   | MemoryPool: PS Perm Gen maximum size                                       | <p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p>          | JMX  | jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.max"]                                                                                                                    |
-| JMX   | MemoryPool: PS Perm Gen used                                               | <p>Current memory usage</p>                                                                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.used"]                                                                                                                   |
-| JMX   | MemoryPool: Tenured Gen committed                                          | <p>Current memory allocated</p>                                                                                                                                                                                                                                                                                          | JMX  | jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                          |
-| JMX   | MemoryPool: Tenured Gen maximum size                                       | <p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p>          | JMX  | jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.max"]                                                                                                                    |
-| JMX   | MemoryPool: Tenured Gen used                                               | <p>Current memory usage</p>                                                                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.used"]                                                                                                                   |
-| JMX   | OperatingSystem: File descriptors maximum count                            | <p>This is the number of file descriptors we can have opened in the same process, as determined by the operating system. You can never have more file descriptors than this number.</p>                                                                                                                                  | JMX  | jmx["java.lang:type=OperatingSystem","MaxFileDescriptorCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                               |
-| JMX   | OperatingSystem: File descriptors opened                                   | <p>This is the number of opened file descriptors at the moment, if this reaches the MaxFileDescriptorCount, the application will throw an IOException: Too many open files. This could mean you’re are opening file descriptors and never closing them.</p>                                                              | JMX  | jmx["java.lang:type=OperatingSystem","OpenFileDescriptorCount"]                                                                                                                  |
-| JMX   | OperatingSystem: Process CPU Load                                          | <p>ProcessCpuLoad represents the CPU load in this process.</p>                                                                                                                                                                                                                                                           | JMX  | jmx["java.lang:type=OperatingSystem","ProcessCpuLoad"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p>                                                                        |
-| JMX   | Runtime: JVM uptime                                                        | <p>-</p>                                                                                                                                                                                                                                                                                                                 | JMX  | jmx["java.lang:type=Runtime","Uptime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                                                                      |
-| JMX   | Runtime: JVM name                                                          | <p>-</p>                                                                                                                                                                                                                                                                                                                 | JMX  | jmx["java.lang:type=Runtime","VmName"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p>                                                                       |
-| JMX   | Runtime: JVM version                                                       | <p>-</p>                                                                                                                                                                                                                                                                                                                 | JMX  | jmx["java.lang:type=Runtime","VmVersion"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p>                                                                    |
-| JMX   | Threading: Daemon thread count                                             | <p>Number of daemon threads running.</p>                                                                                                                                                                                                                                                                                 | JMX  | jmx["java.lang:type=Threading","DaemonThreadCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                          |
-| JMX   | Threading: Peak thread count                                               | <p>Maximum number of threads being executed at the same time since the JVM was started or the peak was reset.</p>                                                                                                                                                                                                        | JMX  | jmx["java.lang:type=Threading","PeakThreadCount"]                                                                                                                                |
-| JMX   | Threading: Thread count                                                    | <p>The number of threads running at the current moment.</p>                                                                                                                                                                                                                                                              | JMX  | jmx["java.lang:type=Threading","ThreadCount"]                                                                                                                                    |
-| JMX   | Threading: Total started thread count                                      | <p>The number of threads started since the JVM was launched.</p>                                                                                                                                                                                                                                                         | JMX  | jmx["java.lang:type=Threading","TotalStartedThreadCount"]                                                                                                                        |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|JMX |ClassLoading: Loaded class count |<p>Displays number of classes that are currently loaded in the Java virtual machine.</p> |JMX |jmx["java.lang:type=ClassLoading","LoadedClassCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |ClassLoading: Total loaded class count |<p>Displays the total number of classes that have been loaded since the Java virtual machine has started execution.</p> |JMX |jmx["java.lang:type=ClassLoading","TotalLoadedClassCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |ClassLoading: Unloaded class count |<p>Displays the total number of classes that have been loaded since the Java virtual machine has started execution.</p> |JMX |jmx["java.lang:type=ClassLoading","UnloadedClassCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |Compilation: Name of the current JIT compiler |<p>Displays the total number of classes unloaded since the Java virtual machine has started execution.</p> |JMX |jmx["java.lang:type=Compilation","Name"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|JMX |Compilation: Accumulated time spent |<p>Displays the approximate accumulated elapsed time spent in compilation, in seconds.</p> |JMX |jmx["java.lang:type=Compilation","TotalCompilationTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |GarbageCollector: ConcurrentMarkSweep number of collections per second |<p>Displays the total number of collections that have occurred per second.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=ConcurrentMarkSweep","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|JMX |GarbageCollector: ConcurrentMarkSweep accumulated time spent in collection |<p>Displays the approximate accumulated collection elapsed time, in seconds.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=ConcurrentMarkSweep","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |GarbageCollector: Copy number of collections per second |<p>Displays the total number of collections that have occurred per second.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=Copy","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|JMX |GarbageCollector: Copy accumulated time spent in collection |<p>Displays the approximate accumulated collection elapsed time, in seconds.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=Copy","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |GarbageCollector: MarkSweepCompact number of collections per second |<p>Displays the total number of collections that have occurred per second.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=MarkSweepCompact","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|JMX |GarbageCollector: MarkSweepCompact accumulated time spent in collection |<p>Displays the approximate accumulated collection elapsed time, in seconds.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=MarkSweepCompact","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |GarbageCollector: ParNew number of collections per second |<p>Displays the total number of collections that have occurred per second.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=ParNew","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|JMX |GarbageCollector: ParNew accumulated time spent in collection |<p>Displays the approximate accumulated collection elapsed time, in seconds.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=ParNew","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |GarbageCollector: PS MarkSweep number of collections per second |<p>Displays the total number of collections that have occurred per second.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=PS MarkSweep","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|JMX |GarbageCollector: PS MarkSweep accumulated time spent in collection |<p>Displays the approximate accumulated collection elapsed time, in seconds.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=PS MarkSweep","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |GarbageCollector: PS Scavenge number of collections per second |<p>Displays the total number of collections that have occurred per second.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=PS Scavenge","CollectionCount"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|JMX |GarbageCollector: PS Scavenge accumulated time spent in collection |<p>Displays the approximate accumulated collection elapsed time, in seconds.</p> |JMX |jmx["java.lang:type=GarbageCollector,name=PS Scavenge","CollectionTime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |Memory: Heap memory committed |<p>Current heap memory allocated. This amount of memory is guaranteed for the Java virtual machine to use.</p> |JMX |jmx["java.lang:type=Memory","HeapMemoryUsage.committed"] |
+|JMX |Memory: Heap memory maximum size |<p>Maximum amount of heap that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=Memory","HeapMemoryUsage.max"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |Memory: Heap memory used |<p>Current memory usage outside the heap.</p> |JMX |jmx["java.lang:type=Memory","HeapMemoryUsage.used"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |Memory: Non-Heap memory committed |<p>Current memory allocated outside the heap. This amount of memory is guaranteed for the Java virtual machine to use.</p> |JMX |jmx["java.lang:type=Memory","NonHeapMemoryUsage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |Memory: Non-Heap memory maximum size |<p>Maximum amount of non-heap memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=Memory","NonHeapMemoryUsage.max"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |Memory: Non-Heap memory used |<p>Current memory usage outside the heap</p> |JMX |jmx["java.lang:type=Memory","NonHeapMemoryUsage.used"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |Memory: Object pending finalization count |<p>The approximate number of objects for which finalization is pending.</p> |JMX |jmx["java.lang:type=Memory","ObjectPendingFinalizationCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |MemoryPool: CMS Old Gen committed |<p>Current memory allocated</p> |JMX |jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |MemoryPool: CMS Old Gen maximum size |<p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.max"] |
+|JMX |MemoryPool: CMS Old Gen used |<p>Current memory usage</p> |JMX |jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.used"] |
+|JMX |MemoryPool: CMS Perm Gen committed |<p>Current memory allocated</p> |JMX |jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |MemoryPool: CMS Perm Gen maximum size |<p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.max"] |
+|JMX |MemoryPool: CMS Perm Gen used |<p>Current memory usage</p> |JMX |jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.used"] |
+|JMX |MemoryPool: Code Cache committed |<p>Current memory allocated</p> |JMX |jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |MemoryPool: CodeCache maximum size |<p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.max"] |
+|JMX |MemoryPool: Code Cache used |<p>Current memory usage</p> |JMX |jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.used"] |
+|JMX |MemoryPool: Perm Gen committed |<p>Current memory allocated</p> |JMX |jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |MemoryPool: Perm Gen maximum size |<p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.max"] |
+|JMX |MemoryPool: Perm Gen used |<p>Current memory usage</p> |JMX |jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.used"] |
+|JMX |MemoryPool: PS Old Gen |<p>Current memory allocated</p> |JMX |jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |MemoryPool: PS Old Gen maximum size |<p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.max"] |
+|JMX |MemoryPool: PS Old Gen used |<p>Current memory usage</p> |JMX |jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.used"] |
+|JMX |MemoryPool: PS Perm Gen committed |<p>Current memory allocated</p> |JMX |jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |MemoryPool: PS Perm Gen maximum size |<p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.max"] |
+|JMX |MemoryPool: PS Perm Gen used |<p>Current memory usage</p> |JMX |jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.used"] |
+|JMX |MemoryPool: Tenured Gen committed |<p>Current memory allocated</p> |JMX |jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.committed"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |MemoryPool: Tenured Gen maximum size |<p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.max"] |
+|JMX |MemoryPool: Tenured Gen used |<p>Current memory usage</p> |JMX |jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.used"] |
+|JMX |OperatingSystem: File descriptors maximum count |<p>This is the number of file descriptors we can have opened in the same process, as determined by the operating system. You can never have more file descriptors than this number.</p> |JMX |jmx["java.lang:type=OperatingSystem","MaxFileDescriptorCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |OperatingSystem: File descriptors opened |<p>This is the number of opened file descriptors at the moment, if this reaches the MaxFileDescriptorCount, the application will throw an IOException: Too many open files. This could mean you’re are opening file descriptors and never closing them.</p> |JMX |jmx["java.lang:type=OperatingSystem","OpenFileDescriptorCount"] |
+|JMX |OperatingSystem: Process CPU Load |<p>ProcessCpuLoad represents the CPU load in this process.</p> |JMX |jmx["java.lang:type=OperatingSystem","ProcessCpuLoad"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p> |
+|JMX |Runtime: JVM uptime |<p>-</p> |JMX |jmx["java.lang:type=Runtime","Uptime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|JMX |Runtime: JVM name |<p>-</p> |JMX |jmx["java.lang:type=Runtime","VmName"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|JMX |Runtime: JVM version |<p>-</p> |JMX |jmx["java.lang:type=Runtime","VmVersion"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|JMX |Threading: Daemon thread count |<p>Number of daemon threads running.</p> |JMX |jmx["java.lang:type=Threading","DaemonThreadCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|JMX |Threading: Peak thread count |<p>Maximum number of threads being executed at the same time since the JVM was started or the peak was reset.</p> |JMX |jmx["java.lang:type=Threading","PeakThreadCount"] |
+|JMX |Threading: Thread count |<p>The number of threads running at the current moment.</p> |JMX |jmx["java.lang:type=Threading","ThreadCount"] |
+|JMX |Threading: Total started thread count |<p>The number of threads started since the JVM was launched.</p> |JMX |jmx["java.lang:type=Threading","TotalStartedThreadCount"] |
 
 ## Triggers
 
-| Name                                                                                                                        | Description | Expression                                                                                                                                                                                                                                                   | Severity | Dependencies and additional info |
-|-----------------------------------------------------------------------------------------------------------------------------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| Compilation: {HOST.NAME} uses suboptimal JIT compiler                                                                       | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=Compilation","Name"].str(Client)}=1`                                                                                                                                                                                     | INFO     | <p>Manual close: YES</p>         |
-| GarbageCollector: Concurrent Mark Sweep in fire fighting mode                                                               | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=GarbageCollector,name=ConcurrentMarkSweep","CollectionCount"].last()}>{Generic Java JMX:jmx["java.lang:type=GarbageCollector,name=ParNew","CollectionCount"].last()}`                                                    | AVERAGE  |                                  |
-| GarbageCollector: Mark Sweep Compact in fire fighting mode                                                                  | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=GarbageCollector,name=MarkSweepCompact","CollectionCount"].last()}>{Generic Java JMX:jmx["java.lang:type=GarbageCollector,name=Copy","CollectionCount"].last()}`                                                         | AVERAGE  |                                  |
-| GarbageCollector: PS Mark Sweep in fire fighting mode                                                                       | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=GarbageCollector,name=PS MarkSweep","CollectionCount"].last()}>{Generic Java JMX:jmx["java.lang:type=GarbageCollector,name=PS Scavenge","CollectionCount"].last()}`                                                      | AVERAGE  |                                  |
-| Memory: Heap memory usage more than {$JMX.HEAP.USAGE.MAX}% for {$JMX.HEAP.MEM.USAGE.TIME}                                   | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=Memory","HeapMemoryUsage.used"].min({$JMX.HEAP.MEM.USAGE.TIME})}>({Generic Java JMX:jmx["java.lang:type=Memory","HeapMemoryUsage.max"].last()}*{$JMX.HEAP.MEM.USAGE.MAX}/100)`                                           | WARNING  |                                  |
-| Memory: Non-Heap memory usage more than {$JMX.NONHEAP.MEM.USAGE.MAX}% for {$JMX.NONHEAP.MEM.USAGE.TIME}                     | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=Memory","NonHeapMemoryUsage.used"].min({$JMX.NONHEAP.MEM.USAGE.TIME})}>({Generic Java JMX:jmx["java.lang:type=Memory","NonHeapMemoryUsage.max"].last()}*{$JMX.NONHEAP.MEM.USAGE.MAX}/100)`                               | WARNING  |                                  |
-| MemoryPool: CMS Old Gen memory usage more than {$JMX.MP.USAGE.MAX:"CMS Old Gen"}% for {$JMX.MP.USAGE.TIME:"CMS Old Gen"}    | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.used"].min({$JMX.MP.USAGE.TIME:"CMS Old Gen"})}>({Generic Java JMX:jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.max"].last()}*{$JMX.MP.USAGE.MAX:"CMS Old Gen"}/100)`     | WARNING  |                                  |
-| MemoryPool: CMS Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"CMS Perm Gen"}% for {$JMX.MP.USAGE.TIME:"CMS Perm Gen"} | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.used"].min({$JMX.MP.USAGE.TIME:"CMS Perm Gen"})}>({Generic Java JMX:jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.max"].last()}*{$JMX.MP.USAGE.MAX:"CMS Perm Gen"}/100)` | WARNING  |                                  |
-| MemoryPool: Code Cache memory usage more than {$JMX.MP.USAGE.MAX:"Code Cache"}% for {$JMX.MP.USAGE.TIME:"Code Cache"}       | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.used"].min({$JMX.MP.USAGE.TIME:"Code Cache"})}>({Generic Java JMX:jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.max"].last()}*{$JMX.MP.USAGE.MAX:"Code Cache"}/100)`         | WARNING  |                                  |
-| MemoryPool: Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"Perm Gen"}% for {$JMX.MP.USAGE.TIME:"Perm Gen"}             | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.used"].min({$JMX.MP.USAGE.TIME:"Perm Gen"})}>({Generic Java JMX:jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.max"].last()}*{$JMX.MP.USAGE.MAX:"Perm Gen"}/100)`                 | WARNING  |                                  |
-| MemoryPool: PS Old Gen memory usage more than {$JMX.MP.USAGE.MAX:"PS Old Gen"}% for {$JMX.MP.USAGE.TIME:"PS Old Gen"}       | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.used"].min({$JMX.MP.USAGE.TIME:"PS Old Gen"})}>({Generic Java JMX:jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.max"].last()}*{$JMX.MP.USAGE.MAX:"PS Old Gen"}/100)`         | WARNING  |                                  |
-| MemoryPool: PS Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"PS Perm Gen"}% for {$JMX.MP.USAGE.TIME:"PS Perm Gen"}    | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.used"].min({$JMX.MP.USAGE.TIME:"PS Perm Gen"})}>({Generic Java JMX:jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.max"].last()}*{$JMX.MP.USAGE.MAX:"PS Perm Gen"}/100)`     | WARNING  |                                  |
-| MemoryPool: Tenured Gen memory usage more than {$JMX.MP.USAGE.MAX:"Tenured Gen"}% for {$JMX.MP.USAGE.TIME:"Tenured Gen"}    | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.used"].min({$JMX.MP.USAGE.TIME:"Tenured Gen"})}>({Generic Java JMX:jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.max"].last()}*{$JMX.MP.USAGE.MAX:"Tenured Gen"}/100)`     | WARNING  |                                  |
-| OperatingSystem: Opened file descriptor count more than {$JMX.FILE.DESCRIPTORS.MAX}% of maximum                             | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=OperatingSystem","OpenFileDescriptorCount"].min({$JMX.FILE.DESCRIPTORS.TIME})}>({Generic Java JMX:jmx["java.lang:type=OperatingSystem","MaxFileDescriptorCount"].last()}*{$JMX.FILE.DESCRIPTORS.MAX}/100)`               | WARNING  |                                  |
-| OperatingSystem: Process CPU Load more than {$JMX.CPU.LOAD.MAX}% for {$JMX.CPU.LOAD.TIME}                                   | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=OperatingSystem","ProcessCpuLoad"].min({$JMX.CPU.LOAD.TIME})}>{$JMX.CPU.LOAD.MAX}`                                                                                                                                       | AVERAGE  |                                  |
-| Runtime: JVM is not reachable                                                                                               | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=Runtime","Uptime"].nodata(5m)}=1`                                                                                                                                                                                        | AVERAGE  | <p>Manual close: YES</p>         |
-| Runtime: {HOST.NAME} runs suboptimal VM type                                                                                | <p>-</p>    | `{TEMPLATE_NAME:jmx["java.lang:type=Runtime","VmName"].str(Server)}<>1`                                                                                                                                                                                      | INFO     | <p>Manual close: YES</p>         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Compilation: {HOST.NAME} uses suboptimal JIT compiler |<p>-</p> |`find(/Generic Java JMX/jmx["java.lang:type=Compilation","Name"],,"like","Client")=1` |INFO |<p>Manual close: YES</p> |
+|GarbageCollector: Concurrent Mark Sweep in fire fighting mode |<p>-</p> |`last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=ConcurrentMarkSweep","CollectionCount"])>last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=ParNew","CollectionCount"])` |AVERAGE | |
+|GarbageCollector: Mark Sweep Compact in fire fighting mode |<p>-</p> |`last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=MarkSweepCompact","CollectionCount"])>last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=Copy","CollectionCount"])` |AVERAGE | |
+|GarbageCollector: PS Mark Sweep in fire fighting mode |<p>-</p> |`last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=PS MarkSweep","CollectionCount"])>last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=PS Scavenge","CollectionCount"])` |AVERAGE | |
+|Memory: Heap memory usage more than {$JMX.HEAP.USAGE.MAX}% for {$JMX.HEAP.MEM.USAGE.TIME} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=Memory","HeapMemoryUsage.used"],{$JMX.HEAP.MEM.USAGE.TIME})>(last(/Generic Java JMX/jmx["java.lang:type=Memory","HeapMemoryUsage.max"])*{$JMX.HEAP.MEM.USAGE.MAX}/100)` |WARNING | |
+|Memory: Non-Heap memory usage more than {$JMX.NONHEAP.MEM.USAGE.MAX}% for {$JMX.NONHEAP.MEM.USAGE.TIME} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=Memory","NonHeapMemoryUsage.used"],{$JMX.NONHEAP.MEM.USAGE.TIME})>(last(/Generic Java JMX/jmx["java.lang:type=Memory","NonHeapMemoryUsage.max"])*{$JMX.NONHEAP.MEM.USAGE.MAX}/100)` |WARNING | |
+|MemoryPool: CMS Old Gen memory usage more than {$JMX.MP.USAGE.MAX:"CMS Old Gen"}% for {$JMX.MP.USAGE.TIME:"CMS Old Gen"} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"CMS Old Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"CMS Old Gen"}/100)` |WARNING | |
+|MemoryPool: CMS Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"CMS Perm Gen"}% for {$JMX.MP.USAGE.TIME:"CMS Perm Gen"} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"CMS Perm Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"CMS Perm Gen"}/100)` |WARNING | |
+|MemoryPool: Code Cache memory usage more than {$JMX.MP.USAGE.MAX:"Code Cache"}% for {$JMX.MP.USAGE.TIME:"Code Cache"} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.used"],{$JMX.MP.USAGE.TIME:"Code Cache"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.max"])*{$JMX.MP.USAGE.MAX:"Code Cache"}/100)` |WARNING | |
+|MemoryPool: Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"Perm Gen"}% for {$JMX.MP.USAGE.TIME:"Perm Gen"} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"Perm Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"Perm Gen"}/100)` |WARNING | |
+|MemoryPool: PS Old Gen memory usage more than {$JMX.MP.USAGE.MAX:"PS Old Gen"}% for {$JMX.MP.USAGE.TIME:"PS Old Gen"} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"PS Old Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"PS Old Gen"}/100)` |WARNING | |
+|MemoryPool: PS Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"PS Perm Gen"}% for {$JMX.MP.USAGE.TIME:"PS Perm Gen"} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"PS Perm Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"PS Perm Gen"}/100)` |WARNING | |
+|MemoryPool: Tenured Gen memory usage more than {$JMX.MP.USAGE.MAX:"Tenured Gen"}% for {$JMX.MP.USAGE.TIME:"Tenured Gen"} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"Tenured Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"Tenured Gen"}/100)` |WARNING | |
+|OperatingSystem: Opened file descriptor count more than {$JMX.FILE.DESCRIPTORS.MAX}% of maximum |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=OperatingSystem","OpenFileDescriptorCount"],{$JMX.FILE.DESCRIPTORS.TIME})>(last(/Generic Java JMX/jmx["java.lang:type=OperatingSystem","MaxFileDescriptorCount"])*{$JMX.FILE.DESCRIPTORS.MAX}/100)` |WARNING | |
+|OperatingSystem: Process CPU Load more than {$JMX.CPU.LOAD.MAX}% for {$JMX.CPU.LOAD.TIME} |<p>-</p> |`min(/Generic Java JMX/jmx["java.lang:type=OperatingSystem","ProcessCpuLoad"],{$JMX.CPU.LOAD.TIME})>{$JMX.CPU.LOAD.MAX}` |AVERAGE | |
+|Runtime: JVM is not reachable |<p>-</p> |`nodata(/Generic Java JMX/jmx["java.lang:type=Runtime","Uptime"],5m)=1` |AVERAGE |<p>Manual close: YES</p> |
+|Runtime: {HOST.NAME} runs suboptimal VM type |<p>-</p> |`find(/Generic Java JMX/jmx["java.lang:type=Runtime","VmName"],,"like","Server")<>1` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml b/templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml
index a9f1b97f695..ebe98df581d 100644
--- a/templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml
+++ b/templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:17Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:03Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: 72aab08f7f27406a8f2c291648e5ba95
       template: 'Generic Java JMX'
       name: 'Generic Java JMX'
-      description: 'Template tooling version used: 0.38'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/gitlab_http/README.md b/templates/app/gitlab_http/README.md
index 68a32d129e8..a9880a3a48c 100644
--- a/templates/app/gitlab_http/README.md
+++ b/templates/app/gitlab_http/README.md
@@ -7,7 +7,7 @@ For Zabbix version: 6.0 and higher
 The template to monitor GitLab by Zabbix that works without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `GitLab by HTTP` — collects metrics by HTTP agent from GitLab /metrics endpoint.
+Template `GitLab by HTTP` — collects metrics by HTTP agent from GitLab /metrics endpoint.
 See https://docs.gitlab.com/ee/administration/monitoring/prometheus/gitlab_metrics.html.
 
 
@@ -22,9 +22,10 @@ This template was tested on:
 
 This template works with self-hosted GitLab instances. Internal service metrics are collected from GitLab /-/metrics endpoint.
 To access the metrics, the client IP address must be [explicitly allowed](https://docs.gitlab.com/ee/administration/monitoring/ip_whitelist.html).
-Don't forget to change the macros {$GITLAB.URL}. 
-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 Gitlab instance version and configuration. See [Gitlab’s documentation](https://docs.gitlab.com/ee/administration/monitoring/prometheus/gitlab_metrics.html) for further information about its metric collection.
+Don't forget to change the macros {$GITLAB.URL}.
+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 Gitlab instance version and configuration. See [Gitlab's documentation](https://docs.gitlab.com/ee/administration/monitoring/prometheus/gitlab_metrics.html) for further information about its metric collection.
 
 
 ## Zabbix configuration
@@ -59,15 +60,15 @@ There are no template links in this template.
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|GitLab |GitLab: Instance readiness check |<p>The readiness probe checks whether the GitLab instance is ready to accept traffic via Rails Controllers.</p> |HTTP_AGENT |gitlab.readiness<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- JSONPATH: `$.master_check[0].status`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
-|GitLab |GitLab: Application server status |<p>Checks whether the application server is running. This probe is used to know if Rails Controllers are not deadlocked due to a multi-threading.</p> |HTTP_AGENT |gitlab.liveness<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- JSONPATH: `$.status`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|GitLab |GitLab: Instance readiness check |<p>The readiness probe checks whether the GitLab instance is ready to accept traffic via Rails Controllers.</p> |HTTP_AGENT |gitlab.readiness<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"master_check":[{"status":"failed"}]}`</p><p>- JSONPATH: `$.master_check[0].status`</p><p>- BOOL_TO_DECIMAL</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|GitLab |GitLab: Application server status |<p>Checks whether the application server is running. This probe is used to know if Rails Controllers are not deadlocked due to a multi-threading.</p> |HTTP_AGENT |gitlab.liveness<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"status": "failed"}`</p><p>- JSONPATH: `$.status`</p><p>- BOOL_TO_DECIMAL</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |GitLab |GitLab: Version |<p>Version of the GitLab instance.</p> |DEPENDENT |gitlab.deployments.version<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="deployments")].labels.version.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |GitLab |GitLab: Ruby: First process start time |<p>Minimum UNIX timestamp of ruby processes start time.</p> |DEPENDENT |gitlab.ruby.process_start_time_seconds.first<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_start_time_seconds")].value.min()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |GitLab |GitLab: Ruby: Last process start time |<p>Maximum UNIX timestamp ruby processes start time.</p> |DEPENDENT |gitlab.ruby.process_start_time_seconds.last<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_start_time_seconds")].value.max()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |GitLab |GitLab: User logins, total |<p>Counter of how many users have logged in since GitLab was started or restarted.</p> |DEPENDENT |gitlab.user_session_logins_total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="user_session_logins_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |GitLab |GitLab: User CAPTCHA logins failed, total |<p>Counter of failed CAPTCHA attempts during login.</p> |DEPENDENT |gitlab.failed_login_captcha_total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="failed_login_captcha_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |GitLab |GitLab: User CAPTCHA logins, total |<p>Counter of successful CAPTCHA attempts during login.</p> |DEPENDENT |gitlab.successful_login_captcha_total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="successful_login_captcha_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|GitLab |GitLab: Upload file does not exist	 |<p>Number of times an upload record could not find its file.</p> |DEPENDENT |gitlab.upload_file_does_not_exist<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="upload_file_does_not_exist	")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|GitLab |GitLab: Upload file does not exist    |<p>Number of times an upload record could not find its file.</p> |DEPENDENT |gitlab.upload_file_does_not_exist<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="upload_file_does_not_exist")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |GitLab |GitLab: Pipelines: Processing events, total  |<p>Total amount of pipeline processing events.</p> |DEPENDENT |gitlab.pipeline.processing_events_total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_ci_pipeline_processing_events_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |GitLab |GitLab: Pipelines: Created, total  |<p>Counter of pipelines created.</p> |DEPENDENT |gitlab.pipeline.created_total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="pipelines_created_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |GitLab |GitLab: Pipelines: Auto DevOps pipelines, total |<p>Counter of completed Auto DevOps pipelines.</p> |DEPENDENT |gitlab.pipeline.auto_devops_completed.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="auto_devops_pipelines_completed_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
@@ -80,27 +81,27 @@ There are no template links in this template.
 |GitLab |GitLab: Database: Connection pool, idle |<p>Connections to the main database not in use.</p> |DEPENDENT |gitlab.database.connection_pool_idle<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_database_connection_pool_idle" && @.labels.class == "ActiveRecord::Base")].value.sum()`</p> |
 |GitLab |GitLab: Database: Connection pool, size |<p>Total connection to the main database pool capacity.</p> |DEPENDENT |gitlab.database.connection_pool_size<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_database_connection_pool_size" && @.labels.class == "ActiveRecord::Base")].value.sum()`</p> |
 |GitLab |GitLab: Database: Connection pool, waiting |<p>Threads currently waiting on this queue.</p> |DEPENDENT |gitlab.database.connection_pool_waiting<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_database_connection_pool_waiting" && @.labels.class == "ActiveRecord::Base")].value.sum()`</p> |
-|GitLab |GitLab: Redis: Client requests rate, queues |<p>Number of Redis client requests per second. (Instance: queues)</p> |DEPENDENT |gitlab.redis.client_requests.queues.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_requests_total" && @.labels.storage == "queues")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Redis: Client requests rate, cache |<p>Number of Redis client requests per second. (Instance: cache)</p> |DEPENDENT |gitlab.redis.client_requests.cache.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_requests_total" && @.labels.storage == "cache")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Redis: Client requests rate, shared_state |<p>Number of Redis client requests per second. (Instance: shared_state)</p> |DEPENDENT |gitlab.redis.client_requests.shared_state.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_requests_total" && @.labels.storage == "shared_state")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Redis: Client exceptions rate, queues |<p>Number of Redis client exceptions per second. (Instance: queues)</p> |DEPENDENT |gitlab.redis.client_exceptions.queues.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_exceptions_total" && @.labels.storage == "queues")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Redis: Client exceptions rate, cache |<p>Number of Redis client exceptions per second. (Instance: cache)</p> |DEPENDENT |gitlab.redis.client_exceptions.cache.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_exceptions_total" && @.labels.storage == "cache")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Redis: client exceptions rate, shared_state |<p>Number of Redis client exceptions per second. (Instance: shared_state)</p> |DEPENDENT |gitlab.redis.client_exceptions.shared_state.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_exceptions_total" && @.labels.storage == "shared_state")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Cache: Misses rate, total  |<p>The cache read miss count.</p> |DEPENDENT |gitlab.cache.misses_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_cache_misses_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Cache: Operations rate, total  |<p>The count of cache operations.</p> |DEPENDENT |gitlab.cache.operations_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_cache_operations_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Ruby: CPU  usage per second |<p>Average CPU time util in seconds.</p> |DEPENDENT |gitlab.ruby.process_cpu_seconds.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_cpu_seconds_total")].value.avg()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|GitLab |GitLab: Redis: Client requests rate, queues |<p>Number of Redis client requests per second. (Instance: queues)</p> |DEPENDENT |gitlab.redis.client_requests.queues.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_requests_total" && @.labels.storage == "queues")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Redis: Client requests rate, cache |<p>Number of Redis client requests per second. (Instance: cache)</p> |DEPENDENT |gitlab.redis.client_requests.cache.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_requests_total" && @.labels.storage == "cache")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Redis: Client requests rate, shared_state |<p>Number of Redis client requests per second. (Instance: shared_state)</p> |DEPENDENT |gitlab.redis.client_requests.shared_state.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_requests_total" && @.labels.storage == "shared_state")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Redis: Client exceptions rate, queues |<p>Number of Redis client exceptions per second. (Instance: queues)</p> |DEPENDENT |gitlab.redis.client_exceptions.queues.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_exceptions_total" && @.labels.storage == "queues")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Redis: Client exceptions rate, cache |<p>Number of Redis client exceptions per second. (Instance: cache)</p> |DEPENDENT |gitlab.redis.client_exceptions.cache.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_exceptions_total" && @.labels.storage == "cache")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Redis: client exceptions rate, shared_state |<p>Number of Redis client exceptions per second. (Instance: shared_state)</p> |DEPENDENT |gitlab.redis.client_exceptions.shared_state.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_redis_client_exceptions_total" && @.labels.storage == "shared_state")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Cache: Misses rate, total  |<p>The cache read miss count.</p> |DEPENDENT |gitlab.cache.misses_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_cache_misses_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Cache: Operations rate, total  |<p>The count of cache operations.</p> |DEPENDENT |gitlab.cache.operations_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_cache_operations_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Ruby: CPU  usage per second |<p>Average CPU time util in seconds.</p> |DEPENDENT |gitlab.ruby.process_cpu_seconds.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_cpu_seconds_total")].value.avg()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
 |GitLab |GitLab: Ruby: Running_threads |<p>Number of running Ruby threads.</p> |DEPENDENT |gitlab.ruby.threads_running<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="gitlab_ruby_threads_running_threads")].value.sum()`</p> |
 |GitLab |GitLab: Ruby: File descriptors opened, avg |<p>Average number of opened file descriptors.</p> |DEPENDENT |gitlab.ruby.file_descriptors.avg<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_file_descriptors")].value.avg()`</p> |
 |GitLab |GitLab: Ruby: File descriptors opened, max |<p>Maximum number of opened file descriptors.</p> |DEPENDENT |gitlab.ruby.file_descriptors.max<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_file_descriptors")].value.max()`</p> |
 |GitLab |GitLab: Ruby: File descriptors opened, min |<p>Minimum number of opened file descriptors.</p> |DEPENDENT |gitlab.ruby.file_descriptors.min<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_file_descriptors")].value.min()`</p> |
 |GitLab |GitLab: Ruby: File descriptors, max |<p>Maximum number of open file descriptors per process.</p> |DEPENDENT |gitlab.ruby.process_max_fds<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_max_fds")].value.avg()`</p> |
-|GitLab |GitLab: Ruby: RSS memory, avg |<p>Average RSS	Memory usage in bytes.</p> |DEPENDENT |gitlab.ruby.process_resident_memory_bytes.avg<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_resident_memory_bytes")].value.avg()`</p> |
-|GitLab |GitLab: Ruby: RSS memory, min |<p>Minimum RSS	Memory usage in bytes.</p> |DEPENDENT |gitlab.ruby.process_resident_memory_bytes.min<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_resident_memory_bytes")].value.min()`</p> |
-|GitLab |GitLab: Ruby: RSS memory, max |<p>Maxinun RSS	Memory usage in bytes.</p> |DEPENDENT |gitlab.ruby.process_resident_memory_bytes.max<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_resident_memory_bytes")].value.max()`</p> |
-|GitLab |GitLab: HTTP requests rate, total |<p>Number of requests received into the system.</p> |DEPENDENT |gitlab.http.requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_requests_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: HTTP requests rate, 5xx |<p>Number of handle failures of requests with HTTP-code 5xx.</p> |DEPENDENT |gitlab.http.requests.5xx.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_requests_total" && @.labels.status =~ '5..' )].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: HTTP requests rate, 4xx |<p>Number of handle failures of requests with code 4XX.</p> |DEPENDENT |gitlab.http.requests.4xx.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_requests_total" && @.labels.status =~ '4..' )].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|GitLab |GitLab: Transactions per second |<p>Transactions per second (gitlab_transaction_* metrics).</p> |DEPENDENT |gitlab.transactions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=~"gitlab_transaction_.*_count_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|GitLab |GitLab: Ruby: RSS memory, avg |<p>Average RSS Memory usage in bytes.</p> |DEPENDENT |gitlab.ruby.process_resident_memory_bytes.avg<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_resident_memory_bytes")].value.avg()`</p> |
+|GitLab |GitLab: Ruby: RSS memory, min |<p>Minimum RSS Memory usage in bytes.</p> |DEPENDENT |gitlab.ruby.process_resident_memory_bytes.min<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_resident_memory_bytes")].value.min()`</p> |
+|GitLab |GitLab: Ruby: RSS memory, max |<p>Maximum RSS Memory usage in bytes.</p> |DEPENDENT |gitlab.ruby.process_resident_memory_bytes.max<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="ruby_process_resident_memory_bytes")].value.max()`</p> |
+|GitLab |GitLab: HTTP requests rate, total |<p>Number of requests received into the system.</p> |DEPENDENT |gitlab.http.requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_requests_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: HTTP requests rate, 5xx |<p>Number of handle failures of requests with HTTP-code 5xx.</p> |DEPENDENT |gitlab.http.requests.5xx.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_requests_total" && @.labels.status =~ '5..' )].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: HTTP requests rate, 4xx |<p>Number of handle failures of requests with code 4XX.</p> |DEPENDENT |gitlab.http.requests.4xx.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_requests_total" && @.labels.status =~ '4..' )].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|GitLab |GitLab: Transactions per second |<p>Transactions per second (gitlab_transaction_* metrics).</p> |DEPENDENT |gitlab.transactions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=~"gitlab_transaction_.*_count_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
 |GitLab: Puma stats |GitLab: Active connections |<p>Number of puma threads processing a request.</p> |DEPENDENT |gitlab.puma.active_connections[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=='puma_active_connections')].value.sum()`</p> |
 |GitLab: Puma stats |GitLab: Workers |<p>Total number of puma workers.</p> |DEPENDENT |gitlab.puma.workers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=='puma_workers')].value.sum()`</p> |
 |GitLab: Puma stats |GitLab: Running workers |<p>The number of booted puma workers.</p> |DEPENDENT |gitlab.puma.running_workers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=='puma_running_workers')].value.sum()`</p> |
@@ -114,25 +115,25 @@ There are no template links in this template.
 |GitLab: Unicorn stats |GitLab: Unicorn: Workers |<p>The number of Unicorn workers</p> |DEPENDENT |gitlab.unicorn.unicorn_workers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=='unicorn_workers')].value.sum()`</p> |
 |GitLab: Unicorn stats |GitLab: Unicorn: Active connections |<p>The number of active Unicorn connections.</p> |DEPENDENT |gitlab.unicorn.active_connections[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=='unicorn_active_connections')].value.sum()`</p> |
 |GitLab: Unicorn stats |GitLab: Unicorn: Queued connections |<p>The number of queued Unicorn connections.</p> |DEPENDENT |gitlab.unicorn.queued_connections[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=='unicorn_queued_connections')].value.sum()`</p> |
-|Zabbix_raw_items |GitLab: Get instance metrics |<p>-</p> |HTTP_AGENT |gitlab.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- PROMETHEUS_TO_JSON |
+|Zabbix_raw_items |GitLab: Get instance metrics |<p>-</p> |HTTP_AGENT |gitlab.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- PROMETHEUS_TO_JSON</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|GitLab: Gitlab instance is not able to accept traffic |<p>-</p> |`{TEMPLATE_NAME:gitlab.readiness.last()}=0` |HIGH |<p>**Depends on**:</p><p>- GitLab: Liveness check was failed</p> |
-|GitLab: Liveness check was failed |<p>The application server is not running or Rails Controllers are deadlocked.</p> |`{TEMPLATE_NAME:gitlab.liveness.last()}=0` |HIGH | |
-|GitLab: Version has changed (new version: {ITEM.VALUE}) |<p>GitLab version has changed. Ack to close.</p> |`{TEMPLATE_NAME:gitlab.deployments.version.diff()}=1 and {TEMPLATE_NAME:gitlab.deployments.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|GitLab: Too many Redis queues client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m) |<p>"Too many  Redis client exceptions during  to requests to  Redis instance queues."</p> |`{TEMPLATE_NAME:gitlab.redis.client_exceptions.queues.rate.min(5m)}>{$GITLAB.REDIS.FAIL.MAX.WARN}` |WARNING | |
-|GitLab: Too many Redis cache client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m) |<p>"Too many  Redis client exceptions during  to requests to  Redis instance cache."</p> |`{TEMPLATE_NAME:gitlab.redis.client_exceptions.cache.rate.min(5m)}>{$GITLAB.REDIS.FAIL.MAX.WARN}` |WARNING | |
-|GitLab: Too many Redis shared_state client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m) |<p>"Too many  Redis client exceptions during  to requests to  Redis instance shared_state."</p> |`{TEMPLATE_NAME:gitlab.redis.client_exceptions.shared_state.rate.min(5m)}>{$GITLAB.REDIS.FAIL.MAX.WARN}` |WARNING | |
-|GitLab: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for metrics for the last 30 minutes</p> |`{TEMPLATE_NAME:gitlab.ruby.threads_running.nodata(30m)}=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- GitLab: Liveness check was failed</p> |
-|GitLab: Current number of open files is too high (over {$GITLAB.OPEN.FDS.MAX.WARN}% for 5m) |<p>-</p> |`{TEMPLATE_NAME:gitlab.ruby.file_descriptors.max.min(5m)}/{GitLab by HTTP:gitlab.ruby.process_max_fds.last()}*100>{$GITLAB.OPEN.FDS.MAX.WARN}` |WARNING | |
-|GitLab: Too many HTTP requests failures (over {$GITLAB.HTTP.FAIL.MAX.WARN} for 5m)' |<p>"Too many requests failed on GitLab instance with 5xx HTTP code"</p> |`{TEMPLATE_NAME:gitlab.http.requests.5xx.rate.min(5m)}>{$GITLAB.HTTP.FAIL.MAX.WARN}` |WARNING | |
-|GitLab: Puma instance thread utilization is too high (over {$GITLAB.PUMA.UTILIZATION.MAX.WARN}% for 5m) |<p>-</p> |`{TEMPLATE_NAME:gitlab.puma.active_connections[{#SINGLETON}].min(5m)}/{GitLab by HTTP:gitlab.puma.max_threads[{#SINGLETON}].last()}*100>{$GITLAB.PUMA.UTILIZATION.MAX.WARN}` |WARNING | |
-|GitLab: Puma is queueing requests (over {$GITLAB.PUMA.QUEUE.MAX.WARN}% for 15m) |<p>-</p> |`{TEMPLATE_NAME:gitlab.puma.queued_connections[{#SINGLETON}].min(15m)}>{$GITLAB.PUMA.QUEUE.MAX.WARN}` |WARNING | |
-|GitLab: Unicorn worker utilization is too high (over {$GITLAB.UNICORN.UTILIZATION.MAX.WARN}% for 5m) |<p>-</p> |`{TEMPLATE_NAME:gitlab.unicorn.active_connections[{#SINGLETON}].min(5m)}/{GitLab by HTTP:gitlab.unicorn.unicorn_workers[{#SINGLETON}].last()}*100>{$GITLAB.UNICORN.UTILIZATION.MAX.WARN}` |WARNING | |
-|GitLab: Unicorn is queueing requests (over {$GITLAB.UNICORN.QUEUE.MAX.WARN}% for 5m) |<p>-</p> |`{TEMPLATE_NAME:gitlab.unicorn.queued_connections[{#SINGLETON}].min(5m)}>{$GITLAB.UNICORN.QUEUE.MAX.WARN}` |WARNING | |
+|GitLab: Gitlab instance is not able to accept traffic |<p>-</p> |`last(/GitLab by HTTP/gitlab.readiness)=0` |HIGH |<p>**Depends on**:</p><p>- GitLab: Liveness check was failed</p> |
+|GitLab: Liveness check was failed |<p>The application server is not running or Rails Controllers are deadlocked.</p> |`last(/GitLab by HTTP/gitlab.liveness)=0` |HIGH | |
+|GitLab: Version has changed (new version: {ITEM.VALUE}) |<p>GitLab version has changed. Ack to close.</p> |`last(/GitLab by HTTP/gitlab.deployments.version,#1)<>last(/GitLab by HTTP/gitlab.deployments.version,#2) and length(last(/GitLab by HTTP/gitlab.deployments.version))>0` |INFO |<p>Manual close: YES</p> |
+|GitLab: Too many Redis queues client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m) |<p>"Too many  Redis client exceptions during  to requests to  Redis instance queues."</p> |`min(/GitLab by HTTP/gitlab.redis.client_exceptions.queues.rate,5m)>{$GITLAB.REDIS.FAIL.MAX.WARN}` |WARNING | |
+|GitLab: Too many Redis cache client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m) |<p>"Too many  Redis client exceptions during  to requests to  Redis instance cache."</p> |`min(/GitLab by HTTP/gitlab.redis.client_exceptions.cache.rate,5m)>{$GITLAB.REDIS.FAIL.MAX.WARN}` |WARNING | |
+|GitLab: Too many Redis shared_state client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m) |<p>"Too many  Redis client exceptions during  to requests to  Redis instance shared_state."</p> |`min(/GitLab by HTTP/gitlab.redis.client_exceptions.shared_state.rate,5m)>{$GITLAB.REDIS.FAIL.MAX.WARN}` |WARNING | |
+|GitLab: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for metrics for the last 30 minutes</p> |`nodata(/GitLab by HTTP/gitlab.ruby.threads_running,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- GitLab: Liveness check was failed</p> |
+|GitLab: Current number of open files is too high (over {$GITLAB.OPEN.FDS.MAX.WARN}% for 5m) |<p>-</p> |`min(/GitLab by HTTP/gitlab.ruby.file_descriptors.max,5m)/last(/GitLab by HTTP/gitlab.ruby.process_max_fds)*100>{$GITLAB.OPEN.FDS.MAX.WARN}` |WARNING | |
+|GitLab: Too many HTTP requests failures (over {$GITLAB.HTTP.FAIL.MAX.WARN} for 5m)' |<p>"Too many requests failed on GitLab instance with 5xx HTTP code"</p> |`min(/GitLab by HTTP/gitlab.http.requests.5xx.rate,5m)>{$GITLAB.HTTP.FAIL.MAX.WARN}` |WARNING | |
+|GitLab: Puma instance thread utilization is too high (over {$GITLAB.PUMA.UTILIZATION.MAX.WARN}% for 5m) |<p>-</p> |`min(/GitLab by HTTP/gitlab.puma.active_connections[{#SINGLETON}],5m)/last(/GitLab by HTTP/gitlab.puma.max_threads[{#SINGLETON}])*100>{$GITLAB.PUMA.UTILIZATION.MAX.WARN}` |WARNING | |
+|GitLab: Puma is queueing requests (over {$GITLAB.PUMA.QUEUE.MAX.WARN}% for 15m) |<p>-</p> |`min(/GitLab by HTTP/gitlab.puma.queued_connections[{#SINGLETON}],15m)>{$GITLAB.PUMA.QUEUE.MAX.WARN}` |WARNING | |
+|GitLab: Unicorn worker utilization is too high (over {$GITLAB.UNICORN.UTILIZATION.MAX.WARN}% for 5m) |<p>-</p> |`min(/GitLab by HTTP/gitlab.unicorn.active_connections[{#SINGLETON}],5m)/last(/GitLab by HTTP/gitlab.unicorn.unicorn_workers[{#SINGLETON}])*100>{$GITLAB.UNICORN.UTILIZATION.MAX.WARN}` |WARNING | |
+|GitLab: Unicorn is queueing requests (over {$GITLAB.UNICORN.QUEUE.MAX.WARN}% for 5m) |<p>-</p> |`min(/GitLab by HTTP/gitlab.unicorn.queued_connections[{#SINGLETON}],5m)>{$GITLAB.UNICORN.QUEUE.MAX.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/gitlab_http/template_app_gitlab_http.yaml b/templates/app/gitlab_http/template_app_gitlab_http.yaml
index 5b2ef9ba71f..3acf7ed0ae0 100644
--- a/templates/app/gitlab_http/template_app_gitlab_http.yaml
+++ b/templates/app/gitlab_http/template_app_gitlab_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-15T14:16:46Z'
+  version: '6.0'
+  date: '2021-12-15T08:29:12Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,11 +16,11 @@ zabbix_export:
         To access the metrics, the client IP address must be explicitly allowed. See https://docs.gitlab.com/ee/administration/monitoring/ip_whitelist.html.
         
         Don't forget change macros {$GITLAB.URL}.
-        Some metrics may not be collected depending on your Gitlab instance version and configuration. See (Gitlab’s documentation[)https://docs.gitlab.com/ee/administration/monitoring/prometheus/gitlab_metrics.html] for further information about its metric collection.
+        Some metrics may not be collected depending on your Gitlab instance version and configuration. See (Gitlab's documentation[)https://docs.gitlab.com/ee/administration/monitoring/prometheus/gitlab_metrics.html] for further information about its metric collection.
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -377,7 +377,6 @@ zabbix_export:
               parameters:
                 - 30m
           url: '{$GITLAB.URL}/-/liveness'
-          status_codes: ''
           tags:
             -
               tag: Application
@@ -846,7 +845,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           units: B
-          description: "Average RSS\tMemory usage in bytes."
+          description: 'Average RSS Memory usage in bytes.'
           preprocessing:
             -
               type: JSONPATH
@@ -867,7 +866,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           units: B
-          description: "Maxinun RSS\tMemory usage in bytes."
+          description: 'Maximum RSS Memory usage in bytes.'
           preprocessing:
             -
               type: JSONPATH
@@ -888,7 +887,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           units: B
-          description: "Minimum RSS\tMemory usage in bytes."
+          description: 'Minimum RSS Memory usage in bytes.'
           preprocessing:
             -
               type: JSONPATH
@@ -1037,7 +1036,7 @@ zabbix_export:
             -
               type: JSONPATH
               parameters:
-                - "$[?(@.name==\"upload_file_does_not_exist\t\")].value.first()"
+                - '$[?(@.name=="upload_file_does_not_exist")].value.first()'
               error_handler: DISCARD_VALUE
           master_item:
             key: gitlab.get_metrics
diff --git a/templates/app/hadoop_http/README.md b/templates/app/hadoop_http/README.md
index 42a3205a693..0d802215ca5 100644
--- a/templates/app/hadoop_http/README.md
+++ b/templates/app/hadoop_http/README.md
@@ -3,16 +3,15 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
-The template for monitoring Hadoop over HTTP that works without any external scripts.  
-It collects metrics by polling the Hadoop API remotely using an HTTP agent and JSONPath preprocessing.  
-Zabbix server (or proxy) execute direct requests to ResourceManager, NodeManagers, NameNode, DataNodes APIs.  
+For Zabbix version: 6.0 and higher  
+The template for monitoring Hadoop over HTTP that works without any external scripts.
+It collects metrics by polling the Hadoop API remotely using an HTTP agent and JSONPath preprocessing.
+Zabbix server (or proxy) execute direct requests to ResourceManager, NodeManagers, NameNode, DataNodes APIs.
 All metrics are collected at once, thanks to the Zabbix bulk data collection.
 
 
 This template was tested on:
 
-- Zabbix, version 5.0 and later
 - Hadoop, version 3.1 and later
 
 ## Setup
@@ -27,15 +26,15 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                             | Description                                                                                         | Default           |
-|--------------------------------------------------|-----------------------------------------------------------------------------------------------------|-------------------|
-| {$HADOOP.CAPACITY_REMAINING.MIN.WARN}            | <p>The Hadoop cluster capacity remaining percent for trigger expression.</p>                        | `20`              |
-| {$HADOOP.NAMENODE.HOST}                          | <p>The Hadoop NameNode host IP address or FQDN.</p>                                                 | `NameNode`        |
-| {$HADOOP.NAMENODE.PORT}                          | <p>The Hadoop NameNode Web-UI port.</p>                                                             | `9870`            |
-| {$HADOOP.NAMENODE.RESPONSE_TIME.MAX.WARN}        | <p>The Hadoop NameNode API page maximum response time in seconds for trigger expression.</p>        | `10s`             |
-| {$HADOOP.RESOURCEMANAGER.HOST}                   | <p>The Hadoop ResourceManager host IP address or FQDN.</p>                                          | `ResourceManager` |
-| {$HADOOP.RESOURCEMANAGER.PORT}                   | <p>The Hadoop ResourceManager Web-UI port.</p>                                                      | `8088`            |
-| {$HADOOP.RESOURCEMANAGER.RESPONSE_TIME.MAX.WARN} | <p>The Hadoop ResourceManager API page maximum response time in seconds for trigger expression.</p> | `10s`             |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$HADOOP.CAPACITY_REMAINING.MIN.WARN} |<p>The Hadoop cluster capacity remaining percent for trigger expression.</p> |`20` |
+|{$HADOOP.NAMENODE.HOST} |<p>The Hadoop NameNode host IP address or FQDN.</p> |`NameNode` |
+|{$HADOOP.NAMENODE.PORT} |<p>The Hadoop NameNode Web-UI port.</p> |`9870` |
+|{$HADOOP.NAMENODE.RESPONSE_TIME.MAX.WARN} |<p>The Hadoop NameNode API page maximum response time in seconds for trigger expression.</p> |`10s` |
+|{$HADOOP.RESOURCEMANAGER.HOST} |<p>The Hadoop ResourceManager host IP address or FQDN.</p> |`ResourceManager` |
+|{$HADOOP.RESOURCEMANAGER.PORT} |<p>The Hadoop ResourceManager Web-UI port.</p> |`8088` |
+|{$HADOOP.RESOURCEMANAGER.RESPONSE_TIME.MAX.WARN} |<p>The Hadoop ResourceManager API page maximum response time in seconds for trigger expression.</p> |`10s` |
 
 ## Template links
 
@@ -43,97 +42,97 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                   | Description | Type       | Key and additional info                                                                                                |
-|------------------------|-------------|------------|------------------------------------------------------------------------------------------------------------------------|
-| Node manager discovery | <p>-</p>    | HTTP_AGENT | hadoop.nodemanager.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Data node discovery    | <p>-</p>    | HTTP_AGENT | hadoop.datanode.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>    |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Node manager discovery |<p>-</p> |HTTP_AGENT |hadoop.nodemanager.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Data node discovery |<p>-</p> |HTTP_AGENT |hadoop.datanode.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
-| Group            | Name                                         | Description                                                                                                                      | Type       | Key and additional info                                                                                                                                                                                                                     |
-|------------------|----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------|------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Hadoop           | ResourceManager: Service status              | <p>Hadoop ResourceManager API port availability.</p>                                                                             | SIMPLE     | net.tcp.service["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                |
-| Hadoop           | ResourceManager: Service response time       | <p>Hadoop ResourceManager API performance.</p>                                                                                   | SIMPLE     | net.tcp.service.perf["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"]                                                                                                                                               |
-| Hadoop           | ResourceManager: Uptime                      |                                                                                                                                  | DEPENDENT  | hadoop.resourcemanager.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Runtime')].Uptime.first()`</p><p>- MULTIPLIER: `0.001`</p>                                                                          |
-| Hadoop           | ResourceManager: RPC queue & processing time | <p>Average time spent on processing RPC requests.</p>                                                                            | DEPENDENT  | hadoop.resourcemanager.rpc_processing_time_avg<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=RpcActivityForPort8031')].RpcProcessingTimeAvgTime.first()`</p>                               |
-| Hadoop           | ResourceManager: Active NMs                  | <p>Number of Active NodeManagers.</p>                                                                                            | DEPENDENT  | hadoop.resourcemanager.num_active_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumActiveNMs.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                   |
-| Hadoop           | ResourceManager: Decommissioning NMs         | <p>Number of Decommissioning NodeManagers.</p>                                                                                   | DEPENDENT  | hadoop.resourcemanager.num_decommissioning_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumDecommissioningNMs.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-| Hadoop           | ResourceManager: Decommissioned NMs          | <p>Number of Decommissioned NodeManagers.</p>                                                                                    | DEPENDENT  | hadoop.resourcemanager.num_decommissioned_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumDecommissionedNMs.first()`</p>                                             |
-| Hadoop           | ResourceManager: Lost NMs                    | <p>Number of Lost NodeManagers.</p>                                                                                              | DEPENDENT  | hadoop.resourcemanager.num_lost_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumLostNMs.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                       |
-| Hadoop           | ResourceManager: Unhealthy NMs               | <p>Number of Unhealthy NodeManagers.</p>                                                                                         | DEPENDENT  | hadoop.resourcemanager.num_unhealthy_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumUnhealthyNMs.first()`</p>                                                       |
-| Hadoop           | ResourceManager: Rebooted NMs                | <p>Number of Rebooted NodeManagers.</p>                                                                                          | DEPENDENT  | hadoop.resourcemanager.num_rebooted_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumRebootedNMs.first()`</p>                                                         |
-| Hadoop           | ResourceManager: Shutdown NMs                | <p>Number of Shutdown NodeManagers.</p>                                                                                          | DEPENDENT  | hadoop.resourcemanager.num_shutdown_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumShutdownNMs.first()`</p>                                                         |
-| Hadoop           | NameNode: Service status                     | <p>Hadoop NameNode API port availability.</p>                                                                                    | SIMPLE     | net.tcp.service["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                              |
-| Hadoop           | NameNode: Service response time              | <p>Hadoop NameNode API performance.</p>                                                                                          | SIMPLE     | net.tcp.service.perf["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"]                                                                                                                                                             |
-| Hadoop           | NameNode: Uptime                             |                                                                                                                                  | DEPENDENT  | hadoop.namenode.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Runtime')].Uptime.first()`</p><p>- MULTIPLIER: `0.001`</p>                                                                                 |
-| Hadoop           | NameNode: RPC queue & processing time        | <p>Average time spent on processing RPC requests.</p>                                                                            | DEPENDENT  | hadoop.namenode.rpc_processing_time_avg<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=RpcActivityForPort9000')].RpcProcessingTimeAvgTime.first()`</p>                                             |
-| Hadoop           | NameNode: Block Pool Renaming                |                                                                                                                                  | DEPENDENT  | hadoop.namenode.percent_block_pool_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=NameNodeInfo')].PercentBlockPoolUsed.first()`</p>                                                           |
-| Hadoop           | NameNode: Transactions since last checkpoint | <p>Total number of transactions since last checkpoint.</p>                                                                       | DEPENDENT  | hadoop.namenode.transactions_since_last_checkpoint<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].TransactionsSinceLastCheckpoint.first()`</p>                                     |
-| Hadoop           | NameNode: Percent capacity remaining         | <p>Available capacity in percent.</p>                                                                                            | DEPENDENT  | hadoop.namenode.percent_remaining<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=NameNodeInfo')].PercentRemaining.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                           |
-| Hadoop           | NameNode: Capacity remaining                 | <p>Available capacity.</p>                                                                                                       | DEPENDENT  | hadoop.namenode.capacity_remaining<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].CapacityRemaining.first()`</p>                                                                   |
-| Hadoop           | NameNode: Corrupt blocks                     | <p>Number of corrupt blocks.</p>                                                                                                 | DEPENDENT  | hadoop.namenode.corrupt_blocks<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].CorruptBlocks.first()`</p>                                                                           |
-| Hadoop           | NameNode: Missing blocks                     | <p>Number of missing blocks.</p>                                                                                                 | DEPENDENT  | hadoop.namenode.missing_blocks<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].MissingBlocks.first()`</p>                                                                           |
-| Hadoop           | NameNode: Failed volumes                     | <p>Number of failed volumes.</p>                                                                                                 | DEPENDENT  | hadoop.namenode.volume_failures_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].VolumeFailuresTotal.first()`</p>                                                              |
-| Hadoop           | NameNode: Alive DataNodes                    | <p>Count of alive DataNodes.</p>                                                                                                 | DEPENDENT  | hadoop.namenode.num_live_data_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].NumLiveDataNodes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                         |
-| Hadoop           | NameNode: Dead DataNodes                     | <p>Count of dead DataNodes.</p>                                                                                                  | DEPENDENT  | hadoop.namenode.num_dead_data_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].NumDeadDataNodes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                         |
-| Hadoop           | NameNode: Stale DataNodes                    | <p>DataNodes that do not send a heartbeat within 30 seconds are marked as "stale".</p>                                           | DEPENDENT  | hadoop.namenode.num_stale_data_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].StaleDataNodes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                          |
-| Hadoop           | NameNode: Total files                        | <p>Total count of files tracked by the NameNode.</p>                                                                             | DEPENDENT  | hadoop.namenode.files_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].FilesTotal.first()`</p>                                                                                 |
-| Hadoop           | NameNode: Total load                         | <p>The current number of concurrent file accesses (read/write) across all DataNodes.</p>                                         | DEPENDENT  | hadoop.namenode.total_load<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].TotalLoad.first()`</p>                                                                                   |
-| Hadoop           | NameNode: Blocks allocable                   | <p>Maximum number of blocks allocable.</p>                                                                                       | DEPENDENT  | hadoop.namenode.block_capacity<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].BlockCapacity.first()`</p>                                                                           |
-| Hadoop           | NameNode: Total blocks                       | <p>Count of blocks tracked by NameNode.</p>                                                                                      | DEPENDENT  | hadoop.namenode.blocks_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].BlocksTotal.first()`</p>                                                                               |
-| Hadoop           | NameNode: Under-replicated blocks            | <p>The number of blocks with insufficient replication.</p>                                                                       | DEPENDENT  | hadoop.namenode.under_replicated_blocks<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].UnderReplicatedBlocks.first()`</p>                                                          |
-| Hadoop           | {#HOSTNAME}: RPC queue & processing time     | <p>Average time spent on processing RPC requests.</p>                                                                            | DEPENDENT  | hadoop.nodemanager.rpc_processing_time_avg[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NodeManager,name=RpcActivityForPort8040')].RpcProcessingTimeAvgTime.first()`</p>                          |
-| Hadoop           | {#HOSTNAME}: Container launch avg duration   |                                                                                                                                  | DEPENDENT  | hadoop.nodemanager.container_launch_duration_avg[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NodeManager,name=NodeManagerMetrics')].ContainerLaunchDurationAvgTime.first()`</p>                  |
-| Hadoop           | {#HOSTNAME}: JVM Threads                     | <p>The number of JVM threads.</p>                                                                                                | DEPENDENT  | hadoop.nodemanager.jvm.threads[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Threading')].ThreadCount.first()`</p>                                                                                 |
-| Hadoop           | {#HOSTNAME}: JVM Garbage collection time     | <p>The JVM garbage collection time in milliseconds.</p>                                                                          | DEPENDENT  | hadoop.nodemanager.jvm.gc_time[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NodeManager,name=JvmMetrics')].GcTimeMillis.first()`</p>                                                              |
-| Hadoop           | {#HOSTNAME}: JVM Heap usage                  | <p>The JVM heap usage in MBytes.</p>                                                                                             | DEPENDENT  | hadoop.nodemanager.jvm.mem_heap_used[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NodeManager,name=JvmMetrics')].MemHeapUsedM.first()`</p>                                                        |
-| Hadoop           | {#HOSTNAME}: Uptime                          |                                                                                                                                  | DEPENDENT  | hadoop.nodemanager.uptime[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Runtime')].Uptime.first()`</p><p>- MULTIPLIER: `0.001`</p>                                                                 |
-| Hadoop           | {#HOSTNAME}: State                           | <p>State of the node - valid values are: NEW, RUNNING, UNHEALTHY, DECOMMISSIONING, DECOMMISSIONED, LOST, REBOOTED, SHUTDOWN.</p> | DEPENDENT  | hadoop.nodemanager.state[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].State.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                                                                  |
-| Hadoop           | {#HOSTNAME}: Version                         |                                                                                                                                  | DEPENDENT  | hadoop.nodemanager.version[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].NodeManagerVersion.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                                                   |
-| Hadoop           | {#HOSTNAME}: Number of containers            |                                                                                                                                  | DEPENDENT  | hadoop.nodemanager.numcontainers[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].NumContainers.first()`</p>                                                                                            |
-| Hadoop           | {#HOSTNAME}: Used memory                     |                                                                                                                                  | DEPENDENT  | hadoop.nodemanager.usedmemory[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].UsedMemoryMB.first()`</p>                                                                                                |
-| Hadoop           | {#HOSTNAME}: Available memory                |                                                                                                                                  | DEPENDENT  | hadoop.nodemanager.availablememory[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].AvailableMemoryMB.first()`</p>                                                                                      |
-| Hadoop           | {#HOSTNAME}: Remaining                       | <p>Remaining disk space.</p>                                                                                                     | DEPENDENT  | hadoop.datanode.remaining[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=FSDatasetState')].Remaining.first()`</p>                                                                     |
-| Hadoop           | {#HOSTNAME}: Used                            | <p>Used disk space.</p>                                                                                                          | DEPENDENT  | hadoop.datanode.dfs_used[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=FSDatasetState')].DfsUsed.first()`</p>                                                                        |
-| Hadoop           | {#HOSTNAME}: Number of failed volumes        | <p>Number of failed storage volumes.</p>                                                                                         | DEPENDENT  | hadoop.datanode.numfailedvolumes[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=FSDatasetState')].NumFailedVolumes.first()`</p>                                                       |
-| Hadoop           | {#HOSTNAME}: JVM Threads                     | <p>The number of JVM threads.</p>                                                                                                | DEPENDENT  | hadoop.datanode.jvm.threads[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Threading')].ThreadCount.first()`</p>                                                                                    |
-| Hadoop           | {#HOSTNAME}: JVM Garbage collection time     | <p>The JVM garbage collection time in milliseconds.</p>                                                                          | DEPENDENT  | hadoop.datanode.jvm.gc_time[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=JvmMetrics')].GcTimeMillis.first()`</p>                                                                    |
-| Hadoop           | {#HOSTNAME}: JVM Heap usage                  | <p>The JVM heap usage in MBytes.</p>                                                                                             | DEPENDENT  | hadoop.datanode.jvm.mem_heap_used[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=JvmMetrics')].MemHeapUsedM.first()`</p>                                                              |
-| Hadoop           | {#HOSTNAME}: Uptime                          |                                                                                                                                  | DEPENDENT  | hadoop.datanode.uptime[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Runtime')].Uptime.first()`</p><p>- MULTIPLIER: `0.001`</p>                                                                    |
-| Hadoop           | {#HOSTNAME}: Version                         | <p>DataNode software version.</p>                                                                                                | DEPENDENT  | hadoop.datanode.version[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.HostName=='{#HOSTNAME}')].version.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                                                                |
-| Hadoop           | {#HOSTNAME}: Admin state                     | <p>Administrative state.</p>                                                                                                     | DEPENDENT  | hadoop.datanode.admin_state[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.HostName=='{#HOSTNAME}')].adminState.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                                                         |
-| Hadoop           | {#HOSTNAME}: Oper state                      | <p>Operational state.</p>                                                                                                        | DEPENDENT  | hadoop.datanode.oper_state[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.HostName=='{#HOSTNAME}')].operState.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>                                                           |
-| Zabbix_raw_items | Get ResourceManager stats                    | <p>-</p>                                                                                                                         | HTTP_AGENT | hadoop.resourcemanager.get                                                                                                                                                                                                                  |
-| Zabbix_raw_items | Get NameNode stats                           | <p>-</p>                                                                                                                         | HTTP_AGENT | hadoop.namenode.get                                                                                                                                                                                                                         |
-| Zabbix_raw_items | Get NodeManagers states                      | <p>-</p>                                                                                                                         | HTTP_AGENT | hadoop.nodemanagers.get<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(JSON.parse(JSON.parse(value).beans[0].LiveNodeManagers))`</p>                                                                                       |
-| Zabbix_raw_items | Get DataNodes states                         | <p>-</p>                                                                                                                         | HTTP_AGENT | hadoop.datanodes.get<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                                                              |
-| Zabbix_raw_items | Hadoop NodeManager {#HOSTNAME}: Get stats    |                                                                                                                                  | HTTP_AGENT | hadoop.nodemanager.get[{#HOSTNAME}]                                                                                                                                                                                                         |
-| Zabbix_raw_items | Hadoop DataNode {#HOSTNAME}: Get stats       |                                                                                                                                  | HTTP_AGENT | hadoop.datanode.get[{#HOSTNAME}]                                                                                                                                                                                                            |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Hadoop |ResourceManager: Service status |<p>Hadoop ResourceManager API port availability.</p> |SIMPLE |net.tcp.service["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Hadoop |ResourceManager: Service response time |<p>Hadoop ResourceManager API performance.</p> |SIMPLE |net.tcp.service.perf["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"] |
+|Hadoop |ResourceManager: Uptime |<p>-</p> |DEPENDENT |hadoop.resourcemanager.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Runtime')].Uptime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
+|Hadoop |ResourceManager: RPC queue & processing time |<p>Average time spent on processing RPC requests.</p> |DEPENDENT |hadoop.resourcemanager.rpc_processing_time_avg<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=RpcActivityForPort8031')].RpcProcessingTimeAvgTime.first()`</p> |
+|Hadoop |ResourceManager: Active NMs |<p>Number of Active NodeManagers.</p> |DEPENDENT |hadoop.resourcemanager.num_active_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumActiveNMs.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |ResourceManager: Decommissioning NMs |<p>Number of Decommissioning NodeManagers.</p> |DEPENDENT |hadoop.resourcemanager.num_decommissioning_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumDecommissioningNMs.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |ResourceManager: Decommissioned NMs |<p>Number of Decommissioned NodeManagers.</p> |DEPENDENT |hadoop.resourcemanager.num_decommissioned_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumDecommissionedNMs.first()`</p> |
+|Hadoop |ResourceManager: Lost NMs |<p>Number of Lost NodeManagers.</p> |DEPENDENT |hadoop.resourcemanager.num_lost_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumLostNMs.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |ResourceManager: Unhealthy NMs |<p>Number of Unhealthy NodeManagers.</p> |DEPENDENT |hadoop.resourcemanager.num_unhealthy_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumUnhealthyNMs.first()`</p> |
+|Hadoop |ResourceManager: Rebooted NMs |<p>Number of Rebooted NodeManagers.</p> |DEPENDENT |hadoop.resourcemanager.num_rebooted_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumRebootedNMs.first()`</p> |
+|Hadoop |ResourceManager: Shutdown NMs |<p>Number of Shutdown NodeManagers.</p> |DEPENDENT |hadoop.resourcemanager.num_shutdown_nm<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=ResourceManager,name=ClusterMetrics')].NumShutdownNMs.first()`</p> |
+|Hadoop |NameNode: Service status |<p>Hadoop NameNode API port availability.</p> |SIMPLE |net.tcp.service["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Hadoop |NameNode: Service response time |<p>Hadoop NameNode API performance.</p> |SIMPLE |net.tcp.service.perf["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"] |
+|Hadoop |NameNode: Uptime |<p>-</p> |DEPENDENT |hadoop.namenode.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Runtime')].Uptime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
+|Hadoop |NameNode: RPC queue & processing time |<p>Average time spent on processing RPC requests.</p> |DEPENDENT |hadoop.namenode.rpc_processing_time_avg<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=RpcActivityForPort9000')].RpcProcessingTimeAvgTime.first()`</p> |
+|Hadoop |NameNode: Block Pool Renaming |<p>-</p> |DEPENDENT |hadoop.namenode.percent_block_pool_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=NameNodeInfo')].PercentBlockPoolUsed.first()`</p> |
+|Hadoop |NameNode: Transactions since last checkpoint |<p>Total number of transactions since last checkpoint.</p> |DEPENDENT |hadoop.namenode.transactions_since_last_checkpoint<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].TransactionsSinceLastCheckpoint.first()`</p> |
+|Hadoop |NameNode: Percent capacity remaining |<p>Available capacity in percent.</p> |DEPENDENT |hadoop.namenode.percent_remaining<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=NameNodeInfo')].PercentRemaining.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |NameNode: Capacity remaining |<p>Available capacity.</p> |DEPENDENT |hadoop.namenode.capacity_remaining<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].CapacityRemaining.first()`</p> |
+|Hadoop |NameNode: Corrupt blocks |<p>Number of corrupt blocks.</p> |DEPENDENT |hadoop.namenode.corrupt_blocks<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].CorruptBlocks.first()`</p> |
+|Hadoop |NameNode: Missing blocks |<p>Number of missing blocks.</p> |DEPENDENT |hadoop.namenode.missing_blocks<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].MissingBlocks.first()`</p> |
+|Hadoop |NameNode: Failed volumes |<p>Number of failed volumes.</p> |DEPENDENT |hadoop.namenode.volume_failures_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].VolumeFailuresTotal.first()`</p> |
+|Hadoop |NameNode: Alive DataNodes |<p>Count of alive DataNodes.</p> |DEPENDENT |hadoop.namenode.num_live_data_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].NumLiveDataNodes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |NameNode: Dead DataNodes |<p>Count of dead DataNodes.</p> |DEPENDENT |hadoop.namenode.num_dead_data_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].NumDeadDataNodes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |NameNode: Stale DataNodes |<p>DataNodes that do not send a heartbeat within 30 seconds are marked as "stale".</p> |DEPENDENT |hadoop.namenode.num_stale_data_nodes<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].StaleDataNodes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |NameNode: Total files |<p>Total count of files tracked by the NameNode.</p> |DEPENDENT |hadoop.namenode.files_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].FilesTotal.first()`</p> |
+|Hadoop |NameNode: Total load |<p>The current number of concurrent file accesses (read/write) across all DataNodes.</p> |DEPENDENT |hadoop.namenode.total_load<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].TotalLoad.first()`</p> |
+|Hadoop |NameNode: Blocks allocable |<p>Maximum number of blocks allocable.</p> |DEPENDENT |hadoop.namenode.block_capacity<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].BlockCapacity.first()`</p> |
+|Hadoop |NameNode: Total blocks |<p>Count of blocks tracked by NameNode.</p> |DEPENDENT |hadoop.namenode.blocks_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].BlocksTotal.first()`</p> |
+|Hadoop |NameNode: Under-replicated blocks |<p>The number of blocks with insufficient replication.</p> |DEPENDENT |hadoop.namenode.under_replicated_blocks<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NameNode,name=FSNamesystem')].UnderReplicatedBlocks.first()`</p> |
+|Hadoop |{#HOSTNAME}: RPC queue & processing time |<p>Average time spent on processing RPC requests.</p> |DEPENDENT |hadoop.nodemanager.rpc_processing_time_avg[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NodeManager,name=RpcActivityForPort8040')].RpcProcessingTimeAvgTime.first()`</p> |
+|Hadoop |{#HOSTNAME}: Container launch avg duration |<p>-</p> |DEPENDENT |hadoop.nodemanager.container_launch_duration_avg[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NodeManager,name=NodeManagerMetrics')].ContainerLaunchDurationAvgTime.first()`</p> |
+|Hadoop |{#HOSTNAME}: JVM Threads |<p>The number of JVM threads.</p> |DEPENDENT |hadoop.nodemanager.jvm.threads[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Threading')].ThreadCount.first()`</p> |
+|Hadoop |{#HOSTNAME}: JVM Garbage collection time |<p>The JVM garbage collection time in milliseconds.</p> |DEPENDENT |hadoop.nodemanager.jvm.gc_time[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NodeManager,name=JvmMetrics')].GcTimeMillis.first()`</p> |
+|Hadoop |{#HOSTNAME}: JVM Heap usage |<p>The JVM heap usage in MBytes.</p> |DEPENDENT |hadoop.nodemanager.jvm.mem_heap_used[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=NodeManager,name=JvmMetrics')].MemHeapUsedM.first()`</p> |
+|Hadoop |{#HOSTNAME}: Uptime |<p>-</p> |DEPENDENT |hadoop.nodemanager.uptime[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Runtime')].Uptime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
+|Hadoop |{#HOSTNAME}: State |<p>State of the node - valid values are: NEW, RUNNING, UNHEALTHY, DECOMMISSIONING, DECOMMISSIONED, LOST, REBOOTED, SHUTDOWN.</p> |DEPENDENT |hadoop.nodemanager.state[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].State.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |{#HOSTNAME}: Version |<p>-</p> |DEPENDENT |hadoop.nodemanager.version[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].NodeManagerVersion.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |{#HOSTNAME}: Number of containers |<p>-</p> |DEPENDENT |hadoop.nodemanager.numcontainers[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].NumContainers.first()`</p> |
+|Hadoop |{#HOSTNAME}: Used memory |<p>-</p> |DEPENDENT |hadoop.nodemanager.usedmemory[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].UsedMemoryMB.first()`</p> |
+|Hadoop |{#HOSTNAME}: Available memory |<p>-</p> |DEPENDENT |hadoop.nodemanager.availablememory[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.HostName=='{#HOSTNAME}')].AvailableMemoryMB.first()`</p> |
+|Hadoop |{#HOSTNAME}: Remaining |<p>Remaining disk space.</p> |DEPENDENT |hadoop.datanode.remaining[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=FSDatasetState')].Remaining.first()`</p> |
+|Hadoop |{#HOSTNAME}: Used |<p>Used disk space.</p> |DEPENDENT |hadoop.datanode.dfs_used[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=FSDatasetState')].DfsUsed.first()`</p> |
+|Hadoop |{#HOSTNAME}: Number of failed volumes |<p>Number of failed storage volumes.</p> |DEPENDENT |hadoop.datanode.numfailedvolumes[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=FSDatasetState')].NumFailedVolumes.first()`</p> |
+|Hadoop |{#HOSTNAME}: JVM Threads |<p>The number of JVM threads.</p> |DEPENDENT |hadoop.datanode.jvm.threads[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Threading')].ThreadCount.first()`</p> |
+|Hadoop |{#HOSTNAME}: JVM Garbage collection time |<p>The JVM garbage collection time in milliseconds.</p> |DEPENDENT |hadoop.datanode.jvm.gc_time[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=JvmMetrics')].GcTimeMillis.first()`</p> |
+|Hadoop |{#HOSTNAME}: JVM Heap usage |<p>The JVM heap usage in MBytes.</p> |DEPENDENT |hadoop.datanode.jvm.mem_heap_used[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='Hadoop:service=DataNode,name=JvmMetrics')].MemHeapUsedM.first()`</p> |
+|Hadoop |{#HOSTNAME}: Uptime |<p>-</p> |DEPENDENT |hadoop.datanode.uptime[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.beans[?(@.name=='java.lang:type=Runtime')].Uptime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
+|Hadoop |{#HOSTNAME}: Version |<p>DataNode software version.</p> |DEPENDENT |hadoop.datanode.version[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.HostName=='{#HOSTNAME}')].version.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |{#HOSTNAME}: Admin state |<p>Administrative state.</p> |DEPENDENT |hadoop.datanode.admin_state[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.HostName=='{#HOSTNAME}')].adminState.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Hadoop |{#HOSTNAME}: Oper state |<p>Operational state.</p> |DEPENDENT |hadoop.datanode.oper_state[{#HOSTNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.HostName=='{#HOSTNAME}')].operState.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Zabbix_raw_items |Get ResourceManager stats |<p>-</p> |HTTP_AGENT |hadoop.resourcemanager.get |
+|Zabbix_raw_items |Get NameNode stats |<p>-</p> |HTTP_AGENT |hadoop.namenode.get |
+|Zabbix_raw_items |Get NodeManagers states |<p>-</p> |HTTP_AGENT |hadoop.nodemanagers.get<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(JSON.parse(JSON.parse(value).beans[0].LiveNodeManagers))`</p> |
+|Zabbix_raw_items |Get DataNodes states |<p>-</p> |HTTP_AGENT |hadoop.datanodes.get<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Zabbix_raw_items |Hadoop NodeManager {#HOSTNAME}: Get stats |<p>-</p> |HTTP_AGENT |hadoop.nodemanager.get[{#HOSTNAME}] |
+|Zabbix_raw_items |Hadoop DataNode {#HOSTNAME}: Get stats |<p>-</p> |HTTP_AGENT |hadoop.datanode.get[{#HOSTNAME}] |
 
 ## Triggers
 
-| Name                                                                                                              | Description                                                                                                                                                                                                                                                                                                                                                                                                                                               | Expression                                                                                                                                                               | Severity | Dependencies and additional info                                                                        |
-|-------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------------|
-| ResourceManager: Service is unavailable                                                                           | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:net.tcp.service["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"].last()}=0`                                                      | AVERAGE  | <p>Manual close: YES</p>                                                                                |
-| ResourceManager: Service response time is too high (over {$HADOOP.RESOURCEMANAGER.RESPONSE_TIME.MAX.WARN} for 5m) | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:net.tcp.service.perf["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"].min(5m)}>{$HADOOP.RESOURCEMANAGER.RESPONSE_TIME.MAX.WARN}` | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- ResourceManager: Service is unavailable</p>          |
-| ResourceManager: Service has been restarted (uptime < 10m)                                                        | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:hadoop.resourcemanager.uptime.last()}<10m`                                                                                                               | INFO     | <p>Manual close: YES</p>                                                                                |
-| ResourceManager: Failed to fetch ResourceManager API page (or no data for 30m)                                    | <p>Zabbix has not received data for items for the last 30 minutes.</p>                                                                                                                                                                                                                                                                                                                                                                                    | `{TEMPLATE_NAME:hadoop.resourcemanager.uptime.nodata(30m)}=1`                                                                                                            | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- ResourceManager: Service is unavailable</p>          |
-| ResourceManager: Cluster has no active NodeManagers                                                               | <p>Cluster is unable to execute any jobs without at least one NodeManager.</p>                                                                                                                                                                                                                                                                                                                                                                            | `{TEMPLATE_NAME:hadoop.resourcemanager.num_active_nm.max(5m)}=0`                                                                                                         | HIGH     |                                                                                                         |
-| ResourceManager: Cluster has unhealthy NodeManagers                                                               | <p>YARN considers any node with disk utilization exceeding the value specified under the property yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage (in yarn-site.xml) to be unhealthy. Ample disk space is critical to ensure uninterrupted operation of a Hadoop cluster, and large numbers of unhealthyNodes (the number to alert on depends on the size of your cluster) should be quickly investigated and resolved.</p> | `{TEMPLATE_NAME:hadoop.resourcemanager.num_unhealthy_nm.min(15m)}>0`                                                                                                     | AVERAGE  |                                                                                                         |
-| NameNode: Service is unavailable                                                                                  | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:net.tcp.service["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"].last()}=0`                                                                    | AVERAGE  | <p>Manual close: YES</p>                                                                                |
-| NameNode: Service response time is too high (over {$HADOOP.NAMENODE.RESPONSE_TIME.MAX.WARN} for 5m)               | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:net.tcp.service.perf["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"].min(5m)}>{$HADOOP.NAMENODE.RESPONSE_TIME.MAX.WARN}`                      | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- NameNode: Service is unavailable</p>                 |
-| NameNode: Service has been restarted (uptime < 10m)                                                               | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:hadoop.namenode.uptime.last()}<10m`                                                                                                                      | INFO     | <p>Manual close: YES</p>                                                                                |
-| NameNode: Failed to fetch NameNode API page (or no data for 30m)                                                  | <p>Zabbix has not received data for items for the last 30 minutes.</p>                                                                                                                                                                                                                                                                                                                                                                                    | `{TEMPLATE_NAME:hadoop.namenode.uptime.nodata(30m)}=1`                                                                                                                   | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- NameNode: Service is unavailable</p>                 |
-| NameNode: Cluster capacity remaining is low (below {$HADOOP.CAPACITY_REMAINING.MIN.WARN}% for 15m)                | <p>A good practice is to ensure that disk use never exceeds 80 percent capacity.</p>                                                                                                                                                                                                                                                                                                                                                                      | `{TEMPLATE_NAME:hadoop.namenode.percent_remaining.max(15m)}<{$HADOOP.CAPACITY_REMAINING.MIN.WARN}`                                                                       | WARNING  |                                                                                                         |
-| NameNode: Cluster has missing blocks                                                                              | <p>A missing block is far worse than a corrupt block, because a missing block cannot be recovered by copying a replica.</p>                                                                                                                                                                                                                                                                                                                               | `{TEMPLATE_NAME:hadoop.namenode.missing_blocks.min(15m)}>0`                                                                                                              | AVERAGE  |                                                                                                         |
-| NameNode: Cluster has volume failures                                                                             | <p>HDFS now allows for disks to fail in place, without affecting DataNode operations, until a threshold value is reached. This is set on each DataNode via the dfs.datanode.failed.volumes.tolerated property; it defaults to 0, meaning that any volume failure will shut down the DataNode; on a production cluster where DataNodes typically have 6, 8, or 12 disks, setting this parameter to 1 or 2 is typically the best practice.</p>              | `{TEMPLATE_NAME:hadoop.namenode.volume_failures_total.min(15m)}>0`                                                                                                       | AVERAGE  |                                                                                                         |
-| NameNode: Cluster has DataNodes in Dead state                                                                     | <p>The death of a DataNode causes a flurry of network activity, as the NameNode initiates replication of blocks lost on the dead nodes.</p>                                                                                                                                                                                                                                                                                                               | `{TEMPLATE_NAME:hadoop.namenode.num_dead_data_nodes.min(5m)}>0`                                                                                                          | AVERAGE  |                                                                                                         |
-| {#HOSTNAME}: Service has been restarted (uptime < 10m)                                                            | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:hadoop.nodemanager.uptime[{#HOSTNAME}].last()}<10m`                                                                                                      | INFO     | <p>Manual close: YES</p>                                                                                |
-| {#HOSTNAME}: Failed to fetch NodeManager API page (or no data for 30m)                                            | <p>Zabbix has not received data for items for the last 30 minutes.</p>                                                                                                                                                                                                                                                                                                                                                                                    | `{TEMPLATE_NAME:hadoop.nodemanager.uptime[{#HOSTNAME}].nodata(30m)}=1`                                                                                                   | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- {#HOSTNAME}: NodeManager has state {ITEM.VALUE}.</p> |
-| {#HOSTNAME}: NodeManager has state {ITEM.VALUE}.                                                                  | <p>The state is different from normal.</p>                                                                                                                                                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:hadoop.nodemanager.state[{#HOSTNAME}].last()}<>"RUNNING"`                                                                                                | AVERAGE  |                                                                                                         |
-| {#HOSTNAME}: Service has been restarted (uptime < 10m)                                                            | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:hadoop.datanode.uptime[{#HOSTNAME}].last()}<10m`                                                                                                         | INFO     | <p>Manual close: YES</p>                                                                                |
-| {#HOSTNAME}: Failed to fetch DataNode API page (or no data for 30m)                                               | <p>Zabbix has not received data for items for the last 30 minutes.</p>                                                                                                                                                                                                                                                                                                                                                                                    | `{TEMPLATE_NAME:hadoop.datanode.uptime[{#HOSTNAME}].nodata(30m)}=1`                                                                                                      | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- {#HOSTNAME}: DataNode has state {ITEM.VALUE}.</p>    |
-| {#HOSTNAME}: DataNode has state {ITEM.VALUE}.                                                                     | <p>The state is different from normal.</p>                                                                                                                                                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:hadoop.datanode.oper_state[{#HOSTNAME}].last()}<>"Live"`                                                                                                 | AVERAGE  |                                                                                                         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|ResourceManager: Service is unavailable |<p>-</p> |`last(/Hadoop by HTTP/net.tcp.service["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|ResourceManager: Service response time is too high (over {$HADOOP.RESOURCEMANAGER.RESPONSE_TIME.MAX.WARN} for 5m) |<p>-</p> |`min(/Hadoop by HTTP/net.tcp.service.perf["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"],5m)>{$HADOOP.RESOURCEMANAGER.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- ResourceManager: Service is unavailable</p> |
+|ResourceManager: Service has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Hadoop by HTTP/hadoop.resourcemanager.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ResourceManager: Failed to fetch ResourceManager API page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Hadoop by HTTP/hadoop.resourcemanager.uptime,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- ResourceManager: Service is unavailable</p> |
+|ResourceManager: Cluster has no active NodeManagers |<p>Cluster is unable to execute any jobs without at least one NodeManager.</p> |`max(/Hadoop by HTTP/hadoop.resourcemanager.num_active_nm,5m)=0` |HIGH | |
+|ResourceManager: Cluster has unhealthy NodeManagers |<p>YARN considers any node with disk utilization exceeding the value specified under the property yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage (in yarn-site.xml) to be unhealthy. Ample disk space is critical to ensure uninterrupted operation of a Hadoop cluster, and large numbers of unhealthyNodes (the number to alert on depends on the size of your cluster) should be quickly investigated and resolved.</p> |`min(/Hadoop by HTTP/hadoop.resourcemanager.num_unhealthy_nm,15m)>0` |AVERAGE | |
+|NameNode: Service is unavailable |<p>-</p> |`last(/Hadoop by HTTP/net.tcp.service["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|NameNode: Service response time is too high (over {$HADOOP.NAMENODE.RESPONSE_TIME.MAX.WARN} for 5m) |<p>-</p> |`min(/Hadoop by HTTP/net.tcp.service.perf["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"],5m)>{$HADOOP.NAMENODE.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- NameNode: Service is unavailable</p> |
+|NameNode: Service has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Hadoop by HTTP/hadoop.namenode.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|NameNode: Failed to fetch NameNode API page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Hadoop by HTTP/hadoop.namenode.uptime,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- NameNode: Service is unavailable</p> |
+|NameNode: Cluster capacity remaining is low (below {$HADOOP.CAPACITY_REMAINING.MIN.WARN}% for 15m) |<p>A good practice is to ensure that disk use never exceeds 80 percent capacity.</p> |`max(/Hadoop by HTTP/hadoop.namenode.percent_remaining,15m)<{$HADOOP.CAPACITY_REMAINING.MIN.WARN}` |WARNING | |
+|NameNode: Cluster has missing blocks |<p>A missing block is far worse than a corrupt block, because a missing block cannot be recovered by copying a replica.</p> |`min(/Hadoop by HTTP/hadoop.namenode.missing_blocks,15m)>0` |AVERAGE | |
+|NameNode: Cluster has volume failures |<p>HDFS now allows for disks to fail in place, without affecting DataNode operations, until a threshold value is reached. This is set on each DataNode via the dfs.datanode.failed.volumes.tolerated property; it defaults to 0, meaning that any volume failure will shut down the DataNode; on a production cluster where DataNodes typically have 6, 8, or 12 disks, setting this parameter to 1 or 2 is typically the best practice.</p> |`min(/Hadoop by HTTP/hadoop.namenode.volume_failures_total,15m)>0` |AVERAGE | |
+|NameNode: Cluster has DataNodes in Dead state |<p>The death of a DataNode causes a flurry of network activity, as the NameNode initiates replication of blocks lost on the dead nodes.</p> |`min(/Hadoop by HTTP/hadoop.namenode.num_dead_data_nodes,5m)>0` |AVERAGE | |
+|{#HOSTNAME}: Service has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Hadoop by HTTP/hadoop.nodemanager.uptime[{#HOSTNAME}])<10m` |INFO |<p>Manual close: YES</p> |
+|{#HOSTNAME}: Failed to fetch NodeManager API page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Hadoop by HTTP/hadoop.nodemanager.uptime[{#HOSTNAME}],30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- {#HOSTNAME}: NodeManager has state {ITEM.VALUE}.</p> |
+|{#HOSTNAME}: NodeManager has state {ITEM.VALUE}. |<p>The state is different from normal.</p> |`last(/Hadoop by HTTP/hadoop.nodemanager.state[{#HOSTNAME}])<>"RUNNING"` |AVERAGE | |
+|{#HOSTNAME}: Service has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Hadoop by HTTP/hadoop.datanode.uptime[{#HOSTNAME}])<10m` |INFO |<p>Manual close: YES</p> |
+|{#HOSTNAME}: Failed to fetch DataNode API page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Hadoop by HTTP/hadoop.datanode.uptime[{#HOSTNAME}],30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- {#HOSTNAME}: DataNode has state {ITEM.VALUE}.</p> |
+|{#HOSTNAME}: DataNode has state {ITEM.VALUE}. |<p>The state is different from normal.</p> |`last(/Hadoop by HTTP/hadoop.datanode.oper_state[{#HOSTNAME}])<>"Live"` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/hadoop_http/template_app_hadoop_http.yaml b/templates/app/hadoop_http/template_app_hadoop_http.yaml
index b1c68a7034d..316f5d86f83 100644
--- a/templates/app/hadoop_http/template_app_hadoop_http.yaml
+++ b/templates/app/hadoop_http/template_app_hadoop_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:24Z'
+  version: '6.0'
+  date: '2021-12-15T08:32:52Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -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/413459-discussion-thread-for-official-zabbix-template-hadoop
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/haproxy_agent/README.md b/templates/app/haproxy_agent/README.md
index c39fd4edb16..93bb2d90338 100644
--- a/templates/app/haproxy_agent/README.md
+++ b/templates/app/haproxy_agent/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor HAProxy by Zabbix that works without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -14,7 +14,6 @@ Note that this solution supports https and redirects.
 This template was tested on:
 
 - HAProxy, version 1.8
-- Zabbix, version 5.4
 
 ## Setup
 
@@ -66,9 +65,9 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Backend discovery |<p>Discovery backends</p> |DEPENDENT |haproxy.backend.discovery<p>**Filter**:</p>AND <p>- A: {#SVNAME} MATCHES_REGEX `BACKEND`</p><p>- B: {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
-|Frontend discovery |<p>Discovery frontends</p> |DEPENDENT |haproxy.frontend.discovery<p>**Filter**:</p>AND <p>- A: {#SVNAME} MATCHES_REGEX `FRONTEND`</p><p>- B: {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
-|Server discovery |<p>Discovery servers</p> |DEPENDENT |haproxy.server.discovery<p>**Filter**:</p>AND <p>- A: {#SVNAME} NOT_MATCHES_REGEX `FRONTEND|BACKEND`</p><p>- B: {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
+|Backend discovery |<p>Discovery backends</p> |DEPENDENT |haproxy.backend.discovery<p>**Filter**:</p>AND <p>- {#SVNAME} MATCHES_REGEX `BACKEND`</p><p>- {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
+|Frontend discovery |<p>Discovery frontends</p> |DEPENDENT |haproxy.frontend.discovery<p>**Filter**:</p>AND <p>- {#SVNAME} MATCHES_REGEX `FRONTEND`</p><p>- {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
+|Server discovery |<p>Discovery servers</p> |DEPENDENT |haproxy.server.discovery<p>**Filter**:</p>AND <p>- {#SVNAME} NOT_MATCHES_REGEX `FRONTEND|BACKEND`</p><p>- {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -80,23 +79,23 @@ There are no template links in this template.
 |HAProxy |HAProxy: Service response time |<p>-</p> |ZABBIX_PASSIVE |net.tcp.service.perf["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"] |
 |HAProxy |HAProxy Backend {#PXNAME}: Status |<p>Possible values:</p><p>UP - The server is reporting as healthy.</p><p>DOWN - The server is reporting as unhealthy and unable to receive requests.</p><p>NOLB - You've added http-check disable-on-404 to the backend and the health checked URL has returned an HTTP 404 response.</p><p>MAINT - The server has been disabled or put into maintenance mode.</p><p>DRAIN - The server has been put into drain mode.</p><p>no check - Health checks are not enabled for this server.</p> |DEPENDENT |haproxy.backend.status[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Responses time |<p>Average backend response time (in ms) for the last 1,024 requests</p> |DEPENDENT |haproxy.backend.rtime[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].rtime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
-|HAProxy |HAProxy Backend {#PXNAME}: Errors connection per second |<p>Number of requests that encountered an error attempting to connect to a backend server.</p> |DEPENDENT |haproxy.backend.econ.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].econ.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Responses denied per second |<p>Responses denied due to security concerns (ACL-restricted).</p> |DEPENDENT |haproxy.backend.dresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dresp.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Response errors per second |<p>Number of requests whose responses yielded an error</p> |DEPENDENT |haproxy.backend.eresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].eresp.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy Backend {#PXNAME}: Errors connection per second |<p>Number of requests that encountered an error attempting to connect to a backend server.</p> |DEPENDENT |haproxy.backend.econ.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].econ.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Responses denied per second |<p>Responses denied due to security concerns (ACL-restricted).</p> |DEPENDENT |haproxy.backend.dresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dresp.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Response errors per second |<p>Number of requests whose responses yielded an error</p> |DEPENDENT |haproxy.backend.eresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].eresp.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Unassigned requests |<p>Current number of requests unassigned in queue.</p> |DEPENDENT |haproxy.backend.qcur[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qcur.first()`</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Time in queue |<p>Average time spent in queue (in ms) for the last 1,024 requests</p> |DEPENDENT |haproxy.backend.qtime[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qtime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
-|HAProxy |HAProxy Backend {#PXNAME}: Redispatched requests per second |<p>Number of times a request was redispatched to a different backend.</p> |DEPENDENT |haproxy.backend.wredis.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wredis.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Retried connections per second |<p>Number of times a connection was retried.</p> |DEPENDENT |haproxy.backend.wretr.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wretr.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.backend.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.backend.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.backend.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.backend.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.backend.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Incoming traffic |<p>Number of bits received by the backend</p> |DEPENDENT |haproxy.backend.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Outgoing traffic |<p>Number of bits sent by the backend</p> |DEPENDENT |haproxy.backend.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy Backend {#PXNAME}: Redispatched requests per second |<p>Number of times a request was redispatched to a different backend.</p> |DEPENDENT |haproxy.backend.wredis.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wredis.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Retried connections per second |<p>Number of times a connection was retried.</p> |DEPENDENT |haproxy.backend.wretr.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wretr.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.backend.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.backend.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.backend.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.backend.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.backend.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Incoming traffic |<p>Number of bits received by the backend</p> |DEPENDENT |haproxy.backend.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Outgoing traffic |<p>Number of bits sent by the backend</p> |DEPENDENT |haproxy.backend.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Number of active servers |<p>Number of active servers.</p> |DEPENDENT |haproxy.backend.act[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].act.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Number of backup servers |<p>Number of backup servers.</p> |DEPENDENT |haproxy.backend.bck[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bck.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|HAProxy |HAProxy Backend {#PXNAME}: Sessions per second |<p>Cumulative number of sessions (end-to-end connections) per second.</p> |DEPENDENT |haproxy.backend.stot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].stot.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy Backend {#PXNAME}: Sessions per second |<p>Cumulative number of sessions (end-to-end connections) per second.</p> |DEPENDENT |haproxy.backend.stot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].stot.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Weight |<p>Total effective weight.</p> |DEPENDENT |haproxy.backend.weight[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].weight.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy Frontend {#PXNAME}: Status |<p>Possible values: OPEN, STOP.</p><p>When Status is OPEN, the frontend is operating normally and ready to receive traffic.</p> |DEPENDENT |haproxy.frontend.status[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |HAProxy |HAProxy Frontend {#PXNAME}: Requests rate |<p>HTTP requests per second</p> |DEPENDENT |haproxy.frontend.req_rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].req_rate.first()`</p> |
@@ -104,37 +103,37 @@ There are no template links in this template.
 |HAProxy |HAProxy Frontend {#PXNAME}: Established sessions |<p>The current number of established sessions.</p> |DEPENDENT |haproxy.frontend.scur[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].scur.first()`</p> |
 |HAProxy |HAProxy Frontend {#PXNAME}: Session limits |<p>The most simultaneous sessions that are allowed, as defined by the maxconn setting in the frontend.</p> |DEPENDENT |haproxy.frontend.slim[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].slim.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy Frontend {#PXNAME}: Session utilization |<p>Percentage of sessions used (scur / slim * 100).</p> |CALCULATED |haproxy.frontend.sutil[{#PXNAME},{#SVNAME}]<p>**Expression**:</p>`last(//haproxy.frontend.scur[{#PXNAME},{#SVNAME}]) / last(//haproxy.frontend.slim[{#PXNAME},{#SVNAME}]) * 100` |
-|HAProxy |HAProxy Frontend {#PXNAME}: Request errors per second |<p>Number of request errors per second.</p> |DEPENDENT |haproxy.frontend.ereq.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].ereq.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Denied requests per second |<p>Requests denied due to security concerns (ACL-restricted) per second.</p> |DEPENDENT |haproxy.frontend.dreq.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dreq.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.frontend.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.frontend.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.frontend.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.frontend.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.frontend.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Incoming traffic |<p>Number of bits received by the frontend</p> |DEPENDENT |haproxy.frontend.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Outgoing traffic |<p>Number of bits sent by the frontend</p> |DEPENDENT |haproxy.frontend.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy Frontend {#PXNAME}: Request errors per second |<p>Number of request errors per second.</p> |DEPENDENT |haproxy.frontend.ereq.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].ereq.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Denied requests per second |<p>Requests denied due to security concerns (ACL-restricted) per second.</p> |DEPENDENT |haproxy.frontend.dreq.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dreq.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.frontend.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.frontend.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.frontend.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.frontend.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.frontend.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Incoming traffic |<p>Number of bits received by the frontend</p> |DEPENDENT |haproxy.frontend.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Outgoing traffic |<p>Number of bits sent by the frontend</p> |DEPENDENT |haproxy.frontend.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Status | |DEPENDENT |haproxy.server.status[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Responses time |<p>Average server response time (in ms) for the last 1,024 requests.</p> |DEPENDENT |haproxy.server.rtime[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].rtime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Errors connection per second |<p>Number of requests that encountered an error attempting to connect to a backend server.</p> |DEPENDENT |haproxy.server.econ.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].econ.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Responses denied per second |<p>Responses denied due to security concerns (ACL-restricted).</p> |DEPENDENT |haproxy.server.dresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dresp.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Response errors per second |<p>Number of requests whose responses yielded an error.</p> |DEPENDENT |haproxy.server.eresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].eresp.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Errors connection per second |<p>Number of requests that encountered an error attempting to connect to a backend server.</p> |DEPENDENT |haproxy.server.econ.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].econ.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Responses denied per second |<p>Responses denied due to security concerns (ACL-restricted).</p> |DEPENDENT |haproxy.server.dresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dresp.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Response errors per second |<p>Number of requests whose responses yielded an error.</p> |DEPENDENT |haproxy.server.eresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].eresp.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Unassigned requests |<p>Current number of requests unassigned in queue.</p> |DEPENDENT |haproxy.server.qcur[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qcur.first()`</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Time in queue |<p>Average time spent in queue (in ms) for the last 1,024 requests.</p> |DEPENDENT |haproxy.server.qtime[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qtime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Redispatched requests per second |<p>Number of times a request was redispatched to a different backend.</p> |DEPENDENT |haproxy.server.wredis.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wredis.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Retried connections per second |<p>Number of times a connection was retried.</p> |DEPENDENT |haproxy.server.wretr.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wretr.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.server.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.server.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.server.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.server.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.server.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Incoming traffic |<p>Number of bits received by the backend</p> |DEPENDENT |haproxy.server.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Outgoing traffic |<p>Number of bits sent by the backend</p> |DEPENDENT |haproxy.server.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Redispatched requests per second |<p>Number of times a request was redispatched to a different backend.</p> |DEPENDENT |haproxy.server.wredis.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wredis.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Retried connections per second |<p>Number of times a connection was retried.</p> |DEPENDENT |haproxy.server.wretr.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wretr.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.server.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.server.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.server.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.server.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.server.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Incoming traffic |<p>Number of bits received by the backend</p> |DEPENDENT |haproxy.server.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Outgoing traffic |<p>Number of bits sent by the backend</p> |DEPENDENT |haproxy.server.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Server is active |<p>Shows whether the server is active (marked with a Y) or a backup (marked with a -).</p> |DEPENDENT |haproxy.server.act[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].act.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Server is backup |<p>Shows whether the server is a backup (marked with a Y) or active (marked with a -).</p> |DEPENDENT |haproxy.server.bck[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bck.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Sessions per second |<p>Cumulative number of sessions (end-to-end connections) per second.</p> |DEPENDENT |haproxy.server.stot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].stot.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Sessions per second |<p>Cumulative number of sessions (end-to-end connections) per second.</p> |DEPENDENT |haproxy.server.stot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].stot.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Weight |<p>Effective weight.</p> |DEPENDENT |haproxy.server.weight[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].weight.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Configured maxqueue |<p>Configured maxqueue for the server, or nothing in the value is 0 (default, meaning no limit).</p> |DEPENDENT |haproxy.server.qlimit[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qlimit.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>- MATCHES_REGEX: `^\d+$`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Server was selected per second |<p>Number of times that server was selected.</p> |DEPENDENT |haproxy.server.lbtot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].lbtot.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Server was selected per second |<p>Number of times that server was selected.</p> |DEPENDENT |haproxy.server.lbtot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].lbtot.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Status of last health check |<p>Status of last health check, one of:</p><p>UNK     -> unknown</p><p>INI     -> initializing</p><p>SOCKERR -> socket error</p><p>L4OK    -> check passed on layer 4, no upper layers testing enabled</p><p>L4TOUT  -> layer 1-4 timeout</p><p>L4CON   -> layer 1-4 connection problem, for example "Connection refused" (tcp rst) or "No route to host" (icmp)</p><p>L6OK    -> check passed on layer 6</p><p>L6TOUT  -> layer 6 (SSL) timeout</p><p>L6RSP   -> layer 6 invalid response - protocol error</p><p>L7OK    -> check passed on layer 7</p><p>L7OKC   -> check conditionally passed on layer 7, for example 404 with disable-on-404</p><p>L7TOUT  -> layer 7 (HTTP/SMTP) timeout</p><p>L7RSP   -> layer 7 invalid response - protocol error</p><p>L7STS   -> layer 7 response error, for example HTTP 5xx</p><p>Notice: If a check is currently running, the last known status will be reported, prefixed with "* ". e. g. "* L7OK".</p> |DEPENDENT |haproxy.server.check_status[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].check_status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |Zabbix_raw_items |HAProxy: Get stats |<p>HAProxy Statistics Report in CSV format</p> |ZABBIX_PASSIVE |web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]<p>**Preprocessing**:</p><p>- REGEX: `# ([\s\S]*) \1`</p><p>- CSV_TO_JSON: ` 1`</p> |
 |Zabbix_raw_items |HAProxy: Get nodes |<p>Array for LLD rules.</p> |DEPENDENT |haproxy.get.nodes<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(JSON.parse(value),['mode','pxname','svname'])`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -144,24 +143,24 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|HAProxy: Version has changed (new version: {ITEM.VALUE}) |<p>HAProxy version has changed. Ack to close.</p> |`last(/TEMPLATE_NAME/haproxy.version,#1)<>last(/TEMPLATE_NAME/haproxy.version,#2) and length(last(/TEMPLATE_NAME/haproxy.version))>0` |INFO |<p>Manual close: YES</p> |
-|HAProxy: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/TEMPLATE_NAME/haproxy.uptime)<10m` |INFO |<p>Manual close: YES</p> |
-|HAProxy: Service is down |<p>-</p> |`last(/TEMPLATE_NAME/net.tcp.service["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
-|HAProxy: Service response time is too high (over {$HAPROXY.RESPONSE_TIME.MAX.WARN} for 5m) |<p>-</p> |`min(/TEMPLATE_NAME/net.tcp.service.perf["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"],5m)>{$HAPROXY.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- HAProxy: Service is down</p> |
-|HAProxy backend {#PXNAME}: Server is DOWN |<p>Backend is not available.</p> |`count(/TEMPLATE_NAME/haproxy.backend.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5` |AVERAGE | |
-|HAProxy backend {#PXNAME}: Average response time is more than {$HAPROXY.BACK_RTIME.MAX.WARN} for 5m |<p>Average backend response time (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_RTIME.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.backend.rtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_RTIME.MAX.WARN}` |WARNING | |
-|HAProxy backend {#PXNAME}: Number of responses with error is more than {$HAPROXY.BACK_ERESP.MAX.WARN} for 5m |<p>Number of requests on backend, whose responses yielded an error, is more than {$HAPROXY.BACK_ERESP.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.backend.eresp.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_ERESP.MAX.WARN}` |WARNING | |
-|HAProxy backend {#PXNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN} for 5m |<p>Current number of requests on backend unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.backend.qcur[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_QCUR.MAX.WARN}` |WARNING | |
-|HAProxy backend {#PXNAME}: Average time spent in queue is more than {$HAPROXY.BACK_QTIME.MAX.WARN} for 5m |<p>Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_QTIME.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.backend.qtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_QTIME.MAX.WARN}` |WARNING | |
-|HAProxy frontend {#PXNAME}: Session utilization is more than {$HAPROXY.FRONT_SUTIL.MAX.WARN}% for 5m |<p>Alerting on this metric is essential to ensure your server has sufficient capacity to handle all concurrent sessions. Unlike requests, upon reaching the session limit HAProxy will deny additional clients until resource consumption drops. Furthermore, if you find your session usage percentage to be hovering above 80%, it could be time to either modify HAProxy’s configuration to allow more sessions, or migrate your HAProxy server to a bigger box.</p> |`min(/TEMPLATE_NAME/haproxy.frontend.sutil[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_SUTIL.MAX.WARN}` |WARNING | |
-|HAProxy frontend {#PXNAME}: Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN} for 5m |<p>Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.frontend.ereq.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_EREQ.MAX.WARN}` |WARNING | |
-|HAProxy frontend {#PXNAME}: Number of requests denied is more than {$HAPROXY.FRONT_DREQ.MAX.WARN} for 5m |<p>Number of requests denied due to security concerns (ACL-restricted) is more than {$HAPROXY.FRONT_DREQ.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.frontend.dreq.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_DREQ.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Server is DOWN |<p>Server is not available.</p> |`count(/TEMPLATE_NAME/haproxy.server.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Average response time is more than {$HAPROXY.SERVER_RTIME.MAX.WARN} for 5m |<p>Average server response time (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_RTIME.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.server.rtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_RTIME.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Number of responses with error is more than {$HAPROXY.SERVER_ERESP.MAX.WARN} for 5m |<p>Number of requests on server, whose responses yielded an error, is more than {$HAPROXY.SERVER_ERESP.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.server.eresp.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_ERESP.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN} for 5m |<p>Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.server.qcur[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_QCUR.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Average time spent in queue is more than {$HAPROXY.SERVER_QTIME.MAX.WARN} for 5m |<p>Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_QTIME.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.server.qtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_QTIME.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Health check error |<p>Please check the server for faults.</p> |`find(/TEMPLATE_NAME/haproxy.server.check_status[{#PXNAME},{#SVNAME}],#3,"regexp","(?:L[4-7]OK|^$)")=0` |WARNING |<p>**Depends on**:</p><p>- HAProxy {#PXNAME} {#SVNAME}: Server is DOWN</p> |
+|HAProxy: Version has changed (new version: {ITEM.VALUE}) |<p>HAProxy version has changed. Ack to close.</p> |`last(/HAProxy by Zabbix agent/haproxy.version,#1)<>last(/HAProxy by Zabbix agent/haproxy.version,#2) and length(last(/HAProxy by Zabbix agent/haproxy.version))>0` |INFO |<p>Manual close: YES</p> |
+|HAProxy: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/HAProxy by Zabbix agent/haproxy.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|HAProxy: Service is down |<p>-</p> |`last(/HAProxy by Zabbix agent/net.tcp.service["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|HAProxy: Service response time is too high (over {$HAPROXY.RESPONSE_TIME.MAX.WARN} for 5m) |<p>-</p> |`min(/HAProxy by Zabbix agent/net.tcp.service.perf["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"],5m)>{$HAPROXY.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- HAProxy: Service is down</p> |
+|HAProxy backend {#PXNAME}: Server is DOWN |<p>Backend is not available.</p> |`count(/HAProxy by Zabbix agent/haproxy.backend.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5` |AVERAGE | |
+|HAProxy backend {#PXNAME}: Average response time is more than {$HAPROXY.BACK_RTIME.MAX.WARN} for 5m |<p>Average backend response time (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_RTIME.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.backend.rtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_RTIME.MAX.WARN}` |WARNING | |
+|HAProxy backend {#PXNAME}: Number of responses with error is more than {$HAPROXY.BACK_ERESP.MAX.WARN} for 5m |<p>Number of requests on backend, whose responses yielded an error, is more than {$HAPROXY.BACK_ERESP.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.backend.eresp.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_ERESP.MAX.WARN}` |WARNING | |
+|HAProxy backend {#PXNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN} for 5m |<p>Current number of requests on backend unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.backend.qcur[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_QCUR.MAX.WARN}` |WARNING | |
+|HAProxy backend {#PXNAME}: Average time spent in queue is more than {$HAPROXY.BACK_QTIME.MAX.WARN} for 5m |<p>Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_QTIME.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.backend.qtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_QTIME.MAX.WARN}` |WARNING | |
+|HAProxy frontend {#PXNAME}: Session utilization is more than {$HAPROXY.FRONT_SUTIL.MAX.WARN}% for 5m |<p>Alerting on this metric is essential to ensure your server has sufficient capacity to handle all concurrent sessions. Unlike requests, upon reaching the session limit HAProxy will deny additional clients until resource consumption drops. Furthermore, if you find your session usage percentage to be hovering above 80%, it could be time to either modify HAProxy’s configuration to allow more sessions, or migrate your HAProxy server to a bigger box.</p> |`min(/HAProxy by Zabbix agent/haproxy.frontend.sutil[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_SUTIL.MAX.WARN}` |WARNING | |
+|HAProxy frontend {#PXNAME}: Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN} for 5m |<p>Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.frontend.ereq.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_EREQ.MAX.WARN}` |WARNING | |
+|HAProxy frontend {#PXNAME}: Number of requests denied is more than {$HAPROXY.FRONT_DREQ.MAX.WARN} for 5m |<p>Number of requests denied due to security concerns (ACL-restricted) is more than {$HAPROXY.FRONT_DREQ.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.frontend.dreq.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_DREQ.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Server is DOWN |<p>Server is not available.</p> |`count(/HAProxy by Zabbix agent/haproxy.server.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Average response time is more than {$HAPROXY.SERVER_RTIME.MAX.WARN} for 5m |<p>Average server response time (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_RTIME.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.server.rtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_RTIME.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Number of responses with error is more than {$HAPROXY.SERVER_ERESP.MAX.WARN} for 5m |<p>Number of requests on server, whose responses yielded an error, is more than {$HAPROXY.SERVER_ERESP.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.server.eresp.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_ERESP.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN} for 5m |<p>Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.server.qcur[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_QCUR.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Average time spent in queue is more than {$HAPROXY.SERVER_QTIME.MAX.WARN} for 5m |<p>Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_QTIME.MAX.WARN}.</p> |`min(/HAProxy by Zabbix agent/haproxy.server.qtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_QTIME.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Health check error |<p>Please check the server for faults.</p> |`find(/HAProxy by Zabbix agent/haproxy.server.check_status[{#PXNAME},{#SVNAME}],#3,"regexp","(?:L[4-7]OK|^$)")=0` |WARNING |<p>**Depends on**:</p><p>- HAProxy {#PXNAME} {#SVNAME}: Server is DOWN</p> |
 
 ## Feedback
 
diff --git a/templates/app/haproxy_agent/template_app_haproxy_agent.yaml b/templates/app/haproxy_agent/template_app_haproxy_agent.yaml
index 0953efcf0b0..5357dd23d6c 100644
--- a/templates/app/haproxy_agent/template_app_haproxy_agent.yaml
+++ b/templates/app/haproxy_agent/template_app_haproxy_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-08-09T08:38:36Z'
+  version: '6.0'
+  date: '2021-12-15T08:55:27Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -22,7 +22,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/393527-discussion-thread-for-official-zabbix-template-haproxy
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -866,6 +866,8 @@ zabbix_export:
                 MAINT - The server has been disabled or put into maintenance mode.
                 DRAIN - The server has been put into drain mode.
                 no check - Health checks are not enabled for this server.
+              valuemap:
+                name: 'Service state'
               preprocessing:
                 -
                   type: JSONPATH
@@ -2566,6 +2568,8 @@ zabbix_export:
               history: 7d
               trends: '0'
               value_type: CHAR
+              valuemap:
+                name: 'Service state'
               preprocessing:
                 -
                   type: JSONPATH
@@ -2911,7 +2915,7 @@ zabbix_export:
                 -
                   type: GRAPH_PROTOTYPE
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -2924,7 +2928,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -2933,9 +2937,9 @@ zabbix_export:
                         host: 'HAProxy by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '12'
+                  'y': '5'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -2948,7 +2952,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -2957,9 +2961,9 @@ zabbix_export:
                         host: 'HAProxy by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '24'
+                  'y': '10'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -2972,7 +2976,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -2988,7 +2992,7 @@ zabbix_export:
                 -
                   type: GRAPH_PROTOTYPE
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3001,7 +3005,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3010,9 +3014,9 @@ zabbix_export:
                         host: 'HAProxy by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '12'
+                  'y': '5'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3025,7 +3029,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3034,9 +3038,9 @@ zabbix_export:
                         host: 'HAProxy by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '24'
+                  'y': '10'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3049,7 +3053,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3058,9 +3062,9 @@ zabbix_export:
                         host: 'HAProxy by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '36'
+                  'y': '15'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3073,7 +3077,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3089,7 +3093,7 @@ zabbix_export:
                 -
                   type: GRAPH_PROTOTYPE
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3102,7 +3106,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3111,9 +3115,9 @@ zabbix_export:
                         host: 'HAProxy by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '12'
+                  'y': '5'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3126,7 +3130,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3135,9 +3139,9 @@ zabbix_export:
                         host: 'HAProxy by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '24'
+                  'y': '10'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3150,7 +3154,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
diff --git a/templates/app/haproxy_http/README.md b/templates/app/haproxy_http/README.md
index fe2d1de0209..365f5b7a1d1 100644
--- a/templates/app/haproxy_http/README.md
+++ b/templates/app/haproxy_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor HAProxy by Zabbix that works without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -14,7 +14,6 @@ Note that this solution supports https and redirects.
 This template was tested on:
 
 - HAProxy, version 1.8
-- Zabbix, version 5.4
 
 ## Setup
 
@@ -73,9 +72,9 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Backend discovery |<p>Discovery backends</p> |DEPENDENT |haproxy.backend.discovery<p>**Filter**:</p>AND <p>- A: {#SVNAME} MATCHES_REGEX `BACKEND`</p><p>- B: {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
-|Frontend discovery |<p>Discovery frontends</p> |DEPENDENT |haproxy.frontend.discovery<p>**Filter**:</p>AND <p>- A: {#SVNAME} MATCHES_REGEX `FRONTEND`</p><p>- B: {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
-|Server discovery |<p>Discovery servers</p> |DEPENDENT |haproxy.server.discovery<p>**Filter**:</p>AND <p>- A: {#SVNAME} NOT_MATCHES_REGEX `FRONTEND|BACKEND`</p><p>- B: {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
+|Backend discovery |<p>Discovery backends</p> |DEPENDENT |haproxy.backend.discovery<p>**Filter**:</p>AND <p>- {#SVNAME} MATCHES_REGEX `BACKEND`</p><p>- {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
+|Frontend discovery |<p>Discovery frontends</p> |DEPENDENT |haproxy.frontend.discovery<p>**Filter**:</p>AND <p>- {#SVNAME} MATCHES_REGEX `FRONTEND`</p><p>- {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
+|Server discovery |<p>Discovery servers</p> |DEPENDENT |haproxy.server.discovery<p>**Filter**:</p>AND <p>- {#SVNAME} NOT_MATCHES_REGEX `FRONTEND|BACKEND`</p><p>- {#MODE} MATCHES_REGEX `http|tcp`</p><p>**Overrides:**</p><p>Discard HTTP status codes<br> - {#MODE} MATCHES_REGEX `tcp`<br>  - ITEM_PROTOTYPE LIKE `Number of responses with codes` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -87,23 +86,23 @@ There are no template links in this template.
 |HAProxy |HAProxy: Service response time |<p>-</p> |SIMPLE |net.tcp.service.perf["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"] |
 |HAProxy |HAProxy Backend {#PXNAME}: Status |<p>Possible values:</p><p>UP - The server is reporting as healthy.</p><p>DOWN - The server is reporting as unhealthy and unable to receive requests.</p><p>NOLB - You've added http-check disable-on-404 to the backend and the health checked URL has returned an HTTP 404 response.</p><p>MAINT - The server has been disabled or put into maintenance mode.</p><p>DRAIN - The server has been put into drain mode.</p><p>no check - Health checks are not enabled for this server.</p> |DEPENDENT |haproxy.backend.status[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Responses time |<p>Average backend response time (in ms) for the last 1,024 requests</p> |DEPENDENT |haproxy.backend.rtime[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].rtime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
-|HAProxy |HAProxy Backend {#PXNAME}: Errors connection per second |<p>Number of requests that encountered an error attempting to connect to a backend server.</p> |DEPENDENT |haproxy.backend.econ.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].econ.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Responses denied per second |<p>Responses denied due to security concerns (ACL-restricted).</p> |DEPENDENT |haproxy.backend.dresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dresp.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Response errors per second |<p>Number of requests whose responses yielded an error</p> |DEPENDENT |haproxy.backend.eresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].eresp.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy Backend {#PXNAME}: Errors connection per second |<p>Number of requests that encountered an error attempting to connect to a backend server.</p> |DEPENDENT |haproxy.backend.econ.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].econ.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Responses denied per second |<p>Responses denied due to security concerns (ACL-restricted).</p> |DEPENDENT |haproxy.backend.dresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dresp.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Response errors per second |<p>Number of requests whose responses yielded an error</p> |DEPENDENT |haproxy.backend.eresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].eresp.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Unassigned requests |<p>Current number of requests unassigned in queue.</p> |DEPENDENT |haproxy.backend.qcur[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qcur.first()`</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Time in queue |<p>Average time spent in queue (in ms) for the last 1,024 requests</p> |DEPENDENT |haproxy.backend.qtime[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qtime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
-|HAProxy |HAProxy Backend {#PXNAME}: Redispatched requests per second |<p>Number of times a request was redispatched to a different backend.</p> |DEPENDENT |haproxy.backend.wredis.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wredis.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Retried connections per second |<p>Number of times a connection was retried.</p> |DEPENDENT |haproxy.backend.wretr.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wretr.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.backend.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.backend.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.backend.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.backend.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.backend.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Incoming traffic |<p>Number of bits received by the backend</p> |DEPENDENT |haproxy.backend.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Backend {#PXNAME}: Outgoing traffic |<p>Number of bits sent by the backend</p> |DEPENDENT |haproxy.backend.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy Backend {#PXNAME}: Redispatched requests per second |<p>Number of times a request was redispatched to a different backend.</p> |DEPENDENT |haproxy.backend.wredis.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wredis.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Retried connections per second |<p>Number of times a connection was retried.</p> |DEPENDENT |haproxy.backend.wretr.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wretr.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.backend.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.backend.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.backend.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.backend.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.backend.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Incoming traffic |<p>Number of bits received by the backend</p> |DEPENDENT |haproxy.backend.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Backend {#PXNAME}: Outgoing traffic |<p>Number of bits sent by the backend</p> |DEPENDENT |haproxy.backend.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Number of active servers |<p>Number of active servers.</p> |DEPENDENT |haproxy.backend.act[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].act.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Number of backup servers |<p>Number of backup servers.</p> |DEPENDENT |haproxy.backend.bck[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bck.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|HAProxy |HAProxy Backend {#PXNAME}: Sessions per second |<p>Cumulative number of sessions (end-to-end connections) per second.</p> |DEPENDENT |haproxy.backend.stot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].stot.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy Backend {#PXNAME}: Sessions per second |<p>Cumulative number of sessions (end-to-end connections) per second.</p> |DEPENDENT |haproxy.backend.stot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].stot.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy Backend {#PXNAME}: Weight |<p>Total effective weight.</p> |DEPENDENT |haproxy.backend.weight[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].weight.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy Frontend {#PXNAME}: Status |<p>Possible values: OPEN, STOP.</p><p>When Status is OPEN, the frontend is operating normally and ready to receive traffic.</p> |DEPENDENT |haproxy.frontend.status[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |HAProxy |HAProxy Frontend {#PXNAME}: Requests rate |<p>HTTP requests per second</p> |DEPENDENT |haproxy.frontend.req_rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].req_rate.first()`</p> |
@@ -111,37 +110,37 @@ There are no template links in this template.
 |HAProxy |HAProxy Frontend {#PXNAME}: Established sessions |<p>The current number of established sessions.</p> |DEPENDENT |haproxy.frontend.scur[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].scur.first()`</p> |
 |HAProxy |HAProxy Frontend {#PXNAME}: Session limits |<p>The most simultaneous sessions that are allowed, as defined by the maxconn setting in the frontend.</p> |DEPENDENT |haproxy.frontend.slim[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].slim.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy Frontend {#PXNAME}: Session utilization |<p>Percentage of sessions used (scur / slim * 100).</p> |CALCULATED |haproxy.frontend.sutil[{#PXNAME},{#SVNAME}]<p>**Expression**:</p>`last(//haproxy.frontend.scur[{#PXNAME},{#SVNAME}]) / last(//haproxy.frontend.slim[{#PXNAME},{#SVNAME}]) * 100` |
-|HAProxy |HAProxy Frontend {#PXNAME}: Request errors per second |<p>Number of request errors per second.</p> |DEPENDENT |haproxy.frontend.ereq.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].ereq.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Denied requests per second |<p>Requests denied due to security concerns (ACL-restricted) per second.</p> |DEPENDENT |haproxy.frontend.dreq.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dreq.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.frontend.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.frontend.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.frontend.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.frontend.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.frontend.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Incoming traffic |<p>Number of bits received by the frontend</p> |DEPENDENT |haproxy.frontend.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy Frontend {#PXNAME}: Outgoing traffic |<p>Number of bits sent by the frontend</p> |DEPENDENT |haproxy.frontend.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy Frontend {#PXNAME}: Request errors per second |<p>Number of request errors per second.</p> |DEPENDENT |haproxy.frontend.ereq.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].ereq.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Denied requests per second |<p>Requests denied due to security concerns (ACL-restricted) per second.</p> |DEPENDENT |haproxy.frontend.dreq.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dreq.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.frontend.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.frontend.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.frontend.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.frontend.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.frontend.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Incoming traffic |<p>Number of bits received by the frontend</p> |DEPENDENT |haproxy.frontend.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy Frontend {#PXNAME}: Outgoing traffic |<p>Number of bits sent by the frontend</p> |DEPENDENT |haproxy.frontend.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Status | |DEPENDENT |haproxy.server.status[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Responses time |<p>Average server response time (in ms) for the last 1,024 requests.</p> |DEPENDENT |haproxy.server.rtime[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].rtime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Errors connection per second |<p>Number of requests that encountered an error attempting to connect to a backend server.</p> |DEPENDENT |haproxy.server.econ.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].econ.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Responses denied per second |<p>Responses denied due to security concerns (ACL-restricted).</p> |DEPENDENT |haproxy.server.dresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dresp.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Response errors per second |<p>Number of requests whose responses yielded an error.</p> |DEPENDENT |haproxy.server.eresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].eresp.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Errors connection per second |<p>Number of requests that encountered an error attempting to connect to a backend server.</p> |DEPENDENT |haproxy.server.econ.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].econ.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Responses denied per second |<p>Responses denied due to security concerns (ACL-restricted).</p> |DEPENDENT |haproxy.server.dresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].dresp.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Response errors per second |<p>Number of requests whose responses yielded an error.</p> |DEPENDENT |haproxy.server.eresp.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].eresp.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Unassigned requests |<p>Current number of requests unassigned in queue.</p> |DEPENDENT |haproxy.server.qcur[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qcur.first()`</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Time in queue |<p>Average time spent in queue (in ms) for the last 1,024 requests.</p> |DEPENDENT |haproxy.server.qtime[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qtime.first()`</p><p>- MULTIPLIER: `0.001`</p> |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Redispatched requests per second |<p>Number of times a request was redispatched to a different backend.</p> |DEPENDENT |haproxy.server.wredis.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wredis.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Retried connections per second |<p>Number of times a connection was retried.</p> |DEPENDENT |haproxy.server.wretr.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wretr.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.server.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.server.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.server.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.server.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.server.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Incoming traffic |<p>Number of bits received by the backend</p> |DEPENDENT |haproxy.server.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Outgoing traffic |<p>Number of bits sent by the backend</p> |DEPENDENT |haproxy.server.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Redispatched requests per second |<p>Number of times a request was redispatched to a different backend.</p> |DEPENDENT |haproxy.server.wredis.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wredis.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Retried connections per second |<p>Number of times a connection was retried.</p> |DEPENDENT |haproxy.server.wretr.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].wretr.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 1xx per second |<p>Number of informational HTTP responses per second.</p> |DEPENDENT |haproxy.server.hrsp_1xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_1xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 2xx per second |<p>Number of successful HTTP responses per second.</p> |DEPENDENT |haproxy.server.hrsp_2xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_2xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 3xx per second |<p>Number of HTTP redirections per second.</p> |DEPENDENT |haproxy.server.hrsp_3xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_3xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 4xx per second |<p>Number of HTTP client errors per second.</p> |DEPENDENT |haproxy.server.hrsp_4xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_4xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 5xx per second |<p>Number of HTTP server errors per second.</p> |DEPENDENT |haproxy.server.hrsp_5xx.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].hrsp_5xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Incoming traffic |<p>Number of bits received by the backend</p> |DEPENDENT |haproxy.server.bin.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bin.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Outgoing traffic |<p>Number of bits sent by the backend</p> |DEPENDENT |haproxy.server.bout.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bout.first()`</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Server is active |<p>Shows whether the server is active (marked with a Y) or a backup (marked with a -).</p> |DEPENDENT |haproxy.server.act[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].act.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Server is backup |<p>Shows whether the server is a backup (marked with a Y) or active (marked with a -).</p> |DEPENDENT |haproxy.server.bck[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].bck.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Sessions per second |<p>Cumulative number of sessions (end-to-end connections) per second.</p> |DEPENDENT |haproxy.server.stot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].stot.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Sessions per second |<p>Cumulative number of sessions (end-to-end connections) per second.</p> |DEPENDENT |haproxy.server.stot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].stot.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Weight |<p>Effective weight.</p> |DEPENDENT |haproxy.server.weight[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].weight.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Configured maxqueue |<p>Configured maxqueue for the server, or nothing in the value is 0 (default, meaning no limit).</p> |DEPENDENT |haproxy.server.qlimit[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].qlimit.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>- MATCHES_REGEX: `^\d+$`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Server was selected per second |<p>Number of times that server was selected.</p> |DEPENDENT |haproxy.server.lbtot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].lbtot.first()`</p><p>- CHANGE_PER_SECOND |
+|HAProxy |HAProxy {#PXNAME} {#SVNAME}: Server was selected per second |<p>Number of times that server was selected.</p> |DEPENDENT |haproxy.server.lbtot.rate[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].lbtot.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |HAProxy |HAProxy {#PXNAME} {#SVNAME}: Status of last health check |<p>Status of last health check, one of:</p><p>UNK     -> unknown</p><p>INI     -> initializing</p><p>SOCKERR -> socket error</p><p>L4OK    -> check passed on layer 4, no upper layers testing enabled</p><p>L4TOUT  -> layer 1-4 timeout</p><p>L4CON   -> layer 1-4 connection problem, for example "Connection refused" (tcp rst) or "No route to host" (icmp)</p><p>L6OK    -> check passed on layer 6</p><p>L6TOUT  -> layer 6 (SSL) timeout</p><p>L6RSP   -> layer 6 invalid response - protocol error</p><p>L7OK    -> check passed on layer 7</p><p>L7OKC   -> check conditionally passed on layer 7, for example 404 with disable-on-404</p><p>L7TOUT  -> layer 7 (HTTP/SMTP) timeout</p><p>L7RSP   -> layer 7 invalid response - protocol error</p><p>L7STS   -> layer 7 response error, for example HTTP 5xx</p><p>Notice: If a check is currently running, the last known status will be reported, prefixed with "* ". e. g. "* L7OK".</p> |DEPENDENT |haproxy.server.check_status[{#PXNAME},{#SVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.pxname == '{#PXNAME}' && @.svname == '{#SVNAME}')].check_status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |Zabbix_raw_items |HAProxy: Get stats |<p>HAProxy Statistics Report in CSV format</p> |HTTP_AGENT |haproxy.get<p>**Preprocessing**:</p><p>- REGEX: `# ([\s\S]*)\n \1`</p><p>- CSV_TO_JSON: ` 1`</p> |
 |Zabbix_raw_items |HAProxy: Get nodes |<p>Array for LLD rules.</p> |DEPENDENT |haproxy.get.nodes<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(JSON.parse(value),['mode','pxname','svname'])`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -151,24 +150,24 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|HAProxy: Version has changed (new version: {ITEM.VALUE}) |<p>HAProxy version has changed. Ack to close.</p> |`last(/TEMPLATE_NAME/haproxy.version,#1)<>last(/TEMPLATE_NAME/haproxy.version,#2) and length(last(/TEMPLATE_NAME/haproxy.version))>0` |INFO |<p>Manual close: YES</p> |
-|HAProxy: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/TEMPLATE_NAME/haproxy.uptime)<10m` |INFO |<p>Manual close: YES</p> |
-|HAProxy: Service is down |<p>-</p> |`last(/TEMPLATE_NAME/net.tcp.service["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
-|HAProxy: Service response time is too high (over {$HAPROXY.RESPONSE_TIME.MAX.WARN} for 5m) |<p>-</p> |`min(/TEMPLATE_NAME/net.tcp.service.perf["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"],5m)>{$HAPROXY.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- HAProxy: Service is down</p> |
-|HAProxy backend {#PXNAME}: Server is DOWN |<p>Backend is not available.</p> |`count(/TEMPLATE_NAME/haproxy.backend.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5` |AVERAGE | |
-|HAProxy backend {#PXNAME}: Average response time is more than {$HAPROXY.BACK_RTIME.MAX.WARN} for 5m |<p>Average backend response time (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_RTIME.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.backend.rtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_RTIME.MAX.WARN}` |WARNING | |
-|HAProxy backend {#PXNAME}: Number of responses with error is more than {$HAPROXY.BACK_ERESP.MAX.WARN} for 5m |<p>Number of requests on backend, whose responses yielded an error, is more than {$HAPROXY.BACK_ERESP.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.backend.eresp.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_ERESP.MAX.WARN}` |WARNING | |
-|HAProxy backend {#PXNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN} for 5m |<p>Current number of requests on backend unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.backend.qcur[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_QCUR.MAX.WARN}` |WARNING | |
-|HAProxy backend {#PXNAME}: Average time spent in queue is more than {$HAPROXY.BACK_QTIME.MAX.WARN} for 5m |<p>Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_QTIME.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.backend.qtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_QTIME.MAX.WARN}` |WARNING | |
-|HAProxy frontend {#PXNAME}: Session utilization is more than {$HAPROXY.FRONT_SUTIL.MAX.WARN}% for 5m |<p>Alerting on this metric is essential to ensure your server has sufficient capacity to handle all concurrent sessions. Unlike requests, upon reaching the session limit HAProxy will deny additional clients until resource consumption drops. Furthermore, if you find your session usage percentage to be hovering above 80%, it could be time to either modify HAProxy’s configuration to allow more sessions, or migrate your HAProxy server to a bigger box.</p> |`min(/TEMPLATE_NAME/haproxy.frontend.sutil[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_SUTIL.MAX.WARN}` |WARNING | |
-|HAProxy frontend {#PXNAME}: Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN} for 5m |<p>Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.frontend.ereq.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_EREQ.MAX.WARN}` |WARNING | |
-|HAProxy frontend {#PXNAME}: Number of requests denied is more than {$HAPROXY.FRONT_DREQ.MAX.WARN} for 5m |<p>Number of requests denied due to security concerns (ACL-restricted) is more than {$HAPROXY.FRONT_DREQ.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.frontend.dreq.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_DREQ.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Server is DOWN |<p>Server is not available.</p> |`count(/TEMPLATE_NAME/haproxy.server.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Average response time is more than {$HAPROXY.SERVER_RTIME.MAX.WARN} for 5m |<p>Average server response time (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_RTIME.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.server.rtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_RTIME.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Number of responses with error is more than {$HAPROXY.SERVER_ERESP.MAX.WARN} for 5m |<p>Number of requests on server, whose responses yielded an error, is more than {$HAPROXY.SERVER_ERESP.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.server.eresp.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_ERESP.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN} for 5m |<p>Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.server.qcur[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_QCUR.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Average time spent in queue is more than {$HAPROXY.SERVER_QTIME.MAX.WARN} for 5m |<p>Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_QTIME.MAX.WARN}.</p> |`min(/TEMPLATE_NAME/haproxy.server.qtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_QTIME.MAX.WARN}` |WARNING | |
-|HAProxy {#PXNAME} {#SVNAME}: Health check error |<p>Please check the server for faults.</p> |`find(/TEMPLATE_NAME/haproxy.server.check_status[{#PXNAME},{#SVNAME}],#3,"regexp","(?:L[4-7]OK|^$)")=0` |WARNING |<p>**Depends on**:</p><p>- HAProxy {#PXNAME} {#SVNAME}: Server is DOWN</p> |
+|HAProxy: Version has changed (new version: {ITEM.VALUE}) |<p>HAProxy version has changed. Ack to close.</p> |`last(/HAProxy by HTTP/haproxy.version,#1)<>last(/HAProxy by HTTP/haproxy.version,#2) and length(last(/HAProxy by HTTP/haproxy.version))>0` |INFO |<p>Manual close: YES</p> |
+|HAProxy: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/HAProxy by HTTP/haproxy.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|HAProxy: Service is down |<p>-</p> |`last(/HAProxy by HTTP/net.tcp.service["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|HAProxy: Service response time is too high (over {$HAPROXY.RESPONSE_TIME.MAX.WARN} for 5m) |<p>-</p> |`min(/HAProxy by HTTP/net.tcp.service.perf["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"],5m)>{$HAPROXY.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- HAProxy: Service is down</p> |
+|HAProxy backend {#PXNAME}: Server is DOWN |<p>Backend is not available.</p> |`count(/HAProxy by HTTP/haproxy.backend.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5` |AVERAGE | |
+|HAProxy backend {#PXNAME}: Average response time is more than {$HAPROXY.BACK_RTIME.MAX.WARN} for 5m |<p>Average backend response time (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_RTIME.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.backend.rtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_RTIME.MAX.WARN}` |WARNING | |
+|HAProxy backend {#PXNAME}: Number of responses with error is more than {$HAPROXY.BACK_ERESP.MAX.WARN} for 5m |<p>Number of requests on backend, whose responses yielded an error, is more than {$HAPROXY.BACK_ERESP.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.backend.eresp.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_ERESP.MAX.WARN}` |WARNING | |
+|HAProxy backend {#PXNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN} for 5m |<p>Current number of requests on backend unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.backend.qcur[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_QCUR.MAX.WARN}` |WARNING | |
+|HAProxy backend {#PXNAME}: Average time spent in queue is more than {$HAPROXY.BACK_QTIME.MAX.WARN} for 5m |<p>Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_QTIME.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.backend.qtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.BACK_QTIME.MAX.WARN}` |WARNING | |
+|HAProxy frontend {#PXNAME}: Session utilization is more than {$HAPROXY.FRONT_SUTIL.MAX.WARN}% for 5m |<p>Alerting on this metric is essential to ensure your server has sufficient capacity to handle all concurrent sessions. Unlike requests, upon reaching the session limit HAProxy will deny additional clients until resource consumption drops. Furthermore, if you find your session usage percentage to be hovering above 80%, it could be time to either modify HAProxy’s configuration to allow more sessions, or migrate your HAProxy server to a bigger box.</p> |`min(/HAProxy by HTTP/haproxy.frontend.sutil[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_SUTIL.MAX.WARN}` |WARNING | |
+|HAProxy frontend {#PXNAME}: Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN} for 5m |<p>Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.frontend.ereq.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_EREQ.MAX.WARN}` |WARNING | |
+|HAProxy frontend {#PXNAME}: Number of requests denied is more than {$HAPROXY.FRONT_DREQ.MAX.WARN} for 5m |<p>Number of requests denied due to security concerns (ACL-restricted) is more than {$HAPROXY.FRONT_DREQ.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.frontend.dreq.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_DREQ.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Server is DOWN |<p>Server is not available.</p> |`count(/HAProxy by HTTP/haproxy.server.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Average response time is more than {$HAPROXY.SERVER_RTIME.MAX.WARN} for 5m |<p>Average server response time (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_RTIME.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.server.rtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_RTIME.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Number of responses with error is more than {$HAPROXY.SERVER_ERESP.MAX.WARN} for 5m |<p>Number of requests on server, whose responses yielded an error, is more than {$HAPROXY.SERVER_ERESP.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.server.eresp.rate[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_ERESP.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN} for 5m |<p>Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.server.qcur[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_QCUR.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Average time spent in queue is more than {$HAPROXY.SERVER_QTIME.MAX.WARN} for 5m |<p>Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_QTIME.MAX.WARN}.</p> |`min(/HAProxy by HTTP/haproxy.server.qtime[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.SERVER_QTIME.MAX.WARN}` |WARNING | |
+|HAProxy {#PXNAME} {#SVNAME}: Health check error |<p>Please check the server for faults.</p> |`find(/HAProxy by HTTP/haproxy.server.check_status[{#PXNAME},{#SVNAME}],#3,"regexp","(?:L[4-7]OK|^$)")=0` |WARNING |<p>**Depends on**:</p><p>- HAProxy {#PXNAME} {#SVNAME}: Server is DOWN</p> |
 
 ## Feedback
 
diff --git a/templates/app/haproxy_http/template_app_haproxy_http.yaml b/templates/app/haproxy_http/template_app_haproxy_http.yaml
index 954cefc7f3b..31685533ab9 100644
--- a/templates/app/haproxy_http/template_app_haproxy_http.yaml
+++ b/templates/app/haproxy_http/template_app_haproxy_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-08-09T08:38:38Z'
+  version: '6.0'
+  date: '2021-12-15T08:55:31Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -23,7 +23,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/393527-discussion-thread-for-official-zabbix-template-haproxy
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -2934,7 +2934,7 @@ zabbix_export:
                 -
                   type: GRAPH_PROTOTYPE
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -2947,7 +2947,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -2956,9 +2956,9 @@ zabbix_export:
                         host: 'HAProxy by HTTP'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '12'
+                  'y': '5'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -2971,7 +2971,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -2980,9 +2980,9 @@ zabbix_export:
                         host: 'HAProxy by HTTP'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '24'
+                  'y': '10'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -2995,7 +2995,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3011,7 +3011,7 @@ zabbix_export:
                 -
                   type: GRAPH_PROTOTYPE
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3024,7 +3024,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3033,9 +3033,9 @@ zabbix_export:
                         host: 'HAProxy by HTTP'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '12'
+                  'y': '5'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3048,7 +3048,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3057,9 +3057,9 @@ zabbix_export:
                         host: 'HAProxy by HTTP'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '24'
+                  'y': '10'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3072,7 +3072,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3081,9 +3081,9 @@ zabbix_export:
                         host: 'HAProxy by HTTP'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '36'
+                  'y': '15'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3096,7 +3096,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3112,7 +3112,7 @@ zabbix_export:
                 -
                   type: GRAPH_PROTOTYPE
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3125,7 +3125,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3134,9 +3134,9 @@ zabbix_export:
                         host: 'HAProxy by HTTP'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '12'
+                  'y': '5'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3149,7 +3149,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
@@ -3158,9 +3158,9 @@ zabbix_export:
                         host: 'HAProxy by HTTP'
                 -
                   type: GRAPH_PROTOTYPE
-                  'y': '24'
+                  'y': '10'
                   width: '24'
-                  height: '12'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -3173,7 +3173,7 @@ zabbix_export:
                     -
                       type: INTEGER
                       name: rows
-                      value: '3'
+                      value: '1'
                     -
                       type: GRAPH_PROTOTYPE
                       name: graphid
diff --git a/templates/app/iis_agent/README.md b/templates/app/iis_agent/README.md
index 6d4bedabaa6..6a15be44670 100644
--- a/templates/app/iis_agent/README.md
+++ b/templates/app/iis_agent/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor IIS (Internet Information Services) by Zabbix that works without any external scripts.
 
 
@@ -43,7 +43,7 @@ No specific Zabbix configuration is required.
 |{$IIS.PORT} |<p>Listening port.</p> |`80` |
 |{$IIS.QUEUE.MAX.TIME} |<p>The time during which the queue length may exceed the threshold.</p> |`5m` |
 |{$IIS.QUEUE.MAX.WARN} |<p>Maximum application pool's request queue length for trigger expression.</p> |`` |
-|{$IIS.SERVICE} |<p>The service (http/https/etc) for port check. See "net.tcp.service" documentation page for more information.</p> |`http` |
+|{$IIS.SERVICE} |<p>The service (http/https/etc) for port check. See "net.tcp.service" documentation page for more information: https://www.zabbix.com/documentation/6.0/manual/config/items/itemtypes/simple_checks</p> |`http` |
 
 ## Template links
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Application pools discovery |<p>-</p> |ZABBIX_PASSIVE |wmi.getall[root\webAdministration, select Name from ApplicationPool]<p>**Filter**:</p>AND <p>- A: {#APPPOOL} NOT_MATCHES_REGEX `{$IIS.APPPOOL.NOT_MATCHES}`</p><p>- B: {#APPPOOL} MATCHES_REGEX `{$IIS.APPPOOL.MATCHES}`</p> |
+|Application pools discovery |<p>-</p> |ZABBIX_PASSIVE |wmi.getall[root\webAdministration, select Name from ApplicationPool]<p>**Filter**:</p>AND <p>- {#APPPOOL} NOT_MATCHES_REGEX `{$IIS.APPPOOL.NOT_MATCHES}`</p><p>- {#APPPOOL} MATCHES_REGEX `{$IIS.APPPOOL.MATCHES}`</p> |
 
 ## Items collected
 
@@ -110,7 +110,7 @@ There are no template links in this template.
 |IIS: Port {$IIS.PORT} is down |<p>-</p> |`last(/IIS by Zabbix agent/net.tcp.service[{$IIS.SERVICE},,{$IIS.PORT}])=0` |AVERAGE |<p>Manual close: YES</p><p>**Depends on**:</p><p>- IIS: The World Wide Web Publishing Service (W3SVC) is not running</p> |
 |IIS: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/IIS by Zabbix agent/perf_counter_en["\Web Service(_Total)\Service Uptime"])<10m` |INFO |<p>Manual close: YES</p> |
 |IIS: {#APPPOOL} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool Uptime"])<10m` |INFO |<p>Manual close: YES</p> |
-|IIS: Application pool {#APPPOOL} is not in Running state |<p>-</p> |`last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool State"])<>3 and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1` |HIGH | |
+|IIS: Application pool {#APPPOOL} is not in Running state |<p>-</p> |`last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool State"])<>3 and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1` |HIGH |<p>**Depends on**:</p><p>- IIS: The World Wide Web Publishing Service (W3SVC) is not running</p> |
 |IIS: Application pool {#APPPOOL} has been recycled |<p>-</p> |`last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Total Application Pool Recycles"],#1)<>last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Total Application Pool Recycles"],#2) and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1` |INFO | |
 |IIS: Request queue of {#APPPOOL} is too large (over {$IIS.QUEUE.MAX.WARN}) |<p>-</p> |`min(/IIS by Zabbix agent/perf_counter_en["\HTTP Service Request Queues({#APPPOOL})\CurrentQueueSize"],{$IIS.QUEUE.MAX.TIME})>{$IIS.QUEUE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- IIS: Application pool {#APPPOOL} is not in Running state</p> |
 
diff --git a/templates/app/iis_agent/template_app_iis_agent.yaml b/templates/app/iis_agent/template_app_iis_agent.yaml
index 4811d52d447..2dadb41006c 100644
--- a/templates/app/iis_agent/template_app_iis_agent.yaml
+++ b/templates/app/iis_agent/template_app_iis_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:20Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:19Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -11,12 +11,12 @@ zabbix_export:
       template: 'IIS by Zabbix agent'
       name: 'IIS by Zabbix agent'
       description: |
-        Get metrics from IIS using Zabbix agent running on Windows
+        Get metrics from IIS using Zabbix agent running on Windows.
         
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/401862-discussion-thread-for-official-zabbix-template-internet-information-services
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -664,6 +664,10 @@ zabbix_export:
                   expression: 'last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool State"])<>3 and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1'
                   name: 'IIS: Application pool {#APPPOOL} is not in Running state'
                   priority: HIGH
+                  dependencies:
+                    -
+                      name: 'IIS: The World Wide Web Publishing Service (W3SVC) is not running'
+                      expression: 'last(/IIS by Zabbix agent/service_state[W3SVC])<>0'
             -
               uuid: f039a53351d54132ab9ad046282389d8
               name: 'IIS: {#APPPOOL} Uptime'
@@ -810,6 +814,9 @@ zabbix_export:
               value: '1'
               newvalue: Paused
             -
+              value: '2'
+              newvalue: 'Start pending'
+            -
               value: '3'
               newvalue: 'Pause pending'
             -
@@ -827,9 +834,6 @@ zabbix_export:
             -
               value: '255'
               newvalue: 'No such service'
-            -
-              value: '2'
-              newvalue: 'Start pending'
   graphs:
     -
       uuid: 3a0454724c9a444cbeb3ad0da2a3a560
diff --git a/templates/app/iis_agent_active/README.md b/templates/app/iis_agent_active/README.md
index 8b5f8a3bef3..4b695520e32 100644
--- a/templates/app/iis_agent_active/README.md
+++ b/templates/app/iis_agent_active/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor IIS (Internet Information Services) by Zabbix that works without any external scripts.
 
 
@@ -43,7 +43,7 @@ No specific Zabbix configuration is required.
 |{$IIS.PORT} |<p>Listening port.</p> |`80` |
 |{$IIS.QUEUE.MAX.TIME} |<p>The time during which the queue length may exceed the threshold.</p> |`5m` |
 |{$IIS.QUEUE.MAX.WARN} |<p>Maximum application pool's request queue length for trigger expression.</p> |`` |
-|{$IIS.SERVICE} |<p>The service (http/https/etc) for port check. See "net.tcp.service" documentation page for more information.</p> |`http` |
+|{$IIS.SERVICE} |<p>The service (http/https/etc) for port check. See "net.tcp.service" documentation page for more information: https://www.zabbix.com/documentation/6.0/manual/config/items/itemtypes/simple_checks</p> |`http` |
 
 ## Template links
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Application pools discovery |<p>-</p> |ZABBIX_ACTIVE |wmi.getall[root\webAdministration, select Name from ApplicationPool]<p>**Filter**:</p>AND <p>- A: {#APPPOOL} NOT_MATCHES_REGEX `{$IIS.APPPOOL.NOT_MATCHES}`</p><p>- B: {#APPPOOL} MATCHES_REGEX `{$IIS.APPPOOL.MATCHES}`</p> |
+|Application pools discovery |<p>-</p> |ZABBIX_ACTIVE |wmi.getall[root\webAdministration, select Name from ApplicationPool]<p>**Filter**:</p>AND <p>- {#APPPOOL} NOT_MATCHES_REGEX `{$IIS.APPPOOL.NOT_MATCHES}`</p><p>- {#APPPOOL} MATCHES_REGEX `{$IIS.APPPOOL.MATCHES}`</p> |
 
 ## Items collected
 
@@ -110,7 +110,7 @@ There are no template links in this template.
 |IIS: Port {$IIS.PORT} is down |<p>-</p> |`last(/IIS by Zabbix agent active/net.tcp.service[{$IIS.SERVICE},,{$IIS.PORT}])=0` |AVERAGE |<p>Manual close: YES</p><p>**Depends on**:</p><p>- IIS: The World Wide Web Publishing Service (W3SVC) is not running</p> |
 |IIS: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/IIS by Zabbix agent active/perf_counter_en["\Web Service(_Total)\Service Uptime"])<10m` |INFO |<p>Manual close: YES</p> |
 |IIS: {#APPPOOL} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool Uptime"])<10m` |INFO |<p>Manual close: YES</p> |
-|IIS: Application pool {#APPPOOL} is not in Running state |<p>-</p> |`last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool State"])<>3 and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1` |HIGH | |
+|IIS: Application pool {#APPPOOL} is not in Running state |<p>-</p> |`last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool State"])<>3 and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1` |HIGH |<p>**Depends on**:</p><p>- IIS: The World Wide Web Publishing Service (W3SVC) is not running</p> |
 |IIS: Application pool {#APPPOOL} has been recycled |<p>-</p> |`last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Total Application Pool Recycles"],#1)<>last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Total Application Pool Recycles"],#2) and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1` |INFO | |
 |IIS: Request queue of {#APPPOOL} is too large (over {$IIS.QUEUE.MAX.WARN}) |<p>-</p> |`min(/IIS by Zabbix agent active/perf_counter_en["\HTTP Service Request Queues({#APPPOOL})\CurrentQueueSize"],{$IIS.QUEUE.MAX.TIME})>{$IIS.QUEUE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- IIS: Application pool {#APPPOOL} is not in Running state</p> |
 
diff --git a/templates/app/iis_agent_active/template_app_iis_agent_active.yaml b/templates/app/iis_agent_active/template_app_iis_agent_active.yaml
index a2fe7009cd8..8cc71b9cc7b 100644
--- a/templates/app/iis_agent_active/template_app_iis_agent_active.yaml
+++ b/templates/app/iis_agent_active/template_app_iis_agent_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:22Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:23Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -11,12 +11,12 @@ zabbix_export:
       template: 'IIS by Zabbix agent active'
       name: 'IIS by Zabbix agent active'
       description: |
-        Get metrics from IIS using Zabbix agent running on Windows
+        Get metrics from IIS using Zabbix agent running on Windows.
         
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/401862-discussion-thread-for-official-zabbix-template-internet-information-services
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -702,6 +702,10 @@ zabbix_export:
                   expression: 'last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool State"])<>3 and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1'
                   name: 'IIS: Application pool {#APPPOOL} is not in Running state'
                   priority: HIGH
+                  dependencies:
+                    -
+                      name: 'IIS: The World Wide Web Publishing Service (W3SVC) is not running'
+                      expression: 'last(/IIS by Zabbix agent active/service_state[W3SVC])<>0'
             -
               uuid: f0a6fe8a4cc44582a3048f1a00442736
               name: 'IIS: {#APPPOOL} Uptime'
@@ -851,6 +855,9 @@ zabbix_export:
               value: '1'
               newvalue: Paused
             -
+              value: '2'
+              newvalue: 'Start pending'
+            -
               value: '3'
               newvalue: 'Pause pending'
             -
@@ -868,9 +875,6 @@ zabbix_export:
             -
               value: '255'
               newvalue: 'No such service'
-            -
-              value: '2'
-              newvalue: 'Start pending'
   graphs:
     -
       uuid: e3b3f8f973204070a37b9eb861e2a079
diff --git a/templates/app/jenkins/README.md b/templates/app/jenkins/README.md
index 4d9b4d64fbb..a167592408e 100644
--- a/templates/app/jenkins/README.md
+++ b/templates/app/jenkins/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Apache Jenkins by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -17,11 +17,11 @@ This template was tested on:
 
 > See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/http) for basic instructions.
 
-Metrics are collected by requests to [Metrics API](https://plugins.jenkins.io/metrics/).  
+Metrics are collected by requests to [Metrics API](https://plugins.jenkins.io/metrics/).
 For common metrics:
- Install and configure Metrics plugin parameters according [official documentations](https://plugins.jenkins.io/metrics/). Do not forget to configure access to the Metrics Servlet by issuing API key and change macro {$JENKINS.API.KEY}. 
+ Install and configure Metrics plugin parameters according [official documentations](https://plugins.jenkins.io/metrics/). Do not forget to configure access to the Metrics Servlet by issuing API key and change macro {$JENKINS.API.KEY}.
 
-For monitoring computers and builds: 
+For monitoring computers and builds:
  Create API token for monitoring user according [official documentations](https://www.jenkins.io/doc/book/system-administration/authenticating-scripted-clients/) and change macro {$JENKINS.USER}, {$JENKINS.API.TOKEN}.
 Don't forget to change macros {$JENKINS.URL}.
 
@@ -50,8 +50,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Jobs discovery | |HTTP_AGENT |jenkins.jobs<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[*]`</p> |
-|Computers discovery | |HTTP_AGENT |jenkins.computers<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[*]`</p> |
+|Jobs discovery |<p>-</p> |HTTP_AGENT |jenkins.jobs<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[*]`</p> |
+|Computers discovery |<p>-</p> |HTTP_AGENT |jenkins.computers<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[*]`</p> |
 
 ## Items collected
 
@@ -61,10 +61,10 @@ There are no template links in this template.
 |Jenkins |Jenkins: Temporary space check message |<p>The message will reference the first node which fails this check. There may be other nodes that fail the check, but this health check is designed to fail fast.</p> |DEPENDENT |jenkins.temporary_space.message<p>**Preprocessing**:</p><p>- JSONPATH: `$['temporary-space'].message`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Jenkins |Jenkins: Plugins check message |<p>The message of plugins health check.</p> |DEPENDENT |jenkins.plugins.message<p>**Preprocessing**:</p><p>- JSONPATH: `$['plugins'].message`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Jenkins |Jenkins: Thread deadlock check message |<p>The message of thread deadlock health check.</p> |DEPENDENT |jenkins.thread_deadlock.message<p>**Preprocessing**:</p><p>- JSONPATH: `$['thread-deadlock'].message`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|Jenkins |Jenkins: Disk space check |<p>Returns FAIL if any of the Jenkins disk space monitors are reporting the disk space as less than the configured threshold.</p> |DEPENDENT |jenkins.disk_space<p>**Preprocessing**:</p><p>- JSONPATH: `$['disk-space'].healthy`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Jenkins |Jenkins: Plugins check |<p>Returns FAIL if any of the Jenkins plugins failed to start.</p> |DEPENDENT |jenkins.plugins<p>**Preprocessing**:</p><p>- JSONPATH: `$.plugins.healthy`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Jenkins |Jenkins: Temporary space check |<p>Returns FAIL if any of the Jenkins temporary space monitors are reporting the temporary space as less than the configured threshold.</p> |DEPENDENT |jenkins.temporary_space<p>**Preprocessing**:</p><p>- JSONPATH: `$['temporary-space'].healthy`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Jenkins |Jenkins: Thread deadlock check |<p>Returns FAIL if there are any deadlocked threads in the Jenkins master JVM.</p> |DEPENDENT |jenkins.thread_deadlock<p>**Preprocessing**:</p><p>- JSONPATH: `$['thread-deadlock'].healthy`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Jenkins |Jenkins: Disk space check |<p>Returns FAIL if any of the Jenkins disk space monitors are reporting the disk space as less than the configured threshold.</p> |DEPENDENT |jenkins.disk_space<p>**Preprocessing**:</p><p>- JSONPATH: `$['disk-space'].healthy`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Jenkins |Jenkins: Plugins check |<p>Returns FAIL if any of the Jenkins plugins failed to start.</p> |DEPENDENT |jenkins.plugins<p>**Preprocessing**:</p><p>- JSONPATH: `$.plugins.healthy`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Jenkins |Jenkins: Temporary space check |<p>Returns FAIL if any of the Jenkins temporary space monitors are reporting the temporary space as less than the configured threshold.</p> |DEPENDENT |jenkins.temporary_space<p>**Preprocessing**:</p><p>- JSONPATH: `$['temporary-space'].healthy`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Jenkins |Jenkins: Thread deadlock check |<p>Returns FAIL if there are any deadlocked threads in the Jenkins master JVM.</p> |DEPENDENT |jenkins.thread_deadlock<p>**Preprocessing**:</p><p>- JSONPATH: `$['thread-deadlock'].healthy`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Jenkins |Jenkins: Executors count |<p>The number of executors available to Jenkins. This is corresponds to the sum of all the executors of all the on-line nodes.</p> |DEPENDENT |jenkins.executor.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['jenkins.executor.count.value'].value`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Jenkins |Jenkins: Executors free |<p>The number of executors available to Jenkins that are not currently in use.</p> |DEPENDENT |jenkins.executor.free<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['jenkins.executor.free.value'].value`</p> |
 |Jenkins |Jenkins: Executors in use |<p>The number of executors available to Jenkins that are currently in use.</p> |DEPENDENT |jenkins.executor.in_use<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['jenkins.executor.in-use.value'].value`</p> |
@@ -108,25 +108,25 @@ There are no template links in this template.
 |Jenkins |Jenkins: Build queue, buildable |<p>The number of jobs that are in the Jenkins build queue and currently in the blocked state.</p> |DEPENDENT |jenkins.queue.buildable<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['jenkins.queue.buildable.value'].value`</p> |
 |Jenkins |Jenkins: Build queue, pending |<p>The number of jobs that are in the Jenkins build queue and currently in the blocked state.</p> |DEPENDENT |jenkins.queue.pending<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['jenkins.queue.pending.value'].value`</p> |
 |Jenkins |Jenkins: Build queue, stuck |<p>The number of jobs that are in the Jenkins build queue and currently in the blocked state.</p> |DEPENDENT |jenkins.queue.stuck<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['jenkins.queue.stuck.value'].value`</p> |
-|Jenkins |Jenkins: HTTP active requests, rate |<p>The number of currently active requests against the Jenkins master Web UI.</p> |DEPENDENT |jenkins.http.active_requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.counters.['http.activeRequests'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 400, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/400 status code.</p> |DEPENDENT |jenkins.http.bad_request.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.badRequest'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 500, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/500 status code.</p> |DEPENDENT |jenkins.http.server_error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.serverError'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 503, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/503 status code.</p> |DEPENDENT |jenkins.http.service_unavailable.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.serviceUnavailable'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 200, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/200 status code.</p> |DEPENDENT |jenkins.http.ok.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.ok'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response other, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a non-informational status code that is not in the list: HTTP/200, HTTP/201, HTTP/204, HTTP/304, HTTP/400, HTTP/403, HTTP/404, HTTP/500, or HTTP/503.</p> |DEPENDENT |jenkins.http.other.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.other'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 201, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/201 status code.</p> |DEPENDENT |jenkins.http.created.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.created'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 204, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/204 status code.</p> |DEPENDENT |jenkins.http.no_content.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.noContent'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 404, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/404 status code.</p> |DEPENDENT |jenkins.http.not_found.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.notFound'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 304, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/304 status code.</p> |DEPENDENT |jenkins.http.not_modified.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.notModified'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP response 403, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/403 status code.</p> |DEPENDENT |jenkins.http.forbidden.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.forbidden'].count`</p><p>- CHANGE_PER_SECOND |
-|Jenkins |Jenkins: HTTP requests, rate |<p>The rate at which the Jenkins master Web UI is receiving requests.</p> |DEPENDENT |jenkins.http.requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.timers.['http.requests'].count`</p><p>- CHANGE_PER_SECOND |
+|Jenkins |Jenkins: HTTP active requests, rate |<p>The number of currently active requests against the Jenkins master Web UI.</p> |DEPENDENT |jenkins.http.active_requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.counters.['http.activeRequests'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 400, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/400 status code.</p> |DEPENDENT |jenkins.http.bad_request.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.badRequest'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 500, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/500 status code.</p> |DEPENDENT |jenkins.http.server_error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.serverError'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 503, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/503 status code.</p> |DEPENDENT |jenkins.http.service_unavailable.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.serviceUnavailable'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 200, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/200 status code.</p> |DEPENDENT |jenkins.http.ok.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.ok'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response other, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a non-informational status code that is not in the list: HTTP/200, HTTP/201, HTTP/204, HTTP/304, HTTP/400, HTTP/403, HTTP/404, HTTP/500, or HTTP/503.</p> |DEPENDENT |jenkins.http.other.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.other'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 201, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/201 status code.</p> |DEPENDENT |jenkins.http.created.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.created'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 204, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/204 status code.</p> |DEPENDENT |jenkins.http.no_content.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.noContent'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 404, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/404 status code.</p> |DEPENDENT |jenkins.http.not_found.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.notFound'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 304, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/304 status code.</p> |DEPENDENT |jenkins.http.not_modified.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.notModified'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP response 403, rate |<p>The rate at which the Jenkins master Web UI is responding to requests with a HTTP/403 status code.</p> |DEPENDENT |jenkins.http.forbidden.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.meters.['http.responseCodes.forbidden'].count`</p><p>- CHANGE_PER_SECOND</p> |
+|Jenkins |Jenkins: HTTP requests, rate |<p>The rate at which the Jenkins master Web UI is receiving requests.</p> |DEPENDENT |jenkins.http.requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.timers.['http.requests'].count`</p><p>- CHANGE_PER_SECOND</p> |
 |Jenkins |Jenkins: HTTP requests, p95 |<p>The time spent generating the corresponding responses.</p> |DEPENDENT |jenkins.http.requests_p95.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.timers.['http.requests'].p95`</p> |
 |Jenkins |Jenkins: HTTP requests, median |<p>The time spent generating the corresponding responses.</p> |DEPENDENT |jenkins.http.requests_p50.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.timers.['http.requests'].p50`</p> |
 |Jenkins |Jenkins: Version |<p>Version of Jenkins server.</p> |DEPENDENT |jenkins.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['jenkins.versions.core'].value`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Jenkins |Jenkins: CPU Load |<p>The system load on the Jenkins master as reported by the JVM’s Operating System JMX bean. The calculation of system load is operating system dependent. Typically this is the sum of the number of processes that are currently running plus the number that are waiting to run. This is typically comparable against the number of CPU cores.</p> |DEPENDENT |jenkins.system.cpu.load<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['system.cpu.load'].value`</p> |
 |Jenkins |Jenkins: Uptime |<p>The number of seconds since the Jenkins master JVM started.</p> |DEPENDENT |jenkins.system.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['vm.uptime.milliseconds'].value`</p><p>- MULTIPLIER: `0.001`</p> |
 |Jenkins |Jenkins: File descriptor ratio |<p>The ratio of used to total file descriptors</p> |DEPENDENT |jenkins.descriptor.ratio<p>**Preprocessing**:</p><p>- JSONPATH: `$.gauges.['vm.file.descriptor.ratio'].value`</p><p>- MULTIPLIER: `100`</p> |
-|Jenkins |Jenkins: Service ping | |HTTP_AGENT |jenkins.ping<p>**Preprocessing**:</p><p>- REGEX: `{$JENKINS.PING.REPLY}$ 1`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|Jenkins |Jenkins: Service ping | |HTTP_AGENT |jenkins.ping<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- REGEX: `{$JENKINS.PING.REPLY}$ 1`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Jenkins |Jenkins job [{#NAME}]: Health score |<p>Represents health of project. A number between 0-100.</p><p>Job Description: {#DESCRIPTION}</p><p>Job Url: {#URL}</p> |DEPENDENT |jenkins.build.health[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].healthReport..score.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Jenkins |Jenkins job [{#NAME}]: Last Build number |<p>Details: {#URL}/lastBuild/</p> |DEPENDENT |jenkins.last_build.number[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastBuild.number.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Jenkins |Jenkins job [{#NAME}]: Last Build duration |<p>Build duration (in seconds).</p> |DEPENDENT |jenkins.last_build.duration[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastBuild.duration.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
@@ -134,15 +134,15 @@ There are no template links in this template.
 |Jenkins |Jenkins job [{#NAME}]: Last Build result | |DEPENDENT |jenkins.last_build.result[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastBuild.result.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Jenkins |Jenkins job [{#NAME}]: Last Failed Build number |<p>Details: {#URL}/lastFailedBuild/</p> |DEPENDENT |jenkins.last_failed_build.number[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastFailedBuild.number.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Jenkins |Jenkins job [{#NAME}]: Last Failed Build duration |<p>Build duration (in seconds).</p> |DEPENDENT |jenkins.last_failed_build.duration[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastFailedBuild.duration.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
-|Jenkins |Jenkins job [{#NAME}]: Last Failed Build timestamp | |DEPENDENT |jenkins.last_failed_build.timestamp[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastFailedBuild.timestamp.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|Jenkins |Jenkins job [{#NAME}]: Last Failed Build timestamp |<p>-</p> |DEPENDENT |jenkins.last_failed_build.timestamp[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastFailedBuild.timestamp.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Jenkins |Jenkins job [{#NAME}]: Last Successful Build number |<p>Details: {#URL}/lastSuccessfulBuild/</p> |DEPENDENT |jenkins.last_successful_build.number[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastSuccessfulBuild.number.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Jenkins |Jenkins job [{#NAME}]: Last Successful Build duration |<p>Build duration (in seconds).</p> |DEPENDENT |jenkins.last_successful_build.duration[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastSuccessfulBuild.duration.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
-|Jenkins |Jenkins job [{#NAME}]: Last Successful Build timestamp | |DEPENDENT |jenkins.last_successful_build.timestamp[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastSuccessfulBuild.timestamp.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|Jenkins |Jenkins job [{#NAME}]: Last Successful Build timestamp |<p>-</p> |DEPENDENT |jenkins.last_successful_build.timestamp[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.[?(@.name == "{#NAME}")].lastSuccessfulBuild.timestamp.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Executors |<p>The maximum number of concurrent builds that Jenkins may perform on this node.</p> |DEPENDENT |jenkins.computer.numExecutors[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].numExecutors.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: State |<p>Represents the actual online/offline state.</p><p>Node description: {#DESCRIPTION}</p> |DEPENDENT |jenkins.computer.state[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].offline.first()`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: State |<p>Represents the actual online/offline state.</p><p>Node description: {#DESCRIPTION}</p> |DEPENDENT |jenkins.computer.state[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].offline.first()`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Offline cause reason |<p>If the computer was offline (either temporarily or not), will return the cause as a string (without user info). Empty string if the system was put offline without given a cause.</p> |DEPENDENT |jenkins.computer.offline.reason[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].offlineCauseReason.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Idle |<p>Returns true if all the executors of this computer are idle.</p> |DEPENDENT |jenkins.computer.idle[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].idle.first()`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Temporarily offline |<p>Returns true if this node is marked temporarily offline.</p> |DEPENDENT |jenkins.computer.temp_offline[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].temporarilyOffline.first()`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Idle |<p>Returns true if all the executors of this computer are idle.</p> |DEPENDENT |jenkins.computer.idle[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].idle.first()`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Temporarily offline |<p>Returns true if this node is marked temporarily offline.</p> |DEPENDENT |jenkins.computer.temp_offline[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].temporarilyOffline.first()`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Available disk space |<p>The available disk space of $JENKINS_HOME on agent.</p> |DEPENDENT |jenkins.computer.disk_space[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].monitorData['hudson.node_monitors.DiskSpaceMonitor'].size.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Available temp space |<p>The available disk space of the temporary directory. Java tools and tests/builds often create files in the temporary directory, and may not function properly if there's no available space.</p> |DEPENDENT |jenkins.computer.temp_space[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].monitorData['hudson.node_monitors.TemporarySpaceMonitor'].size.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Response time average |<p>The round trip network response time from the master to the agent</p> |DEPENDENT |jenkins.computer.response_time[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].monitorData['hudson.node_monitors.ResponseTimeMonitor'].average.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p> |
@@ -151,27 +151,27 @@ There are no template links in this template.
 |Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Total physical memory |<p>Total physical memory of the system, in bytes.</p> |DEPENDENT |jenkins.computer.total_physical_memory[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].monitorData['hudson.node_monitors.SwapSpaceMonitor'].totalPhysicalMemory.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Total swap space |<p>Total number of swap space in bytes.</p> |DEPENDENT |jenkins.computer.total_swap_space[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].monitorData['hudson.node_monitors.SwapSpaceMonitor'].totalSwapSpace.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |Jenkins |Jenkins: Computer [{#DISPLAY_NAME}]: Clock difference |<p>The clock difference between the master and nodes.</p> |DEPENDENT |jenkins.computer.clock_difference[{#DISPLAY_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.computer.[?(@.displayName == "{#DISPLAY_NAME}")].monitorData['hudson.node_monitors.ClockMonitor'].diff.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `0.001`</p> |
-|Zabbix_raw_items |Jenkins: Get service metrics |<p>-</p> |HTTP_AGENT |jenkins.get_metrics |
-|Zabbix_raw_items |Jenkins: Get healthcheck | |HTTP_AGENT |jenkins.healthcheck |
-|Zabbix_raw_items |Jenkins: Get jobs info |<p>-</p> |HTTP_AGENT |jenkins.job_info |
-|Zabbix_raw_items |Jenkins: Get computer info |<p>-</p> |HTTP_AGENT |jenkins.computer_info |
+|Zabbix_raw_items |Jenkins: Get service metrics |<p>-</p> |HTTP_AGENT |jenkins.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Zabbix_raw_items |Jenkins: Get healthcheck | |HTTP_AGENT |jenkins.healthcheck<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Zabbix_raw_items |Jenkins: Get jobs info |<p>-</p> |HTTP_AGENT |jenkins.job_info<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Zabbix_raw_items |Jenkins: Get computer info |<p>-</p> |HTTP_AGENT |jenkins.computer_info<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Jenkins: Disk space is too low |<p>Jenkins disk space monitors are reporting the disk space as less than the configured threshold. The message will reference the first node which fails this check.</p><p>Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`{TEMPLATE_NAME:jenkins.disk_space.last()}=0 and {Jenkins by HTTP:jenkins.disk_space.message.strlen()}>0` |WARNING | |
-|Jenkins: One or more Jenkins plugins failed to start |<p>A failure is typically indicative of a potential issue within the Jenkins installation that will either be solved by explicitly disabling the failing plugin(s) or by resolving the corresponding plugin dependency issues. </p><p>Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`{TEMPLATE_NAME:jenkins.plugins.last()}=0 and {Jenkins by HTTP:jenkins.plugins.message.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Jenkins: Temporary space is too low |<p>Jenkins temporary space monitors are reporting the temporary space as less than the configured threshold. The message will reference the first node which fails this check.</p><p>Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`{TEMPLATE_NAME:jenkins.temporary_space.last()}=0 and {Jenkins by HTTP:jenkins.temporary_space.message.strlen()}>0` |WARNING | |
-|Jenkins: There are deadlocked threads in Jenkins master JVM |<p>There are any deadlocked threads in the Jenkins master JVM.</p><p>Health check message: {{ITEM.LASTVALUE2}.regsub('(.*)',\1)}</p> |`{TEMPLATE_NAME:jenkins.thread_deadlock.last()}=0 and {Jenkins by HTTP:jenkins.thread_deadlock.message.strlen()}>0` |WARNING | |
-|Jenkins: Service has no online nodes |<p>-</p> |`{TEMPLATE_NAME:jenkins.node.online.last()}=0` |AVERAGE | |
-|Jenkins: Version has changed (new version: {ITEM.VALUE}) |<p>Jenkins version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jenkins.version.diff()}=1 and {TEMPLATE_NAME:jenkins.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Jenkins: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:jenkins.system.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Jenkins: Current number of used files is too high (over {$JENKINS.FILE_DESCRIPTORS.MAX.WARN}% for 5m) |<p>-</p> |`{TEMPLATE_NAME:jenkins.descriptor.ratio.min(5m)}>{$JENKINS.FILE_DESCRIPTORS.MAX.WARN}` |WARNING | |
-|Jenkins: Service is down |<p>-</p> |`{TEMPLATE_NAME:jenkins.ping.last()}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Jenkins job [{#NAME}]: Job is unhealthy |<p>-</p> |`{TEMPLATE_NAME:jenkins.build.health[{#NAME}].last()}<{$JENKINS.JOB.HEALTH.SCORE.MIN.WARN}` |WARNING |<p>Manual close: YES</p> |
-|Jenkins: Computer [{#DISPLAY_NAME}]: Node is down |<p>Node down with reason: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`{TEMPLATE_NAME:jenkins.computer.state[{#DISPLAY_NAME}].last()}=1 and {Jenkins by HTTP:jenkins.computer.offline.reason[{#DISPLAY_NAME}].strlen()}>0` |AVERAGE |<p>**Depends on**:</p><p>- Jenkins: Computer [{#DISPLAY_NAME}]: Node is temporarily offline</p> |
-|Jenkins: Computer [{#DISPLAY_NAME}]: Node is temporarily offline |<p>Node is temporarily Offline with reason: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`{TEMPLATE_NAME:jenkins.computer.temp_offline[{#DISPLAY_NAME}].last()}=1 and {Jenkins by HTTP:jenkins.computer.offline.reason[{#DISPLAY_NAME}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
+|Jenkins: Disk space is too low |<p>Jenkins disk space monitors are reporting the disk space as less than the configured threshold. The message will reference the first node which fails this check.</p><p>Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`last(/Jenkins by HTTP/jenkins.disk_space)=0 and length(last(/Jenkins by HTTP/jenkins.disk_space.message))>0` |WARNING | |
+|Jenkins: One or more Jenkins plugins failed to start |<p>A failure is typically indicative of a potential issue within the Jenkins installation that will either be solved by explicitly disabling the failing plugin(s) or by resolving the corresponding plugin dependency issues.</p><p>Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`last(/Jenkins by HTTP/jenkins.plugins)=0 and length(last(/Jenkins by HTTP/jenkins.plugins.message))>0` |INFO |<p>Manual close: YES</p> |
+|Jenkins: Temporary space is too low |<p>Jenkins temporary space monitors are reporting the temporary space as less than the configured threshold. The message will reference the first node which fails this check.</p><p>Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`last(/Jenkins by HTTP/jenkins.temporary_space)=0 and length(last(/Jenkins by HTTP/jenkins.temporary_space.message))>0` |WARNING | |
+|Jenkins: There are deadlocked threads in Jenkins master JVM |<p>There are any deadlocked threads in the Jenkins master JVM.</p><p>Health check message: {{ITEM.LASTVALUE2}.regsub('(.*)',\1)}</p> |`last(/Jenkins by HTTP/jenkins.thread_deadlock)=0 and length(last(/Jenkins by HTTP/jenkins.thread_deadlock.message))>0` |WARNING | |
+|Jenkins: Service has no online nodes |<p>-</p> |`last(/Jenkins by HTTP/jenkins.node.online)=0` |AVERAGE | |
+|Jenkins: Version has changed (new version: {ITEM.VALUE}) |<p>Jenkins version has changed. Ack to close.</p> |`last(/Jenkins by HTTP/jenkins.version,#1)<>last(/Jenkins by HTTP/jenkins.version,#2) and length(last(/Jenkins by HTTP/jenkins.version))>0` |INFO |<p>Manual close: YES</p> |
+|Jenkins: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Jenkins by HTTP/jenkins.system.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Jenkins: Current number of used files is too high (over {$JENKINS.FILE_DESCRIPTORS.MAX.WARN}% for 5m) |<p>-</p> |`min(/Jenkins by HTTP/jenkins.descriptor.ratio,5m)>{$JENKINS.FILE_DESCRIPTORS.MAX.WARN}` |WARNING | |
+|Jenkins: Service is down |<p>-</p> |`last(/Jenkins by HTTP/jenkins.ping)=0` |AVERAGE |<p>Manual close: YES</p> |
+|Jenkins job [{#NAME}]: Job is unhealthy |<p>-</p> |`last(/Jenkins by HTTP/jenkins.build.health[{#NAME}])<{$JENKINS.JOB.HEALTH.SCORE.MIN.WARN}` |WARNING |<p>Manual close: YES</p> |
+|Jenkins: Computer [{#DISPLAY_NAME}]: Node is down |<p>Node down with reason: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`last(/Jenkins by HTTP/jenkins.computer.state[{#DISPLAY_NAME}])=1 and length(last(/Jenkins by HTTP/jenkins.computer.offline.reason[{#DISPLAY_NAME}]))>0` |AVERAGE |<p>**Depends on**:</p><p>- Jenkins: Computer [{#DISPLAY_NAME}]: Node is temporarily offline</p><p>- Jenkins: Service has no online nodes</p> |
+|Jenkins: Computer [{#DISPLAY_NAME}]: Node is temporarily offline |<p>Node is temporarily Offline with reason: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}</p> |`last(/Jenkins by HTTP/jenkins.computer.temp_offline[{#DISPLAY_NAME}])=1 and length(last(/Jenkins by HTTP/jenkins.computer.offline.reason[{#DISPLAY_NAME}]))>0` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/app/jenkins/template_app_jenkins.yaml b/templates/app/jenkins/template_app_jenkins.yaml
index b8e47e6e5d2..31b213c9844 100644
--- a/templates/app/jenkins/template_app_jenkins.yaml
+++ b/templates/app/jenkins/template_app_jenkins.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:25Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:27Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -204,7 +204,6 @@ zabbix_export:
               parameters:
                 - ''
           url: '{$JENKINS.URL}/metrics/{$JENKINS.API.KEY}/metrics'
-          status_codes: ''
           tags:
             -
               tag: Application
@@ -223,7 +222,6 @@ zabbix_export:
               parameters:
                 - ''
           url: '{$JENKINS.URL}/metrics/{$JENKINS.API.KEY}/healthcheck'
-          status_codes: ''
           tags:
             -
               tag: Application
@@ -1253,7 +1251,6 @@ zabbix_export:
               parameters:
                 - 30m
           url: '{$JENKINS.URL}/metrics/{$JENKINS.API.KEY}/ping'
-          status_codes: ''
           tags:
             -
               tag: Application
@@ -2530,7 +2527,7 @@ zabbix_export:
       name: 'Jenkins: One or more Jenkins plugins failed to start'
       priority: INFO
       description: |
-        A failure is typically indicative of a potential issue within the Jenkins installation that will either be solved by explicitly disabling the failing plugin(s) or by resolving the corresponding plugin dependency issues. 
+        A failure is typically indicative of a potential issue within the Jenkins installation that will either be solved by explicitly disabling the failing plugin(s) or by resolving the corresponding plugin dependency issues.
         Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}
       manual_close: 'YES'
     -
diff --git a/templates/app/kafka_jmx/README.md b/templates/app/kafka_jmx/README.md
index c22373eee11..a8e01cac2fe 100644
--- a/templates/app/kafka_jmx/README.md
+++ b/templates/app/kafka_jmx/README.md
@@ -3,14 +3,13 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official JMX Template for Apache Kafka.
 
 
 This template was tested on:
 
 - Apache Kafka, version 2.6.0
-- Zabbix, version 5.0, 5.2
 
 ## Setup
 
@@ -28,14 +27,14 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                       | Description                                                                       | Default              |
-|--------------------------------------------|-----------------------------------------------------------------------------------|----------------------|
-| {$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN}        | <p>The minimum Network processor average idle percent for trigger expression.</p> | `30`                 |
-| {$KAFKA.PASSWORD}                          | <p>-</p>                                                                          | `zabbix`             |
-| {$KAFKA.REQUEST_HANDLER_AVG_IDLE.MIN.WARN} | <p>The minimum Request handler average idle percent for trigger expression.</p>   | `30`                 |
-| {$KAFKA.TOPIC.MATCHES}                     | <p>Filter of discoverable topics</p>                                              | `.*`                 |
-| {$KAFKA.TOPIC.NOT_MATCHES}                 | <p>Filter to exclude discovered topics</p>                                        | `__consumer_offsets` |
-| {$KAFKA.USER}                              | <p>-</p>                                                                          | `zabbix`             |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN} |<p>The minimum Network processor average idle percent for trigger expression.</p> |`30` |
+|{$KAFKA.PASSWORD} |<p>-</p> |`zabbix` |
+|{$KAFKA.REQUEST_HANDLER_AVG_IDLE.MIN.WARN} |<p>The minimum Request handler average idle percent for trigger expression.</p> |`30` |
+|{$KAFKA.TOPIC.MATCHES} |<p>Filter of discoverable topics</p> |`.*` |
+|{$KAFKA.TOPIC.NOT_MATCHES} |<p>Filter to exclude discovered topics</p> |`__consumer_offsets` |
+|{$KAFKA.USER} |<p>-</p> |`zabbix` |
 
 ## Template links
 
@@ -43,99 +42,98 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                   | Description | Type | Key and additional info                                                                                                                                                                                                                                |
-|------------------------|-------------|------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Topic Metrics (write)  | <p>-</p>    | JMX  | jmx.discovery[beans,"kafka.server:type=BrokerTopicMetrics,name=MessagesInPerSec,topic=*"]<p>**Filter**:</p>AND <p>- A: {#JMXTOPIC} MATCHES_REGEX `{$KAFKA.TOPIC.MATCHES}`</p><p>- B: {#JMXTOPIC} NOT_MATCHES_REGEX `{$KAFKA.TOPIC.NOT_MATCHES}`</p>    |
-| Topic Metrics  (read)  | <p>-</p>    | JMX  | jmx.discovery[beans,"kafka.server:type=BrokerTopicMetrics,name=BytesOutPerSec,topic=*"]<p>**Filter**:</p>AND <p>- A: {#JMXTOPIC} MATCHES_REGEX `{$KAFKA.TOPIC.MATCHES}`</p><p>- B: {#JMXTOPIC} NOT_MATCHES_REGEX `{$KAFKA.TOPIC.NOT_MATCHES}`</p>      |
-| Topic Metrics (errors) | <p>-</p>    | JMX  | jmx.discovery[beans,"kafka.server:type=BrokerTopicMetrics,name=BytesRejectedPerSec,topic=*"]<p>**Filter**:</p>AND <p>- A: {#JMXTOPIC} MATCHES_REGEX `{$KAFKA.TOPIC.MATCHES}`</p><p>- B: {#JMXTOPIC} NOT_MATCHES_REGEX `{$KAFKA.TOPIC.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Topic Metrics (write) |<p>-</p> |JMX |jmx.discovery[beans,"kafka.server:type=BrokerTopicMetrics,name=MessagesInPerSec,topic=*"]<p>**Filter**:</p>AND <p>- {#JMXTOPIC} MATCHES_REGEX `{$KAFKA.TOPIC.MATCHES}`</p><p>- {#JMXTOPIC} NOT_MATCHES_REGEX `{$KAFKA.TOPIC.NOT_MATCHES}`</p> |
+|Topic Metrics  (read) |<p>-</p> |JMX |jmx.discovery[beans,"kafka.server:type=BrokerTopicMetrics,name=BytesOutPerSec,topic=*"]<p>**Filter**:</p>AND <p>- {#JMXTOPIC} MATCHES_REGEX `{$KAFKA.TOPIC.MATCHES}`</p><p>- {#JMXTOPIC} NOT_MATCHES_REGEX `{$KAFKA.TOPIC.NOT_MATCHES}`</p> |
+|Topic Metrics (errors) |<p>-</p> |JMX |jmx.discovery[beans,"kafka.server:type=BrokerTopicMetrics,name=BytesRejectedPerSec,topic=*"]<p>**Filter**:</p>AND <p>- {#JMXTOPIC} MATCHES_REGEX `{$KAFKA.TOPIC.MATCHES}`</p><p>- {#JMXTOPIC} NOT_MATCHES_REGEX `{$KAFKA.TOPIC.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group | Name                                                 | Description                                                                                                                                                    | Type | Key and additional info                                                                                                                               |
-|-------|------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Kafka | Kafka: Leader election per second                    | <p>Number of leader elections per second.</p>                                                                                                                  | JMX  | jmx["kafka.controller:type=ControllerStats,name=LeaderElectionRateAndTimeMs","Count"]                                                                 |
-| Kafka | Kafka: Unclean leader election per second            | <p>Number of “unclean” elections per second.</p>                                                                                                               | JMX  | jmx["kafka.controller:type=ControllerStats,name=UncleanLeaderElectionsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                 |
-| Kafka | Kafka: Controller state on broker                    | <p>One indicates that the broker is the controller for the cluster.</p>                                                                                        | JMX  | jmx["kafka.controller:type=KafkaController,name=ActiveControllerCount","Value"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>    |
-| Kafka | Kafka: Ineligible pending replica deletes            | <p>The number of ineligible pending replica deletes.</p>                                                                                                       | JMX  | jmx["kafka.controller:type=KafkaController,name=ReplicasIneligibleToDeleteCount","Value"]                                                             |
-| Kafka | Kafka: Pending replica deletes                       | <p>The number of pending replica deletes.</p>                                                                                                                  | JMX  | jmx["kafka.controller:type=KafkaController,name=ReplicasToDeleteCount","Value"]                                                                       |
-| Kafka | Kafka: Ineligible pending topic deletes              | <p>The number of ineligible pending topic deletes.</p>                                                                                                         | JMX  | jmx["kafka.controller:type=KafkaController,name=TopicsIneligibleToDeleteCount","Value"]                                                               |
-| Kafka | Kafka: Pending topic deletes                         | <p>The number of pending topic deletes.</p>                                                                                                                    | JMX  | jmx["kafka.controller:type=KafkaController,name=TopicsToDeleteCount","Value"]                                                                         |
-| Kafka | Kafka: Offline log directory count                   | <p>The number of offline log directories (for example, after a hardware failure).</p>                                                                          | JMX  | jmx["kafka.log:type=LogManager,name=OfflineLogDirectoryCount","Value"]                                                                                |
-| Kafka | Kafka: Offline partitions count                      | <p>Number of partitions that don't have an active leader.</p>                                                                                                  | JMX  | jmx["kafka.controller:type=KafkaController,name=OfflinePartitionsCount","Value"]                                                                      |
-| Kafka | Kafka: Bytes out per second                          | <p>The rate at which data is fetched and read from the broker by consumers.</p>                                                                                | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=BytesOutPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                |
-| Kafka | Kafka: Bytes in per second                           | <p>The rate at which data sent from producers is consumed by the broker.</p>                                                                                   | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=BytesInPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                 |
-| Kafka | Kafka: Messages in per second                        | <p>The rate at which individual messages are consumed by the broker.</p>                                                                                       | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=MessagesInPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                              |
-| Kafka | Kafka: Bytes rejected per second                     | <p>The rate at which bytes rejected per second by the broker.</p>                                                                                              | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=BytesRejectedPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                           |
-| Kafka | Kafka: Client fetch request failed per second        | <p>Number of client fetch request failures per second.</p>                                                                                                     | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=FailedFetchRequestsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                     |
-| Kafka | Kafka: Produce requests failed per second            | <p>Number of failed produce requests per second.</p>                                                                                                           | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=FailedProduceRequestsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                   |
-| Kafka | Kafka: Request handler average idle percent          | <p>Indicates the percentage of time that the request handler (IO) threads are not in use.</p>                                                                  | JMX  | jmx["kafka.server:type=KafkaRequestHandlerPool,name=RequestHandlerAvgIdlePercent","OneMinuteRate"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p> |
-| Kafka | Kafka: Fetch-Consumer response send time, mean       | <p>Average time taken, in milliseconds, to send the response.</p>                                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchConsumer","Mean"]                                                         |
-| Kafka | Kafka: Fetch-Consumer response send time, p95        | <p>The time taken, in milliseconds, to send the response for 95th percentile.</p>                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchConsumer","95thPercentile"]                                               |
-| Kafka | Kafka: Fetch-Consumer response send time, p99        | <p>The time taken, in milliseconds, to send the response for 99th percentile.</p>                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchConsumer","99thPercentile"]                                               |
-| Kafka | Kafka: Fetch-Follower response send time, mean       | <p>Average time taken, in milliseconds, to send the response.</p>                                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchFollower","Mean"]                                                         |
-| Kafka | Kafka: Fetch-Follower response send time, p95        | <p>The time taken, in milliseconds, to send the response for 95th percentile.</p>                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchFollower","95thPercentile"]                                               |
-| Kafka | Kafka: Fetch-Follower response send time, p99        | <p>The time taken, in milliseconds, to send the response for 99th percentile.</p>                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchFollower","99thPercentile"]                                               |
-| Kafka | Kafka: Produce response send time, mean              | <p>Average time taken, in milliseconds, to send the response.</p>                                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=Produce","Mean"]                                                               |
-| Kafka | Kafka: Produce response send time, p95               | <p>The time taken, in milliseconds, to send the response for 95th percentile.</p>                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=Produce","95thPercentile"]                                                     |
-| Kafka | Kafka: Produce response send time, p99               | <p>The time taken, in milliseconds, to send the response for 99th percentile.</p>                                                                              | JMX  | jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=Produce","99thPercentile"]                                                     |
-| Kafka | Kafka: Fetch-Consumer request total time, mean       | <p>Average time in ms to serve the Fetch-Consumer request.</p>                                                                                                 | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchConsumer","Mean"]                                                                |
-| Kafka | Kafka: Fetch-Consumer request total time, p95        | <p>Time in ms to serve the Fetch-Consumer request for 95th percentile.</p>                                                                                     | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchConsumer","95thPercentile"]                                                      |
-| Kafka | Kafka: Fetch-Consumer request total time, p99        | <p>Time in ms to serve the specified Fetch-Consumer for 99th percentile.</p>                                                                                   | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchConsumer","99thPercentile"]                                                      |
-| Kafka | Kafka: Fetch-Follower request total time, mean       | <p>Average time in ms to serve the Fetch-Follower request.</p>                                                                                                 | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchFollower","Mean"]                                                                |
-| Kafka | Kafka: Fetch-Follower request total time, p95        | <p>Time in ms to serve the Fetch-Follower request for 95th percentile.</p>                                                                                     | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchFollower","95thPercentile"]                                                      |
-| Kafka | Kafka: Fetch-Follower request total time, p99        | <p>Time in ms to serve the Fetch-Follower request for 99th percentile.</p>                                                                                     | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchFollower","99thPercentile"]                                                      |
-| Kafka | Kafka: Produce request total time, mean              | <p>Average time in ms to serve the Produce request.</p>                                                                                                        | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=Produce","Mean"]                                                                      |
-| Kafka | Kafka: Produce request total time, p95               | <p>Time in ms  to serve the Produce requests for 95th percentile.</p>                                                                                          | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=Produce","95thPercentile"]                                                            |
-| Kafka | Kafka: Produce request total time, p99               | <p>Time in ms  to serve the Produce requests for 99th percentile.</p>                                                                                          | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=Produce","99thPercentile"]                                                            |
-| Kafka | Kafka: Fetch-Consumer request total time, mean       | <p>Average time for a request to update metadata.</p>                                                                                                          | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=UpdateMetadata","Mean"]                                                               |
-| Kafka | Kafka: UpdateMetadata request total time, p95        | <p>Time for update metadata requests for 95th percentile.</p>                                                                                                  | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=UpdateMetadata","95thPercentile"]                                                     |
-| Kafka | Kafka: UpdateMetadata request total time, p99        | <p>Time for update metadata requests for 99th percentile.</p>                                                                                                  | JMX  | jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=UpdateMetadata","99thPercentile"]                                                     |
-| Kafka | Kafka: Temporary memory size in bytes (Fetch), max   | <p>The maximum of temporary memory used for converting message formats and decompressing messages.</p>                                                         | JMX  | jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Fetch","Max"]                                                                |
-| Kafka | Kafka: Temporary memory size in bytes (Fetch), avg   | <p>The amount of temporary memory used for converting message formats and decompressing messages.</p>                                                          | JMX  | jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Fetch","Mean"]                                                               |
-| Kafka | Kafka: Temporary memory size in bytes (Fetch), min   | <p>The minimum of temporary memory used for converting message formats and decompressing messages.</p>                                                         | JMX  | jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Fetch","Mean"]                                                               |
-| Kafka | Kafka: Temporary memory size in bytes (Produce), max | <p>The maximum of temporary memory used for converting message formats and decompressing messages.</p>                                                         | JMX  | jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Produce","Max"]                                                              |
-| Kafka | Kafka: Temporary memory size in bytes (Produce), avg | <p>The amount of temporary memory used for converting message formats and decompressing messages.</p>                                                          | JMX  | jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Produce","Mean"]                                                             |
-| Kafka | Kafka: Temporary memory size in bytes (Produce), min | <p>The minimum of temporary memory used for converting message formats and decompressing messages.</p>                                                         | JMX  | jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Produce","Min"]                                                              |
-| Kafka | Kafka: Network processor average idle percent        | <p>The average percentage of time that the network processors are idle.</p>                                                                                    | JMX  | jmx["kafka.network:type=SocketServer,name=NetworkProcessorAvgIdlePercent","Value"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p>                 |
-| Kafka | Kafka: Requests in producer purgatory                | <p>Number of requests waiting in producer purgatory.</p>                                                                                                       | JMX  | jmx["kafka.server:type=DelayedOperationPurgatory,name=PurgatorySize,delayedOperation=Fetch","Value"]                                                  |
-| Kafka | Kafka: Requests in fetch purgatory                   | <p>Number of requests waiting in fetch purgatory.</p>                                                                                                          | JMX  | jmx["kafka.server:type=DelayedOperationPurgatory,name=PurgatorySize,delayedOperation=Produce","Value"]                                                |
-| Kafka | Kafka: Replication maximum lag                       | <p>The maximum lag between the time that messages are received by the leader replica and by the follower replicas.</p>                                         | JMX  | jmx["kafka.server:type=ReplicaFetcherManager,name=MaxLag,clientId=Replica","Value"]                                                                   |
-| Kafka | Kafka: Under minimum ISR partition count             | <p>The number of partitions under the minimum In-Sync Replica (ISR) count.</p>                                                                                 | JMX  | jmx["kafka.server:type=ReplicaManager,name=UnderMinIsrPartitionCount","Value"]                                                                        |
-| Kafka | Kafka: Under replicated partitions                   | <p>The number of partitions that have not been fully replicated in the follower replicas (the number of non-reassigning replicas - the number of ISR > 0).</p> | JMX  | jmx["kafka.server:type=ReplicaManager,name=UnderReplicatedPartitions","Value"]                                                                        |
-| Kafka | Kafka: ISR expands per second                        | <p>The rate at which the number of ISRs in the broker increases.</p>                                                                                           | JMX  | jmx["kafka.server:type=ReplicaManager,name=IsrExpandsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                  |
-| Kafka | Kafka: ISR shrink per second                         | <p>Rate of replicas leaving the ISR pool.</p>                                                                                                                  | JMX  | jmx["kafka.server:type=ReplicaManager,name=IsrShrinksPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                  |
-| Kafka | Kafka: Leader count                                  | <p>The number of replicas for which this broker is the leader.</p>                                                                                             | JMX  | jmx["kafka.server:type=ReplicaManager,name=LeaderCount","Value"]                                                                                      |
-| Kafka | Kafka: Partition count                               | <p>The number of partitions in the broker.</p>                                                                                                                 | JMX  | jmx["kafka.server:type=ReplicaManager,name=PartitionCount","Value"]                                                                                   |
-| Kafka | Kafka: Number of reassigning partitions              | <p>The number of reassigning leader partitions on a broker.</p>                                                                                                | JMX  | jmx["kafka.server:type=ReplicaManager,name=ReassigningPartitions","Value"]                                                                            |
-| Kafka | Kafka: Request queue size                            | <p>The size of the delay queue.</p>                                                                                                                            | JMX  | jmx["kafka.server:type=Request","queue-size"]                                                                                                         |
-| Kafka | Kafka: Version                                       | <p>Current version of brocker.</p>                                                                                                                             | JMX  | jmx["kafka.server:type=app-info","version"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                        |
-| Kafka | Kafka: Uptime                                        | <p>Service uptime in seconds.</p>                                                                                                                              | JMX  | jmx["kafka.server:type=app-info","start-time-ms"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (Math.floor((Date.now()-Number(value))/1000))`</p> |
-| Kafka | Kafka: ZooKeeper client request latency              | <p>Latency in milliseconds for ZooKeeper requests from broker.</p>                                                                                              | JMX  | jmx["kafka.server:type=ZooKeeperClientMetrics,name=ZooKeeperRequestLatencyMs","Count"]                                                                |
-| Kafka | Kafka: ZooKeeper connection status                   | <p>Connection status of broker's ZooKeeper session.</p>                                                                                                        | JMX  | jmx["kafka.server:type=SessionExpireListener,name=SessionState","Value"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>           |
-| Kafka | Kafka: ZooKeeper disconnect rate                     | <p>ZooKeeper client disconnect per second.</p>                                                                                                                 | JMX  | jmx["kafka.server:type=SessionExpireListener,name=ZooKeeperDisconnectsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                 |
-| Kafka | Kafka: ZooKeeper session expiration rate             | <p>ZooKeeper client session expiration  per second.</p>                                                                                                        | JMX  | jmx["kafka.server:type=SessionExpireListener,name=ZooKeeperExpiresPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                     |
-| Kafka | Kafka: ZooKeeper readonly rate                       | <p>ZooKeeper client readonly  per second.</p>                                                                                                                  | JMX  | jmx["kafka.server:type=SessionExpireListener,name=ZooKeeperReadOnlyConnectsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND            |
-| Kafka | Kafka: ZooKeeper sync rate                           | <p>ZooKeeper client sync  per second.</p>                                                                                                                      | JMX  | jmx["kafka.server:type=SessionExpireListener,name=ZooKeeperSyncConnectsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                |
-| Kafka | Kafka {#JMXTOPIC}: Messages in per second            | <p>The rate at which individual messages are consumed by topic.</p>                                                                                            | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=MessagesInPerSec,topic={#JMXTOPIC}","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND            |
-| Kafka | Kafka {#JMXTOPIC}: Bytes in per second               | <p>The rate at which data sent from producers is consumed by topic.</p>                                                                                        | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=BytesInPerSec,topic={#JMXTOPIC}","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND               |
-| Kafka | Kafka {#JMXTOPIC}: Bytes out per second              | <p>The rate at which data is fetched and read from the broker by consumers (by topic).</p>                                                                     | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=BytesOutPerSec,topic={#JMXTOPIC}","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND              |
-| Kafka | Kafka {#JMXTOPIC}: Bytes rejected per second         | <p>Rejected bytes rate by topic.</p>                                                                                                                           | JMX  | jmx["kafka.server:type=BrokerTopicMetrics,name=BytesRejectedPerSec,topic={#JMXTOPIC}","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND         |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Kafka |Kafka: Leader election per second |<p>Number of leader elections per second.</p> |JMX |jmx["kafka.controller:type=ControllerStats,name=LeaderElectionRateAndTimeMs","Count"] |
+|Kafka |Kafka: Unclean leader election per second |<p>Number of “unclean” elections per second.</p> |JMX |jmx["kafka.controller:type=ControllerStats,name=UncleanLeaderElectionsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: Controller state on broker |<p>One indicates that the broker is the controller for the cluster.</p> |JMX |jmx["kafka.controller:type=KafkaController,name=ActiveControllerCount","Value"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Kafka |Kafka: Ineligible pending replica deletes |<p>The number of ineligible pending replica deletes.</p> |JMX |jmx["kafka.controller:type=KafkaController,name=ReplicasIneligibleToDeleteCount","Value"] |
+|Kafka |Kafka: Pending replica deletes |<p>The number of pending replica deletes.</p> |JMX |jmx["kafka.controller:type=KafkaController,name=ReplicasToDeleteCount","Value"] |
+|Kafka |Kafka: Ineligible pending topic deletes |<p>The number of ineligible pending topic deletes.</p> |JMX |jmx["kafka.controller:type=KafkaController,name=TopicsIneligibleToDeleteCount","Value"] |
+|Kafka |Kafka: Pending topic deletes |<p>The number of pending topic deletes.</p> |JMX |jmx["kafka.controller:type=KafkaController,name=TopicsToDeleteCount","Value"] |
+|Kafka |Kafka: Offline log directory count |<p>The number of offline log directories (for example, after a hardware failure).</p> |JMX |jmx["kafka.log:type=LogManager,name=OfflineLogDirectoryCount","Value"] |
+|Kafka |Kafka: Offline partitions count |<p>Number of partitions that don't have an active leader.</p> |JMX |jmx["kafka.controller:type=KafkaController,name=OfflinePartitionsCount","Value"] |
+|Kafka |Kafka: Bytes out per second |<p>The rate at which data is fetched and read from the broker by consumers.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=BytesOutPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: Bytes in per second |<p>The rate at which data sent from producers is consumed by the broker.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=BytesInPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: Messages in per second |<p>The rate at which individual messages are consumed by the broker.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=MessagesInPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: Bytes rejected per second |<p>The rate at which bytes rejected per second by the broker.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=BytesRejectedPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: Client fetch request failed per second |<p>Number of client fetch request failures per second.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=FailedFetchRequestsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: Produce requests failed per second |<p>Number of failed produce requests per second.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=FailedProduceRequestsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: Request handler average idle percent |<p>Indicates the percentage of time that the request handler (IO) threads are not in use.</p> |JMX |jmx["kafka.server:type=KafkaRequestHandlerPool,name=RequestHandlerAvgIdlePercent","OneMinuteRate"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p> |
+|Kafka |Kafka: Fetch-Consumer response send time, mean |<p>Average time taken, in milliseconds, to send the response.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchConsumer","Mean"] |
+|Kafka |Kafka: Fetch-Consumer response send time, p95 |<p>The time taken, in milliseconds, to send the response for 95th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchConsumer","95thPercentile"] |
+|Kafka |Kafka: Fetch-Consumer response send time, p99 |<p>The time taken, in milliseconds, to send the response for 99th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchConsumer","99thPercentile"] |
+|Kafka |Kafka: Fetch-Follower response send time, mean |<p>Average time taken, in milliseconds, to send the response.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchFollower","Mean"] |
+|Kafka |Kafka: Fetch-Follower response send time, p95 |<p>The time taken, in milliseconds, to send the response for 95th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchFollower","95thPercentile"] |
+|Kafka |Kafka: Fetch-Follower response send time, p99 |<p>The time taken, in milliseconds, to send the response for 99th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=FetchFollower","99thPercentile"] |
+|Kafka |Kafka: Produce response send time, mean |<p>Average time taken, in milliseconds, to send the response.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=Produce","Mean"] |
+|Kafka |Kafka: Produce response send time, p95 |<p>The time taken, in milliseconds, to send the response for 95th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=Produce","95thPercentile"] |
+|Kafka |Kafka: Produce response send time, p99 |<p>The time taken, in milliseconds, to send the response for 99th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=ResponseSendTimeMs,request=Produce","99thPercentile"] |
+|Kafka |Kafka: Fetch-Consumer request total time, mean |<p>Average time in ms to serve the Fetch-Consumer request.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchConsumer","Mean"] |
+|Kafka |Kafka: Fetch-Consumer request total time, p95 |<p>Time in ms to serve the Fetch-Consumer request for 95th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchConsumer","95thPercentile"] |
+|Kafka |Kafka: Fetch-Consumer request total time, p99 |<p>Time in ms to serve the specified Fetch-Consumer for 99th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchConsumer","99thPercentile"] |
+|Kafka |Kafka: Fetch-Follower request total time, mean |<p>Average time in ms to serve the Fetch-Follower request.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchFollower","Mean"] |
+|Kafka |Kafka: Fetch-Follower request total time, p95 |<p>Time in ms to serve the Fetch-Follower request for 95th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchFollower","95thPercentile"] |
+|Kafka |Kafka: Fetch-Follower request total time, p99 |<p>Time in ms to serve the Fetch-Follower request for 99th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=FetchFollower","99thPercentile"] |
+|Kafka |Kafka: Produce request total time, mean |<p>Average time in ms to serve the Produce request.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=Produce","Mean"] |
+|Kafka |Kafka: Produce request total time, p95 |<p>Time in ms  to serve the Produce requests for 95th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=Produce","95thPercentile"] |
+|Kafka |Kafka: Produce request total time, p99 |<p>Time in ms  to serve the Produce requests for 99th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=Produce","99thPercentile"] |
+|Kafka |Kafka: Fetch-Consumer request total time, mean |<p>Average time for a request to update metadata.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=UpdateMetadata","Mean"] |
+|Kafka |Kafka: UpdateMetadata request total time, p95 |<p>Time for update metadata requests for 95th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=UpdateMetadata","95thPercentile"] |
+|Kafka |Kafka: UpdateMetadata request total time, p99 |<p>Time for update metadata requests for 99th percentile.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TotalTimeMs,request=UpdateMetadata","99thPercentile"] |
+|Kafka |Kafka: Temporary memory size in bytes (Fetch), max |<p>The maximum of temporary memory used for converting message formats and decompressing messages.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Fetch","Max"] |
+|Kafka |Kafka: Temporary memory size in bytes (Fetch), min |<p>The minimum of temporary memory used for converting message formats and decompressing messages.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Fetch","Mean"] |
+|Kafka |Kafka: Temporary memory size in bytes (Produce), max |<p>The maximum of temporary memory used for converting message formats and decompressing messages.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Produce","Max"] |
+|Kafka |Kafka: Temporary memory size in bytes (Produce), avg |<p>The amount of temporary memory used for converting message formats and decompressing messages.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Produce","Mean"] |
+|Kafka |Kafka: Temporary memory size in bytes (Produce), min |<p>The minimum of temporary memory used for converting message formats and decompressing messages.</p> |JMX |jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Produce","Min"] |
+|Kafka |Kafka: Network processor average idle percent |<p>The average percentage of time that the network processors are idle.</p> |JMX |jmx["kafka.network:type=SocketServer,name=NetworkProcessorAvgIdlePercent","Value"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p> |
+|Kafka |Kafka: Requests in producer purgatory |<p>Number of requests waiting in producer purgatory.</p> |JMX |jmx["kafka.server:type=DelayedOperationPurgatory,name=PurgatorySize,delayedOperation=Fetch","Value"] |
+|Kafka |Kafka: Requests in fetch purgatory |<p>Number of requests waiting in fetch purgatory.</p> |JMX |jmx["kafka.server:type=DelayedOperationPurgatory,name=PurgatorySize,delayedOperation=Produce","Value"] |
+|Kafka |Kafka: Replication maximum lag |<p>The maximum lag between the time that messages are received by the leader replica and by the follower replicas.</p> |JMX |jmx["kafka.server:type=ReplicaFetcherManager,name=MaxLag,clientId=Replica","Value"] |
+|Kafka |Kafka: Under minimum ISR partition count |<p>The number of partitions under the minimum In-Sync Replica (ISR) count.</p> |JMX |jmx["kafka.server:type=ReplicaManager,name=UnderMinIsrPartitionCount","Value"] |
+|Kafka |Kafka: Under replicated partitions |<p>The number of partitions that have not been fully replicated in the follower replicas (the number of non-reassigning replicas - the number of ISR > 0).</p> |JMX |jmx["kafka.server:type=ReplicaManager,name=UnderReplicatedPartitions","Value"] |
+|Kafka |Kafka: ISR expands per second |<p>The rate at which the number of ISRs in the broker increases.</p> |JMX |jmx["kafka.server:type=ReplicaManager,name=IsrExpandsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: ISR shrink per second |<p>Rate of replicas leaving the ISR pool.</p> |JMX |jmx["kafka.server:type=ReplicaManager,name=IsrShrinksPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: Leader count |<p>The number of replicas for which this broker is the leader.</p> |JMX |jmx["kafka.server:type=ReplicaManager,name=LeaderCount","Value"] |
+|Kafka |Kafka: Partition count |<p>The number of partitions in the broker.</p> |JMX |jmx["kafka.server:type=ReplicaManager,name=PartitionCount","Value"] |
+|Kafka |Kafka: Number of reassigning partitions |<p>The number of reassigning leader partitions on a broker.</p> |JMX |jmx["kafka.server:type=ReplicaManager,name=ReassigningPartitions","Value"] |
+|Kafka |Kafka: Request queue size |<p>The size of the delay queue.</p> |JMX |jmx["kafka.server:type=Request","queue-size"] |
+|Kafka |Kafka: Version |<p>Current version of broker.</p> |JMX |jmx["kafka.server:type=app-info","version"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Kafka |Kafka: Uptime |<p>Service uptime in seconds.</p> |JMX |jmx["kafka.server:type=app-info","start-time-ms"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (Math.floor((Date.now()-Number(value))/1000))`</p> |
+|Kafka |Kafka: ZooKeeper client request latency |<p>Latency in milliseconds for ZooKeeper requests from broker.</p> |JMX |jmx["kafka.server:type=ZooKeeperClientMetrics,name=ZooKeeperRequestLatencyMs","Count"] |
+|Kafka |Kafka: ZooKeeper connection status |<p>Connection status of broker's ZooKeeper session.</p> |JMX |jmx["kafka.server:type=SessionExpireListener,name=SessionState","Value"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Kafka |Kafka: ZooKeeper disconnect rate |<p>ZooKeeper client disconnect per second.</p> |JMX |jmx["kafka.server:type=SessionExpireListener,name=ZooKeeperDisconnectsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: ZooKeeper session expiration rate |<p>ZooKeeper client session expiration  per second.</p> |JMX |jmx["kafka.server:type=SessionExpireListener,name=ZooKeeperExpiresPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: ZooKeeper readonly rate |<p>ZooKeeper client readonly  per second.</p> |JMX |jmx["kafka.server:type=SessionExpireListener,name=ZooKeeperReadOnlyConnectsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka: ZooKeeper sync rate |<p>ZooKeeper client sync  per second.</p> |JMX |jmx["kafka.server:type=SessionExpireListener,name=ZooKeeperSyncConnectsPerSec","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka {#JMXTOPIC}: Messages in per second |<p>The rate at which individual messages are consumed by topic.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=MessagesInPerSec,topic={#JMXTOPIC}","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka {#JMXTOPIC}: Bytes in per second |<p>The rate at which data sent from producers is consumed by topic.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=BytesInPerSec,topic={#JMXTOPIC}","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka {#JMXTOPIC}: Bytes out per second |<p>The rate at which data is fetched and read from the broker by consumers (by topic).</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=BytesOutPerSec,topic={#JMXTOPIC}","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Kafka |Kafka {#JMXTOPIC}: Bytes rejected per second |<p>Rejected bytes rate by topic.</p> |JMX |jmx["kafka.server:type=BrokerTopicMetrics,name=BytesRejectedPerSec,topic={#JMXTOPIC}","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
-| Name                                                                                                              | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Expression                                                                                                                                                               | Severity | Dependencies and additional info |
-|-------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| Kafka: Unclean leader election detected                                                                           | <p>Unclean leader elections occur when there is no qualified partition leader among Kafka brokers. If Kafka is configured to allow an unclean leader election, a leader is chosen from the out-of-sync replicas, and any messages that were not synced prior to the loss of the former leader are lost forever. Essentially, unclean leader elections sacrifice consistency for availability.</p>                                                                                                                                                   | `{TEMPLATE_NAME:jmx["kafka.controller:type=ControllerStats,name=UncleanLeaderElectionsPerSec","Count"].last()}>0`                                                        | AVERAGE  |                                  |
-| Kafka: There are offline log directories                                                                          | <p>The offline log directory count metric indicate the number of log directories which are offline (due to an hardware failure for example) so that the broker cannot store incoming messages anymore.</p>                                                                                                                                                                                                                                                                                                                                          | `{TEMPLATE_NAME:jmx["kafka.log:type=LogManager,name=OfflineLogDirectoryCount","Value"].last()} > 0`                                                                      | WARNING  |                                  |
-| Kafka: One or more partitions have no leader                                                                      | <p>Any partition without an active leader will be completely inaccessible, and both consumers and producers of that partition will be blocked until a leader becomes available.</p>                                                                                                                                                                                                                                                                                                                                                                 | `{TEMPLATE_NAME:jmx["kafka.controller:type=KafkaController,name=OfflinePartitionsCount","Value"].last()} > 0`                                                            | WARNING  |                                  |
-| Kafka: Request handler average idle percent is too low (under {$KAFKA.REQUEST_HANDLER_AVG_IDLE.MIN.WARN} for 15m) | <p>The request handler idle ratio metric indicates the percentage of time the request handlers are not in use. The lower this number, the more loaded the broker is.</p>                                                                                                                                                                                                                                                                                                                                                                            | `{TEMPLATE_NAME:jmx["kafka.server:type=KafkaRequestHandlerPool,name=RequestHandlerAvgIdlePercent","OneMinuteRate"].max(15m)}<{$KAFKA.REQUEST_HANDLER_AVG_IDLE.MIN.WARN}` | AVERAGE  |                                  |
-| Kafka: Network processor average idle percent is too low (under {$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN} for 15m)      | <p>The network processor idle ratio metric indicates the percentage of time the network processor are not in use. The lower this number, the more loaded the broker is.</p>                                                                                                                                                                                                                                                                                                                                                                         | `{TEMPLATE_NAME:jmx["kafka.network:type=SocketServer,name=NetworkProcessorAvgIdlePercent","Value"].max(15m)}<{$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN}`                        | AVERAGE  |                                  |
-| Kafka: Failed to fetch info data (or no data for 15m)                                                             | <p>Zabbix has not received data for items for the last 15 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `{TEMPLATE_NAME:jmx["kafka.network:type=SocketServer,name=NetworkProcessorAvgIdlePercent","Value"].nodata(15m)}=1`                                                       | WARNING  |                                  |
-| Kafka: There are partitions under the min ISR                                                                     | <p>The Under min ISR partitions metric displays the number of partitions, where the number of In-Sync Replicas (ISR) is less than the minimum number of in-sync replicas specified. The two most common causes of under-min ISR partitions are that one or more brokers is unresponsive, or the cluster is experiencing performance issues and one or more brokers are falling behind.</p>                                                                                                                                                          | `{TEMPLATE_NAME:jmx["kafka.server:type=ReplicaManager,name=UnderMinIsrPartitionCount","Value"].last()}>0`                                                                | AVERAGE  |                                  |
-| Kafka: There are under replicated partitions                                                                      | <p>The Under replicated partitions metric displays the number of partitions that do not have enough replicas to meet the desired replication factor. A partition will also be considered under-replicated if the correct number of replicas exist, but one or more of the replicas have fallen significantly behind the partition leader. The two most common causes of under-replicated partitions are that one or more brokers is unresponsive, or the cluster is experiencing performance issues and one or more brokers have fallen behind.</p> | `{TEMPLATE_NAME:jmx["kafka.server:type=ReplicaManager,name=UnderReplicatedPartitions","Value"].last()}>0`                                                                | AVERAGE  |                                  |
-| Kafka: Version has changed (new version: {ITEM.VALUE})                                                            | <p>Kafka version has changed. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:jmx["kafka.server:type=app-info","version"].diff()}=1 and {TEMPLATE_NAME:jmx["kafka.server:type=app-info","version"].strlen()}>0`                        | INFO     | <p>Manual close: YES</p>         |
-| Kafka: has been restarted (uptime < 10m)                                                                          | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `{TEMPLATE_NAME:jmx["kafka.server:type=app-info","start-time-ms"].last()}<10m`                                                                                           | INFO     | <p>Manual close: YES</p>         |
-| Kafka: Broker is not connected to ZooKeeper                                                                       | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `{TEMPLATE_NAME:jmx["kafka.server:type=SessionExpireListener,name=SessionState","Value"].regexp("CONNECTED")}=0`                                                         | AVERAGE  |                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Kafka: Unclean leader election detected |<p>Unclean leader elections occur when there is no qualified partition leader among Kafka brokers. If Kafka is configured to allow an unclean leader election, a leader is chosen from the out-of-sync replicas, and any messages that were not synced prior to the loss of the former leader are lost forever. Essentially, unclean leader elections sacrifice consistency for availability.</p> |`last(/Apache Kafka by JMX/jmx["kafka.controller:type=ControllerStats,name=UncleanLeaderElectionsPerSec","Count"])>0` |AVERAGE | |
+|Kafka: There are offline log directories |<p>The offline log directory count metric indicate the number of log directories which are offline (due to an hardware failure for example) so that the broker cannot store incoming messages anymore.</p> |`last(/Apache Kafka by JMX/jmx["kafka.log:type=LogManager,name=OfflineLogDirectoryCount","Value"]) > 0` |WARNING | |
+|Kafka: One or more partitions have no leader |<p>Any partition without an active leader will be completely inaccessible, and both consumers and producers of that partition will be blocked until a leader becomes available.</p> |`last(/Apache Kafka by JMX/jmx["kafka.controller:type=KafkaController,name=OfflinePartitionsCount","Value"]) > 0` |WARNING | |
+|Kafka: Request handler average idle percent is too low (under {$KAFKA.REQUEST_HANDLER_AVG_IDLE.MIN.WARN} for 15m) |<p>The request handler idle ratio metric indicates the percentage of time the request handlers are not in use. The lower this number, the more loaded the broker is.</p> |`max(/Apache Kafka by JMX/jmx["kafka.server:type=KafkaRequestHandlerPool,name=RequestHandlerAvgIdlePercent","OneMinuteRate"],15m)<{$KAFKA.REQUEST_HANDLER_AVG_IDLE.MIN.WARN}` |AVERAGE | |
+|Kafka: Network processor average idle percent is too low (under {$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN} for 15m) |<p>The network processor idle ratio metric indicates the percentage of time the network processor are not in use. The lower this number, the more loaded the broker is.</p> |`max(/Apache Kafka by JMX/jmx["kafka.network:type=SocketServer,name=NetworkProcessorAvgIdlePercent","Value"],15m)<{$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN}` |AVERAGE | |
+|Kafka: Failed to fetch info data (or no data for 15m) |<p>Zabbix has not received data for items for the last 15 minutes</p> |`nodata(/Apache Kafka by JMX/jmx["kafka.network:type=SocketServer,name=NetworkProcessorAvgIdlePercent","Value"],15m)=1` |WARNING | |
+|Kafka: There are partitions under the min ISR |<p>The Under min ISR partitions metric displays the number of partitions, where the number of In-Sync Replicas (ISR) is less than the minimum number of in-sync replicas specified. The two most common causes of under-min ISR partitions are that one or more brokers is unresponsive, or the cluster is experiencing performance issues and one or more brokers are falling behind.</p> |`last(/Apache Kafka by JMX/jmx["kafka.server:type=ReplicaManager,name=UnderMinIsrPartitionCount","Value"])>0` |AVERAGE | |
+|Kafka: There are under replicated partitions |<p>The Under replicated partitions metric displays the number of partitions that do not have enough replicas to meet the desired replication factor. A partition will also be considered under-replicated if the correct number of replicas exist, but one or more of the replicas have fallen significantly behind the partition leader. The two most common causes of under-replicated partitions are that one or more brokers is unresponsive, or the cluster is experiencing performance issues and one or more brokers have fallen behind.</p> |`last(/Apache Kafka by JMX/jmx["kafka.server:type=ReplicaManager,name=UnderReplicatedPartitions","Value"])>0` |AVERAGE | |
+|Kafka: Version has changed (new version: {ITEM.VALUE}) |<p>Kafka version has changed. Ack to close.</p> |`last(/Apache Kafka by JMX/jmx["kafka.server:type=app-info","version"],#1)<>last(/Apache Kafka by JMX/jmx["kafka.server:type=app-info","version"],#2) and length(last(/Apache Kafka by JMX/jmx["kafka.server:type=app-info","version"]))>0` |INFO |<p>Manual close: YES</p> |
+|Kafka: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Apache Kafka by JMX/jmx["kafka.server:type=app-info","start-time-ms"])<10m` |INFO |<p>Manual close: YES</p> |
+|Kafka: Broker is not connected to ZooKeeper |<p>-</p> |`find(/Apache Kafka by JMX/jmx["kafka.server:type=SessionExpireListener,name=SessionState","Value"],,"regexp","CONNECTED")=0` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/kafka_jmx/template_app_kafka_jmx.yaml b/templates/app/kafka_jmx/template_app_kafka_jmx.yaml
index 048bb5331e0..2cc3963923b 100644
--- a/templates/app/kafka_jmx/template_app_kafka_jmx.yaml
+++ b/templates/app/kafka_jmx/template_app_kafka_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:15Z'
+  version: '6.0'
+  date: '2022-01-10T07:39:26Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -667,7 +667,7 @@ zabbix_export:
           value_type: CHAR
           username: '{$KAFKA.USER}'
           password: '{$KAFKA.PASSWORD}'
-          description: 'Current version of brocker.'
+          description: 'Current version of broker.'
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1359,7 +1359,7 @@ zabbix_export:
             key: 'jmx["kafka.server:type=ReplicaManager,name=IsrExpandsPerSec","Count"]'
     -
       uuid: bd0b892058df48d5939f2ab9de9c2768
-      name: 'Kafka: Leader electoin rate'
+      name: 'Kafka: Leader election rate'
       graph_items:
         -
           color: 1A7C11
@@ -1538,16 +1538,9 @@ zabbix_export:
             key: 'jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Fetch","Mean"]'
         -
           sortorder: '4'
-          drawtype: BOLD_LINE
           color: FC6EA3
           item:
             host: 'Apache Kafka by JMX'
-            key: 'jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Fetch","Mean"]'
-        -
-          sortorder: '5'
-          color: 6C59DC
-          item:
-            host: 'Apache Kafka by JMX'
             key: 'jmx["kafka.network:type=RequestMetrics,name=TemporaryMemoryBytes,request=Fetch","Max"]'
     -
       uuid: e5f69b35415b49168fba4ffa10e75f25
diff --git a/templates/app/memcached/README.md b/templates/app/memcached/README.md
index a45a528b966..6c99e9022a9 100644
--- a/templates/app/memcached/README.md
+++ b/templates/app/memcached/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Memcached server by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -30,13 +30,13 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                 | Description                                                                                                                                                                                                                                                       | Default                 |
-|--------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------|
-| {$MEMCACHED.CONN.PRC.MAX.WARN}       | <p>Maximum percentage of connected clients</p>                                                                                                                                                                                                                    | `80`                    |
-| {$MEMCACHED.CONN.QUEUED.MAX.WARN}    | <p>Maximum number of queued connections per second</p>                                                                                                                                                                                                            | `1`                     |
-| {$MEMCACHED.CONN.THROTTLED.MAX.WARN} | <p>Maximum number of throttled connections per second</p>                                                                                                                                                                                                         | `1`                     |
-| {$MEMCACHED.CONN.URI}                | <p>Connection string in the URI format (password is not used). This param overwrites a value configured in the "Plugins.Memcached.Uri" option of the configuration file (if it's set), otherwise, the plugin's default value is used: "tcp://localhost:11211"</p> | `tcp://localhost:11211` |
-| {$MEMCACHED.MEM.PUSED.MAX.WARN}      | <p>Maximum percentage of memory used</p>                                                                                                                                                                                                                          | `90`                    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$MEMCACHED.CONN.PRC.MAX.WARN} |<p>Maximum percentage of connected clients</p> |`80` |
+|{$MEMCACHED.CONN.QUEUED.MAX.WARN} |<p>Maximum number of queued connections per second</p> |`1` |
+|{$MEMCACHED.CONN.THROTTLED.MAX.WARN} |<p>Maximum number of throttled connections per second</p> |`1` |
+|{$MEMCACHED.CONN.URI} |<p>Connection string in the URI format (password is not used). This param overwrites a value configured in the "Plugins.Memcached.Uri" option of the configuration file (if it's set), otherwise, the plugin's default value is used: "tcp://localhost:11211"</p> |`tcp://localhost:11211` |
+|{$MEMCACHED.MEM.PUSED.MAX.WARN} |<p>Maximum percentage of memory used</p> |`90` |
 
 ## Template links
 
@@ -47,47 +47,47 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group            | Name                                      | Description                                                                                                                                                                                                                                                                                                                                         | Type           | Key and additional info                                                                                                                  |
-|------------------|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|------------------------------------------------------------------------------------------------------------------------------------------|
-| Memcached        | Memcached: Ping                           |                                                                                                                                                                                                                                                                                                                                                     | ZABBIX_PASSIVE | memcached.ping["{$MEMCACHED.CONN.URI}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                              |
-| Memcached        | Memcached: Max connections                | <p>Max number of concurrent connections</p>                                                                                                                                                                                                                                                                                                         | DEPENDENT      | memcached.connections.max<p>**Preprocessing**:</p><p>- JSONPATH: `$.max_connections`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p>      |
-| Memcached        | Memcached: Maximum number of bytes        | <p>Maximum number of bytes allowed in cache. You can adjust this setting via a config file or the command line while starting your Memcached server.</p>                                                                                                                                                                                            | DEPENDENT      | memcached.config.limit_maxbytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.limit_maxbytes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
-| Memcached        | Memcached: CPU sys                        | <p>System CPU consumed by the Memcached server</p>                                                                                                                                                                                                                                                                                                  | DEPENDENT      | memcached.cpu.sys<p>**Preprocessing**:</p><p>- JSONPATH: `$.rusage_system`</p>                                                           |
-| Memcached        | Memcached: CPU user                       | <p>User CPU consumed by the Memcached server</p>                                                                                                                                                                                                                                                                                                    | DEPENDENT      | memcached.cpu.user<p>**Preprocessing**:</p><p>- JSONPATH: `$.rusage_user`</p>                                                            |
-| Memcached        | Memcached: Queued connections per second  | <p>Number of times that memcached has hit its connections limit and disabled its listener</p>                                                                                                                                                                                                                                                       | DEPENDENT      | memcached.connections.queued.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.listen_disabled_num`</p><p>- CHANGE_PER_SECOND               |
-| Memcached        | Memcached: New connections per second     | <p>Number of connections opened per second</p>                                                                                                                                                                                                                                                                                                      | DEPENDENT      | memcached.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_connections`</p><p>- CHANGE_PER_SECOND                        |
-| Memcached        | Memcached: Throttled connections          | <p>Number of times a client connection was throttled. When sending GETs in batch mode and the connection contains too many requests (limited by -R parameter) the connection might be throttled to prevent starvation.</p>                                                                                                                          | DEPENDENT      | memcached.connections.throttled.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.conn_yields`</p><p>- CHANGE_PER_SECOND                    |
-| Memcached        | Memcached: Connection structures          | <p>Number of  connection structures allocated by the server</p>                                                                                                                                                                                                                                                                                     | DEPENDENT      | memcached.connections.structures<p>**Preprocessing**:</p><p>- JSONPATH: `$.connection_structures`</p>                                    |
-| Memcached        | Memcached: Open connections               | <p>The number of clients presently connected</p>                                                                                                                                                                                                                                                                                                    | DEPENDENT      | memcached.connections.current<p>**Preprocessing**:</p><p>- JSONPATH: `$.curr_connections`</p>                                            |
-| Memcached        | Memcached: Commands: FLUSH per second     | <p>The flush_all command invalidates all items in the database. This operation incurs a performance penalty and shouldn’t take place in production, so check your debug scripts.</p>                                                                                                                                                                | DEPENDENT      | memcached.commands.flush.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.cmd_flush`</p><p>- CHANGE_PER_SECOND                             |
-| Memcached        | Memcached: Commands: GET per second       | <p>Number of GET requests received by server per second.</p>                                                                                                                                                                                                                                                                                        | DEPENDENT      | memcached.commands.get.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.cmd_get`</p><p>- CHANGE_PER_SECOND                                 |
-| Memcached        | Memcached: Commands: SET per second       | <p>Number of SET requests received by server per second.</p>                                                                                                                                                                                                                                                                                        | DEPENDENT      | memcached.commands.set.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.cmd_set`</p><p>- CHANGE_PER_SECOND                                 |
-| Memcached        | Memcached: Process id                     | <p>PID of the server process</p>                                                                                                                                                                                                                                                                                                                    | DEPENDENT      | memcached.process_id<p>**Preprocessing**:</p><p>- JSONPATH: `$.pid`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                        |
-| Memcached        | Memcached: Memcached version              | <p>Version of the Memcached server</p>                                                                                                                                                                                                                                                                                                              | DEPENDENT      | memcached.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                       |
-| Memcached        | Memcached: Uptime                         | <p>Number of seconds since Memcached server start</p>                                                                                                                                                                                                                                                                                               | DEPENDENT      | memcached.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p>                                                                   |
-| Memcached        | Memcached: Bytes used                     | <p>Current number of bytes used to store items.</p>                                                                                                                                                                                                                                                                                                 | DEPENDENT      | memcached.stats.bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.bytes`</p>                                                               |
-| Memcached        | Memcached: Written bytes per second       | <p>The network's read rate per second in B/sec</p>                                                                                                                                                                                                                                                                                                  | DEPENDENT      | memcached.stats.bytes_written.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.bytes_written`</p><p>- CHANGE_PER_SECOND                    |
-| Memcached        | Memcached: Read bytes per second          | <p>The network's read rate per second in B/sec</p>                                                                                                                                                                                                                                                                                                  | DEPENDENT      | memcached.stats.bytes_read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.bytes_read`</p><p>- CHANGE_PER_SECOND                          |
-| Memcached        | Memcached: Hits per second                | <p>Number of successful GET requests (items requested and found) per second.</p>                                                                                                                                                                                                                                                                    | DEPENDENT      | memcached.stats.hits.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.get_hits`</p><p>- CHANGE_PER_SECOND                                  |
-| Memcached        | Memcached: Misses per second              | <p>Number of missed GET requests (items requested but not found) per second.</p>                                                                                                                                                                                                                                                                    | DEPENDENT      | memcached.stats.misses.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.get_misses`</p><p>- CHANGE_PER_SECOND                              |
-| Memcached        | Memcached: Evictions per second           | <p>"An eviction is when an item that still has time to live is removed from the cache because a brand new item needs to be allocated.</p><p>The item is selected with a pseudo-LRU mechanism.</p><p>A high number of evictions coupled with a low hit rate means your application is setting a large number of keys that are never used again."</p> | DEPENDENT      | memcached.stats.evictions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.evictions`</p><p>- CHANGE_PER_SECOND                            |
-| Memcached        | Memcached: New items per second           | <p>Number of new items stored per second.</p>                                                                                                                                                                                                                                                                                                       | DEPENDENT      | memcached.stats.total_items.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_items`</p><p>- CHANGE_PER_SECOND                        |
-| Memcached        | Memcached: Current number of items stored | <p>Current number of items stored by this instance.</p>                                                                                                                                                                                                                                                                                             | DEPENDENT      | memcached.stats.curr_items<p>**Preprocessing**:</p><p>- JSONPATH: `$.curr_items`</p>                                                     |
-| Memcached        | Memcached: Threads                        | <p>Number of worker threads requested</p>                                                                                                                                                                                                                                                                                                           | DEPENDENT      | memcached.stats.threads<p>**Preprocessing**:</p><p>- JSONPATH: `$.threads`</p>                                                           |
-| Zabbix_raw_items | Memcached: Get status                     |                                                                                                                                                                                                                                                                                                                                                     | ZABBIX_PASSIVE | memcached.stats["{$MEMCACHED.CONN.URI}"]                                                                                                 |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Memcached |Memcached: Ping | |ZABBIX_PASSIVE |memcached.ping["{$MEMCACHED.CONN.URI}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Memcached |Memcached: Max connections |<p>Max number of concurrent connections</p> |DEPENDENT |memcached.connections.max<p>**Preprocessing**:</p><p>- JSONPATH: `$.max_connections`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|Memcached |Memcached: Maximum number of bytes |<p>Maximum number of bytes allowed in cache. You can adjust this setting via a config file or the command line while starting your Memcached server.</p> |DEPENDENT |memcached.config.limit_maxbytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.limit_maxbytes`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|Memcached |Memcached: CPU sys |<p>System CPU consumed by the Memcached server</p> |DEPENDENT |memcached.cpu.sys<p>**Preprocessing**:</p><p>- JSONPATH: `$.rusage_system`</p> |
+|Memcached |Memcached: CPU user |<p>User CPU consumed by the Memcached server</p> |DEPENDENT |memcached.cpu.user<p>**Preprocessing**:</p><p>- JSONPATH: `$.rusage_user`</p> |
+|Memcached |Memcached: Queued connections per second |<p>Number of times that memcached has hit its connections limit and disabled its listener</p> |DEPENDENT |memcached.connections.queued.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.listen_disabled_num`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: New connections per second |<p>Number of connections opened per second</p> |DEPENDENT |memcached.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_connections`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Throttled connections |<p>Number of times a client connection was throttled. When sending GETs in batch mode and the connection contains too many requests (limited by -R parameter) the connection might be throttled to prevent starvation.</p> |DEPENDENT |memcached.connections.throttled.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.conn_yields`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Connection structures |<p>Number of  connection structures allocated by the server</p> |DEPENDENT |memcached.connections.structures<p>**Preprocessing**:</p><p>- JSONPATH: `$.connection_structures`</p> |
+|Memcached |Memcached: Open connections |<p>The number of clients presently connected</p> |DEPENDENT |memcached.connections.current<p>**Preprocessing**:</p><p>- JSONPATH: `$.curr_connections`</p> |
+|Memcached |Memcached: Commands: FLUSH per second |<p>The flush_all command invalidates all items in the database. This operation incurs a performance penalty and shouldn’t take place in production, so check your debug scripts.</p> |DEPENDENT |memcached.commands.flush.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.cmd_flush`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Commands: GET per second |<p>Number of GET requests received by server per second.</p> |DEPENDENT |memcached.commands.get.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.cmd_get`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Commands: SET per second |<p>Number of SET requests received by server per second.</p> |DEPENDENT |memcached.commands.set.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.cmd_set`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Process id |<p>PID of the server process</p> |DEPENDENT |memcached.process_id<p>**Preprocessing**:</p><p>- JSONPATH: `$.pid`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memcached |Memcached: Memcached version |<p>Version of the Memcached server</p> |DEPENDENT |memcached.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memcached |Memcached: Uptime |<p>Number of seconds since Memcached server start</p> |DEPENDENT |memcached.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p> |
+|Memcached |Memcached: Bytes used |<p>Current number of bytes used to store items.</p> |DEPENDENT |memcached.stats.bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.bytes`</p> |
+|Memcached |Memcached: Written bytes per second |<p>The network's read rate per second in B/sec</p> |DEPENDENT |memcached.stats.bytes_written.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.bytes_written`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Read bytes per second |<p>The network's read rate per second in B/sec</p> |DEPENDENT |memcached.stats.bytes_read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.bytes_read`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Hits per second |<p>Number of successful GET requests (items requested and found) per second.</p> |DEPENDENT |memcached.stats.hits.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.get_hits`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Misses per second |<p>Number of missed GET requests (items requested but not found) per second.</p> |DEPENDENT |memcached.stats.misses.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.get_misses`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Evictions per second |<p>"An eviction is when an item that still has time to live is removed from the cache because a brand new item needs to be allocated.</p><p>The item is selected with a pseudo-LRU mechanism.</p><p>A high number of evictions coupled with a low hit rate means your application is setting a large number of keys that are never used again."</p> |DEPENDENT |memcached.stats.evictions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.evictions`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: New items per second |<p>Number of new items stored per second.</p> |DEPENDENT |memcached.stats.total_items.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_items`</p><p>- CHANGE_PER_SECOND</p> |
+|Memcached |Memcached: Current number of items stored |<p>Current number of items stored by this instance.</p> |DEPENDENT |memcached.stats.curr_items<p>**Preprocessing**:</p><p>- JSONPATH: `$.curr_items`</p> |
+|Memcached |Memcached: Threads |<p>Number of worker threads requested</p> |DEPENDENT |memcached.stats.threads<p>**Preprocessing**:</p><p>- JSONPATH: `$.threads`</p> |
+|Zabbix_raw_items |Memcached: Get status | |ZABBIX_PASSIVE |memcached.stats["{$MEMCACHED.CONN.URI}"] |
 
 ## Triggers
 
-| Name                                                                                                  | Description                                                                                                                                                                                                                                  | Expression                                                                                                                              | Severity | Dependencies and additional info                                                  |
-|-------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------|
-| Memcached: Service is down                                                                            | <p>-</p>                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:memcached.ping["{$MEMCACHED.CONN.URI}"].last()}=0`                                                                      | AVERAGE  | <p>Manual close: YES</p>                                                          |
-| Memcached: Failed to fetch info data (or no data for 30m)                                             | <p>Zabbix has not received data for items for the last 30 minutes</p>                                                                                                                                                                        | `{TEMPLATE_NAME:memcached.cpu.sys.nodata(30m)}=1`                                                                                       | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Memcached: Service is down</p> |
-| Memcached: Too many queued connections (over {$MEMCACHED.CONN.QUEUED.MAX.WARN} in 5m)                 | <p>The max number of connections is reachedand and a new connection had to wait in the queue as a result.</p>                                                                                                                                | `{TEMPLATE_NAME:memcached.connections.queued.rate.min(5m)}>{$MEMCACHED.CONN.QUEUED.MAX.WARN}`                                           | WARNING  |                                                                                   |
-| Memcached: Too many throttled connections (over {$MEMCACHED.CONN.THROTTLED.MAX.WARN} in 5m)           | <p>Number of times a client connection was throttled is too high.</p><p>When sending GETs in batch mode and the connection contains too many requests (limited by -R parameter) the connection might be throttled to prevent starvation.</p> | `{TEMPLATE_NAME:memcached.connections.throttled.rate.min(5m)}>{$MEMCACHED.CONN.THROTTLED.MAX.WARN}`                                     | WARNING  |                                                                                   |
-| Memcached: Total number of connected clients is too high (over {$MEMCACHED.CONN.PRC.MAX.WARN}% in 5m) | <p>When the number of connections reaches the value of the "max_connections" parameter, new connections will be rejected.</p>                                                                                                                | `{TEMPLATE_NAME:memcached.connections.current.min(5m)}/{Memcached:memcached.connections.max.last()}*100>{$MEMCACHED.CONN.PRC.MAX.WARN}` | WARNING  |                                                                                   |
-| Memcached: Version has changed (new version: {ITEM.VALUE})                                            | <p>Memcached version has changed. Ack to close.</p>                                                                                                                                                                                          | `{TEMPLATE_NAME:memcached.version.diff()}=1 and {TEMPLATE_NAME:memcached.version.strlen()}>0`                                           | INFO     | <p>Manual close: YES</p>                                                          |
-| Memcached: has been restarted (uptime < 10m)                                                          | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                        | `{TEMPLATE_NAME:memcached.uptime.last()}<10m`                                                                                           | INFO     | <p>Manual close: YES</p>                                                          |
-| Memcached: Memory usage is too high (over {$MEMCACHED.MEM.PUSED.MAX.WARN} in 5m)                      | <p>-</p>                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:memcached.stats.bytes.min(5m)}/{Memcached:memcached.config.limit_maxbytes.last()}*100>{$MEMCACHED.MEM.PUSED.MAX.WARN}`  | WARNING  |                                                                                   |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Memcached: Service is down |<p>-</p> |`last(/Memcached by Zabbix agent 2/memcached.ping["{$MEMCACHED.CONN.URI}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|Memcached: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/Memcached by Zabbix agent 2/memcached.cpu.sys,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Memcached: Service is down</p> |
+|Memcached: Too many queued connections (over {$MEMCACHED.CONN.QUEUED.MAX.WARN} in 5m) |<p>The max number of connections is reachedand and a new connection had to wait in the queue as a result.</p> |`min(/Memcached by Zabbix agent 2/memcached.connections.queued.rate,5m)>{$MEMCACHED.CONN.QUEUED.MAX.WARN}` |WARNING | |
+|Memcached: Too many throttled connections (over {$MEMCACHED.CONN.THROTTLED.MAX.WARN} in 5m) |<p>Number of times a client connection was throttled is too high.</p><p>When sending GETs in batch mode and the connection contains too many requests (limited by -R parameter) the connection might be throttled to prevent starvation.</p> |`min(/Memcached by Zabbix agent 2/memcached.connections.throttled.rate,5m)>{$MEMCACHED.CONN.THROTTLED.MAX.WARN}` |WARNING | |
+|Memcached: Total number of connected clients is too high (over {$MEMCACHED.CONN.PRC.MAX.WARN}% in 5m) |<p>When the number of connections reaches the value of the "max_connections" parameter, new connections will be rejected.</p> |`min(/Memcached by Zabbix agent 2/memcached.connections.current,5m)/last(/Memcached by Zabbix agent 2/memcached.connections.max)*100>{$MEMCACHED.CONN.PRC.MAX.WARN}` |WARNING | |
+|Memcached: Version has changed (new version: {ITEM.VALUE}) |<p>Memcached version has changed. Ack to close.</p> |`last(/Memcached by Zabbix agent 2/memcached.version,#1)<>last(/Memcached by Zabbix agent 2/memcached.version,#2) and length(last(/Memcached by Zabbix agent 2/memcached.version))>0` |INFO |<p>Manual close: YES</p> |
+|Memcached: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Memcached by Zabbix agent 2/memcached.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Memcached: Memory usage is too high (over {$MEMCACHED.MEM.PUSED.MAX.WARN} in 5m) |<p>-</p> |`min(/Memcached by Zabbix agent 2/memcached.stats.bytes,5m)/last(/Memcached by Zabbix agent 2/memcached.config.limit_maxbytes)*100>{$MEMCACHED.MEM.PUSED.MAX.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/memcached/template_app_memcached.yaml b/templates/app/memcached/template_app_memcached.yaml
index 6f2190aeef8..939212642e1 100644
--- a/templates/app/memcached/template_app_memcached.yaml
+++ b/templates/app/memcached/template_app_memcached.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:04:14Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:35Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -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/398623-discussion-thread-for-official-zabbix-template-memcached
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -603,7 +603,7 @@ zabbix_export:
           triggers:
             -
               uuid: c53a2d7b861b41458976bfa03ab1a105
-              expression: last(/Memcached by Zabbix agent 2/memcached.uptime)<10m
+              expression: 'last(/Memcached by Zabbix agent 2/memcached.uptime)<10m'
               name: 'Memcached: has been restarted (uptime < 10m)'
               priority: INFO
               description: 'Uptime is less than 10 minutes'
diff --git a/templates/app/nginx_agent/README.md b/templates/app/nginx_agent/README.md
index a06250bce49..3f099a8a776 100644
--- a/templates/app/nginx_agent/README.md
+++ b/templates/app/nginx_agent/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Nginx by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -52,13 +52,13 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                            | Description                                                                 | Default        |
-|---------------------------------|-----------------------------------------------------------------------------|----------------|
-| {$NGINX.DROP_RATE.MAX.WARN}     | <p>The critical rate of the dropped connections for trigger expression.</p> | `1`            |
-| {$NGINX.RESPONSE_TIME.MAX.WARN} | <p>The Nginx maximum response time in seconds for trigger expression.</p>   | `10`           |
-| {$NGINX.STUB_STATUS.HOST}       | <p>Hostname or IP of Nginx stub_status host or container.</p>               | `localhost`    |
-| {$NGINX.STUB_STATUS.PATH}       | <p>The path of Nginx stub_status page.</p>                                  | `basic_status` |
-| {$NGINX.STUB_STATUS.PORT}       | <p>The port of Nginx stub_status host or container.</p>                     | `80`           |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$NGINX.DROP_RATE.MAX.WARN} |<p>The critical rate of the dropped connections for trigger expression.</p> |`1` |
+|{$NGINX.RESPONSE_TIME.MAX.WARN} |<p>The Nginx maximum response time in seconds for trigger expression.</p> |`10` |
+|{$NGINX.STUB_STATUS.HOST} |<p>Hostname or IP of Nginx stub_status host or container.</p> |`localhost` |
+|{$NGINX.STUB_STATUS.PATH} |<p>The path of Nginx stub_status page.</p> |`basic_status` |
+|{$NGINX.STUB_STATUS.PORT} |<p>The port of Nginx stub_status host or container.</p> |`80` |
 
 ## Template links
 
@@ -69,36 +69,36 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group            | Name                                   | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Type           | Key and additional info                                                                                                                                         |
-|------------------|----------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Nginx            | Nginx: Service status                  | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | ZABBIX_PASSIVE | net.tcp.service[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>               |
-| Nginx            | Nginx: Service response time           | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | ZABBIX_PASSIVE | net.tcp.service.perf[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"]                                                                              |
-| Nginx            | Nginx: Requests total                  | <p>The total number of client requests.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT      | nginx.requests.total<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \3`</p>                                  |
-| Nginx            | Nginx: Requests per second             | <p>The total number of client requests.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT      | nginx.requests.total.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \3`</p><p>- CHANGE_PER_SECOND       |
-| Nginx            | Nginx: Connections accepted per second | <p>The total number of accepted client connections.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT      | nginx.connections.accepted.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \1`</p><p>- CHANGE_PER_SECOND |
-| Nginx            | Nginx: Connections dropped per second  | <p>The total number of dropped client connections.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT      | nginx.connections.dropped.rate<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                  |
-| Nginx            | Nginx: Connections handled per second  | <p>The total number of handled connections. Generally, the parameter value is the same as accepts unless some resource limits have been reached (for example, the worker_connections limit).</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | nginx.connections.handled.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \2`</p><p>- CHANGE_PER_SECOND  |
-| Nginx            | Nginx: Connections active              | <p>The current number of active client connections including Waiting connections.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | nginx.connections.active<p>**Preprocessing**:</p><p>- REGEX: `Active connections: ([0-9]+) \1`</p>                                                              |
-| Nginx            | Nginx: Connections reading             | <p>The current number of connections where nginx is reading the request header.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT      | nginx.connections.reading<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \1`</p>                                    |
-| Nginx            | Nginx: Connections waiting             | <p>The current number of idle client connections waiting for a request.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT      | nginx.connections.waiting<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \3`</p>                                    |
-| Nginx            | Nginx: Connections writing             | <p>The current number of connections where nginx is writing the response back to the client.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | nginx.connections.writing<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \2`</p>                                    |
-| Nginx            | Nginx: Number of processes running     | <p>Number of the Nginx processes running.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | ZABBIX_PASSIVE | proc.num[nginx]                                                                                                                                                 |
-| Nginx            | Nginx: Memory usage (vsize)            | <p>Virtual memory size used by process in bytes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | ZABBIX_PASSIVE | proc.mem[nginx,,,,vsize]                                                                                                                                        |
-| Nginx            | Nginx: Memory usage (rss)              | <p>Resident set size memory used by process in bytes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | ZABBIX_PASSIVE | proc.mem[nginx,,,,rss]                                                                                                                                          |
-| Nginx            | Nginx: CPU utilization                 | <p>Process CPU utilization percentage.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | ZABBIX_PASSIVE | proc.cpu.util[nginx]                                                                                                                                            |
-| Nginx            | Nginx: Version                         | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT      | nginx.version<p>**Preprocessing**:</p><p>- REGEX: `Server: nginx\/(.+(?<!\r)) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                 |
-| Zabbix_raw_items | Nginx: Get stub status page            | <p>The following status information is provided:</p><p>Active connections - the current number of active client connections including Waiting connections.</p><p>Accepts - the total number of accepted client connections.</p><p>Handled - the total number of handled connections. Generally, the parameter value is the same as accepts unless some resource limits have been reached (for example, the worker_connections limit).</p><p>Requests - the total number of client requests.</p><p>Reading - the current number of connections where nginx is reading the request header.</p><p>Writing - the current number of connections where nginx is writing the response back to the client.</p><p>Waiting - the current number of idle client connections waiting for a request.</p><p>https://nginx.org/en/docs/http/ngx_http_stub_status_module.html</p> | ZABBIX_PASSIVE | web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]                                                               |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Nginx |Nginx: Service status |<p>-</p> |ZABBIX_PASSIVE |net.tcp.service[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Nginx |Nginx: Service response time |<p>-</p> |ZABBIX_PASSIVE |net.tcp.service.perf[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"] |
+|Nginx |Nginx: Requests total |<p>The total number of client requests.</p> |DEPENDENT |nginx.requests.total<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \3`</p> |
+|Nginx |Nginx: Requests per second |<p>The total number of client requests.</p> |DEPENDENT |nginx.requests.total.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \3`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Connections accepted per second |<p>The total number of accepted client connections.</p> |DEPENDENT |nginx.connections.accepted.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \1`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Connections dropped per second |<p>The total number of dropped client connections.</p> |DEPENDENT |nginx.connections.dropped.rate<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Connections handled per second |<p>The total number of handled connections. Generally, the parameter value is the same as accepts unless some resource limits have been reached (for example, the worker_connections limit).</p> |DEPENDENT |nginx.connections.handled.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \2`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Connections active |<p>The current number of active client connections including Waiting connections.</p> |DEPENDENT |nginx.connections.active<p>**Preprocessing**:</p><p>- REGEX: `Active connections: ([0-9]+) \1`</p> |
+|Nginx |Nginx: Connections reading |<p>The current number of connections where nginx is reading the request header.</p> |DEPENDENT |nginx.connections.reading<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \1`</p> |
+|Nginx |Nginx: Connections waiting |<p>The current number of idle client connections waiting for a request.</p> |DEPENDENT |nginx.connections.waiting<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \3`</p> |
+|Nginx |Nginx: Connections writing |<p>The current number of connections where nginx is writing the response back to the client.</p> |DEPENDENT |nginx.connections.writing<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \2`</p> |
+|Nginx |Nginx: Number of processes running |<p>Number of the Nginx processes running.</p> |ZABBIX_PASSIVE |proc.num[nginx] |
+|Nginx |Nginx: Memory usage (vsize) |<p>Virtual memory size used by process in bytes.</p> |ZABBIX_PASSIVE |proc.mem[nginx,,,,vsize] |
+|Nginx |Nginx: Memory usage (rss) |<p>Resident set size memory used by process in bytes.</p> |ZABBIX_PASSIVE |proc.mem[nginx,,,,rss] |
+|Nginx |Nginx: CPU utilization |<p>Process CPU utilization percentage.</p> |ZABBIX_PASSIVE |proc.cpu.util[nginx] |
+|Nginx |Nginx: Version |<p>-</p> |DEPENDENT |nginx.version<p>**Preprocessing**:</p><p>- REGEX: `Server: nginx\/(.+(?<!\r)) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Zabbix_raw_items |Nginx: Get stub status page |<p>The following status information is provided:</p><p>Active connections - the current number of active client connections including Waiting connections.</p><p>Accepts - the total number of accepted client connections.</p><p>Handled - the total number of handled connections. Generally, the parameter value is the same as accepts unless some resource limits have been reached (for example, the worker_connections limit).</p><p>Requests - the total number of client requests.</p><p>Reading - the current number of connections where nginx is reading the request header.</p><p>Writing - the current number of connections where nginx is writing the response back to the client.</p><p>Waiting - the current number of idle client connections waiting for a request.</p><p>https://nginx.org/en/docs/http/ngx_http_stub_status_module.html</p> |ZABBIX_PASSIVE |web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"] |
 
 ## Triggers
 
-| Name                                                                                    | Description                                                                                              | Expression                                                                                                                                                                                                                                                                    | Severity | Dependencies and additional info                                                                                    |
-|-----------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------------------------|
-| Nginx: Service is down                                                                  | <p>-</p>                                                                                                 | `{TEMPLATE_NAME:net.tcp.service[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"].last()}=0`                                                                                                                                                                      | AVERAGE  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Process is not running</p>                                |
-| Nginx: Service response time is too high (over {$NGINX.RESPONSE_TIME.MAX.WARN}s for 5m) | <p>-</p>                                                                                                 | `{TEMPLATE_NAME:net.tcp.service.perf[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"].min(5m)}>{$NGINX.RESPONSE_TIME.MAX.WARN}`                                                                                                                                  | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Process is not running</p><p>- Nginx: Service is down</p> |
-| Nginx: High connections drop rate (more than {$NGINX.DROP_RATE.MAX.WARN} for 5m)        | <p>The dropping rate connections is greater than {$NGINX.DROP_RATE.MAX.WARN} for the last 5 minutes.</p> | `{TEMPLATE_NAME:nginx.connections.dropped.rate.min(5m)} > {$NGINX.DROP_RATE.MAX.WARN}`                                                                                                                                                                                        | WARNING  | <p>**Depends on**:</p><p>- Nginx: Process is not running</p><p>- Nginx: Service is down</p>                         |
-| Nginx: Process is not running                                                           | <p>-</p>                                                                                                 | `{TEMPLATE_NAME:proc.num[nginx].last()}=0`                                                                                                                                                                                                                                    | HIGH     |                                                                                                                     |
-| Nginx: Version has changed (new version: {ITEM.VALUE})                                  | <p>Nginx version has changed. Ack to close.</p>                                                          | `{TEMPLATE_NAME:nginx.version.diff()}=1 and {TEMPLATE_NAME:nginx.version.strlen()}>0`                                                                                                                                                                                         | INFO     | <p>Manual close: YES</p>                                                                                            |
-| Nginx: Failed to fetch stub status page (or no data for 30m)                            | <p>Zabbix has not received data for items for the last 30 minutes.</p>                                   | `{TEMPLATE_NAME:web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"].str("HTTP/1.1 200")}=0 or  {TEMPLATE_NAME:web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"].nodata(30m)}=1` | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Process is not running</p><p>- Nginx: Service is down</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Nginx: Service is down |<p>-</p> |`last(/Nginx by Zabbix agent/net.tcp.service[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Process is not running</p> |
+|Nginx: Service response time is too high (over {$NGINX.RESPONSE_TIME.MAX.WARN}s for 5m) |<p>-</p> |`min(/Nginx by Zabbix agent/net.tcp.service.perf[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"],5m)>{$NGINX.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Process is not running</p><p>- Nginx: Service is down</p> |
+|Nginx: High connections drop rate (more than {$NGINX.DROP_RATE.MAX.WARN} for 5m) |<p>The dropping rate connections is greater than {$NGINX.DROP_RATE.MAX.WARN} for the last 5 minutes.</p> |`min(/Nginx by Zabbix agent/nginx.connections.dropped.rate,5m) > {$NGINX.DROP_RATE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Nginx: Process is not running</p><p>- Nginx: Service is down</p> |
+|Nginx: Process is not running |<p>-</p> |`last(/Nginx by Zabbix agent/proc.num[nginx])=0` |HIGH | |
+|Nginx: Version has changed (new version: {ITEM.VALUE}) |<p>Nginx version has changed. Ack to close.</p> |`last(/Nginx by Zabbix agent/nginx.version,#1)<>last(/Nginx by Zabbix agent/nginx.version,#2) and length(last(/Nginx by Zabbix agent/nginx.version))>0` |INFO |<p>Manual close: YES</p> |
+|Nginx: Failed to fetch stub status page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`find(/Nginx by Zabbix agent/web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"],,"like","HTTP/1.1 200")=0 or  nodata(/Nginx by Zabbix agent/web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"],30m)=1 ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Process is not running</p><p>- Nginx: Service is down</p> |
 
 ## Feedback
 
diff --git a/templates/app/nginx_agent/template_app_nginx_agent.yaml b/templates/app/nginx_agent/template_app_nginx_agent.yaml
index 7646ceded78..8d41437a1d0 100644
--- a/templates/app/nginx_agent/template_app_nginx_agent.yaml
+++ b/templates/app/nginx_agent/template_app_nginx_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:23Z'
+  version: '6.0'
+  date: '2021-12-15T09:19:04Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384765-discussion-thread-for-official-zabbix-template-nginx
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/nginx_http/README.md b/templates/app/nginx_http/README.md
index 01f355f9819..f8c83ca3bdf 100644
--- a/templates/app/nginx_http/README.md
+++ b/templates/app/nginx_http/README.md
@@ -3,17 +3,17 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Nginx by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
 Template `Nginx by HTTP` collects metrics by polling [ngx_http_stub_status_module](https://nginx.ru/en/docs/http/ngx_http_stub_status_module.html) with HTTP agent remotely:
 
 ```text
-Active connections: 291 
+Active connections: 291
 server accepts handled requests
-16630948 16630948 31070465 
-Reading: 6 Writing: 179 Waiting: 106 
+16630948 16630948 31070465
+Reading: 6 Writing: 179 Waiting: 106
 ```
 
 Note that this solution supports https and redirects.
@@ -30,7 +30,8 @@ This template was tested on:
 Setup [ngx_http_stub_status_module](https://nginx.ru/en/docs/http/ngx_http_stub_status_module.html).
 Test availability of http_stub_status module with `nginx -V 2>&1 | grep -o with-http_stub_status_module`.
 
-Example configuration of Nginx:        
+Example configuration of Nginx:
+
 ```text
 location = /basic_status {
     stub_status;
@@ -48,13 +49,13 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                            | Description                                                                 | Default        |
-|---------------------------------|-----------------------------------------------------------------------------|----------------|
-| {$NGINX.DROP_RATE.MAX.WARN}     | <p>The critical rate of the dropped connections for trigger expression.</p> | `1`            |
-| {$NGINX.RESPONSE_TIME.MAX.WARN} | <p>The Nginx maximum response time in seconds for trigger expression.</p>   | `10`           |
-| {$NGINX.STUB_STATUS.PATH}       | <p>The path of Nginx stub_status page.</p>                                  | `basic_status` |
-| {$NGINX.STUB_STATUS.PORT}       | <p>The port of Nginx stub_status host or container.</p>                     | `80`           |
-| {$NGINX.STUB_STATUS.SCHEME}     | <p>The protocol http or https of Nginx stub_status host or container.</p>   | `http`         |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$NGINX.DROP_RATE.MAX.WARN} |<p>The critical rate of the dropped connections for trigger expression.</p> |`1` |
+|{$NGINX.RESPONSE_TIME.MAX.WARN} |<p>The Nginx maximum response time in seconds for trigger expression.</p> |`10` |
+|{$NGINX.STUB_STATUS.PATH} |<p>The path of Nginx stub_status page.</p> |`basic_status` |
+|{$NGINX.STUB_STATUS.PORT} |<p>The port of Nginx stub_status host or container.</p> |`80` |
+|{$NGINX.STUB_STATUS.SCHEME} |<p>The protocol http or https of Nginx stub_status host or container.</p> |`http` |
 
 ## Template links
 
@@ -65,31 +66,31 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group            | Name                                   | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Type       | Key and additional info                                                                                                                                         |
-|------------------|----------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Nginx            | Nginx: Service status                  | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | SIMPLE     | net.tcp.service[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                             |
-| Nginx            | Nginx: Service response time           | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | SIMPLE     | net.tcp.service.perf[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"]                                                                                            |
-| Nginx            | Nginx: Requests total                  | <p>The total number of client requests.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT  | nginx.requests.total<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \3`</p>                                  |
-| Nginx            | Nginx: Requests per second             | <p>The total number of client requests.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT  | nginx.requests.total.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \3`</p><p>- CHANGE_PER_SECOND       |
-| Nginx            | Nginx: Connections accepted per second | <p>The total number of accepted client connections.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT  | nginx.connections.accepted.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \1`</p><p>- CHANGE_PER_SECOND |
-| Nginx            | Nginx: Connections dropped per second  | <p>The total number of dropped client connections.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT  | nginx.connections.dropped.rate<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND                  |
-| Nginx            | Nginx: Connections handled per second  | <p>The total number of handled connections. Generally, the parameter value is the same as accepts unless some resource limits have been reached (for example, the worker_connections limit).</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | nginx.connections.handled.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \2`</p><p>- CHANGE_PER_SECOND  |
-| Nginx            | Nginx: Connections active              | <p>The current number of active client connections including Waiting connections.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT  | nginx.connections.active<p>**Preprocessing**:</p><p>- REGEX: `Active connections: ([0-9]+) \1`</p>                                                              |
-| Nginx            | Nginx: Connections reading             | <p>The current number of connections where nginx is reading the request header.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT  | nginx.connections.reading<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \1`</p>                                    |
-| Nginx            | Nginx: Connections waiting             | <p>The current number of idle client connections waiting for a request.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT  | nginx.connections.waiting<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \3`</p>                                    |
-| Nginx            | Nginx: Connections writing             | <p>The current number of connections where nginx is writing the response back to the client.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | nginx.connections.writing<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \2`</p>                                    |
-| Nginx            | Nginx: Version                         | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT  | nginx.version<p>**Preprocessing**:</p><p>- REGEX: `Server: nginx\/(.+(?<!\r)) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                 |
-| Zabbix_raw_items | Nginx: Get stub status page            | <p>The following status information is provided:</p><p>Active connections - the current number of active client connections including Waiting connections.</p><p>Accepts - the total number of accepted client connections.</p><p>Handled - the total number of handled connections. Generally, the parameter value is the same as accepts unless some resource limits have been reached (for example, the worker_connections limit).</p><p>Requests - the total number of client requests.</p><p>Reading - the current number of connections where nginx is reading the request header.</p><p>Writing - the current number of connections where nginx is writing the response back to the client.</p><p>Waiting - the current number of idle client connections waiting for a request.</p><p>https://nginx.org/en/docs/http/ngx_http_stub_status_module.html</p> | HTTP_AGENT | nginx.get_stub_status                                                                                                                                           |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Nginx |Nginx: Service status |<p>-</p> |SIMPLE |net.tcp.service[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Nginx |Nginx: Service response time |<p>-</p> |SIMPLE |net.tcp.service.perf[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"] |
+|Nginx |Nginx: Requests total |<p>The total number of client requests.</p> |DEPENDENT |nginx.requests.total<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \3`</p> |
+|Nginx |Nginx: Requests per second |<p>The total number of client requests.</p> |DEPENDENT |nginx.requests.total.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \3`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Connections accepted per second |<p>The total number of accepted client connections.</p> |DEPENDENT |nginx.connections.accepted.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \1`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Connections dropped per second |<p>The total number of dropped client connections.</p> |DEPENDENT |nginx.connections.dropped.rate<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Connections handled per second |<p>The total number of handled connections. Generally, the parameter value is the same as accepts unless some resource limits have been reached (for example, the worker_connections limit).</p> |DEPENDENT |nginx.connections.handled.rate<p>**Preprocessing**:</p><p>- REGEX: `server accepts handled requests\s+([0-9]+) ([0-9]+) ([0-9]+) \2`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Connections active |<p>The current number of active client connections including Waiting connections.</p> |DEPENDENT |nginx.connections.active<p>**Preprocessing**:</p><p>- REGEX: `Active connections: ([0-9]+) \1`</p> |
+|Nginx |Nginx: Connections reading |<p>The current number of connections where nginx is reading the request header.</p> |DEPENDENT |nginx.connections.reading<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \1`</p> |
+|Nginx |Nginx: Connections waiting |<p>The current number of idle client connections waiting for a request.</p> |DEPENDENT |nginx.connections.waiting<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \3`</p> |
+|Nginx |Nginx: Connections writing |<p>The current number of connections where nginx is writing the response back to the client.</p> |DEPENDENT |nginx.connections.writing<p>**Preprocessing**:</p><p>- REGEX: `Reading: ([0-9]+) Writing: ([0-9]+) Waiting: ([0-9]+) \2`</p> |
+|Nginx |Nginx: Version |<p>-</p> |DEPENDENT |nginx.version<p>**Preprocessing**:</p><p>- REGEX: `Server: nginx\/(.+(?<!\r)) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Zabbix_raw_items |Nginx: Get stub status page |<p>The following status information is provided:</p><p>Active connections - the current number of active client connections including Waiting connections.</p><p>Accepts - the total number of accepted client connections.</p><p>Handled - the total number of handled connections. Generally, the parameter value is the same as accepts unless some resource limits have been reached (for example, the worker_connections limit).</p><p>Requests - the total number of client requests.</p><p>Reading - the current number of connections where nginx is reading the request header.</p><p>Writing - the current number of connections where nginx is writing the response back to the client.</p><p>Waiting - the current number of idle client connections waiting for a request.</p><p>https://nginx.org/en/docs/http/ngx_http_stub_status_module.html</p> |HTTP_AGENT |nginx.get_stub_status |
 
 ## Triggers
 
-| Name                                                                                    | Description                                                                                              | Expression                                                                                                                     | Severity | Dependencies and additional info                                              |
-|-----------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------|
-| Nginx: Service is down                                                                  | <p>-</p>                                                                                                 | `{TEMPLATE_NAME:net.tcp.service[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"].last()}=0`                                     | AVERAGE  | <p>Manual close: YES</p>                                                      |
-| Nginx: Service response time is too high (over {$NGINX.RESPONSE_TIME.MAX.WARN}s for 5m) | <p>-</p>                                                                                                 | `{TEMPLATE_NAME:net.tcp.service.perf[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"].min(5m)}>{$NGINX.RESPONSE_TIME.MAX.WARN}` | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Service is down</p> |
-| Nginx: High connections drop rate (more than {$NGINX.DROP_RATE.MAX.WARN} for 5m)        | <p>The dropping rate connections is greater than {$NGINX.DROP_RATE.MAX.WARN} for the last 5 minutes.</p> | `{TEMPLATE_NAME:nginx.connections.dropped.rate.min(5m)} > {$NGINX.DROP_RATE.MAX.WARN}`                                         | WARNING  | <p>**Depends on**:</p><p>- Nginx: Service is down</p>                         |
-| Nginx: Version has changed (new version: {ITEM.VALUE})                                  | <p>Nginx version has changed. Ack to close.</p>                                                          | `{TEMPLATE_NAME:nginx.version.diff()}=1 and {TEMPLATE_NAME:nginx.version.strlen()}>0`                                          | INFO     | <p>Manual close: YES</p>                                                      |
-| Nginx: Failed to fetch stub status page (or no data for 30m)                            | <p>Zabbix has not received data for items for the last 30 minutes.</p>                                   | `{TEMPLATE_NAME:nginx.get_stub_status.str("HTTP/1.1 200")}=0 or  {TEMPLATE_NAME:nginx.get_stub_status.nodata(30m)}=1`          | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Service is down</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Nginx: Service is down |<p>-</p> |`last(/Nginx by HTTP/net.tcp.service[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|Nginx: Service response time is too high (over {$NGINX.RESPONSE_TIME.MAX.WARN}s for 5m) |<p>-</p> |`min(/Nginx by HTTP/net.tcp.service.perf[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"],5m)>{$NGINX.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Service is down</p> |
+|Nginx: High connections drop rate (more than {$NGINX.DROP_RATE.MAX.WARN} for 5m) |<p>The dropping rate connections is greater than {$NGINX.DROP_RATE.MAX.WARN} for the last 5 minutes.</p> |`min(/Nginx by HTTP/nginx.connections.dropped.rate,5m) > {$NGINX.DROP_RATE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Nginx: Service is down</p> |
+|Nginx: Version has changed (new version: {ITEM.VALUE}) |<p>Nginx version has changed. Ack to close.</p> |`last(/Nginx by HTTP/nginx.version,#1)<>last(/Nginx by HTTP/nginx.version,#2) and length(last(/Nginx by HTTP/nginx.version))>0` |INFO |<p>Manual close: YES</p> |
+|Nginx: Failed to fetch stub status page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`find(/Nginx by HTTP/nginx.get_stub_status,,"like","HTTP/1.1 200")=0 or  nodata(/Nginx by HTTP/nginx.get_stub_status,30m)=1 ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Nginx: Service is down</p> |
 
 ## Feedback
 
diff --git a/templates/app/nginx_http/template_app_nginx_http.yaml b/templates/app/nginx_http/template_app_nginx_http.yaml
index 3f37b838066..cbf27a6b4ec 100644
--- a/templates/app/nginx_http/template_app_nginx_http.yaml
+++ b/templates/app/nginx_http/template_app_nginx_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:26Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:46Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384765-discussion-thread-for-official-zabbix-template-nginx
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/nginx_plus_http/README.md b/templates/app/nginx_plus_http/README.md
index 02ce8825f46..9b42e5d1139 100644
--- a/templates/app/nginx_plus_http/README.md
+++ b/templates/app/nginx_plus_http/README.md
@@ -3,11 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
-The template to monitor Nginx Plus by Zabbix that work without any external scripts.  
+For Zabbix version: 6.0 and higher  
+The template to monitor Nginx Plus by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-The live activity monitoring data is generated by the [NGINX Plus API](http://nginx.org/en/docs/http/ngx_http_api_module.html).  
+The live activity monitoring data is generated by the [NGINX Plus API](http://nginx.org/en/docs/http/ngx_http_api_module.html).
 
 
 
@@ -74,14 +74,14 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|HTTP server zones discovery |<p>-</p> |DEPENDENT |nginx.http.server_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.ZONE.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.ZONE.NOT_MATCHES}`</p> |
-|HTTP location zones discovery |<p>-</p> |DEPENDENT |nginx.http.location_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.LOCATION.ZONE.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.LOCATION.ZONE.NOT_MATCHES}`</p> |
-|HTTP upstreams discovery |<p>-</p> |DEPENDENT |nginx.http.upstreams.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.NOT_MATCHES}`</p> |
-|HTTP upstream peers discovery |<p>-</p> |DEPENDENT |nginx.http.upstream.peers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- A: {#UPSTREAM} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.MATCHES}`</p><p>- B: {#UPSTREAM} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.NOT_MATCHES}`</p> |
-|Stream server zones discovery |<p>-</p> |DEPENDENT |nginx.stream.server_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.ZONE.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.ZONE.NOT_MATCHES}`</p> |
-|Stream upstreams discovery |<p>-</p> |DEPENDENT |nginx.stream.upstreams.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.NOT_MATCHES}`</p> |
-|Stream upstream peers discovery |<p>-</p> |DEPENDENT |nginx.stream.upstream.peers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- A: {#UPSTREAM} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.MATCHES}`</p><p>- B: {#UPSTREAM} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.NOT_MATCHES}`</p> |
-|Resolvers discovery |<p>-</p> |DEPENDENT |nginx.resolvers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.RESOLVER.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.RESOLVER.NOT_MATCHES}`</p> |
+|HTTP server zones discovery |<p>-</p> |DEPENDENT |nginx.http.server_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.ZONE.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.ZONE.NOT_MATCHES}`</p> |
+|HTTP location zones discovery |<p>-</p> |DEPENDENT |nginx.http.location_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.LOCATION.ZONE.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.LOCATION.ZONE.NOT_MATCHES}`</p> |
+|HTTP upstreams discovery |<p>-</p> |DEPENDENT |nginx.http.upstreams.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.NOT_MATCHES}`</p> |
+|HTTP upstream peers discovery |<p>-</p> |DEPENDENT |nginx.http.upstream.peers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#UPSTREAM} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.MATCHES}`</p><p>- {#UPSTREAM} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.NOT_MATCHES}`</p> |
+|Stream server zones discovery |<p>-</p> |DEPENDENT |nginx.stream.server_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.ZONE.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.ZONE.NOT_MATCHES}`</p> |
+|Stream upstreams discovery |<p>-</p> |DEPENDENT |nginx.stream.upstreams.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.NOT_MATCHES}`</p> |
+|Stream upstream peers discovery |<p>-</p> |DEPENDENT |nginx.stream.upstream.peers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#UPSTREAM} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.MATCHES}`</p><p>- {#UPSTREAM} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.NOT_MATCHES}`</p> |
+|Resolvers discovery |<p>-</p> |DEPENDENT |nginx.resolvers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.RESOLVER.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.RESOLVER.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -92,51 +92,51 @@ There are no template links in this template.
 |Nginx |Nginx: Address |<p>The address of the server that accepted status request.</p> |DEPENDENT |nginx.info.address<p>**Preprocessing**:</p><p>- JSONPATH: `$.address`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Nginx |Nginx: Generation |<p>The total number of configuration reloads.</p> |DEPENDENT |nginx.info.generation<p>**Preprocessing**:</p><p>- JSONPATH: `$.generation`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Nginx |Nginx: Uptime |<p>Server uptime.</p> |DEPENDENT |nginx.info.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.load_timestamp`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return Math.floor((Date.now() - new Date(value)) / 1000);`</p> |
-|Nginx |Nginx: Connections accepted, rate |<p>The total number of accepted client connections per second.</p> |DEPENDENT |nginx.connections.accepted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.accepted`</p><p>- CHANGE_PER_SECOND |
+|Nginx |Nginx: Connections accepted, rate |<p>The total number of accepted client connections per second.</p> |DEPENDENT |nginx.connections.accepted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.accepted`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: Connections dropped |<p>The total number of dropped client connections.</p> |DEPENDENT |nginx.connections.dropped<p>**Preprocessing**:</p><p>- JSONPATH: `$.dropped`</p> |
 |Nginx |Nginx: Connections active |<p>The current number of active client connections.</p> |DEPENDENT |nginx.connections.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.active`</p> |
 |Nginx |Nginx: Connections idle |<p>The current number of idle client connections.</p> |DEPENDENT |nginx.connections.idle<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle`</p> |
-|Nginx |Nginx: SSL handshakes, rate |<p>The total number of successful SSL handshakes per second.</p> |DEPENDENT |nginx.ssl.handshakes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.handshakes`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: SSL handshakes failed, rate |<p>The total number of failed SSL handshakes per second.</p> |DEPENDENT |nginx.ssl.handshakes_failed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.handshakes_failed`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: SSL session reuses, rate |<p>The total number of session reuses during SSL handshake per second.</p> |DEPENDENT |nginx.ssl.session_reuses.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.session_reuses`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Requests total, rate |<p>The total number of client requests per second.</p> |DEPENDENT |nginx.requests.total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.total`</p><p>- CHANGE_PER_SECOND |
+|Nginx |Nginx: SSL handshakes, rate |<p>The total number of successful SSL handshakes per second.</p> |DEPENDENT |nginx.ssl.handshakes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.handshakes`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: SSL handshakes failed, rate |<p>The total number of failed SSL handshakes per second.</p> |DEPENDENT |nginx.ssl.handshakes_failed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.handshakes_failed`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: SSL session reuses, rate |<p>The total number of session reuses during SSL handshake per second.</p> |DEPENDENT |nginx.ssl.session_reuses.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.session_reuses`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Requests total, rate |<p>The total number of client requests per second.</p> |DEPENDENT |nginx.requests.total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.total`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: Requests current |<p>The current number of client requests.</p> |DEPENDENT |nginx.requests.current<p>**Preprocessing**:</p><p>- JSONPATH: `$.current`</p> |
 |Nginx |Nginx: HTTP server zone [{#NAME}]: Processing |<p>The number of client requests that are currently being processed.</p> |DEPENDENT |nginx.http.server_zones.processing[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].processing`</p> |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Requests, rate |<p>The total number of client requests received from clients per second.</p> |DEPENDENT |nginx.http.server_zones.requests.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 1xx, rate |<p>The number of responses with “1xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.1xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.1xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 2xx, rate |<p>The number of responses with “2xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.2xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.2xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 3xx, rate |<p>The number of responses with “3xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.3xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.3xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 4xx, rate |<p>The number of responses with “4xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.4xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.4xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 5xx, rate |<p>The number of responses with “5xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.5xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.5xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses total, rate |<p>The total number of responses sent to clients per second.</p> |DEPENDENT |nginx.http.server_zones.responses.total.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.total`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Discarded, rate |<p>The total number of requests completed without sending a response per second.</p> |DEPENDENT |nginx.http.server_zones.discarded.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].discarded`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Received, rate |<p>The total number of bytes received from clients per second.</p> |DEPENDENT |nginx.http.server_zones.received.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].received`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP server zone [{#NAME}]: Sent, rate |<p>The total number of bytes sent to clients per second.</p> |DEPENDENT |nginx.http.server_zones.sent.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sent`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Requests, rate |<p>The total number of client requests received from clients per second.</p> |DEPENDENT |nginx.http.location_zones.requests.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 1xx, rate |<p>The number of responses with “1xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.1xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.1xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 2xx, rate |<p>The number of responses with “2xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.2xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.2xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 3xx, rate |<p>The number of responses with “3xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.3xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.3xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 4xx, rate |<p>The number of responses with “4xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.4xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.4xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 5xx, rate |<p>The number of responses with “5xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.5xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.5xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses total, rate |<p>The total number of responses sent to clients per second.</p> |DEPENDENT |nginx.http.location_zones.responses.total.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.total`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Discarded, rate |<p>The total number of requests completed without sending a response per second.</p> |DEPENDENT |nginx.http.location_zones.discarded.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].discarded`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Received, rate |<p>The total number of bytes received from clients per second.</p> |DEPENDENT |nginx.http.location_zones.received.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].received`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP location zone [{#NAME}]: Sent, rate |<p>The total number of bytes sent to clients per second.</p> |DEPENDENT |nginx.http.location_zones.sent.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sent`</p><p>- CHANGE_PER_SECOND |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Requests, rate |<p>The total number of client requests received from clients per second.</p> |DEPENDENT |nginx.http.server_zones.requests.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 1xx, rate |<p>The number of responses with “1xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.1xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.1xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 2xx, rate |<p>The number of responses with “2xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.2xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.2xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 3xx, rate |<p>The number of responses with “3xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.3xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.3xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 4xx, rate |<p>The number of responses with “4xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.4xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.4xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses 5xx, rate |<p>The number of responses with “5xx” status codes per second.</p> |DEPENDENT |nginx.http.server_zones.responses.5xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.5xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Responses total, rate |<p>The total number of responses sent to clients per second.</p> |DEPENDENT |nginx.http.server_zones.responses.total.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.total`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Discarded, rate |<p>The total number of requests completed without sending a response per second.</p> |DEPENDENT |nginx.http.server_zones.discarded.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].discarded`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Received, rate |<p>The total number of bytes received from clients per second.</p> |DEPENDENT |nginx.http.server_zones.received.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].received`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP server zone [{#NAME}]: Sent, rate |<p>The total number of bytes sent to clients per second.</p> |DEPENDENT |nginx.http.server_zones.sent.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sent`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Requests, rate |<p>The total number of client requests received from clients per second.</p> |DEPENDENT |nginx.http.location_zones.requests.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 1xx, rate |<p>The number of responses with “1xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.1xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.1xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 2xx, rate |<p>The number of responses with “2xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.2xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.2xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 3xx, rate |<p>The number of responses with “3xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.3xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.3xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 4xx, rate |<p>The number of responses with “4xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.4xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.4xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses 5xx, rate |<p>The number of responses with “5xx” status codes per second.</p> |DEPENDENT |nginx.http.location_zones.responses.5xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.5xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Responses total, rate |<p>The total number of responses sent to clients per second.</p> |DEPENDENT |nginx.http.location_zones.responses.total.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.total`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Discarded, rate |<p>The total number of requests completed without sending a response per second.</p> |DEPENDENT |nginx.http.location_zones.discarded.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].discarded`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Received, rate |<p>The total number of bytes received from clients per second.</p> |DEPENDENT |nginx.http.location_zones.received.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].received`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP location zone [{#NAME}]: Sent, rate |<p>The total number of bytes sent to clients per second.</p> |DEPENDENT |nginx.http.location_zones.sent.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sent`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: HTTP upstream [{#NAME}]: Keepalive |<p>The current number of idle keepalive connections.</p> |DEPENDENT |nginx.http.upstreams.keepalive[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].keepalive`</p> |
 |Nginx |Nginx: HTTP upstream [{#NAME}]: Zombies |<p>The current number of servers removed from the group but still processing active client requests.</p> |DEPENDENT |nginx.http.upstreams.zombies[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].zombies`</p> |
 |Nginx |Nginx: HTTP upstream [{#NAME}]: Zone |<p>The name of the shared memory zone that keeps the group’s configuration and run-time state.</p> |DEPENDENT |nginx.http.upstreams.zone[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].zone`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: State |<p>Current state, which may be one of “up”, “draining”, “down”, “unavail”, “checking”, and “unhealthy”.</p> |DEPENDENT |nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Active |<p>The current number of active connections.</p> |DEPENDENT |nginx.http.upstream.peer.active[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].active.first()`</p> |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Requests, rate |<p>The total number of client requests forwarded to this server per second.</p> |DEPENDENT |nginx.http.upstream.peer.requests.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].requests.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 1xx, rate |<p>The number of responses with “1xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.1xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.1xx.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 2xx, rate |<p>The number of responses with “2xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.2xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.2xx.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 3xx, rate |<p>The number of responses with “3xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.3xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.3xx.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 4xx, rate |<p>The number of responses with “4xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.4xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.4xx.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 5xx, rate |<p>The number of responses with “5xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.5xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.5xx.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses total, rate |<p>The total number of responses obtained from this server.</p> |DEPENDENT |nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.total.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Sent, rate |<p>The total number of bytes sent to this server per second.</p> |DEPENDENT |nginx.http.upstream.peer.sent.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].sent.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Received, rate |<p>The total number of bytes received from this server per second.</p> |DEPENDENT |nginx.http.upstream.peer.received.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].received.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Fails, rate |<p>The total number of unsuccessful attempts to communicate with the server per second.</p> |DEPENDENT |nginx.http.upstream.peer.fails.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].fails.first()`</p><p>- CHANGE_PER_SECOND |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Requests, rate |<p>The total number of client requests forwarded to this server per second.</p> |DEPENDENT |nginx.http.upstream.peer.requests.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].requests.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 1xx, rate |<p>The number of responses with “1xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.1xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.1xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 2xx, rate |<p>The number of responses with “2xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.2xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.2xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 3xx, rate |<p>The number of responses with “3xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.3xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.3xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 4xx, rate |<p>The number of responses with “4xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.4xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.4xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 5xx, rate |<p>The number of responses with “5xx” status codes per second.</p> |DEPENDENT |nginx.http.upstream.peer.responses.5xx.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.5xx.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses total, rate |<p>The total number of responses obtained from this server.</p> |DEPENDENT |nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].responses.total.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Sent, rate |<p>The total number of bytes sent to this server per second.</p> |DEPENDENT |nginx.http.upstream.peer.sent.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].sent.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Received, rate |<p>The total number of bytes received from this server per second.</p> |DEPENDENT |nginx.http.upstream.peer.received.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].received.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Fails, rate |<p>The total number of unsuccessful attempts to communicate with the server per second.</p> |DEPENDENT |nginx.http.upstream.peer.fails.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].fails.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Unavail |<p>How many times the server became unavailable for client requests (state “unavail”) due to the number of unsuccessful attempts reaching the max_fails threshold.</p> |DEPENDENT |nginx.http.upstream.peer.unavail.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].unavail.first()`</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Header time |<p>The average time to get the response header from the server.</p> |DEPENDENT |nginx.http.upstream.peer.header_time.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].header_time.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Response time |<p>The average time to get the full response from the server.</p> |DEPENDENT |nginx.http.upstream.peer.response_time.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].response_time.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
@@ -144,21 +144,21 @@ There are no template links in this template.
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, fails |<p>The number of failed health checks.</p> |DEPENDENT |nginx.http.upstream.peer.health_checks.fails[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].health_checks.fails.first()`</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, unhealthy |<p>How many times the server became unhealthy (state “unhealthy”).</p> |DEPENDENT |nginx.http.upstream.peer.health_checks.unhealthy[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].health_checks.unhealthy.first()`</p> |
 |Nginx |Nginx: Stream server zone [{#NAME}]: Processing |<p>The number of client connections that are currently being processed.</p> |DEPENDENT |nginx.stream.server_zones.processing[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].processing`</p> |
-|Nginx |Nginx: Stream server zone [{#NAME}]: Connections, rate |<p>The total number of connections accepted from clients per second.</p> |DEPENDENT |nginx.stream.server_zones.connections.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].connections`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream server zone [{#NAME}]: Sessions 2xx, rate |<p>The total number of sessions completed with status codes “2xx” per second.</p> |DEPENDENT |nginx.stream.server_zones.sessions.2xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sessions.2xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream server zone [{#NAME}]: Sessions 4xx, rate |<p>The total number of sessions completed with status codes “4xx” per second.</p> |DEPENDENT |nginx.stream.server_zones.sessions.4xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sessions.4xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream server zone [{#NAME}]: Sessions 5xx, rate |<p>The total number of sessions completed with status codes “5xx” per second.</p> |DEPENDENT |nginx.stream.server_zones.sessions.5xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sessions.5xx`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream server zone [{#NAME}]: Sessions total, rate |<p>The total number of completed client sessions per second.</p> |DEPENDENT |nginx.stream.server_zones.sessions.total.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sessions.total`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream server zone [{#NAME}]: Discarded, rate |<p>The total number of connections completed without creating a session per second.</p> |DEPENDENT |nginx.stream.server_zones.discarded.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].discarded`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream server zone [{#NAME}]: Received, rate |<p>The total number of bytes received from clients per second.</p> |DEPENDENT |nginx.stream.server_zones.received.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].received`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream server zone [{#NAME}]: Sent, rate |<p>The total number of bytes sent to clients per second.</p> |DEPENDENT |nginx.stream.server_zones.sent.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sent`</p><p>- CHANGE_PER_SECOND |
+|Nginx |Nginx: Stream server zone [{#NAME}]: Connections, rate |<p>The total number of connections accepted from clients per second.</p> |DEPENDENT |nginx.stream.server_zones.connections.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].connections`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream server zone [{#NAME}]: Sessions 2xx, rate |<p>The total number of sessions completed with status codes “2xx” per second.</p> |DEPENDENT |nginx.stream.server_zones.sessions.2xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sessions.2xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream server zone [{#NAME}]: Sessions 4xx, rate |<p>The total number of sessions completed with status codes “4xx” per second.</p> |DEPENDENT |nginx.stream.server_zones.sessions.4xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sessions.4xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream server zone [{#NAME}]: Sessions 5xx, rate |<p>The total number of sessions completed with status codes “5xx” per second.</p> |DEPENDENT |nginx.stream.server_zones.sessions.5xx.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sessions.5xx`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream server zone [{#NAME}]: Sessions total, rate |<p>The total number of completed client sessions per second.</p> |DEPENDENT |nginx.stream.server_zones.sessions.total.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sessions.total`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream server zone [{#NAME}]: Discarded, rate |<p>The total number of connections completed without creating a session per second.</p> |DEPENDENT |nginx.stream.server_zones.discarded.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].discarded`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream server zone [{#NAME}]: Received, rate |<p>The total number of bytes received from clients per second.</p> |DEPENDENT |nginx.stream.server_zones.received.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].received`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream server zone [{#NAME}]: Sent, rate |<p>The total number of bytes sent to clients per second.</p> |DEPENDENT |nginx.stream.server_zones.sent.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sent`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: Stream upstream [{#NAME}]: Zombies | |DEPENDENT |nginx.stream.upstreams.zombies[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].zombies`</p> |
 |Nginx |Nginx: Stream upstream [{#NAME}]: Zone | |DEPENDENT |nginx.stream.upstreams.zone[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].zone`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: State |<p>Current state, which may be one of “up”, “draining”, “down”, “unavail”, “checking”, and “unhealthy”.</p> |DEPENDENT |nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Active |<p>The current number of connections.</p> |DEPENDENT |nginx.stream.upstream.peer.active[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].active.first()`</p> |
-|Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Sent, rate |<p>The total number of bytes sent to this server per second.</p> |DEPENDENT |nginx.stream.upstream.peer.sent.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].sent.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Received, rate |<p>The total number of bytes received from this server per second.</p> |DEPENDENT |nginx.stream.upstream.peer.received.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].received.first()`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Fails, rate |<p>The total number of unsuccessful attempts to communicate with the server per second.</p> |DEPENDENT |nginx.stream.upstream.peer.fails.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].fails.first()`</p><p>- CHANGE_PER_SECOND |
+|Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Sent, rate |<p>The total number of bytes sent to this server per second.</p> |DEPENDENT |nginx.stream.upstream.peer.sent.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].sent.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Received, rate |<p>The total number of bytes received from this server per second.</p> |DEPENDENT |nginx.stream.upstream.peer.received.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].received.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Fails, rate |<p>The total number of unsuccessful attempts to communicate with the server per second.</p> |DEPENDENT |nginx.stream.upstream.peer.fails.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].fails.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Unavail |<p>How many times the server became unavailable for client requests (state “unavail”) due to the number of unsuccessful attempts reaching the max_fails threshold.</p> |DEPENDENT |nginx.stream.upstream.peer.unavail.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].unavail.first()`</p> |
 |Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Connections |<p>The total number of client connections forwarded to this server.</p> |DEPENDENT |nginx.stream.upstream.peer.connections.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].connections.first()`</p> |
 |Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Connect time |<p>The average time to connect to the upstream server.</p> |DEPENDENT |nginx.stream.upstream.peer.connect_time.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].connect_time.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
@@ -167,17 +167,17 @@ There are no template links in this template.
 |Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, check |<p>The total number of health check requests made.</p> |DEPENDENT |nginx.stream.upstream.peer.health_checks.checks[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].health_checks.checks.first()`</p> |
 |Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, fails |<p>The number of failed health checks.</p> |DEPENDENT |nginx.stream.upstream.peer.health_checks.fails[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].health_checks.fails.first()`</p> |
 |Nginx |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, unhealthy |<p>How many times the server became unhealthy (state “unhealthy”).</p> |DEPENDENT |nginx.stream.upstream.peer.health_checks.unhealthy[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].health_checks.unhealthy.first()`</p> |
-|Nginx |Nginx: Resolver [{#NAME}]: Requests name, rate |<p>The total number of requests to resolve names to addresses per second.</p> |DEPENDENT |nginx.resolvers.requests.name.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests.name`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Requests srv, rate |<p>The total number of requests to resolve SRV records per second.</p> |DEPENDENT |nginx.resolvers.requests.srv.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests.srv`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Requests addr, rate |<p>The total number of requests to resolve addresses to names per second.</p> |DEPENDENT |nginx.resolvers.requests.addr.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests.addr`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Responses noerror, rate |<p>The total number of successful responses per second.</p> |DEPENDENT |nginx.resolvers.responses.noerror.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.noerror`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Responses formerr, rate |<p>The total number of FORMERR (Format error) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.formerr.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.formerr`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Responses servfail, rate |<p>The total number of SERVFAIL (Server failure) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.servfail.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.servfail`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Responses nxdomain, rate |<p>The total number of NXDOMAIN (Host not found) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.nxdomain.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.nxdomain`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Responses notimp, rate |<p>The total number of NOTIMP (Unimplemented) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.notimp.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.notimp`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Responses refused, rate |<p>The total number of REFUSED (Operation refused) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.refused.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.refused`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Responses timedout, rate |<p>The total number of timed out requests per second.</p> |DEPENDENT |nginx.resolvers.responses.timedout.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.timedout`</p><p>- CHANGE_PER_SECOND |
-|Nginx |Nginx: Resolver [{#NAME}]: Responses unknown, rate |<p>The total number of requests completed with an unknown error per second.</p> |DEPENDENT |nginx.resolvers.responses.unknown.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.unknown`</p><p>- CHANGE_PER_SECOND |
+|Nginx |Nginx: Resolver [{#NAME}]: Requests name, rate |<p>The total number of requests to resolve names to addresses per second.</p> |DEPENDENT |nginx.resolvers.requests.name.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests.name`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Requests srv, rate |<p>The total number of requests to resolve SRV records per second.</p> |DEPENDENT |nginx.resolvers.requests.srv.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests.srv`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Requests addr, rate |<p>The total number of requests to resolve addresses to names per second.</p> |DEPENDENT |nginx.resolvers.requests.addr.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].requests.addr`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Responses noerror, rate |<p>The total number of successful responses per second.</p> |DEPENDENT |nginx.resolvers.responses.noerror.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.noerror`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Responses formerr, rate |<p>The total number of FORMERR (Format error) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.formerr.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.formerr`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Responses servfail, rate |<p>The total number of SERVFAIL (Server failure) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.servfail.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.servfail`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Responses nxdomain, rate |<p>The total number of NXDOMAIN (Host not found) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.nxdomain.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.nxdomain`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Responses notimp, rate |<p>The total number of NOTIMP (Unimplemented) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.notimp.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.notimp`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Responses refused, rate |<p>The total number of REFUSED (Operation refused) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.refused.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.refused`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Responses timedout, rate |<p>The total number of timed out requests per second.</p> |DEPENDENT |nginx.resolvers.responses.timedout.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.timedout`</p><p>- CHANGE_PER_SECOND</p> |
+|Nginx |Nginx: Resolver [{#NAME}]: Responses unknown, rate |<p>The total number of requests completed with an unknown error per second.</p> |DEPENDENT |nginx.resolvers.responses.unknown.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.unknown`</p><p>- CHANGE_PER_SECOND</p> |
 |Zabbix_raw_items |Nginx: Get info |<p>Return status of nginx running instance.</p> |HTTP_AGENT |nginx.info |
 |Zabbix_raw_items |Nginx: Get connections |<p>Returns statistics of client connections.</p> |HTTP_AGENT |nginx.connections |
 |Zabbix_raw_items |Nginx: Get SSL |<p>Returns SSL statistics.</p> |HTTP_AGENT |nginx.ssl |
@@ -193,15 +193,15 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Nginx: Server response error (text: {ITEM.VALUE}) |<p>-</p> |`{TEMPLATE_NAME:nginx.info.error.strlen()}>0` |HIGH | |
-|Nginx: Version has changed (new version: {ITEM.VALUE}) |<p>Nginx version has changed. Ack to close.</p> |`{TEMPLATE_NAME:nginx.info.version.diff()}=1 and {TEMPLATE_NAME:nginx.info.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Nginx: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:nginx.info.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Nginx: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for metrics for the last 30 minutes</p> |`{TEMPLATE_NAME:nginx.info.uptime.nodata(30m)}=1` |WARNING |<p>Manual close: YES</p> |
-|Nginx: High connections drop rate (more than {$NGINX.DROP_RATE.MAX.WARN} for 5m) |<p>The dropping rate connections is greater than {$NGINX.DROP_RATE.MAX.WARN} for the last 5 minutes.</p> |`{TEMPLATE_NAME:nginx.connections.dropped.min(5m)} > {$NGINX.DROP_RATE.MAX.WARN}` |WARNING | |
-|Nginx: HTTP upstream server is not in UP or DOWN state. |<p>-</p> |`{TEMPLATE_NAME:nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}].str(up)}=0 and {TEMPLATE_NAME:nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}].str(down)}=0` |WARNING | |
-|Nginx: Too many HTTP requests with code 4xx (over {$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}% for 5m) |<p>-</p> |`{TEMPLATE_NAME:nginx.http.upstream.peer.responses.4xx.rate[{#UPSTREAM},{#PEER}].sum(5m)} > ({Nginx Plus by HTTP:nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}].sum(5m)}*({$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}/100))` |WARNING | |
-|Nginx: Too many HTTP requests with code 5xx (over {$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}% for 5m) |<p>-</p> |`{TEMPLATE_NAME:nginx.http.upstream.peer.responses.5xx.rate[{#UPSTREAM},{#PEER}].sum(5m)} > ({Nginx Plus by HTTP:nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}].sum(5m)}*({$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}/100))` |HIGH | |
-|Nginx: Stream upstream server is not in UP or DOWN state. |<p>-</p> |`{TEMPLATE_NAME:nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}].str(up)}=0 and {TEMPLATE_NAME:nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}].str(down)}=0` |WARNING | |
+|Nginx: Server response error (text: {ITEM.VALUE}) |<p>-</p> |`length(last(/Nginx Plus by HTTP/nginx.info.error))>0` |HIGH | |
+|Nginx: Version has changed (new version: {ITEM.VALUE}) |<p>Nginx version has changed. Ack to close.</p> |`last(/Nginx Plus by HTTP/nginx.info.version,#1)<>last(/Nginx Plus by HTTP/nginx.info.version,#2) and length(last(/Nginx Plus by HTTP/nginx.info.version))>0` |INFO |<p>Manual close: YES</p> |
+|Nginx: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Nginx Plus by HTTP/nginx.info.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Nginx: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for metrics for the last 30 minutes</p> |`nodata(/Nginx Plus by HTTP/nginx.info.uptime,30m)=1` |WARNING |<p>Manual close: YES</p> |
+|Nginx: High connections drop rate (more than {$NGINX.DROP_RATE.MAX.WARN} for 5m) |<p>The dropping rate connections is greater than {$NGINX.DROP_RATE.MAX.WARN} for the last 5 minutes.</p> |`min(/Nginx Plus by HTTP/nginx.connections.dropped,5m) > {$NGINX.DROP_RATE.MAX.WARN}` |WARNING | |
+|Nginx: HTTP upstream server is not in UP or DOWN state. |<p>-</p> |`find(/Nginx Plus by HTTP/nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","up")=0 and find(/Nginx Plus by HTTP/nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","down")=0` |WARNING | |
+|Nginx: Too many HTTP requests with code 4xx (over {$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}% for 5m) |<p>-</p> |`sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.4xx.rate[{#UPSTREAM},{#PEER}],5m) > (sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}],5m)*({$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}/100))` |WARNING | |
+|Nginx: Too many HTTP requests with code 5xx (over {$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}% for 5m) |<p>-</p> |`sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.5xx.rate[{#UPSTREAM},{#PEER}],5m) > (sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}],5m)*({$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}/100))` |HIGH | |
+|Nginx: Stream upstream server is not in UP or DOWN state. |<p>-</p> |`find(/Nginx Plus by HTTP/nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","up")=0 and find(/Nginx Plus by HTTP/nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","down")=0` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/nginx_plus_http/template_app_nginx_plus_http.yaml b/templates/app/nginx_plus_http/template_app_nginx_plus_http.yaml
index 5f4c221818e..f04ae215390 100644
--- a/templates/app/nginx_plus_http/template_app_nginx_plus_http.yaml
+++ b/templates/app/nginx_plus_http/template_app_nginx_plus_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-27T13:57:40Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:50Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -8,8 +8,8 @@ zabbix_export:
   templates:
     -
       uuid: 8cad0f2564694416b60bd8a414948641
-      template: 'Template App Nginx Plus by HTTP'
-      name: 'Template App Nginx Plus by HTTP'
+      template: 'Nginx Plus by HTTP'
+      name: 'Nginx Plus by HTTP'
       description: |
         Get Nginx Plus metrics by HTTP agent.
         Metrics are collected by requests to Nginx Plus API.
@@ -17,7 +17,7 @@ zabbix_export:
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -101,7 +101,7 @@ zabbix_export:
           triggers:
             -
               uuid: 91c9dab8147a4d0086019119e4e55b5e
-              expression: 'min(/Template App Nginx Plus by HTTP/nginx.connections.dropped,5m) > {$NGINX.DROP_RATE.MAX.WARN}'
+              expression: 'min(/Nginx Plus by HTTP/nginx.connections.dropped,5m) > {$NGINX.DROP_RATE.MAX.WARN}'
               name: 'Nginx: High connections drop rate (more than {$NGINX.DROP_RATE.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'The dropping rate connections is greater than {$NGINX.DROP_RATE.MAX.WARN} for the last 5 minutes.'
@@ -238,7 +238,7 @@ zabbix_export:
           triggers:
             -
               uuid: e444c708371748bd831bba6c8d9a92e0
-              expression: 'length(last(/Template App Nginx Plus by HTTP/nginx.info.error))>0'
+              expression: 'length(last(/Nginx Plus by HTTP/nginx.info.error))>0'
               name: 'Nginx: Server response error (text: {ITEM.VALUE})'
               priority: HIGH
         -
@@ -292,14 +292,14 @@ zabbix_export:
           triggers:
             -
               uuid: 396fb4be618e45578566971d5399d611
-              expression: 'nodata(/Template App Nginx Plus by HTTP/nginx.info.uptime,30m)=1'
+              expression: 'nodata(/Nginx Plus by HTTP/nginx.info.uptime,30m)=1'
               name: 'Nginx: Failed to fetch info data (or no data for 30m)'
               priority: WARNING
               description: 'Zabbix has not received data for metrics for the last 30 minutes'
               manual_close: 'YES'
             -
               uuid: 95622a29bd58444b9f0bd985db99f922
-              expression: 'last(/Template App Nginx Plus by HTTP/nginx.info.uptime)<10m'
+              expression: 'last(/Nginx Plus by HTTP/nginx.info.uptime)<10m'
               name: 'Nginx: has been restarted (uptime < 10m)'
               priority: INFO
               description: 'Uptime is less than 10 minutes'
@@ -332,7 +332,7 @@ zabbix_export:
           triggers:
             -
               uuid: a91ff018fe4f4a1495b08adeb2b0005f
-              expression: 'last(/Template App Nginx Plus by HTTP/nginx.info.version,#1)<>last(/Template App Nginx Plus by HTTP/nginx.info.version,#2) and length(last(/Template App Nginx Plus by HTTP/nginx.info.version))>0'
+              expression: 'last(/Nginx Plus by HTTP/nginx.info.version,#1)<>last(/Nginx Plus by HTTP/nginx.info.version,#2) and length(last(/Nginx Plus by HTTP/nginx.info.version))>0'
               name: 'Nginx: Version has changed (new version: {ITEM.VALUE})'
               priority: INFO
               description: 'Nginx version has changed. Ack to close.'
@@ -782,7 +782,7 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.location_zones.requests.rate[{#NAME}]'
             -
               uuid: 6b05907e4c544986b977a1b496ca92e2
@@ -792,35 +792,35 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.location_zones.responses.2xx.rate[{#NAME}]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.location_zones.responses.1xx.rate[{#NAME}]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.location_zones.responses.3xx.rate[{#NAME}]'
                 -
                   sortorder: '3'
                   drawtype: GRADIENT_LINE
                   color: A54F10
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.location_zones.responses.4xx.rate[{#NAME}]'
                 -
                   sortorder: '4'
                   drawtype: GRADIENT_LINE
                   color: FC6EA3
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.location_zones.responses.5xx.rate[{#NAME}]'
           master_item:
             key: nginx.http.location_zones
@@ -836,7 +836,6 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(output);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1118,7 +1117,7 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.server_zones.requests.rate[{#NAME}]'
             -
               uuid: 5870e9a861f046b3946c2464c6c5007d
@@ -1128,35 +1127,35 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.server_zones.responses.2xx.rate[{#NAME}]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.server_zones.responses.1xx.rate[{#NAME}]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.server_zones.responses.3xx.rate[{#NAME}]'
                 -
                   sortorder: '3'
                   drawtype: GRADIENT_LINE
                   color: A54F10
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.server_zones.responses.4xx.rate[{#NAME}]'
                 -
                   sortorder: '4'
                   drawtype: GRADIENT_LINE
                   color: FC6EA3
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.server_zones.responses.5xx.rate[{#NAME}]'
           master_item:
             key: nginx.http.server_zones
@@ -1172,7 +1171,6 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(output);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1572,7 +1570,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: fc6586fe2eef457bac1d71ce0313f95d
-                  expression: 'find(/Template App Nginx Plus by HTTP/nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","up")=0 and find(/Template App Nginx Plus by HTTP/nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","down")=0'
+                  expression: 'find(/Nginx Plus by HTTP/nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","up")=0 and find(/Nginx Plus by HTTP/nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","down")=0'
                   name: 'Nginx: HTTP upstream server is not in UP or DOWN state.'
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: WARNING
@@ -1598,12 +1596,12 @@ zabbix_export:
           trigger_prototypes:
             -
               uuid: e7b4782a796b4710b50a96f3d24c8208
-              expression: 'sum(/Template App Nginx Plus by HTTP/nginx.http.upstream.peer.responses.4xx.rate[{#UPSTREAM},{#PEER}],5m) > (sum(/Template App Nginx Plus by HTTP/nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}],5m)*({$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}/100))'
+              expression: 'sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.4xx.rate[{#UPSTREAM},{#PEER}],5m) > (sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}],5m)*({$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}/100))'
               name: 'Nginx: Too many HTTP requests with code 4xx (over {$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}% for 5m)'
               priority: WARNING
             -
               uuid: f542573d149547d3844f635bf2a87120
-              expression: 'sum(/Template App Nginx Plus by HTTP/nginx.http.upstream.peer.responses.5xx.rate[{#UPSTREAM},{#PEER}],5m) > (sum(/Template App Nginx Plus by HTTP/nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}],5m)*({$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}/100))'
+              expression: 'sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.5xx.rate[{#UPSTREAM},{#PEER}],5m) > (sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}],5m)*({$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}/100))'
               name: 'Nginx: Too many HTTP requests with code 5xx (over {$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}% for 5m)'
               priority: HIGH
           graph_prototypes:
@@ -1615,21 +1613,21 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.upstream.peer.health_checks.checks[{#UPSTREAM},{#PEER}]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.upstream.peer.health_checks.fails[{#UPSTREAM},{#PEER}]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.upstream.peer.health_checks.unhealthy[{#UPSTREAM},{#PEER}]'
             -
               uuid: 49cd8f25969d486ab4482b4986b1815a
@@ -1639,35 +1637,35 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.upstream.peer.responses.2xx.rate[{#UPSTREAM},{#PEER}]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.upstream.peer.responses.1xx.rate[{#UPSTREAM},{#PEER}]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.upstream.peer.responses.3xx.rate[{#UPSTREAM},{#PEER}]'
                 -
                   sortorder: '3'
                   drawtype: GRADIENT_LINE
                   color: A54F10
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.upstream.peer.responses.4xx.rate[{#UPSTREAM},{#PEER}]'
                 -
                   sortorder: '4'
                   drawtype: GRADIENT_LINE
                   color: FC6EA3
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.http.upstream.peer.responses.5xx.rate[{#UPSTREAM},{#PEER}]'
           master_item:
             key: nginx.http.upstreams
@@ -1686,8 +1684,6 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(output);
-                  
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1788,7 +1784,6 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(output);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2074,21 +2069,21 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.requests.name.rate[{#NAME}]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.requests.srv.rate[{#NAME}]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.requests.addr.rate[{#NAME}]'
             -
               uuid: e3535ce974114e6188752937c1bdb2c7
@@ -2098,56 +2093,56 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.responses.noerror.rate[{#NAME}]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.responses.formerr.rate[{#NAME}]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.responses.servfail.rate[{#NAME}]'
                 -
                   sortorder: '3'
                   drawtype: GRADIENT_LINE
                   color: A54F10
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.responses.nxdomain.rate[{#NAME}]'
                 -
                   sortorder: '4'
                   drawtype: GRADIENT_LINE
                   color: FC6EA3
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.responses.notimp.rate[{#NAME}]'
                 -
                   sortorder: '5'
                   drawtype: GRADIENT_LINE
                   color: 6C59DC
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.responses.refused.rate[{#NAME}]'
                 -
                   sortorder: '6'
                   drawtype: GRADIENT_LINE
                   color: AC8C14
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.responses.timedout.rate[{#NAME}]'
                 -
                   sortorder: '7'
                   drawtype: GRADIENT_LINE
                   color: 611F27
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.resolvers.responses.unknown.rate[{#NAME}]'
           master_item:
             key: nginx.resolvers
@@ -2163,7 +2158,6 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(output);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2399,21 +2393,21 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.stream.server_zones.sessions.2xx.rate[{#NAME}]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.stream.server_zones.sessions.4xx.rate[{#NAME}]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.stream.server_zones.sessions.5xx.rate[{#NAME}]'
           master_item:
             key: nginx.stream.server_zones
@@ -2429,7 +2423,6 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(output);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2708,7 +2701,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 20ef9b9e953246ef856dd46033595e52
-                  expression: 'find(/Template App Nginx Plus by HTTP/nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","up")=0 and find(/Template App Nginx Plus by HTTP/nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","down")=0'
+                  expression: 'find(/Nginx Plus by HTTP/nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","up")=0 and find(/Nginx Plus by HTTP/nginx.stream.upstream.peer.state[{#UPSTREAM},{#PEER}],,"like","down")=0'
                   name: 'Nginx: Stream upstream server is not in UP or DOWN state.'
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: WARNING
@@ -2740,21 +2733,21 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.stream.upstream.peer.health_checks.checks[{#UPSTREAM},{#PEER}]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.stream.upstream.peer.health_checks.fails[{#UPSTREAM},{#PEER}]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Template App Nginx Plus by HTTP'
+                    host: 'Nginx Plus by HTTP'
                     key: 'nginx.stream.upstream.peer.health_checks.unhealthy[{#UPSTREAM},{#PEER}]'
           master_item:
             key: nginx.stream.upstreams
@@ -2773,8 +2766,6 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(output);
-                  
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2854,7 +2845,6 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(output);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2932,28 +2922,28 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.connections.accepted.rate
         -
           sortorder: '1'
           drawtype: GRADIENT_LINE
           color: 2774A4
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.connections.dropped
         -
           sortorder: '2'
           drawtype: GRADIENT_LINE
           color: F63100
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.connections.active
         -
           sortorder: '3'
           drawtype: GRADIENT_LINE
           color: A54F10
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.connections.idle
     -
       uuid: 4be7153e244b4c28a53c527aa9fd5706
@@ -2963,7 +2953,7 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.requests.total.rate
     -
       uuid: b1c647610c974bc8aad4fb55e1e3c8d3
@@ -2973,21 +2963,21 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.ssl.handshakes.rate
         -
           sortorder: '1'
           drawtype: GRADIENT_LINE
           color: 2774A4
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.ssl.handshakes_failed.rate
         -
           sortorder: '2'
           drawtype: GRADIENT_LINE
           color: F63100
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.ssl.session_reuses.rate
     -
       uuid: b2da29d4951745db8a66a076eb99d0aa
@@ -2996,5 +2986,5 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'Template App Nginx Plus by HTTP'
+            host: 'Nginx Plus by HTTP'
             key: nginx.info.uptime
diff --git a/templates/app/pfsense_snmp/README.md b/templates/app/pfsense_snmp/README.md
new file mode 100644
index 00000000000..6563f805861
--- /dev/null
+++ b/templates/app/pfsense_snmp/README.md
@@ -0,0 +1,202 @@
+
+# PFSense SNMP
+
+## Overview
+
+For Zabbix version: 5.4 and higher  
+Template for monitoring pfSense by SNMP
+
+This template was tested on:
+
+- pfSense, version 2.5.0, 2.5.1, 2.5.2
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+1. Import template into Zabbix
+2. Enable SNMP daemon at Services in pfSense web interface https://docs.netgate.com/pfsense/en/latest/services/snmp.html
+3. Setup firewall rule to get access from Zabbix proxy or Zabbix server by SNMP https://docs.netgate.com/pfsense/en/latest/firewall/index.html#managing-firewall-rules
+4. Link template to the host
+
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>Threshold of CPU utilization for warning trigger in %.</p> |`90` |
+|{$ICMP_LOSS_WARN} |<p>Threshold of ICMP packets loss for warning trigger in %.</p> |`20` |
+|{$ICMP_RESPONSE_TIME_WARN} |<p>Threshold of average ICMP response time for warning trigger in seconds.</p> |`0.15` |
+|{$IF.ERRORS.WARN} |<p>Threshold of error packets rate for warning trigger. Can be used with interface name as context.</p> |`2` |
+|{$IF.UTIL.MAX} |<p>Threshold of interface bandwidth utilization for warning trigger in %. Can be used with interface name as context.</p> |`90` |
+|{$IFCONTROL} |<p>Macro for operational state of the interface for link down trigger. Can be used with interface name as context.</p> |`1` |
+|{$LOAD_AVG_PER_CPU.MAX.WARN} |<p>Load per CPU considered sustainable. Tune if needed.</p> |`1.5` |
+|{$MEMORY.AVAILABLE.MIN} |<p>Threshold of available memory for trigger in bytes.</p> |`20M` |
+|{$MEMORY.UTIL.MAX} |<p>Threshold of memory utilization for trigger in %</p> |`90` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>This macro is used in filters of network interfaces discovery rule.</p> |`^.*` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFALIAS.MATCHES} |<p>This macro is used in filters of network interfaces discovery rule.</p> |`.*` |
+|{$NET.IF.IFALIAS.NOT_MATCHES} |<p>This macro is used in filters of network interfaces discovery rule.</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>This macro used in filters of network interfaces discovery rule.</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>This macro used in filters of network interfaces discovery rule.</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFNAME.MATCHES} |<p>This macro used in filters of network interfaces discovery rule.</p> |`^em[0-9]+$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>This macro used in filters of network interfaces discovery rule.</p> |`^$` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>This macro used in filters of network interfaces discovery rule.</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>This macro used in filters of network interfaces discovery rule.</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>This macro used in filters of network interfaces discovery rule.</p> |`CHANGE_IF_NEEDED` |
+|{$SNMP.TIMEOUT} |<p>The time interval for SNMP availability trigger.</p> |`5m` |
+|{$SOURCE.TRACKING.TABLE.UTIL.MAX} |<p>Threshold of source tracking table utilization trigger in %.</p> |`90` |
+|{$STATE.TABLE.UTIL.MAX} |<p>Threshold of state table utilization trigger in %.</p> |`90` |
+|{$SWAP.PFREE.MIN.WARN} |<p>Threshold of free swap space for warning trigger in %.</p> |`50` |
+|{$VFS.DEV.DEVNAME.MATCHES} |<p>This macro is used in block devices discovery. Can be overridden on the host or linked template level</p> |`.+` |
+|{$VFS.DEV.DEVNAME.NOT_MATCHES} |<p>This macro is used in block devices discovery. Can be overridden on the host or linked template level</p> |`^(loop[0-9]*|sd[a-z][0-9]+|nbd[0-9]+|sr[0-9]+|fd[0-9]+|dm-[0-9]+|ram[0-9]+|ploop[a-z0-9]+|md[0-9]*|hcp[0-9]*|cd[0-9]*|pass[0-9]*|zram[0-9]*)` |
+|{$VFS.FS.FSNAME.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`.+` |
+|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^(/dev|/sys|/run|/var/run|/proc|.+/shm$)` |
+|{$VFS.FS.FSTYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`.*(9.3|hrFSBerkeleyFFS)$` |
+|{$VFS.FS.FSTYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^\s$` |
+|{$VFS.FS.INODE.PFREE.MIN.CRIT} |<p>Threshold of inodes usage for average severity trigger in %. Can be used with filesystem name as context.</p> |`10` |
+|{$VFS.FS.INODE.PFREE.MIN.WARN} |<p>Threshold of inodes usage for warning trigger in %. Can be used with filesystem name as context.</p> |`20` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>Threshold of filesystem used space for average severity trigger in %. Can be used with filesystem name as context.</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>Threshold of used filesystem space for warning trigger in %. Can be used with filesystem name as context.</p> |`80` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>This discovery will create set of per core CPU metrics from UCD-SNMP-MIB, using {#CPU.COUNT} in preprocessing. That's the only reason why LLD is used.</p> |DEPENDENT |cpu.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Mounted filesystem discovery |<p>HOST-RESOURCES-MIB::hrFS discovery with filter</p> |SNMP |vfs.fs.discovery<p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
+|Block devices discovery |<p>Block devices are discovered from UCD-DISKIO-MIB::diskIOTable (http://net-snmp.sourceforge.net/docs/mibs/ucdDiskIOMIB.html#diskIOTable)</p> |SNMP |vfs.dev.discovery<p>**Filter**:</p>AND <p>- {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |PFSense: Interrupts per second |<p>MIB: UCD-SNMP-MIB</p><p>Number of interrupts processed</p> |SNMP |system.cpu.intr<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|CPU |PFSense: Context switches per second |<p>MIB: UCD-SNMP-MIB</p><p>Number of context switches</p> |SNMP |system.cpu.switches<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|CPU |PFSense: Load average (1m avg) |<p>MIB: UCD-SNMP-MIB</p><p>The 1 minute load averages.</p> |SNMP |system.cpu.load.avg1 |
+|CPU |PFSense: Load average (5m avg) |<p>MIB: UCD-SNMP-MIB</p><p>The 5 minutes load averages.</p> |SNMP |system.cpu.load.avg5 |
+|CPU |PFSense: Load average (15m avg) |<p>MIB: UCD-SNMP-MIB</p><p>The 15 minutes load averages.</p> |SNMP |system.cpu.load.avg15 |
+|CPU |PFSense: Number of CPUs |<p>MIB: HOST-RESOURCES-MIB</p><p>Count the number of CPU cores by counting number of cores discovered in hrProcessorTable using LLD</p> |SNMP |system.cpu.num<p>**Preprocessing**:</p><p>- JAVASCRIPT: `//count the number of cores return JSON.parse(value).length; `</p> |
+|CPU |PFSense: CPU idle time |<p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent doing nothing.</p> |SNMP |system.cpu.idle[{#SNMPINDEX}] |
+|CPU |PFSense: CPU system time |<p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running the kernel and its processes.</p> |SNMP |system.cpu.system[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |PFSense: CPU user time |<p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running users' processes that are not niced.</p> |SNMP |system.cpu.user[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |PFSense: CPU nice time |<p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running users' processes that have been niced.</p> |SNMP |system.cpu.nice[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |PFSense: CPU iowait time |<p>MIB: UCD-SNMP-MIB</p><p>Amount of time the CPU has been waiting for I/O to complete.</p> |SNMP |system.cpu.iowait[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |PFSense: CPU interrupt time |<p>MIB: UCD-SNMP-MIB</p><p>The amount of time the CPU has been servicing hardware interrupts.</p> |SNMP |system.cpu.interrupt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |PFSense: CPU utilization |<p>CPU utilization in %</p> |DEPENDENT |system.cpu.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `//Calculate utilization return (100 - value) `</p> |
+|General |PFSense: System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person. If no contact information is known, the value is the zero-length string.</p> |SNMP |system.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT |
+|General |PFSense: System description |<p>MIB: SNMPv2-MIB</p><p>System description of the host.</p> |SNMP |system.descr<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT |
+|General |PFSense: System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node. If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT |
+|General |PFSense: System name |<p>MIB: SNMPv2-MIB</p><p>System host name.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT |
+|General |PFSense: System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor authoritative identification of the network management subsystem contained in the entity. This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining what kind of box is being managed.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT |
+|Memory |PFSense: Free memory |<p>MIB: UCD-SNMP-MIB</p><p>The amount of real/physical memory currently unused or available.</p> |SNMP |vm.memory.free<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |PFSense: Memory (buffers) |<p>MIB: UCD-SNMP-MIB</p><p>The total amount of real or virtual memory currently allocated for use as memory buffers.</p> |SNMP |vm.memory.buffers<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |PFSense: Memory (cached) |<p>MIB: UCD-SNMP-MIB</p><p>The total amount of real or virtual memory currently allocated for use as cached memory.</p> |SNMP |vm.memory.cached<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |PFSense: Total memory |<p>MIB: UCD-SNMP-MIB</p><p>Total memory in Bytes</p> |SNMP |vm.memory.total<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |PFSense: Available memory |<p>Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.</p> |CALCULATED |vm.memory.available<p>**Expression**:</p>`last(//vm.memory.free)+last(//vm.memory.buffers)+last(//vm.memory.cached)` |
+|Memory |PFSense: Memory utilization |<p>Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.</p> |CALCULATED |vm.memory.util<p>**Expression**:</p>`(last(//vm.memory.total)-(last(//vm.memory.free)+last(//vm.memory.buffers)+last(//vm.memory.cached)))/last(//vm.memory.total)*100` |
+|Memory |PFSense: Total swap space |<p>MIB: UCD-SNMP-MIB</p><p>The total amount of swap space configured for this host.</p> |SNMP |system.swap.total<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |PFSense: Free swap space |<p>MIB: UCD-SNMP-MIB</p><p>The amount of swap space currently unused or available.</p> |SNMP |system.swap.free<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |PFSense: Free swap space in % |<p>The free space of swap volume/file in percent.</p> |CALCULATED |system.swap.pfree<p>**Expression**:</p>`last(//system.swap.free)/last(//system.swap.total)*100` |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER<p>- DISCARD_UNCHANGED_HEARTBEAT |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Rules references count |<p>BEGEMOT-PF-MIB</p><p>The number of rules referencing this interface.</p> |SNMP |net.if.rules.refs[{#SNMPINDEX}] |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 traffic passed |<p>BEGEMOT-PF-MIB</p><p>IPv4 bits per second passed coming in on this interface.</p> |SNMP |net.if.in.pass.v4.bps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 traffic blocked |<p>BEGEMOT-PF-MIB</p><p>IPv4 bits per second blocked coming in on this interface.</p> |SNMP |net.if.in.block.v4.bps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 traffic passed |<p>BEGEMOT-PF-MIB</p><p>IPv4 bits per second passed going out on this interface.</p> |SNMP |net.if.out.pass.v4.bps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 traffic blocked |<p>BEGEMOT-PF-MIB</p><p>IPv4 bits per second blocked going out on this interface.</p> |SNMP |net.if.out.block.v4.bps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 packets passed |<p>BEGEMOT-PF-MIB</p><p>The number of IPv4 packets passed coming in on this interface.</p> |SNMP |net.if.in.pass.v4.pps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 packets blocked |<p>BEGEMOT-PF-MIB</p><p>The number of IPv4 packets blocked coming in on this interface.</p> |SNMP |net.if.in.block.v4.pps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 packets passed |<p>BEGEMOT-PF-MIB</p><p>The number of IPv4 packets passed going out on this interface.</p> |SNMP |net.if.out.pass.v4.pps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 packets blocked |<p>BEGEMOT-PF-MIB</p><p>The number of IPv4 packets blocked going out on this interface.</p> |SNMP |net.if.out.block.v4.pps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 traffic passed |<p>BEGEMOT-PF-MIB</p><p>IPv6 bits per second passed coming in on this interface.</p> |SNMP |net.if.in.pass.v6.bps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 traffic blocked |<p>BEGEMOT-PF-MIB</p><p>IPv6 bits per second blocked coming in on this interface.</p> |SNMP |net.if.in.block.v6.bps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 traffic passed |<p>BEGEMOT-PF-MIB</p><p>IPv6 bits per second passed going out on this interface.</p> |SNMP |net.if.out.pass.v6.bps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 traffic blocked |<p>BEGEMOT-PF-MIB</p><p>IPv6 bits per second blocked going out on this interface.</p> |SNMP |net.if.out.block.v6.bps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 packets passed |<p>BEGEMOT-PF-MIB</p><p>The number of IPv6 packets passed coming in on this interface.</p> |SNMP |net.if.in.pass.v6.pps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 packets blocked |<p>BEGEMOT-PF-MIB</p><p>The number of IPv6 packets blocked coming in on this interface.</p> |SNMP |net.if.in.block.v6.pps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 packets passed |<p>BEGEMOT-PF-MIB</p><p>The number of IPv6 packets passed going out on this interface.</p> |SNMP |net.if.out.pass.v6.pps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 packets blocked |<p>BEGEMOT-PF-MIB</p><p>The number of IPv6 packets blocked going out on this interface.</p> |SNMP |net.if.out.block.v6.pps[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|pfSense |PFSense: Packet filter running status |<p>MIB: BEGEMOT-PF-MIB</p><p>True if packet filter is currently enabled</p> |SNMP |pfsense.pf.status |
+|pfSense |PFSense: States table current |<p>MIB: BEGEMOT-PF-MIB</p><p>Number of entries in the state table.</p> |SNMP |pfsense.state.table.count |
+|pfSense |PFSense: States table limit |<p>MIB: BEGEMOT-PF-MIB</p><p>Maximum number of 'keep state' rules in the ruleset.</p> |SNMP |pfsense.state.table.limit |
+|pfSense |PFSense: States table utilization in % |<p>Utilization of state table in %.</p> |CALCULATED |pfsense.state.table.pused<p>**Expression**:</p>`last(//pfsense.state.table.count) * 100 / last(//pfsense.state.table.limit)` |
+|pfSense |PFSense: Source tracking table current |<p>MIB: BEGEMOT-PF-MIB</p><p>Number of entries in the source tracking table.</p> |SNMP |pfsense.source.tracking.table.count |
+|pfSense |PFSense: Source tracking table limit |<p>MIB: BEGEMOT-PF-MIB</p><p>Maximum number of 'sticky-address' or 'source-track' rules in the ruleset.</p> |SNMP |pfsense.source.tracking.table.limit |
+|pfSense |PFSense: Source tracking table utilization in % |<p>Utilization of source tracking table in %.</p> |CALCULATED |pfsense.source.tracking.table.pused<p>**Expression**:</p>`last(//pfsense.source.tracking.table.count) * 100 / last(//pfsense.source.tracking.table.limit)` |
+|pfSense |PFSense: DHCP server status |<p>MIB: HOST-RESOURCES-MIB</p><p>The status of DHCP server process.</p> |SNMP |pfsense.dhcpd.status<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED: ``</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|pfSense |PFSense: DNS server status |<p>MIB: HOST-RESOURCES-MIB</p><p>The status of DNS server process.</p> |SNMP |pfsense.dns.status<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED: ``</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|pfSense |PFSense: State of nginx process |<p>MIB: HOST-RESOURCES-MIB</p><p>The status of nginx process.</p> |SNMP |pfsense.nginx.status<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED: ``</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|pfSense |PFSense: Packets matched a filter rule |<p>MIB: BEGEMOT-PF-MIB</p><p>True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory</p> |SNMP |pfsense.packets.match<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|pfSense |PFSense: Packets with bad offset |<p>MIB: BEGEMOT-PF-MIB</p><p>True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory</p> |SNMP |pfsense.packets.bad.offset<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|pfSense |PFSense: Fragmented packets |<p>MIB: BEGEMOT-PF-MIB</p><p>True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory</p> |SNMP |pfsense.packets.fragment<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|pfSense |PFSense: Short packets |<p>MIB: BEGEMOT-PF-MIB</p><p>True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory</p> |SNMP |pfsense.packets.short<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|pfSense |PFSense: Normalized packets |<p>MIB: BEGEMOT-PF-MIB</p><p>True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory</p> |SNMP |pfsense.packets.normalize<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|pfSense |PFSense: Packets dropped due to memory limitation |<p>MIB: BEGEMOT-PF-MIB</p><p>True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory</p> |SNMP |pfsense.packets.mem.drop<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|pfSense |PFSense: Firewall rules count |<p>MIB: BEGEMOT-PF-MIB</p><p>The number of labeled filter rules on this system.</p> |SNMP |pfsense.rules.count |
+|Status |PFSense: ICMP ping |<p>Host accessibility by ICMP.</p><p>0 - ICMP ping fails.</p><p>1 - ICMP ping successful.</p> |SIMPLE |icmpping |
+|Status |PFSense: ICMP loss |<p>Percentage of lost packets.</p> |SIMPLE |icmppingloss |
+|Status |PFSense: ICMP response time |<p>ICMP ping response time (in seconds).</p> |SIMPLE |icmppingsec |
+|Status |PFSense: Uptime |<p>MIB: SNMPv2-MIB</p><p>System uptime in 'N days, hh:mm:ss' format.</p> |SNMP |system.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
+|Status |PFSense: SNMP agent availability |<p>Availability of SNMP checks on the host. The value of this item corresponds to availability icons in the host list.</p><p>Possible value:</p><p>0 - not available</p><p>1 - available</p><p>2 - unknown</p> |INTERNAL |zabbix[host,snmp,available] |
+|Storage |PFSense: [{#FSNAME}]: Used space |<p>MIB: UCD-SNMP-MIB</p><p>If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.</p> |SNMP |vfs.fs.used[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |PFSense: [{#FSNAME}]: Total space |<p>MIB: UCD-SNMP-MIB</p><p>If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.</p> |SNMP |vfs.fs.total[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |PFSense: [{#FSNAME}]: Space utilization |<p>MIB: UCD-SNMP-MIB</p><p>If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.</p> |SNMP |vfs.fs.pused[{#SNMPINDEX}] |
+|Storage |PFSense: [{#FSNAME}]: Free inodes in % |<p>MIB: UCD-SNMP-MIB</p><p>If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.</p> |SNMP |vfs.fs.inode.pfree[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (100-value);`</p> |
+|Storage |PFSense: [{#DEVNAME}]: Disk read rate |<p>MIB: UCD-DISKIO-MIB</p><p>The number of read accesses from this device since boot.</p> |SNMP |vfs.dev.read.rate[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Storage |PFSense: [{#DEVNAME}]: Disk write rate |<p>MIB: UCD-DISKIO-MIB</p><p>The number of write accesses from this device since boot.</p> |SNMP |vfs.dev.write.rate[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Storage |PFSense: [{#DEVNAME}]: Disk utilization |<p>MIB: UCD-DISKIO-MIB</p><p>The 1 minute average load of disk (%)</p> |SNMP |vfs.dev.util[{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|PFSense: Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/PFSense SNMP/system.cpu.load.avg1,5m)/last(/PFSense SNMP/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/PFSense SNMP/system.cpu.load.avg5)>0 and last(/PFSense SNMP/system.cpu.load.avg15)>0 ` |AVERAGE | |
+|PFSense: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/PFSense SNMP/system.cpu.util[{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING |<p>**Depends on**:</p><p>- PFSense: Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m)</p> |
+|PFSense: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/PFSense SNMP/system.name,#1)<>last(/PFSense SNMP/system.name,#2) and length(last(/PFSense SNMP/system.name))>0` |INFO |<p>Manual close: YES</p> |
+|PFSense: Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>The system is running out of memory</p> |`min(/PFSense SNMP/vm.memory.available,5m)<{$MEMORY.AVAILABLE.MIN} and last(/PFSense SNMP/vm.memory.total)>0` |AVERAGE | |
+|PFSense: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/PFSense SNMP/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- PFSense: Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|PFSense: High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/PFSense SNMP/system.swap.pfree,5m)<{$SWAP.PFREE.MIN.WARN} and last(/PFSense SNMP/system.swap.total)>0` |WARNING |<p>**Depends on**:</p><p>- PFSense: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- PFSense: Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|PFSense: High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/PFSense SNMP/net.if.in.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/PFSense SNMP/net.if.in.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- PFSense: Link down</p> |
+|PFSense: High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/PFSense SNMP/net.if.in[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])) and last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/PFSense SNMP/net.if.in[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- PFSense: Link down</p> |
+|PFSense: High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/PFSense SNMP/net.if.out.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/PFSense SNMP/net.if.out.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- PFSense: Link down</p> |
+|PFSense: High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/PFSense SNMP/net.if.out[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])) and last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/PFSense SNMP/net.if.out[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- PFSense: Link down</p> |
+|PFSense: Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])<0 and last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])>0 and ( last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=6 or last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=7 or last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=11 or last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=62 or last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=69 or last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=117 ) and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])>0 and last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}],#2)>0) or (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2) ` |INFO |<p>**Depends on**:</p><p>- PFSense: Link down</p> |
+|PFSense: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)` |AVERAGE | |
+|PFSense: Packet filter is not running |<p>Please check PF status</p> |`last(/PFSense SNMP/pfsense.pf.status)<>1` |HIGH | |
+|PFSense: State table usage more than {$STATE.TABLE.UTIL.MAX}. |<p>Please check the number of connections https://docs.netgate.com/pfsense/en/latest/config/advanced-firewall-nat.html#config-advanced-firewall-maxstates</p> |`min(/PFSense SNMP/pfsense.state.table.pused,#3)>{$STATE.TABLE.UTIL.MAX}` |WARNING | |
+|PFSense: Source tracking table usage more than {$SOURCE.TRACKING.TABLE.UTIL.MAX}. |<p>Please check the number of sticky connections https://docs.netgate.com/pfsense/en/latest/monitoring/status/firewall-states-sources.html</p> |`min(/PFSense SNMP/pfsense.source.tracking.table.pused,#3)>{$SOURCE.TRACKING.TABLE.UTIL.MAX}` |WARNING | |
+|PFSense: DHCP server is not running |<p>Please check DHCP server settings https://docs.netgate.com/pfsense/en/latest/services/dhcp/index.html</p> |`last(/PFSense SNMP/pfsense.dhcpd.status)=0` |AVERAGE | |
+|PFSense: DNS server is not running |<p>Please check DNS server settings https://docs.netgate.com/pfsense/en/latest/services/dns/index.html</p> |`last(/PFSense SNMP/pfsense.dns.status)=0` |AVERAGE | |
+|PFSense: Web server is not running |<p>Please check nginx service status</p> |`last(/PFSense SNMP/pfsense.nginx.status)=0` |AVERAGE | |
+|PFSense: Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/PFSense SNMP/icmpping,#3)=0` |HIGH | |
+|PFSense: High ICMP ping loss |<p>ICMP packets loss detected</p> |`min(/PFSense SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/PFSense SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- PFSense: Unavailable by ICMP ping</p> |
+|PFSense: High ICMP ping response time |<p>Average ICMP response time is too big.</p> |`avg(/PFSense SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- PFSense: Unavailable by ICMP ping</p> |
+|PFSense: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/PFSense SNMP/system.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|PFSense: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/PFSense SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- PFSense: Unavailable by ICMP ping</p> |
+|PFSense: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"PFSense"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"PFSense"}.</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(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and ((last(/PFSense SNMP/vfs.fs.total[{#SNMPINDEX}])-last(/PFSense SNMP/vfs.fs.used[{#SNMPINDEX}]))<5G or timeleft(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|PFSense: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"PFSense"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"PFSense"}.</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(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and ((last(/PFSense SNMP/vfs.fs.total[{#SNMPINDEX}])-last(/PFSense SNMP/vfs.fs.used[{#SNMPINDEX}]))<10G or timeleft(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- PFSense: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"PFSense"}%)</p> |
+|PFSense: {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%) |<p>It may become impossible to write to disk if there are no index nodes left.</p><p>As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.</p> |`min(/PFSense SNMP/vfs.fs.inode.pfree[{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}` |AVERAGE | |
+|PFSense: {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}%) |<p>It may become impossible to write to disk if there are no index nodes left.</p><p>As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.</p> |`min(/PFSense SNMP/vfs.fs.inode.pfree[{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}` |WARNING |<p>**Depends on**:</p><p>- PFSense: {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)</p> |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/app/pfsense_snmp/template_app_pfsense_snmp.yaml b/templates/app/pfsense_snmp/template_app_pfsense_snmp.yaml
new file mode 100644
index 00000000000..eea3400cf15
--- /dev/null
+++ b/templates/app/pfsense_snmp/template_app_pfsense_snmp.yaml
@@ -0,0 +1,4460 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-12-20T18:07:07Z'
+  groups:
+    -
+      uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
+      name: Templates/Applications
+  templates:
+    -
+      uuid: 16f281aeb8904d3db8b66dda94611fcc
+      template: 'PFSense SNMP'
+      name: 'PFSense SNMP'
+      description: |
+        Template for monitoring pfSense by SNMP
+        Setup:
+          1. Enable SNMP daemon at Services in pfSense web interface https://docs.netgate.com/pfsense/en/latest/services/snmp.html
+          2. Setup firewall rule to get access from Zabbix proxy or Zabbix server by SNMP https://docs.netgate.com/pfsense/en/latest/firewall/index.html#managing-firewall-rules
+          3. Link template to the host
+          
+        
+        
+        MIBs used:
+        BEGEMOT-PF-MIB
+        HOST-RESOURCES-MIB
+        SNMPv2-MIB
+        UCD-DISKIO-MIB
+        UCD-SNMP-MIB
+        
+        Template tooling version used: 0.40
+      groups:
+        -
+          name: Templates/Applications
+      items:
+        -
+          uuid: 2257828f22fd4b5ea7ffffc1c4296674
+          name: 'PFSense: ICMP ping'
+          type: SIMPLE
+          key: icmpping
+          history: 7d
+          description: |
+            Host accessibility by ICMP.
+            0 - ICMP ping fails.
+            1 - ICMP ping successful.
+          valuemap:
+            name: 'Service state'
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: icmp
+            -
+              tag: type
+              value: state
+          triggers:
+            -
+              uuid: 8bf17f0b4f0642d48d76ea3add39ae23
+              expression: 'max(/PFSense SNMP/icmpping,#3)=0'
+              name: 'PFSense: Unavailable by ICMP ping'
+              priority: HIGH
+              description: 'Last three attempts returned timeout.  Please check device connectivity.'
+        -
+          uuid: b70284fd74b246da83e262ed66449612
+          name: 'PFSense: ICMP loss'
+          type: SIMPLE
+          key: icmppingloss
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          description: 'Percentage of lost packets.'
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: icmp
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: e02cf70bf2744d61abf8d770cc568867
+              expression: 'min(/PFSense SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/PFSense SNMP/icmppingloss,5m)<100'
+              name: 'PFSense: High ICMP ping loss'
+              opdata: 'Loss: {ITEM.LASTVALUE1}'
+              priority: WARNING
+              description: 'ICMP packets loss detected'
+              dependencies:
+                -
+                  name: 'PFSense: Unavailable by ICMP ping'
+                  expression: 'max(/PFSense SNMP/icmpping,#3)=0'
+        -
+          uuid: d1493a3c5a634ffb99aa031d134d07ad
+          name: 'PFSense: ICMP response time'
+          type: SIMPLE
+          key: icmppingsec
+          history: 7d
+          value_type: FLOAT
+          units: s
+          description: 'ICMP ping response time (in seconds).'
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: icmp
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: 364ec24b0c88416fb2575a6b06340ec7
+              expression: 'avg(/PFSense SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}'
+              name: 'PFSense: High ICMP ping response time'
+              opdata: 'Value: {ITEM.LASTVALUE1}'
+              priority: WARNING
+              description: 'Average ICMP response time is too big.'
+              dependencies:
+                -
+                  name: 'PFSense: Unavailable by ICMP ping'
+                  expression: 'max(/PFSense SNMP/icmpping,#3)=0'
+        -
+          uuid: a2a331bc385344a1877a45f3887b7d91
+          name: 'PFSense: DHCP server status'
+          type: SNMP_AGENT
+          snmp_oid: '.1.3.6.1.2.1.25.4.2.1.7["index",".1.3.6.1.2.1.25.4.2.1.2","dhcpd"]'
+          key: pfsense.dhcpd.status
+          history: 7d
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The status of DHCP server process.
+          valuemap:
+            name: 'Services status'
+          preprocessing:
+            -
+              type: CHECK_NOT_SUPPORTED
+              parameters:
+                - ''
+              error_handler: CUSTOM_VALUE
+              error_handler_params: '0'
+          tags:
+            -
+              tag: resource
+              value: services
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: 80fc3672290d45d49c250ccc120f3606
+              expression: 'last(/PFSense SNMP/pfsense.dhcpd.status)=0'
+              name: 'PFSense: DHCP server is not running'
+              opdata: 'Current state: {ITEM.LASTVALUE1}'
+              priority: AVERAGE
+              description: 'Please check DHCP server settings https://docs.netgate.com/pfsense/en/latest/services/dhcp/index.html'
+        -
+          uuid: 6a03330a20354f76b8496b9a8eac0c0a
+          name: 'PFSense: DNS server status'
+          type: SNMP_AGENT
+          snmp_oid: '.1.3.6.1.2.1.25.4.2.1.7["index",".1.3.6.1.2.1.25.4.2.1.2","unbound"]'
+          key: pfsense.dns.status
+          history: 7d
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The status of DNS server process.
+          valuemap:
+            name: 'Services status'
+          preprocessing:
+            -
+              type: CHECK_NOT_SUPPORTED
+              parameters:
+                - ''
+              error_handler: CUSTOM_VALUE
+              error_handler_params: '0'
+          tags:
+            -
+              tag: resource
+              value: services
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: 67b862f6aa3a4833af44d513aad517b5
+              expression: 'last(/PFSense SNMP/pfsense.dns.status)=0'
+              name: 'PFSense: DNS server is not running'
+              opdata: 'Current state: {ITEM.LASTVALUE1}'
+              priority: AVERAGE
+              description: 'Please check DNS server settings https://docs.netgate.com/pfsense/en/latest/services/dns/index.html'
+        -
+          uuid: 18a8140ca46a47e0b4a3612be5338ada
+          name: 'PFSense: State of nginx process'
+          type: SNMP_AGENT
+          snmp_oid: '.1.3.6.1.2.1.25.4.2.1.7["index",".1.3.6.1.2.1.25.4.2.1.2","nginx"]'
+          key: pfsense.nginx.status
+          history: 7d
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The status of nginx process.
+          valuemap:
+            name: 'Services status'
+          preprocessing:
+            -
+              type: CHECK_NOT_SUPPORTED
+              parameters:
+                - ''
+              error_handler: CUSTOM_VALUE
+              error_handler_params: '0'
+          tags:
+            -
+              tag: resource
+              value: services
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: 9f7a47055ee64edcbb70b047a35f7774
+              expression: 'last(/PFSense SNMP/pfsense.nginx.status)=0'
+              name: 'PFSense: Web server is not running'
+              opdata: 'Current state: {ITEM.LASTVALUE1}'
+              priority: AVERAGE
+              description: 'Please check nginx service status'
+        -
+          uuid: 3739cb57166343e3955d00fa31d55bd3
+          name: 'PFSense: Packets with bad offset'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.2.2.0
+          key: pfsense.packets.bad.offset
+          history: 7d
+          value_type: FLOAT
+          units: pps
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory
+          preprocessing:
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: rate
+        -
+          uuid: 519dbf4fa71b48e8b70c1260caffea14
+          name: 'PFSense: Fragmented packets'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.2.3.0
+          key: pfsense.packets.fragment
+          history: 7d
+          value_type: FLOAT
+          units: pps
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory
+          preprocessing:
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: rate
+        -
+          uuid: d4a0686adfa7421ea472e64d94bee70b
+          name: 'PFSense: Packets matched a filter rule'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.2.1.0
+          key: pfsense.packets.match
+          history: 7d
+          value_type: FLOAT
+          units: pps
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory
+          preprocessing:
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: rate
+        -
+          uuid: ca30df62467645b6a04f791bf22d7b91
+          name: 'PFSense: Packets dropped due to memory limitation'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.2.6.0
+          key: pfsense.packets.mem.drop
+          history: 7d
+          value_type: FLOAT
+          units: pps
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory
+          preprocessing:
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: rate
+        -
+          uuid: 82360caa98ca4f209499db3c55b0c330
+          name: 'PFSense: Normalized packets'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.2.5.0
+          key: pfsense.packets.normalize
+          history: 7d
+          value_type: FLOAT
+          units: pps
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory
+          preprocessing:
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: rate
+        -
+          uuid: cf4fbeeb1a6a4d9dbb69adf90b54de3a
+          name: 'PFSense: Short packets'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.2.4.0
+          key: pfsense.packets.short
+          history: 7d
+          value_type: FLOAT
+          units: pps
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            True if the packet was logged with the specified packet filter reason code. The known codes are: match, bad-offset, fragment, short, normalize, and memory
+          preprocessing:
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: rate
+        -
+          uuid: 600896282920468baf2e47ab75ee9b31
+          name: 'PFSense: Packet filter running status'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.1.1.0
+          key: pfsense.pf.status
+          history: 7d
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            True if packet filter is currently enabled
+          valuemap:
+            name: 'SNMPv2-TC::TruthValue'
+          tags:
+            -
+              tag: resource
+              value: firewall
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: state
+          triggers:
+            -
+              uuid: 4a7ff4c437054ce88c6c069ffcb6434f
+              expression: 'last(/PFSense SNMP/pfsense.pf.status)<>1'
+              name: 'PFSense: Packet filter is not running'
+              opdata: 'Current running state: {ITEM.LASTVALUE1}'
+              priority: HIGH
+              description: 'Please check PF status'
+        -
+          uuid: 6d0cf4a1a284453991e12daf921fed9a
+          name: 'PFSense: Firewall rules count'
+          type: SNMP_AGENT
+          snmp_oid: .1.3.6.1.4.1.12325.1.200.1.11.1.0
+          key: pfsense.rules.count
+          history: 7d
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            The number of labeled filter rules on this system.
+          tags:
+            -
+              tag: resource
+              value: services
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: c13b50c508e04851baf09c1c865241fc
+          name: 'PFSense: Source tracking table current'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.4.1.0
+          key: pfsense.source.tracking.table.count
+          history: 7d
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            Number of entries in the source tracking table.
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 58e12f73fd4243a89d62bbdc7e307cf9
+          name: 'PFSense: Source tracking table limit'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.5.2.0
+          key: pfsense.source.tracking.table.limit
+          history: 7d
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            Maximum number of 'sticky-address' or 'source-track' rules in the ruleset.
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 8fb3a344b39241bbb3bf78092fa17ec8
+          name: 'PFSense: Source tracking table utilization in %'
+          type: CALCULATED
+          key: pfsense.source.tracking.table.pused
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//pfsense.source.tracking.table.count) * 100 / last(//pfsense.source.tracking.table.limit)'
+          description: 'Utilization of source tracking table in %.'
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: calculated
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: 7983ee28646d4327ae0814c88c7b213f
+              expression: 'min(/PFSense SNMP/pfsense.source.tracking.table.pused,#3)>{$SOURCE.TRACKING.TABLE.UTIL.MAX}'
+              name: 'PFSense: Source tracking table usage more than {$SOURCE.TRACKING.TABLE.UTIL.MAX}.'
+              opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+              priority: WARNING
+              description: 'Please check the number of sticky connections https://docs.netgate.com/pfsense/en/latest/monitoring/status/firewall-states-sources.html'
+        -
+          uuid: f0eab94d244b46c29363b630850ed709
+          name: 'PFSense: States table current'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.3.1.0
+          key: pfsense.state.table.count
+          history: 7d
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            Number of entries in the state table.
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 8500a1db240b48d7bca514371a89c641
+          name: 'PFSense: States table limit'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.12325.1.200.1.5.1.0
+          key: pfsense.state.table.limit
+          history: 7d
+          description: |
+            MIB: BEGEMOT-PF-MIB
+            Maximum number of 'keep state' rules in the ruleset.
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 5e96cadaafca4e51ad62dba4fec5220a
+          name: 'PFSense: States table utilization in %'
+          type: CALCULATED
+          key: pfsense.state.table.pused
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//pfsense.state.table.count) * 100 / last(//pfsense.state.table.limit)'
+          description: 'Utilization of state table in %.'
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: calculated
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: ce0e7dec597e4148abd9b699c787decd
+              expression: 'min(/PFSense SNMP/pfsense.state.table.pused,#3)>{$STATE.TABLE.UTIL.MAX}'
+              name: 'PFSense: State table usage more than {$STATE.TABLE.UTIL.MAX}.'
+              opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+              priority: WARNING
+              description: 'Please check the number of connections https://docs.netgate.com/pfsense/en/latest/config/advanced-firewall-nat.html#config-advanced-firewall-maxstates'
+        -
+          uuid: ef15deb6c36945b281a152e2af39dd1d
+          name: 'PFSense: System contact details'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.4.0
+          key: system.contact
+          delay: 15m
+          history: 7d
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: SNMPv2-MIB
+            The textual identification of the contact person for this managed node, together with information on how to contact this person. If no contact information is known, the value is the zero-length string.
+          inventory_link: CONTACT
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 6h
+          tags:
+            -
+              tag: resource
+              value: inventory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: string
+        -
+          uuid: 44da130c834d476b884a5cfec2ef53cd
+          name: 'PFSense: Interrupts per second'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.2021.11.59.0
+          key: system.cpu.intr
+          history: 7d
+          value_type: FLOAT
+          description: |
+            MIB: UCD-SNMP-MIB
+            Number of interrupts processed
+          preprocessing:
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          tags:
+            -
+              tag: resource
+              value: cpu
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: rate
+        -
+          uuid: 2d426f9553de4c01bf3e92b72a0ef8d5
+          name: 'PFSense: Load average (1m avg)'
+          type: SNMP_AGENT
+          snmp_oid: '1.3.6.1.4.1.2021.10.1.3["index","1.3.6.1.4.1.2021.10.1.2", "Load-1"]'
+          key: system.cpu.load.avg1
+          history: 7d
+          value_type: FLOAT
+          description: |
+            MIB: UCD-SNMP-MIB
+            The 1 minute load averages.
+          tags:
+            -
+              tag: resource
+              value: cpu
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 371cfe5f4cc64582a7d9dacba183c0ea
+          name: 'PFSense: Load average (5m avg)'
+          type: SNMP_AGENT
+          snmp_oid: '1.3.6.1.4.1.2021.10.1.3["index","1.3.6.1.4.1.2021.10.1.2", "Load-5"]'
+          key: system.cpu.load.avg5
+          history: 7d
+          value_type: FLOAT
+          description: |
+            MIB: UCD-SNMP-MIB
+            The 5 minutes load averages.
+          tags:
+            -
+              tag: resource
+              value: cpu
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: e160d773f3814cba89c8729f2b0354f8
+          name: 'PFSense: Load average (15m avg)'
+          type: SNMP_AGENT
+          snmp_oid: '1.3.6.1.4.1.2021.10.1.3["index","1.3.6.1.4.1.2021.10.1.2", "Load-15"]'
+          key: system.cpu.load.avg15
+          history: 7d
+          value_type: FLOAT
+          description: |
+            MIB: UCD-SNMP-MIB
+            The 15 minutes load averages.
+          tags:
+            -
+              tag: resource
+              value: cpu
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 8b9cc8b5ab164399a56169ed0603a804
+          name: 'PFSense: Number of CPUs'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: system.cpu.num
+          history: 7d
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            Count the number of CPU cores by counting number of cores discovered in hrProcessorTable using LLD
+          preprocessing:
+            -
+              type: JAVASCRIPT
+              parameters:
+                - |
+                  //count the number of cores
+                  return JSON.parse(value).length;
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: cpu
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: c476e9b090284cb6aaee6cd3fdcd1b88
+          name: 'PFSense: Context switches per second'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.2021.11.60.0
+          key: system.cpu.switches
+          history: 7d
+          value_type: FLOAT
+          description: |
+            MIB: UCD-SNMP-MIB
+            Number of context switches
+          preprocessing:
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          tags:
+            -
+              tag: resource
+              value: cpu
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: rate
+        -
+          uuid: e7038a49caec4d5293ceb2a18c1d839e
+          name: 'PFSense: System description'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.descr
+          delay: 15m
+          history: 7d
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: SNMPv2-MIB
+            System description of the host.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 6h
+          tags:
+            -
+              tag: resource
+              value: inventory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: string
+        -
+          uuid: cec39a0105434fbeb30529763a7298bb
+          name: 'PFSense: System location'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.6.0
+          key: system.location
+          delay: 15m
+          history: 7d
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: SNMPv2-MIB
+            The physical location of this node. If the location is unknown, the value is the zero-length string.
+          inventory_link: LOCATION
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 6h
+          tags:
+            -
+              tag: resource
+              value: inventory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: string
+        -
+          uuid: 8c3afc62530e457da1e2d057c96fc442
+          name: 'PFSense: System name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.5.0
+          key: system.name
+          delay: 15m
+          history: 7d
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: SNMPv2-MIB
+            System host name.
+          inventory_link: NAME
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 6h
+          tags:
+            -
+              tag: resource
+              value: inventory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: string
+          triggers:
+            -
+              uuid: d00224077a90496099c2622e3c662624
+              expression: 'last(/PFSense SNMP/system.name,#1)<>last(/PFSense SNMP/system.name,#2) and length(last(/PFSense SNMP/system.name))>0'
+              name: 'PFSense: System name has changed (new name: {ITEM.VALUE})'
+              priority: INFO
+              description: 'System name has changed. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 6f1d5a86066d4f669a8c11f77fbc078d
+          name: 'PFSense: System object ID'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.2.0
+          key: system.objectid
+          delay: 15m
+          history: 7d
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: SNMPv2-MIB
+            The vendor authoritative identification of the network management subsystem contained in the entity. This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining what kind of box is being managed.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 6h
+          tags:
+            -
+              tag: resource
+              value: inventory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: string
+        -
+          uuid: 163e057ff21a40cba86fe7ac023d83b1
+          name: 'PFSense: Free swap space'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.2021.4.4.0
+          key: system.swap.free
+          history: 7d
+          units: B
+          description: |
+            MIB: UCD-SNMP-MIB
+            The amount of swap space currently unused or available.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: swap
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: db5dabf90df84ea19e1e164204eeefdc
+          name: 'PFSense: Free swap space in %'
+          type: CALCULATED
+          key: system.swap.pfree
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//system.swap.free)/last(//system.swap.total)*100'
+          description: 'The free space of swap volume/file in percent.'
+          tags:
+            -
+              tag: resource
+              value: swap
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: calculated
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 3a7282d75aea46a38def8dbb5e5018eb
+          name: 'PFSense: Total swap space'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.2021.4.3.0
+          key: system.swap.total
+          history: 7d
+          units: B
+          description: |
+            MIB: UCD-SNMP-MIB
+            The total amount of swap space configured for this host.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: swap
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 0979a3c35bf347a38b2c5a9dbc423325
+          name: 'PFSense: Uptime'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.3.0
+          key: system.uptime
+          delay: 30s
+          history: 7d
+          trends: 0d
+          units: uptime
+          description: |
+            MIB: SNMPv2-MIB
+            System uptime in 'N days, hh:mm:ss' format.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '0.01'
+          tags:
+            -
+              tag: resource
+              value: uptime
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: counter
+          triggers:
+            -
+              uuid: 9da88806fff147f8aa7a79e526f0f7d1
+              expression: 'last(/PFSense SNMP/system.uptime)<10m'
+              name: 'PFSense: has been restarted (uptime < 10m)'
+              priority: INFO
+              description: 'Uptime is less than 10 minutes'
+              manual_close: 'YES'
+        -
+          uuid: 1cc1e018e6364da1bc7264501e668ce8
+          name: 'PFSense: Available memory'
+          type: CALCULATED
+          key: vm.memory.available
+          history: 7d
+          units: B
+          params: last(//vm.memory.free)+last(//vm.memory.buffers)+last(//vm.memory.cached)
+          description: 'Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.'
+          tags:
+            -
+              tag: resource
+              value: memory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: calculated
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 8d421b71ea5f453d9079596617b64d1f
+          name: 'PFSense: Memory (buffers)'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.2021.4.14.0
+          key: vm.memory.buffers
+          history: 7d
+          units: B
+          description: |
+            MIB: UCD-SNMP-MIB
+            The total amount of real or virtual memory currently allocated for use as memory buffers.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: memory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 83ae273de74b4779a66553e976d5fa6e
+          name: 'PFSense: Memory (cached)'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.2021.4.15.0
+          key: vm.memory.cached
+          history: 7d
+          units: B
+          description: |
+            MIB: UCD-SNMP-MIB
+            The total amount of real or virtual memory currently allocated for use as cached memory.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: memory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 4efc067cae354030a8cbd1054671bdf7
+          name: 'PFSense: Free memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.2021.4.6.0
+          key: vm.memory.free
+          history: 7d
+          units: B
+          description: |
+            MIB: UCD-SNMP-MIB
+            The amount of real/physical memory currently unused or available.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: memory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 84705a5340d149cf8a0792a1eb997c8e
+          name: 'PFSense: Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.2021.4.5.0
+          key: vm.memory.total
+          history: 7d
+          units: B
+          description: |
+            MIB: UCD-SNMP-MIB
+            Total memory in Bytes
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: data
+              value: raw
+            -
+              tag: resource
+              value: memory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: snmp
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: d0da8070297d49c3a44aeec984abd085
+          name: 'PFSense: Memory utilization'
+          type: CALCULATED
+          key: vm.memory.util
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: '(last(//vm.memory.total)-(last(//vm.memory.free)+last(//vm.memory.buffers)+last(//vm.memory.cached)))/last(//vm.memory.total)*100'
+          description: 'Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.'
+          tags:
+            -
+              tag: resource
+              value: memory
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: calculated
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: 786ef350e20f4dfc9371a54e4ffeda63
+              expression: 'min(/PFSense SNMP/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              name: 'PFSense: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+              dependencies:
+                -
+                  name: 'PFSense: Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
+                  expression: 'min(/PFSense SNMP/vm.memory.available,5m)<{$MEMORY.AVAILABLE.MIN} and last(/PFSense SNMP/vm.memory.total)>0'
+        -
+          uuid: 585c88310a704e119aa5fc7f7f9c3804
+          name: 'PFSense: SNMP agent availability'
+          type: INTERNAL
+          key: 'zabbix[host,snmp,available]'
+          history: 7d
+          description: |
+            Availability of SNMP checks on the host. The value of this item corresponds to availability icons in the host list.
+            Possible value:
+            0 - not available
+            1 - available
+            2 - unknown
+          valuemap:
+            name: zabbix.host.available
+          tags:
+            -
+              tag: resource
+              value: network
+            -
+              tag: target
+              value: pfsense
+            -
+              tag: transport
+              value: internal
+            -
+              tag: type
+              value: state
+          triggers:
+            -
+              uuid: d06bdb79a48c438798286a89680eb3e1
+              expression: 'max(/PFSense SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              name: 'PFSense: No SNMP data collection'
+              opdata: 'Current state: {ITEM.LASTVALUE1}'
+              priority: WARNING
+              description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              dependencies:
+                -
+                  name: 'PFSense: Unavailable by ICMP ping'
+                  expression: 'max(/PFSense SNMP/icmpping,#3)=0'
+      discovery_rules:
+        -
+          uuid: 47e148e6760145cc9288fa6b4e8d0013
+          name: 'CPU discovery'
+          type: DEPENDENT
+          key: cpu.discovery
+          delay: '0'
+          description: 'This discovery will create set of per core CPU metrics from UCD-SNMP-MIB, using {#CPU.COUNT} in preprocessing. That''s the only reason why LLD is used.'
+          item_prototypes:
+            -
+              uuid: 404e2eab283f4c79a6c2c52684d363c8
+              name: 'PFSense: CPU idle time'
+              type: SNMP_AGENT
+              snmp_oid: 1.3.6.1.4.1.2021.11.11.0
+              key: 'system.cpu.idle[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-SNMP-MIB
+                The time the CPU has spent doing nothing.
+              tags:
+                -
+                  tag: data
+                  value: raw
+                -
+                  tag: resource
+                  value: cpu
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: 57a73880d8ff4779a2bbe9d774ad3fc8
+              name: 'PFSense: CPU interrupt time'
+              type: SNMP_AGENT
+              snmp_oid: 1.3.6.1.4.1.2021.11.56.0
+              key: 'system.cpu.interrupt[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-SNMP-MIB
+                The amount of time the CPU has been servicing hardware interrupts.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: JAVASCRIPT
+                  parameters:
+                    - |
+                      //to get utilization in %, divide by N, where N is number of cores.
+                      return value/{#CPU.COUNT}
+              tags:
+                -
+                  tag: resource
+                  value: cpu
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: 01e84522bcfd4cc2834c6c196e887563
+              name: 'PFSense: CPU iowait time'
+              type: SNMP_AGENT
+              snmp_oid: 1.3.6.1.4.1.2021.11.54.0
+              key: 'system.cpu.iowait[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-SNMP-MIB
+                Amount of time the CPU has been waiting for I/O to complete.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: JAVASCRIPT
+                  parameters:
+                    - |
+                      //to get utilization in %, divide by N, where N is number of cores.
+                      return value/{#CPU.COUNT}
+              tags:
+                -
+                  tag: resource
+                  value: cpu
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: 4eb44b0d8aa2440480c92b880196ba72
+              name: 'PFSense: CPU nice time'
+              type: SNMP_AGENT
+              snmp_oid: 1.3.6.1.4.1.2021.11.51.0
+              key: 'system.cpu.nice[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-SNMP-MIB
+                The time the CPU has spent running users' processes that have been niced.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: JAVASCRIPT
+                  parameters:
+                    - |
+                      //to get utilization in %, divide by N, where N is number of cores.
+                      return value/{#CPU.COUNT}
+              tags:
+                -
+                  tag: resource
+                  value: cpu
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: 4b412b3f128746c69364590965c02eea
+              name: 'PFSense: CPU system time'
+              type: SNMP_AGENT
+              snmp_oid: 1.3.6.1.4.1.2021.11.52.0
+              key: 'system.cpu.system[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-SNMP-MIB
+                The time the CPU has spent running the kernel and its processes.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: JAVASCRIPT
+                  parameters:
+                    - |
+                      //to get utilization in %, divide by N, where N is number of cores.
+                      return value/{#CPU.COUNT}
+              tags:
+                -
+                  tag: resource
+                  value: cpu
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: 922ad22eed7f427e8560942941a427ba
+              name: 'PFSense: CPU user time'
+              type: SNMP_AGENT
+              snmp_oid: 1.3.6.1.4.1.2021.11.50.0
+              key: 'system.cpu.user[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-SNMP-MIB
+                The time the CPU has spent running users' processes that are not niced.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: JAVASCRIPT
+                  parameters:
+                    - |
+                      //to get utilization in %, divide by N, where N is number of cores.
+                      return value/{#CPU.COUNT}
+              tags:
+                -
+                  tag: resource
+                  value: cpu
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: cae6db6f7aae4ecdaac3e451eee5eacb
+              name: 'PFSense: CPU utilization'
+              type: DEPENDENT
+              key: 'system.cpu.util[{#SNMPINDEX}]'
+              delay: '0'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: 'CPU utilization in %'
+              preprocessing:
+                -
+                  type: JAVASCRIPT
+                  parameters:
+                    - |
+                      //Calculate utilization
+                      return (100 - value)
+              master_item:
+                key: 'system.cpu.idle[{#SNMPINDEX}]'
+              tags:
+                -
+                  tag: resource
+                  value: cpu
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: dependent
+                -
+                  tag: type
+                  value: gauge
+              trigger_prototypes:
+                -
+                  uuid: 76857a00f1fe4d639dbb5cfe775f36d6
+                  expression: 'min(/PFSense SNMP/system.cpu.util[{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: 'PFSense: 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.'
+                  dependencies:
+                    -
+                      name: 'PFSense: Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m)'
+                      expression: |
+                        min(/PFSense SNMP/system.cpu.load.avg1,5m)/last(/PFSense SNMP/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN}
+                        and last(/PFSense SNMP/system.cpu.load.avg5)>0
+                        and last(/PFSense SNMP/system.cpu.load.avg15)>0
+          graph_prototypes:
+            -
+              uuid: 2b2dd0814a1e479fb9faa178b10ce83e
+              name: 'PFSense: CPU usage{#SINGLETON}'
+              type: STACKED
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'system.cpu.system[{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'system.cpu.user[{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'system.cpu.nice[{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'system.cpu.iowait[{#SNMPINDEX}]'
+                -
+                  sortorder: '4'
+                  color: FC6EA3
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'system.cpu.interrupt[{#SNMPINDEX}]'
+            -
+              uuid: 3131a60ebd384c79991ba2d6a3e3cf31
+              name: 'PFSense: CPU utilization{#SINGLETON}'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'system.cpu.util[{#SNMPINDEX}]'
+          master_item:
+            key: system.cpu.num
+          preprocessing:
+            -
+              type: JAVASCRIPT
+              parameters:
+                - |
+                  //count the number of CPU cores
+                  return JSON.stringify([{"{#CPU.COUNT}": value, "{#SNMPINDEX}": 0, "{#SINGLETON}":""}])
+        -
+          uuid: 441ad463ea5544f89cb56b0b8f7763f9
+          name: 'Network interfaces discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFOPERSTATUS},1.3.6.1.2.1.2.2.1.8,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFNAME},1.3.6.1.2.1.31.1.1.1.1,{#IFDESCR},1.3.6.1.2.1.2.2.1.2,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: net.if.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: '{$NET.IF.IFADMINSTATUS.MATCHES}'
+                formulaid: A
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: '{$NET.IF.IFADMINSTATUS.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: B
+              -
+                macro: '{#IFOPERSTATUS}'
+                value: '{$NET.IF.IFOPERSTATUS.MATCHES}'
+                formulaid: I
+              -
+                macro: '{#IFOPERSTATUS}'
+                value: '{$NET.IF.IFOPERSTATUS.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: J
+              -
+                macro: '{#IFNAME}'
+                value: '{$NET.IF.IFNAME.MATCHES}'
+                formulaid: G
+              -
+                macro: '{#IFNAME}'
+                value: '{$NET.IF.IFNAME.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: H
+              -
+                macro: '{#IFDESCR}'
+                value: '{$NET.IF.IFDESCR.MATCHES}'
+                formulaid: E
+              -
+                macro: '{#IFDESCR}'
+                value: '{$NET.IF.IFDESCR.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: F
+              -
+                macro: '{#IFALIAS}'
+                value: '{$NET.IF.IFALIAS.MATCHES}'
+                formulaid: C
+              -
+                macro: '{#IFALIAS}'
+                value: '{$NET.IF.IFALIAS.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: D
+              -
+                macro: '{#IFTYPE}'
+                value: '{$NET.IF.IFTYPE.MATCHES}'
+                formulaid: K
+              -
+                macro: '{#IFTYPE}'
+                value: '{$NET.IF.IFTYPE.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: L
+          description: 'Discovering interfaces from IF-MIB.'
+          item_prototypes:
+            -
+              uuid: b20cd75f9b8543c894862003121893c1
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 traffic blocked'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.8["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.in.block.v4.bps[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                BEGEMOT-PF-MIB
+                IPv4 bits per second blocked coming in on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 850a471b36de4bcebf9d8831f52953de
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 packets blocked'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.12["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.in.block.v4.pps[{#SNMPINDEX}]'
+              history: 7d
+              units: pps
+              description: |
+                BEGEMOT-PF-MIB
+                The number of IPv4 packets blocked coming in on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 96de779174c8486d97269a43f0d4a8f4
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 traffic blocked'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.16["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.in.block.v6.bps[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                BEGEMOT-PF-MIB
+                IPv6 bits per second blocked coming in on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 2582b09afee14e658c9c9c8b845818b9
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 packets blocked'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.20["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.in.block.v6.pps[{#SNMPINDEX}]'
+              history: 7d
+              units: pps
+              description: |
+                BEGEMOT-PF-MIB
+                The number of IPv6 packets blocked coming in on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: eea8bd3342824bed8b4e3768c069e8b3
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound packets discarded'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.2.2.1.13.{#SNMPINDEX}'
+              key: 'net.if.in.discards[{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: IF-MIB
+                The number of inbound packets which were chosen to be discarded
+                even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.
+                One possible reason for discarding such a packet could be to free up buffer space.
+                Discontinuities in the value of this counter can occur at re-initialization of the management system,
+                and at other times as indicated by the value of ifCounterDiscontinuityTime.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 4915f853f848404988ce7ae3a22e7991
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound packets with errors'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.2.2.1.14.{#SNMPINDEX}'
+              key: 'net.if.in.errors[{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: IF-MIB
+                For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+              trigger_prototypes:
+                -
+                  uuid: f5cbc2b7d91f4fa5aab8eb96d8a0550f
+                  expression: 'min(/PFSense SNMP/net.if.in.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/PFSense SNMP/net.if.in.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8'
+                  name: 'PFSense: High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)'
+                  opdata: 'errors in: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold'
+                  dependencies:
+                    -
+                      name: 'PFSense: Link down'
+                      expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+            -
+              uuid: fcda9fb8fff14106940543836177e3e3
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 traffic passed'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.7["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.in.pass.v4.bps[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                BEGEMOT-PF-MIB
+                IPv4 bits per second passed coming in on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: a895016cc42341729beb3ec41e30e1dc
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 packets passed'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.11["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.in.pass.v4.pps[{#SNMPINDEX}]'
+              history: 7d
+              units: pps
+              description: |
+                BEGEMOT-PF-MIB
+                The number of IPv4 packets passed coming in on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 1ed0a16478074997a3254fd1025a438d
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 traffic passed'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.15["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.in.pass.v6.bps[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                BEGEMOT-PF-MIB
+                IPv6 bits per second passed coming in on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 5eb85cf165424dde93e028468c310593
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 packets passed'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.19["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.in.pass.v6.pps[{#SNMPINDEX}]'
+              history: 7d
+              units: pps
+              description: |
+                BEGEMOT-PF-MIB
+                The number of IPv6 packets passed coming in on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 4fefa40765144566a5c507ef19f884d6
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Bits received'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.31.1.1.1.6.{#SNMPINDEX}'
+              key: 'net.if.in[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                MIB: IF-MIB
+                The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: b9c94af7fae9462a9659261366c03e4f
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 traffic blocked'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.10["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.out.block.v4.bps[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                BEGEMOT-PF-MIB
+                IPv4 bits per second blocked going out on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 03c616505a6746ffa8027efd95aad00d
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 packets blocked'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.14["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.out.block.v4.pps[{#SNMPINDEX}]'
+              history: 7d
+              units: pps
+              description: |
+                BEGEMOT-PF-MIB
+                The number of IPv4 packets blocked going out on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: c81392868fe04ba5bd82dcffa3065e73
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 traffic blocked'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.18["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.out.block.v6.bps[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                BEGEMOT-PF-MIB
+                IPv6 bits per second blocked going out on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 41a658c922614223b5473eb4e01a3336
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 packets blocked'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.22["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.out.block.v6.pps[{#SNMPINDEX}]'
+              history: 7d
+              units: pps
+              description: |
+                BEGEMOT-PF-MIB
+                The number of IPv6 packets blocked going out on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: feb327e6f99e41c3a0194d1578a46e50
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound packets discarded'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.2.2.1.19.{#SNMPINDEX}'
+              key: 'net.if.out.discards[{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: IF-MIB
+                The number of outbound packets which were chosen to be discarded
+                even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.
+                One possible reason for discarding such a packet could be to free up buffer space.
+                Discontinuities in the value of this counter can occur at re-initialization of the management system,
+                and at other times as indicated by the value of ifCounterDiscontinuityTime.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 72d053e5bf3b4330a99382b8a2efcdf7
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound packets with errors'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.2.2.1.20.{#SNMPINDEX}'
+              key: 'net.if.out.errors[{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: IF-MIB
+                For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+              trigger_prototypes:
+                -
+                  uuid: 5fb5f37490d04dbc8e0553c6aa881547
+                  expression: 'min(/PFSense SNMP/net.if.out.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/PFSense SNMP/net.if.out.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8'
+                  name: 'PFSense: High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)'
+                  opdata: 'errors out: {ITEM.LASTVALUE2}'
+                  priority: WARNING
+                  description: 'Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold'
+                  dependencies:
+                    -
+                      name: 'PFSense: Link down'
+                      expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+            -
+              uuid: 29e2a5d7299b4419bbb29a98c068d46f
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 traffic passed'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.9["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.out.pass.v4.bps[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                BEGEMOT-PF-MIB
+                IPv4 bits per second passed going out on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: e073f3fd38ed4aeaba85dfa5b74cc066
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 packets passed'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.13["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.out.pass.v4.pps[{#SNMPINDEX}]'
+              history: 7d
+              units: pps
+              description: |
+                BEGEMOT-PF-MIB
+                The number of IPv4 packets passed going out on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 3b472db1999640c3a0ef0c75ddae7940
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 traffic passed'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.17["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.out.pass.v6.bps[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                BEGEMOT-PF-MIB
+                IPv6 bits per second passed going out on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: a5ba6a1a6dbf4788b77eee825f85eed1
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 packets passed'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.21["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.out.pass.v6.pps[{#SNMPINDEX}]'
+              history: 7d
+              units: pps
+              description: |
+                BEGEMOT-PF-MIB
+                The number of IPv6 packets passed going out on this interface.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: afd513d29ecc4360ab0baf0a7ae3bb53
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Bits sent'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.31.1.1.1.10.{#SNMPINDEX}'
+              key: 'net.if.out[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                MIB: IF-MIB
+                The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: ecde40c612da452599e2e7b2f1979e83
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Rules references count'
+              type: SNMP_AGENT
+              snmp_oid: '.1.3.6.1.4.1.12325.1.200.1.8.2.1.6["index",".1.3.6.1.4.1.12325.1.200.1.8.2.1.2","{#IFDESCR}"]'
+              key: 'net.if.rules.refs[{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                BEGEMOT-PF-MIB
+                The number of rules referencing this interface.
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: eb2f06d673094e10bab8e1d774b26997
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Speed'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.31.1.1.1.15.{#SNMPINDEX}'
+              key: 'net.if.speed[{#SNMPINDEX}]'
+              history: 7d
+              units: bps
+              description: |
+                MIB: IF-MIB
+                An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1000000'
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: 2af41422c46141fba0432818b076bca3
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Operational status'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.2.2.1.8.{#SNMPINDEX}'
+              key: 'net.if.status[{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: IF-MIB
+                The current operational state of the interface.
+                - The testing(3) state indicates that no operational packet scan be passed
+                - If ifAdminStatus is down(2) then ifOperStatus should be down(2)
+                - If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic
+                - It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)
+                - It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state
+                - It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.
+              valuemap:
+                name: 'IF-MIB::ifOperStatus'
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 6h
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: state
+              trigger_prototypes:
+                -
+                  uuid: d4392162d62541aeb148718ddd7f5d57
+                  expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  name: 'PFSense: Link down'
+                  opdata: 'Current state: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+                  description: |
+                    This trigger expression works as follows:
+                    1. Can be triggered if operations status is down.
+                    2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
+            -
+              uuid: 86f6e925d8a64e31a44b5338c92b31ec
+              name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Interface type'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.2.2.1.3.{#SNMPINDEX}'
+              key: 'net.if.type[{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: IF-MIB
+                The type of interface.
+                Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),
+                through updating the syntax of the IANAifType textual convention.
+              valuemap:
+                name: 'IF-MIB::ifType'
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 6h
+              tags:
+                -
+                  tag: interface
+                  value: '{#IFNAME}({#IFALIAS})'
+                -
+                  tag: resource
+                  value: network
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: string
+          trigger_prototypes:
+            -
+              uuid: eb3090605ba14407a91736ac9768d65a
+              expression: |
+                change(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])<0 and last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])>0
+                and (
+                last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=6 or
+                last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=7 or
+                last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=11 or
+                last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=62 or
+                last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=69 or
+                last(/PFSense SNMP/net.if.type[{#SNMPINDEX}])=117
+                )
+                and
+                (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])<>2)
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: |
+                (change(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])>0 and last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}],#2)>0) or
+                (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)
+              name: 'PFSense: Ethernet has changed to lower speed than it was before'
+              opdata: 'Current reported speed: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.'
+              dependencies:
+                -
+                  name: 'PFSense: Link down'
+                  expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+            -
+              uuid: 90c99a9c4ce44b3ca929c4b3200286fb
+              expression: |
+                (avg(/PFSense SNMP/net.if.in[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])) and
+                last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])>0
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/PFSense SNMP/net.if.in[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])'
+              name: 'PFSense: High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )'
+              opdata: 'In: {ITEM.LASTVALUE1}, speed: {ITEM.LASTVALUE2}'
+              priority: WARNING
+              description: 'The network interface utilization is close to its estimated maximum bandwidth.'
+              dependencies:
+                -
+                  name: 'PFSense: Link down'
+                  expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+            -
+              uuid: 6be52ce31bab4250b421de1bfe84263c
+              expression: |
+                (avg(/PFSense SNMP/net.if.out[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])) and
+                last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])>0
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/PFSense SNMP/net.if.out[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/PFSense SNMP/net.if.speed[{#SNMPINDEX}])'
+              name: 'PFSense: High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )'
+              opdata: 'Out: {ITEM.LASTVALUE1}, speed: {ITEM.LASTVALUE2}'
+              priority: WARNING
+              description: 'The network interface utilization is close to its estimated maximum bandwidth.'
+              dependencies:
+                -
+                  name: 'PFSense: Link down'
+                  expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+          graph_prototypes:
+            -
+              uuid: 4679de2da218418e9564f0cc5a13e31a
+              name: 'PFSense: Inbound packet filter traffic interface [{#IFNAME}({#IFALIAS})]'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.pass.v4.bps[{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: F63100
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.block.v4.bps[{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: 2774A4
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.pass.v6.bps[{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.block.v6.bps[{#SNMPINDEX}]'
+                -
+                  sortorder: '4'
+                  color: 6C59DC
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.pass.v4.pps[{#SNMPINDEX}]'
+                -
+                  sortorder: '5'
+                  color: FC6EA3
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.block.v4.pps[{#SNMPINDEX}]'
+                -
+                  sortorder: '6'
+                  color: AC8C14
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.pass.v6.pps[{#SNMPINDEX}]'
+                -
+                  sortorder: '7'
+                  color: 611F27
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.block.v6.pps[{#SNMPINDEX}]'
+            -
+              uuid: 3acc01b7ad11441ca2ea4dab13274efa
+              name: 'PFSense: Network traffic interface [{#IFNAME}({#IFALIAS})]'
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in[{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  drawtype: BOLD_LINE
+                  color: 2774A4
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out[{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.errors[{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.errors[{#SNMPINDEX}]'
+                -
+                  sortorder: '4'
+                  color: FC6EA3
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.discards[{#SNMPINDEX}]'
+                -
+                  sortorder: '5'
+                  color: 6C59DC
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.in.discards[{#SNMPINDEX}]'
+            -
+              uuid: 58b7aa7618274c9e9285d4c0b63c2ca8
+              name: 'PFSense: Outbound packet filter traffic interface [{#IFNAME}({#IFALIAS})]'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.pass.v4.bps[{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: F63100
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.block.v4.bps[{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: 2774A4
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.pass.v6.bps[{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.block.v6.bps[{#SNMPINDEX}]'
+                -
+                  sortorder: '4'
+                  color: 6C59DC
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.pass.v4.pps[{#SNMPINDEX}]'
+                -
+                  sortorder: '5'
+                  color: FC6EA3
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.block.v4.pps[{#SNMPINDEX}]'
+                -
+                  sortorder: '6'
+                  color: AC8C14
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.pass.v6.pps[{#SNMPINDEX}]'
+                -
+                  sortorder: '7'
+                  color: 611F27
+                  yaxisside: RIGHT
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'net.if.out.block.v6.pps[{#SNMPINDEX}]'
+        -
+          uuid: 2ee60ad904ba45348f5e42b02f27aa98
+          name: 'Block devices discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#DEVNAME},1.3.6.1.4.1.2021.13.15.1.1.2]'
+          key: vfs.dev.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#DEVNAME}'
+                value: '{$VFS.DEV.DEVNAME.MATCHES}'
+                formulaid: A
+              -
+                macro: '{#DEVNAME}'
+                value: '{$VFS.DEV.DEVNAME.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: B
+          description: 'Block devices are discovered from UCD-DISKIO-MIB::diskIOTable (http://net-snmp.sourceforge.net/docs/mibs/ucdDiskIOMIB.html#diskIOTable)'
+          item_prototypes:
+            -
+              uuid: afda1ff507ea43f39dceaf76f3552690
+              name: 'PFSense: [{#DEVNAME}]: Disk read rate'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.2021.13.15.1.1.5.{#SNMPINDEX}'
+              key: 'vfs.dev.read.rate[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '!r/s'
+              description: |
+                MIB: UCD-DISKIO-MIB
+                The number of read accesses from this device since boot.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: device
+                  value: '{#DEVNAME}'
+                -
+                  tag: resource
+                  value: disk
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 180555ff64304d15bd17b9d58cfc91ed
+              name: 'PFSense: [{#DEVNAME}]: Disk utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.2021.13.15.1.1.9.{#SNMPINDEX}'
+              key: 'vfs.dev.util[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-DISKIO-MIB
+                The 1 minute average load of disk (%)
+              tags:
+                -
+                  tag: device
+                  value: '{#DEVNAME}'
+                -
+                  tag: resource
+                  value: disk
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: 35777597864a4db0ad063c609c3dbee3
+              name: 'PFSense: [{#DEVNAME}]: Disk write rate'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.2021.13.15.1.1.6.{#SNMPINDEX}'
+              key: 'vfs.dev.write.rate[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '!w/s'
+              description: |
+                MIB: UCD-DISKIO-MIB
+                The number of write accesses from this device since boot.
+              preprocessing:
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              tags:
+                -
+                  tag: device
+                  value: '{#DEVNAME}'
+                -
+                  tag: resource
+                  value: disk
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: rate
+          graph_prototypes:
+            -
+              uuid: 68683d3f206245639c89bda5da17e0d3
+              name: 'PFSense: Disk [{#DEVNAME}] read/write rates'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'vfs.dev.read.rate[{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  drawtype: GRADIENT_LINE
+                  color: 2774A4
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'vfs.dev.write.rate[{#SNMPINDEX}]'
+        -
+          uuid: 8c6084603d134d1e96aeff663fc0045d
+          name: 'Mounted filesystem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#FSNAME},.1.3.6.1.2.1.25.3.8.1.2,{#FSTYPE},.1.3.6.1.2.1.25.3.8.1.4]'
+          key: vfs.fs.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#FSTYPE}'
+                value: '{$VFS.FS.FSTYPE.MATCHES}'
+                formulaid: C
+              -
+                macro: '{#FSTYPE}'
+                value: '{$VFS.FS.FSTYPE.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: D
+              -
+                macro: '{#FSNAME}'
+                value: '{$VFS.FS.FSNAME.MATCHES}'
+                formulaid: A
+              -
+                macro: '{#FSNAME}'
+                value: '{$VFS.FS.FSNAME.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrFS discovery with filter'
+          item_prototypes:
+            -
+              uuid: 73c51f990076413f959abe81cdcd5225
+              name: 'PFSense: [{#FSNAME}]: Free inodes in %'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.2021.9.1.10["index","1.3.6.1.4.1.2021.9.1.2","{#FSNAME}"]'
+              key: 'vfs.fs.inode.pfree[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-SNMP-MIB
+                If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.
+              preprocessing:
+                -
+                  type: JAVASCRIPT
+                  parameters:
+                    - 'return (100-value);'
+              tags:
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: resource
+                  value: filesystem
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+              trigger_prototypes:
+                -
+                  uuid: 55324e1072f34c5fbc67a7f0566f64d6
+                  expression: 'min(/PFSense SNMP/vfs.fs.inode.pfree[{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  name: 'PFSense: {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
+                  opdata: 'Free inodes: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+                  description: |
+                    It may become impossible to write to disk if there are no index nodes left.
+                    As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                -
+                  uuid: 48917b7fd7cd4e16a7746ce9cf88a7b6
+                  expression: 'min(/PFSense SNMP/vfs.fs.inode.pfree[{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
+                  name: 'PFSense: {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}%)'
+                  opdata: 'Free inodes: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: |
+                    It may become impossible to write to disk if there are no index nodes left.
+                    As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  dependencies:
+                    -
+                      name: 'PFSense: {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
+                      expression: 'min(/PFSense SNMP/vfs.fs.inode.pfree[{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+            -
+              uuid: 51fa616aa3ee4d3ca1371d0d455244eb
+              name: 'PFSense: [{#FSNAME}]: Space utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.2021.9.1.9["index","1.3.6.1.4.1.2021.9.1.2","{#FSNAME}"]'
+              key: 'vfs.fs.pused[{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: UCD-SNMP-MIB
+                If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.
+              tags:
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: resource
+                  value: filesystem
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: f5f253e700f742579a4f91d3061a816e
+              name: 'PFSense: [{#FSNAME}]: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.2021.9.1.6["index","1.3.6.1.4.1.2021.9.1.2","{#FSNAME}"]'
+              key: 'vfs.fs.total[{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: UCD-SNMP-MIB
+                If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: resource
+                  value: filesystem
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+            -
+              uuid: eaf1ed2e94cc41f69fda97778f27628c
+              name: 'PFSense: [{#FSNAME}]: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.2021.9.1.8["index","1.3.6.1.4.1.2021.9.1.2","{#FSNAME}"]'
+              key: 'vfs.fs.used[{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: UCD-SNMP-MIB
+                If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: resource
+                  value: filesystem
+                -
+                  tag: target
+                  value: pfsense
+                -
+                  tag: transport
+                  value: snmp
+                -
+                  tag: type
+                  value: gauge
+          trigger_prototypes:
+            -
+              uuid: 711e2c5b136e4a51a2fb745d847a9fc5
+              expression: |
+                last(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
+                ((last(/PFSense SNMP/vfs.fs.total[{#SNMPINDEX}])-last(/PFSense SNMP/vfs.fs.used[{#SNMPINDEX}]))<5G or timeleft(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}],1h,100)<1d)
+              name: 'PFSense: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"PFSense"}%)'
+              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:"PFSense"}.
+                 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: ef0273e1092a40ff888e0ea87c859abb
+              expression: |
+                last(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and
+                ((last(/PFSense SNMP/vfs.fs.total[{#SNMPINDEX}])-last(/PFSense SNMP/vfs.fs.used[{#SNMPINDEX}]))<10G or timeleft(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}],1h,100)<1d)
+              name: 'PFSense: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"PFSense"}%)'
+              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:"PFSense"}.
+                 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: 'PFSense: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"PFSense"}%)'
+                  expression: |
+                    last(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
+                    ((last(/PFSense SNMP/vfs.fs.total[{#SNMPINDEX}])-last(/PFSense SNMP/vfs.fs.used[{#SNMPINDEX}]))<5G or timeleft(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: af57ea943b0f45f6b03028ef48c07605
+              name: 'PFSense: Disk [{#FSNAME}] space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'vfs.fs.total[{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'PFSense SNMP'
+                    key: 'vfs.fs.used[{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+          description: 'Threshold of CPU utilization for warning trigger in %.'
+        -
+          macro: '{$ICMP_LOSS_WARN}'
+          value: '20'
+          description: 'Threshold of ICMP packets loss for warning trigger in %.'
+        -
+          macro: '{$ICMP_RESPONSE_TIME_WARN}'
+          value: '0.15'
+          description: 'Threshold of average ICMP response time for warning trigger in seconds.'
+        -
+          macro: '{$IF.ERRORS.WARN}'
+          value: '2'
+          description: 'Threshold of error packets rate for warning trigger. Can be used with interface name as context.'
+        -
+          macro: '{$IF.UTIL.MAX}'
+          value: '90'
+          description: 'Threshold of interface bandwidth utilization for warning trigger in %. Can be used with interface name as context.'
+        -
+          macro: '{$IFCONTROL}'
+          value: '1'
+          description: 'Macro for operational state of the interface for link down trigger. Can be used with interface name as context.'
+        -
+          macro: '{$LOAD_AVG_PER_CPU.MAX.WARN}'
+          value: '1.5'
+          description: 'Load per CPU considered sustainable. Tune if needed.'
+        -
+          macro: '{$MEMORY.AVAILABLE.MIN}'
+          value: 20M
+          description: 'Threshold of available memory for trigger in bytes.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+          description: 'Threshold of memory utilization for trigger in %'
+        -
+          macro: '{$NET.IF.IFADMINSTATUS.MATCHES}'
+          value: '^.*'
+          description: 'This macro is used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFADMINSTATUS.NOT_MATCHES}'
+          value: ^2$
+          description: 'Ignore down(2) administrative status'
+        -
+          macro: '{$NET.IF.IFALIAS.MATCHES}'
+          value: '.*'
+          description: 'This macro is used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFALIAS.NOT_MATCHES}'
+          value: CHANGE_IF_NEEDED
+          description: 'This macro is used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFDESCR.MATCHES}'
+          value: '.*'
+          description: 'This macro used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFDESCR.NOT_MATCHES}'
+          value: CHANGE_IF_NEEDED
+          description: 'This macro used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFNAME.MATCHES}'
+          value: '^em[0-9]+$'
+          description: 'This macro used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFNAME.NOT_MATCHES}'
+          value: ^$
+          description: 'This macro used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFOPERSTATUS.MATCHES}'
+          value: '^.*$'
+          description: 'This macro used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFOPERSTATUS.NOT_MATCHES}'
+          value: ^6$
+          description: 'Ignore notPresent(6)'
+        -
+          macro: '{$NET.IF.IFTYPE.MATCHES}'
+          value: '.*'
+          description: 'This macro used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$NET.IF.IFTYPE.NOT_MATCHES}'
+          value: CHANGE_IF_NEEDED
+          description: 'This macro used in filters of network interfaces discovery rule.'
+        -
+          macro: '{$SNMP.TIMEOUT}'
+          value: 5m
+          description: 'The time interval for SNMP availability trigger.'
+        -
+          macro: '{$SOURCE.TRACKING.TABLE.UTIL.MAX}'
+          value: '90'
+          description: 'Threshold of source tracking table utilization trigger in %.'
+        -
+          macro: '{$STATE.TABLE.UTIL.MAX}'
+          value: '90'
+          description: 'Threshold of state table utilization trigger in %.'
+        -
+          macro: '{$SWAP.PFREE.MIN.WARN}'
+          value: '50'
+          description: 'Threshold of free swap space for warning trigger in %.'
+        -
+          macro: '{$VFS.DEV.DEVNAME.MATCHES}'
+          value: .+
+          description: 'This macro is used in block devices discovery. Can be overridden on the host or linked template level'
+        -
+          macro: '{$VFS.DEV.DEVNAME.NOT_MATCHES}'
+          value: '^(loop[0-9]*|sd[a-z][0-9]+|nbd[0-9]+|sr[0-9]+|fd[0-9]+|dm-[0-9]+|ram[0-9]+|ploop[a-z0-9]+|md[0-9]*|hcp[0-9]*|cd[0-9]*|pass[0-9]*|zram[0-9]*)'
+          description: 'This macro is used in block devices discovery. Can be overridden on the host or linked template level'
+        -
+          macro: '{$VFS.FS.FSNAME.MATCHES}'
+          value: .+
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+        -
+          macro: '{$VFS.FS.FSNAME.NOT_MATCHES}'
+          value: ^(/dev|/sys|/run|/var/run|/proc|.+/shm$)
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+        -
+          macro: '{$VFS.FS.FSTYPE.MATCHES}'
+          value: '.*(9.3|hrFSBerkeleyFFS)$'
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+        -
+          macro: '{$VFS.FS.FSTYPE.NOT_MATCHES}'
+          value: ^\s$
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+        -
+          macro: '{$VFS.FS.INODE.PFREE.MIN.CRIT}'
+          value: '10'
+          description: 'Threshold of inodes usage for average severity trigger in %. Can be used with filesystem name as context.'
+        -
+          macro: '{$VFS.FS.INODE.PFREE.MIN.WARN}'
+          value: '20'
+          description: 'Threshold of inodes usage for warning trigger in %. Can be used with filesystem name as context.'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+          description: 'Threshold of filesystem used space for average severity trigger in %. Can be used with filesystem name as context.'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+          description: 'Threshold of used filesystem space for warning trigger in %. Can be used with filesystem name as context.'
+      valuemaps:
+        -
+          uuid: 2216d8afb349448394590770ff99e56a
+          name: 'IF-MIB::ifOperStatus'
+          mappings:
+            -
+              value: '1'
+              newvalue: up
+            -
+              value: '2'
+              newvalue: down
+            -
+              value: '3'
+              newvalue: testing
+            -
+              value: '4'
+              newvalue: unknown
+            -
+              value: '5'
+              newvalue: dormant
+            -
+              value: '6'
+              newvalue: notPresent
+            -
+              value: '7'
+              newvalue: lowerLayerDown
+        -
+          uuid: 3165b9b6c79e446f9d1029571518004e
+          name: 'IF-MIB::ifType'
+          mappings:
+            -
+              value: '1'
+              newvalue: other
+            -
+              value: '2'
+              newvalue: regular1822
+            -
+              value: '3'
+              newvalue: hdh1822
+            -
+              value: '4'
+              newvalue: ddnX25
+            -
+              value: '5'
+              newvalue: rfc877x25
+            -
+              value: '6'
+              newvalue: ethernetCsmacd
+            -
+              value: '7'
+              newvalue: iso88023Csmacd
+            -
+              value: '8'
+              newvalue: iso88024TokenBus
+            -
+              value: '9'
+              newvalue: iso88025TokenRing
+            -
+              value: '10'
+              newvalue: iso88026Man
+            -
+              value: '11'
+              newvalue: starLan
+            -
+              value: '12'
+              newvalue: proteon10Mbit
+            -
+              value: '13'
+              newvalue: proteon80Mbit
+            -
+              value: '14'
+              newvalue: hyperchannel
+            -
+              value: '15'
+              newvalue: fddi
+            -
+              value: '16'
+              newvalue: lapb
+            -
+              value: '17'
+              newvalue: sdlc
+            -
+              value: '18'
+              newvalue: ds1
+            -
+              value: '19'
+              newvalue: e1
+            -
+              value: '20'
+              newvalue: basicISDN
+            -
+              value: '21'
+              newvalue: primaryISDN
+            -
+              value: '22'
+              newvalue: propPointToPointSerial
+            -
+              value: '23'
+              newvalue: ppp
+            -
+              value: '24'
+              newvalue: softwareLoopback
+            -
+              value: '25'
+              newvalue: eon
+            -
+              value: '26'
+              newvalue: ethernet3Mbit
+            -
+              value: '27'
+              newvalue: nsip
+            -
+              value: '28'
+              newvalue: slip
+            -
+              value: '29'
+              newvalue: ultra
+            -
+              value: '30'
+              newvalue: ds3
+            -
+              value: '31'
+              newvalue: sip
+            -
+              value: '32'
+              newvalue: frameRelay
+            -
+              value: '33'
+              newvalue: rs232
+            -
+              value: '34'
+              newvalue: para
+            -
+              value: '35'
+              newvalue: arcnet
+            -
+              value: '36'
+              newvalue: arcnetPlus
+            -
+              value: '37'
+              newvalue: atm
+            -
+              value: '38'
+              newvalue: miox25
+            -
+              value: '39'
+              newvalue: sonet
+            -
+              value: '40'
+              newvalue: x25ple
+            -
+              value: '41'
+              newvalue: iso88022llc
+            -
+              value: '42'
+              newvalue: localTalk
+            -
+              value: '43'
+              newvalue: smdsDxi
+            -
+              value: '44'
+              newvalue: frameRelayService
+            -
+              value: '45'
+              newvalue: v35
+            -
+              value: '46'
+              newvalue: hssi
+            -
+              value: '47'
+              newvalue: hippi
+            -
+              value: '48'
+              newvalue: modem
+            -
+              value: '49'
+              newvalue: aal5
+            -
+              value: '50'
+              newvalue: sonetPath
+            -
+              value: '51'
+              newvalue: sonetVT
+            -
+              value: '52'
+              newvalue: smdsIcip
+            -
+              value: '53'
+              newvalue: propVirtual
+            -
+              value: '54'
+              newvalue: propMultiplexor
+            -
+              value: '55'
+              newvalue: ieee80212
+            -
+              value: '56'
+              newvalue: fibreChannel
+            -
+              value: '57'
+              newvalue: hippiInterface
+            -
+              value: '58'
+              newvalue: frameRelayInterconnect
+            -
+              value: '59'
+              newvalue: aflane8023
+            -
+              value: '60'
+              newvalue: aflane8025
+            -
+              value: '61'
+              newvalue: cctEmul
+            -
+              value: '62'
+              newvalue: fastEther
+            -
+              value: '63'
+              newvalue: isdn
+            -
+              value: '64'
+              newvalue: v11
+            -
+              value: '65'
+              newvalue: v36
+            -
+              value: '66'
+              newvalue: g703at64k
+            -
+              value: '67'
+              newvalue: g703at2mb
+            -
+              value: '68'
+              newvalue: qllc
+            -
+              value: '69'
+              newvalue: fastEtherFX
+            -
+              value: '70'
+              newvalue: channel
+            -
+              value: '71'
+              newvalue: ieee80211
+            -
+              value: '72'
+              newvalue: ibm370parChan
+            -
+              value: '73'
+              newvalue: escon
+            -
+              value: '74'
+              newvalue: dlsw
+            -
+              value: '75'
+              newvalue: isdns
+            -
+              value: '76'
+              newvalue: isdnu
+            -
+              value: '77'
+              newvalue: lapd
+            -
+              value: '78'
+              newvalue: ipSwitch
+            -
+              value: '79'
+              newvalue: rsrb
+            -
+              value: '80'
+              newvalue: atmLogical
+            -
+              value: '81'
+              newvalue: ds0
+            -
+              value: '82'
+              newvalue: ds0Bundle
+            -
+              value: '83'
+              newvalue: bsc
+            -
+              value: '84'
+              newvalue: async
+            -
+              value: '85'
+              newvalue: cnr
+            -
+              value: '86'
+              newvalue: iso88025Dtr
+            -
+              value: '87'
+              newvalue: eplrs
+            -
+              value: '88'
+              newvalue: arap
+            -
+              value: '89'
+              newvalue: propCnls
+            -
+              value: '90'
+              newvalue: hostPad
+            -
+              value: '91'
+              newvalue: termPad
+            -
+              value: '92'
+              newvalue: frameRelayMPI
+            -
+              value: '93'
+              newvalue: x213
+            -
+              value: '94'
+              newvalue: adsl
+            -
+              value: '95'
+              newvalue: radsl
+            -
+              value: '96'
+              newvalue: sdsl
+            -
+              value: '97'
+              newvalue: vdsl
+            -
+              value: '98'
+              newvalue: iso88025CRFPInt
+            -
+              value: '99'
+              newvalue: myrinet
+            -
+              value: '100'
+              newvalue: voiceEM
+            -
+              value: '101'
+              newvalue: voiceFXO
+            -
+              value: '102'
+              newvalue: voiceFXS
+            -
+              value: '103'
+              newvalue: voiceEncap
+            -
+              value: '104'
+              newvalue: voiceOverIp
+            -
+              value: '105'
+              newvalue: atmDxi
+            -
+              value: '106'
+              newvalue: atmFuni
+            -
+              value: '107'
+              newvalue: atmIma
+            -
+              value: '108'
+              newvalue: pppMultilinkBundle
+            -
+              value: '109'
+              newvalue: ipOverCdlc
+            -
+              value: '110'
+              newvalue: ipOverClaw
+            -
+              value: '111'
+              newvalue: stackToStack
+            -
+              value: '112'
+              newvalue: virtualIpAddress
+            -
+              value: '113'
+              newvalue: mpc
+            -
+              value: '114'
+              newvalue: ipOverAtm
+            -
+              value: '115'
+              newvalue: iso88025Fiber
+            -
+              value: '116'
+              newvalue: tdlc
+            -
+              value: '117'
+              newvalue: gigabitEthernet
+            -
+              value: '118'
+              newvalue: hdlc
+            -
+              value: '119'
+              newvalue: lapf
+            -
+              value: '120'
+              newvalue: v37
+            -
+              value: '121'
+              newvalue: x25mlp
+            -
+              value: '122'
+              newvalue: x25huntGroup
+            -
+              value: '123'
+              newvalue: trasnpHdlc
+            -
+              value: '124'
+              newvalue: interleave
+            -
+              value: '125'
+              newvalue: fast
+            -
+              value: '126'
+              newvalue: ip
+            -
+              value: '127'
+              newvalue: docsCableMaclayer
+            -
+              value: '128'
+              newvalue: docsCableDownstream
+            -
+              value: '129'
+              newvalue: docsCableUpstream
+            -
+              value: '130'
+              newvalue: a12MppSwitch
+            -
+              value: '131'
+              newvalue: tunnel
+            -
+              value: '132'
+              newvalue: coffee
+            -
+              value: '133'
+              newvalue: ces
+            -
+              value: '134'
+              newvalue: atmSubInterface
+            -
+              value: '135'
+              newvalue: l2vlan
+            -
+              value: '136'
+              newvalue: l3ipvlan
+            -
+              value: '137'
+              newvalue: l3ipxvlan
+            -
+              value: '138'
+              newvalue: digitalPowerline
+            -
+              value: '139'
+              newvalue: mediaMailOverIp
+            -
+              value: '140'
+              newvalue: dtm
+            -
+              value: '141'
+              newvalue: dcn
+            -
+              value: '142'
+              newvalue: ipForward
+            -
+              value: '143'
+              newvalue: msdsl
+            -
+              value: '144'
+              newvalue: ieee1394
+            -
+              value: '145'
+              newvalue: if-gsn
+            -
+              value: '146'
+              newvalue: dvbRccMacLayer
+            -
+              value: '147'
+              newvalue: dvbRccDownstream
+            -
+              value: '148'
+              newvalue: dvbRccUpstream
+            -
+              value: '149'
+              newvalue: atmVirtual
+            -
+              value: '150'
+              newvalue: mplsTunnel
+            -
+              value: '151'
+              newvalue: srp
+            -
+              value: '152'
+              newvalue: voiceOverAtm
+            -
+              value: '153'
+              newvalue: voiceOverFrameRelay
+            -
+              value: '154'
+              newvalue: idsl
+            -
+              value: '155'
+              newvalue: compositeLink
+            -
+              value: '156'
+              newvalue: ss7SigLink
+            -
+              value: '157'
+              newvalue: propWirelessP2P
+            -
+              value: '158'
+              newvalue: frForward
+            -
+              value: '159'
+              newvalue: rfc1483
+            -
+              value: '160'
+              newvalue: usb
+            -
+              value: '161'
+              newvalue: ieee8023adLag
+            -
+              value: '162'
+              newvalue: bgppolicyaccounting
+            -
+              value: '163'
+              newvalue: frf16MfrBundle
+            -
+              value: '164'
+              newvalue: h323Gatekeeper
+            -
+              value: '165'
+              newvalue: h323Proxy
+            -
+              value: '166'
+              newvalue: mpls
+            -
+              value: '167'
+              newvalue: mfSigLink
+            -
+              value: '168'
+              newvalue: hdsl2
+            -
+              value: '169'
+              newvalue: shdsl
+            -
+              value: '170'
+              newvalue: ds1FDL
+            -
+              value: '171'
+              newvalue: pos
+            -
+              value: '172'
+              newvalue: dvbAsiIn
+            -
+              value: '173'
+              newvalue: dvbAsiOut
+            -
+              value: '174'
+              newvalue: plc
+            -
+              value: '175'
+              newvalue: nfas
+            -
+              value: '176'
+              newvalue: tr008
+            -
+              value: '177'
+              newvalue: gr303RDT
+            -
+              value: '178'
+              newvalue: gr303IDT
+            -
+              value: '179'
+              newvalue: isup
+            -
+              value: '180'
+              newvalue: propDocsWirelessMaclayer
+            -
+              value: '181'
+              newvalue: propDocsWirelessDownstream
+            -
+              value: '182'
+              newvalue: propDocsWirelessUpstream
+            -
+              value: '183'
+              newvalue: hiperlan2
+            -
+              value: '184'
+              newvalue: propBWAp2Mp
+            -
+              value: '185'
+              newvalue: sonetOverheadChannel
+            -
+              value: '186'
+              newvalue: digitalWrapperOverheadChannel
+            -
+              value: '187'
+              newvalue: aal2
+            -
+              value: '188'
+              newvalue: radioMAC
+            -
+              value: '189'
+              newvalue: atmRadio
+            -
+              value: '190'
+              newvalue: imt
+            -
+              value: '191'
+              newvalue: mvl
+            -
+              value: '192'
+              newvalue: reachDSL
+            -
+              value: '193'
+              newvalue: frDlciEndPt
+            -
+              value: '194'
+              newvalue: atmVciEndPt
+            -
+              value: '195'
+              newvalue: opticalChannel
+            -
+              value: '196'
+              newvalue: opticalTransport
+            -
+              value: '197'
+              newvalue: propAtm
+            -
+              value: '198'
+              newvalue: voiceOverCable
+            -
+              value: '199'
+              newvalue: infiniband
+            -
+              value: '200'
+              newvalue: teLink
+            -
+              value: '201'
+              newvalue: q2931
+            -
+              value: '202'
+              newvalue: virtualTg
+            -
+              value: '203'
+              newvalue: sipTg
+            -
+              value: '204'
+              newvalue: sipSig
+            -
+              value: '205'
+              newvalue: docsCableUpstreamChannel
+            -
+              value: '206'
+              newvalue: econet
+            -
+              value: '207'
+              newvalue: pon155
+            -
+              value: '208'
+              newvalue: pon622
+            -
+              value: '209'
+              newvalue: bridge
+            -
+              value: '210'
+              newvalue: linegroup
+            -
+              value: '211'
+              newvalue: voiceEMFGD
+            -
+              value: '212'
+              newvalue: voiceFGDEANA
+            -
+              value: '213'
+              newvalue: voiceDID
+            -
+              value: '214'
+              newvalue: mpegTransport
+            -
+              value: '215'
+              newvalue: sixToFour
+            -
+              value: '216'
+              newvalue: gtp
+            -
+              value: '217'
+              newvalue: pdnEtherLoop1
+            -
+              value: '218'
+              newvalue: pdnEtherLoop2
+            -
+              value: '219'
+              newvalue: opticalChannelGroup
+            -
+              value: '220'
+              newvalue: homepna
+            -
+              value: '221'
+              newvalue: gfp
+            -
+              value: '222'
+              newvalue: ciscoISLvlan
+            -
+              value: '223'
+              newvalue: actelisMetaLOOP
+            -
+              value: '224'
+              newvalue: fcipLink
+            -
+              value: '225'
+              newvalue: rpr
+            -
+              value: '226'
+              newvalue: qam
+            -
+              value: '227'
+              newvalue: lmp
+            -
+              value: '228'
+              newvalue: cblVectaStar
+            -
+              value: '229'
+              newvalue: docsCableMCmtsDownstream
+            -
+              value: '230'
+              newvalue: adsl2
+            -
+              value: '231'
+              newvalue: macSecControlledIF
+            -
+              value: '232'
+              newvalue: macSecUncontrolledIF
+            -
+              value: '233'
+              newvalue: aviciOpticalEther
+            -
+              value: '234'
+              newvalue: atmbond
+            -
+              value: '235'
+              newvalue: voiceFGDOS
+            -
+              value: '236'
+              newvalue: mocaVersion1
+            -
+              value: '237'
+              newvalue: ieee80216WMAN
+            -
+              value: '238'
+              newvalue: adsl2plus
+            -
+              value: '239'
+              newvalue: dvbRcsMacLayer
+            -
+              value: '240'
+              newvalue: dvbTdm
+            -
+              value: '241'
+              newvalue: dvbRcsTdma
+            -
+              value: '242'
+              newvalue: x86Laps
+            -
+              value: '243'
+              newvalue: wwanPP
+            -
+              value: '244'
+              newvalue: wwanPP2
+            -
+              value: '245'
+              newvalue: voiceEBS
+            -
+              value: '246'
+              newvalue: ifPwType
+            -
+              value: '247'
+              newvalue: ilan
+            -
+              value: '248'
+              newvalue: pip
+            -
+              value: '249'
+              newvalue: aluELP
+            -
+              value: '250'
+              newvalue: gpon
+            -
+              value: '251'
+              newvalue: vdsl2
+            -
+              value: '252'
+              newvalue: capwapDot11Profile
+            -
+              value: '253'
+              newvalue: capwapDot11Bss
+            -
+              value: '254'
+              newvalue: capwapWtpVirtualRadio
+            -
+              value: '255'
+              newvalue: bits
+            -
+              value: '256'
+              newvalue: docsCableUpstreamRfPort
+            -
+              value: '257'
+              newvalue: cableDownstreamRfPort
+            -
+              value: '258'
+              newvalue: vmwareVirtualNic
+            -
+              value: '259'
+              newvalue: ieee802154
+            -
+              value: '260'
+              newvalue: otnOdu
+            -
+              value: '261'
+              newvalue: otnOtu
+            -
+              value: '262'
+              newvalue: ifVfiType
+            -
+              value: '263'
+              newvalue: g9981
+            -
+              value: '264'
+              newvalue: g9982
+            -
+              value: '265'
+              newvalue: g9983
+            -
+              value: '266'
+              newvalue: aluEpon
+            -
+              value: '267'
+              newvalue: aluEponOnu
+            -
+              value: '268'
+              newvalue: aluEponPhysicalUni
+            -
+              value: '269'
+              newvalue: aluEponLogicalLink
+            -
+              value: '270'
+              newvalue: aluGponOnu
+            -
+              value: '271'
+              newvalue: aluGponPhysicalUni
+            -
+              value: '272'
+              newvalue: vmwareNicTeam
+            -
+              value: '277'
+              newvalue: docsOfdmDownstream
+            -
+              value: '278'
+              newvalue: docsOfdmaUpstream
+            -
+              value: '279'
+              newvalue: gfast
+            -
+              value: '280'
+              newvalue: sdci
+            -
+              value: '281'
+              newvalue: xboxWireless
+            -
+              value: '282'
+              newvalue: fastdsl
+            -
+              value: '283'
+              newvalue: docsCableScte55d1FwdOob
+            -
+              value: '284'
+              newvalue: docsCableScte55d1RetOob
+            -
+              value: '285'
+              newvalue: docsCableScte55d2DsOob
+            -
+              value: '286'
+              newvalue: docsCableScte55d2UsOob
+            -
+              value: '287'
+              newvalue: docsCableNdf
+            -
+              value: '288'
+              newvalue: docsCableNdr
+            -
+              value: '289'
+              newvalue: ptm
+            -
+              value: '290'
+              newvalue: ghn
+        -
+          uuid: fc5652614ee94cd8b437b3058886e857
+          name: 'Services status'
+          mappings:
+            -
+              value: '0'
+              newvalue: 'not running'
+            -
+              value: '2'
+              newvalue: running
+        -
+          uuid: c3c721156c624317af993e1a263c16bc
+          name: 'Service state'
+          mappings:
+            -
+              value: '0'
+              newvalue: Down
+            -
+              value: '1'
+              newvalue: Up
+        -
+          uuid: f6bb441b7a65446c96c546bd3f3140ee
+          name: 'SNMPv2-TC::TruthValue'
+          mappings:
+            -
+              value: '1'
+              newvalue: 'true'
+            -
+              value: '2'
+              newvalue: 'false'
+        -
+          uuid: d553e33d8b104a5e89d88500e85fa5fc
+          name: zabbix.host.available
+          mappings:
+            -
+              value: '0'
+              newvalue: 'not available'
+            -
+              value: '1'
+              newvalue: available
+            -
+              value: '2'
+              newvalue: unknown
+  triggers:
+    -
+      uuid: fe568255690f4125847230be3ba88f54
+      expression: 'min(/PFSense SNMP/system.swap.pfree,5m)<{$SWAP.PFREE.MIN.WARN} and last(/PFSense SNMP/system.swap.total)>0'
+      name: 'PFSense: High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
+      opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
+      priority: WARNING
+      description: 'This trigger is ignored, if there is no swap configured'
+      dependencies:
+        -
+          name: 'PFSense: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+          expression: 'min(/PFSense SNMP/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+        -
+          name: 'PFSense: Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
+          expression: 'min(/PFSense SNMP/vm.memory.available,5m)<{$MEMORY.AVAILABLE.MIN} and last(/PFSense SNMP/vm.memory.total)>0'
+    -
+      uuid: d890efaff23f49e8ba05d22390f9e21b
+      expression: 'min(/PFSense SNMP/vm.memory.available,5m)<{$MEMORY.AVAILABLE.MIN} and last(/PFSense SNMP/vm.memory.total)>0'
+      name: 'PFSense: Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
+      opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
+      priority: AVERAGE
+      description: 'The system is running out of memory'
+    -
+      uuid: ffbe648f887744de91a6e1206518fc74
+      expression: |
+        min(/PFSense SNMP/system.cpu.load.avg1,5m)/last(/PFSense SNMP/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN}
+        and last(/PFSense SNMP/system.cpu.load.avg5)>0
+        and last(/PFSense SNMP/system.cpu.load.avg15)>0
+      name: 'PFSense: Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m)'
+      opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
+      priority: AVERAGE
+      description: 'Per CPU load average is too high. Your system may be slow to respond.'
+  graphs:
+    -
+      uuid: 7fdf3de55e6b48abb9c6fbbf4a0f4ceb
+      name: 'PFSense: CPU jumps'
+      graph_items:
+        -
+          color: 1A7C11
+          item:
+            host: 'PFSense SNMP'
+            key: system.cpu.switches
+        -
+          sortorder: '1'
+          color: 2774A4
+          item:
+            host: 'PFSense SNMP'
+            key: system.cpu.intr
+    -
+      uuid: f282a7c00c5a451e93c1a62939999041
+      name: 'PFSense: Memory usage'
+      ymin_type_1: FIXED
+      graph_items:
+        -
+          drawtype: BOLD_LINE
+          color: 1A7C11
+          item:
+            host: 'PFSense SNMP'
+            key: vm.memory.total
+        -
+          sortorder: '1'
+          drawtype: GRADIENT_LINE
+          color: 2774A4
+          item:
+            host: 'PFSense SNMP'
+            key: vm.memory.available
+    -
+      uuid: 38b05f5d70f84ac69220e93bc9636b76
+      name: 'PFSense: Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'PFSense SNMP'
+            key: vm.memory.util
+    -
+      uuid: cd45a63b52d7470db6b4574027433c8e
+      name: 'PFSense: Packet filter reason codes'
+      type: STACKED
+      ymin_type_1: FIXED
+      graph_items:
+        -
+          color: 1A7C11
+          item:
+            host: 'PFSense SNMP'
+            key: pfsense.packets.match
+        -
+          sortorder: '1'
+          color: 2774A4
+          item:
+            host: 'PFSense SNMP'
+            key: pfsense.packets.bad.offset
+        -
+          sortorder: '2'
+          color: F63100
+          item:
+            host: 'PFSense SNMP'
+            key: pfsense.packets.fragment
+        -
+          sortorder: '3'
+          color: A54F10
+          item:
+            host: 'PFSense SNMP'
+            key: pfsense.packets.short
+        -
+          sortorder: '4'
+          color: FC6EA3
+          item:
+            host: 'PFSense SNMP'
+            key: pfsense.packets.normalize
+        -
+          sortorder: '5'
+          color: 6C59DC
+          item:
+            host: 'PFSense SNMP'
+            key: pfsense.packets.mem.drop
+    -
+      uuid: 33a80d114d82400ebe2b3583726a5526
+      name: 'PFSense: Swap usage'
+      graph_items:
+        -
+          color: 1A7C11
+          item:
+            host: 'PFSense SNMP'
+            key: system.swap.free
+        -
+          sortorder: '1'
+          color: 2774A4
+          item:
+            host: 'PFSense SNMP'
+            key: system.swap.total
+    -
+      uuid: d1e3ad2d98bd42a0bdd8435e94c15c3c
+      name: 'PFSense: System load'
+      ymin_type_1: FIXED
+      graph_items:
+        -
+          color: 1A7C11
+          item:
+            host: 'PFSense SNMP'
+            key: system.cpu.load.avg1
+        -
+          sortorder: '1'
+          color: 2774A4
+          item:
+            host: 'PFSense SNMP'
+            key: system.cpu.load.avg5
+        -
+          sortorder: '2'
+          color: F63100
+          item:
+            host: 'PFSense SNMP'
+            key: system.cpu.load.avg15
+        -
+          sortorder: '3'
+          color: A54F10
+          yaxisside: RIGHT
+          item:
+            host: 'PFSense SNMP'
+            key: system.cpu.num
diff --git a/templates/app/php-fpm_agent/README.md b/templates/app/php-fpm_agent/README.md
index e83bc351d07..63816ad8974 100644
--- a/templates/app/php-fpm_agent/README.md
+++ b/templates/app/php-fpm_agent/README.md
@@ -113,15 +113,15 @@ There are no template links in this template.
 |PHP-FPM |PHP-FPM: Start time |<p>The time when this pool was started.</p> |DEPENDENT |php-fpm.start_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.['start time']`</p> |
 |PHP-FPM |PHP-FPM: Processes, total |<p>The total number of server processes currently running.</p> |DEPENDENT |php-fpm.processes_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.['total processes']`</p> |
 |PHP-FPM |PHP-FPM: Processes, idle |<p>The total number of idle processes.</p> |DEPENDENT |php-fpm.processes_idle<p>**Preprocessing**:</p><p>- JSONPATH: `$.['idle processes']`</p> |
-|PHP-FPM |PHP-FPM: Queue usage |<p>Queue utilization</p> |CALCULATED |php-fpm.listen_queue_usage<p>**Expression**:</p>`last(php-fpm.listen_queue)/(last(php-fpm.listen_queue_len)+(last(php-fpm.listen_queue_len)=0))*100` |
+|PHP-FPM |PHP-FPM: Queue usage |<p>Queue utilization</p> |CALCULATED |php-fpm.listen_queue_usage<p>**Expression**:</p>`last(//php-fpm.listen_queue)/(last(//php-fpm.listen_queue_len)+(last(//php-fpm.listen_queue_len)=0))*100` |
 |PHP-FPM |PHP-FPM: Process manager |<p>The method used by the process manager to control the number of child processes for this pool.</p> |DEPENDENT |php-fpm.process_manager<p>**Preprocessing**:</p><p>- JSONPATH: `$.['process manager']`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |PHP-FPM |PHP-FPM: Processes, max active |<p>The highest value that 'active processes' has reached since the php-fpm server started.</p> |DEPENDENT |php-fpm.processes_max_active<p>**Preprocessing**:</p><p>- JSONPATH: `$.['max active processes']`</p> |
-|PHP-FPM |PHP-FPM: Accepted connections per second |<p>The number of accepted requests per second.</p> |DEPENDENT |php-fpm.conn_accepted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.['accepted conn']`</p><p>- CHANGE_PER_SECOND |
-|PHP-FPM |PHP-FPM: Slow requests |<p>The number of requests that exceeded your request_slowlog_timeout value.</p> |DEPENDENT |php-fpm.slow_requests<p>**Preprocessing**:</p><p>- JSONPATH: `$.['slow requests']`</p><p>- SIMPLE_CHANGE |
+|PHP-FPM |PHP-FPM: Accepted connections per second |<p>The number of accepted requests per second.</p> |DEPENDENT |php-fpm.conn_accepted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.['accepted conn']`</p><p>- CHANGE_PER_SECOND</p> |
+|PHP-FPM |PHP-FPM: Slow requests |<p>The number of requests that exceeded your request_slowlog_timeout value.</p> |DEPENDENT |php-fpm.slow_requests<p>**Preprocessing**:</p><p>- JSONPATH: `$.['slow requests']`</p><p>- SIMPLE_CHANGE</p> |
 |PHP-FPM |PHP-FPM: Listen queue |<p>The current number of connections that have been initiated, but not yet accepted.</p> |DEPENDENT |php-fpm.listen_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.['listen queue']`</p> |
 |PHP-FPM |PHP-FPM: Listen queue, max |<p>The maximum number of requests in the queue of pending connections since this FPM pool has started.</p> |DEPENDENT |php-fpm.listen_queue_max<p>**Preprocessing**:</p><p>- JSONPATH: `$.['max listen queue']`</p> |
 |PHP-FPM |PHP-FPM: Listen queue, len |<p>Size of the socket queue of pending connections.</p> |DEPENDENT |php-fpm.listen_queue_len<p>**Preprocessing**:</p><p>- JSONPATH: `$.['listen queue len']`</p> |
-|PHP-FPM |PHP-FPM: Max children reached |<p>The number of times that pm.max_children has been reached since the php-fpm pool started </p> |DEPENDENT |php-fpm.max_children<p>**Preprocessing**:</p><p>- JSONPATH: `$.['max children reached']`</p><p>- SIMPLE_CHANGE |
+|PHP-FPM |PHP-FPM: Max children reached |<p>The number of times that pm.max_children has been reached since the php-fpm pool started </p> |DEPENDENT |php-fpm.max_children<p>**Preprocessing**:</p><p>- JSONPATH: `$.['max children reached']`</p><p>- SIMPLE_CHANGE</p> |
 |Zabbix_raw_items |PHP-FPM: php-fpm_ping |<p>-</p> |ZABBIX_PASSIVE |web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.PING.PAGE}","{$PHP_FPM.PORT}"] |
 |Zabbix_raw_items |PHP-FPM: Get status page |<p>-</p> |ZABBIX_PASSIVE |web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]<p>**Preprocessing**:</p><p>- REGEX: `^[.\s\S]*({.+}) \1`</p> |
 
@@ -129,14 +129,14 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|PHP-FPM: Process is not running |<p>-</p> |`{TEMPLATE_NAME:proc.num["{$PHP_FPM.PROCESS_NAME}"].last()}=0` |HIGH | |
-|PHP-FPM: Service is down |<p>-</p> |`{TEMPLATE_NAME:php-fpm.ping.last()}=0 or {TEMPLATE_NAME:php-fpm.ping.nodata(3m)}=1` |HIGH |<p>Manual close: YES</p><p>**Depends on**:</p><p>- PHP-FPM: Process is not running</p> |
-|PHP-FPM: Version has changed (new version: {ITEM.VALUE}) |<p>PHP-FPM version has changed. Ack to close.</p> |`{TEMPLATE_NAME:php-fpm.version.diff()}=1 and {TEMPLATE_NAME:php-fpm.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|PHP-FPM: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`{TEMPLATE_NAME:php-fpm.uptime.nodata(30m)}=1` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- PHP-FPM: Process is not running</p> |
-|PHP-FPM: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:php-fpm.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|PHP-FPM: Queue utilization is high (over {$PHP_FPM.QUEUE.WARN.MAX}% for 15m) |<p>The queue for this pool reached {$PHP_FPM.QUEUE.WARN.MAX}% of its maximum capacity. Items in queue represent the current number of connections that have been initiated on this pool, but not yet accepted.</p> |`{TEMPLATE_NAME:php-fpm.listen_queue_usage.min(15m)}  > {$PHP_FPM.QUEUE.WARN.MAX} ` |WARNING | |
-|PHP-FPM: Manager  changed (new value received: {ITEM.VALUE}) |<p>PHP-FPM manager changed. Ack to close.</p> |`{TEMPLATE_NAME:php-fpm.process_manager.diff()}=1` |INFO |<p>Manual close: YES</p> |
-|PHP-FPM: Detected slow requests |<p>PHP-FPM detected slow request. A slow request means that it took more time to execute than expected (defined in the configuration of your pool).</p> |`{TEMPLATE_NAME:php-fpm.slow_requests.min(#3)}>0 ` |WARNING | |
+|PHP-FPM: Process is not running |<p>-</p> |`last(/PHP-FPM by Zabbix agent/proc.num["{$PHP_FPM.PROCESS_NAME}"])=0` |HIGH | |
+|PHP-FPM: Service is down |<p>-</p> |`last(/PHP-FPM by Zabbix agent/php-fpm.ping)=0 or nodata(/PHP-FPM by Zabbix agent/php-fpm.ping,3m)=1` |HIGH |<p>Manual close: YES</p><p>**Depends on**:</p><p>- PHP-FPM: Process is not running</p> |
+|PHP-FPM: Version has changed (new version: {ITEM.VALUE}) |<p>PHP-FPM version has changed. Ack to close.</p> |`last(/PHP-FPM by Zabbix agent/php-fpm.version,#1)<>last(/PHP-FPM by Zabbix agent/php-fpm.version,#2) and length(last(/PHP-FPM by Zabbix agent/php-fpm.version))>0` |INFO |<p>Manual close: YES</p> |
+|PHP-FPM: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/PHP-FPM by Zabbix agent/php-fpm.uptime,30m)=1` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- PHP-FPM: Process is not running</p> |
+|PHP-FPM: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/PHP-FPM by Zabbix agent/php-fpm.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|PHP-FPM: Queue utilization is high (over {$PHP_FPM.QUEUE.WARN.MAX}% for 15m) |<p>The queue for this pool reached {$PHP_FPM.QUEUE.WARN.MAX}% of its maximum capacity. Items in queue represent the current number of connections that have been initiated on this pool, but not yet accepted.</p> |`min(/PHP-FPM by Zabbix agent/php-fpm.listen_queue_usage,15m) > {$PHP_FPM.QUEUE.WARN.MAX}` |WARNING | |
+|PHP-FPM: Manager  changed (new value received: {ITEM.VALUE}) |<p>PHP-FPM manager changed. Ack to close.</p> |`last(/PHP-FPM by Zabbix agent/php-fpm.process_manager,#1)<>last(/PHP-FPM by Zabbix agent/php-fpm.process_manager,#2)` |INFO |<p>Manual close: YES</p> |
+|PHP-FPM: Detected slow requests |<p>PHP-FPM detected slow request. A slow request means that it took more time to execute than expected (defined in the configuration of your pool).</p> |`min(/PHP-FPM by Zabbix agent/php-fpm.slow_requests,#3)>0` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml b/templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml
index c7645e93ec9..6bf11048625 100644
--- a/templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml
+++ b/templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T12:22:25Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:53Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Get PHP-FPM metrics using Zabbix agent running on Linux.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -116,7 +116,7 @@ zabbix_export:
           triggers:
             -
               uuid: a11264f0e1174b7fb81b457dad1a745f
-              expression: 'min(/PHP-FPM by Zabbix agent/php-fpm.listen_queue_usage,15m)  > {$PHP_FPM.QUEUE.WARN.MAX}'
+              expression: 'min(/PHP-FPM by Zabbix agent/php-fpm.listen_queue_usage,15m) > {$PHP_FPM.QUEUE.WARN.MAX}'
               name: 'PHP-FPM: Queue utilization is high (over {$PHP_FPM.QUEUE.WARN.MAX}% for 15m)'
               priority: WARNING
               description: 'The queue for this pool reached {$PHP_FPM.QUEUE.WARN.MAX}% of its maximum capacity. Items in queue represent the current number of connections that have been initiated on this pool, but not yet accepted.'
diff --git a/templates/app/php-fpm_http/README.md b/templates/app/php-fpm_http/README.md
index 55f555ffbfa..52199ab55bc 100644
--- a/templates/app/php-fpm_http/README.md
+++ b/templates/app/php-fpm_http/README.md
@@ -107,13 +107,13 @@ There are no template links in this template.
 |PHP-FPM |PHP-FPM: Processes, idle |<p>The total number of idle processes.</p> |DEPENDENT |php-fpm.processes_idle<p>**Preprocessing**:</p><p>- JSONPATH: `$.['idle processes']`</p> |
 |PHP-FPM |PHP-FPM: Process manager |<p>The method used by the process manager to control the number of child processes for this pool.</p> |DEPENDENT |php-fpm.process_manager<p>**Preprocessing**:</p><p>- JSONPATH: `$.['process manager']`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |PHP-FPM |PHP-FPM: Processes, max active |<p>The highest value that 'active processes' has reached since the php-fpm server started.</p> |DEPENDENT |php-fpm.processes_max_active<p>**Preprocessing**:</p><p>- JSONPATH: `$.['max active processes']`</p> |
-|PHP-FPM |PHP-FPM: Accepted connections per second |<p>The number of accepted requests per second.</p> |DEPENDENT |php-fpm.conn_accepted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.['accepted conn']`</p><p>- CHANGE_PER_SECOND |
-|PHP-FPM |PHP-FPM: Slow requests |<p>The number of requests that exceeded your request_slowlog_timeout value.</p> |DEPENDENT |php-fpm.slow_requests<p>**Preprocessing**:</p><p>- JSONPATH: `$.['slow requests']`</p><p>- SIMPLE_CHANGE |
+|PHP-FPM |PHP-FPM: Accepted connections per second |<p>The number of accepted requests per second.</p> |DEPENDENT |php-fpm.conn_accepted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.['accepted conn']`</p><p>- CHANGE_PER_SECOND</p> |
+|PHP-FPM |PHP-FPM: Slow requests |<p>The number of requests that exceeded your request_slowlog_timeout value.</p> |DEPENDENT |php-fpm.slow_requests<p>**Preprocessing**:</p><p>- JSONPATH: `$.['slow requests']`</p><p>- SIMPLE_CHANGE</p> |
 |PHP-FPM |PHP-FPM: Listen queue |<p>The current number of connections that have been initiated, but not yet accepted.</p> |DEPENDENT |php-fpm.listen_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.['listen queue']`</p> |
 |PHP-FPM |PHP-FPM: Listen queue, max |<p>The maximum number of requests in the queue of pending connections since this FPM pool has started.</p> |DEPENDENT |php-fpm.listen_queue_max<p>**Preprocessing**:</p><p>- JSONPATH: `$.['max listen queue']`</p> |
 |PHP-FPM |PHP-FPM: Listen queue, len |<p>Size of the socket queue of pending connections.</p> |DEPENDENT |php-fpm.listen_queue_len<p>**Preprocessing**:</p><p>- JSONPATH: `$.['listen queue len']`</p> |
-|PHP-FPM |PHP-FPM: Queue usage |<p>Queue utilization</p> |CALCULATED |php-fpm.listen_queue_usage<p>**Expression**:</p>`last(php-fpm.listen_queue)/(last(php-fpm.listen_queue_len)+(last(php-fpm.listen_queue_len)=0))*100` |
-|PHP-FPM |PHP-FPM: Max children reached |<p>The number of times that pm.max_children has been reached since the php-fpm pool started </p> |DEPENDENT |php-fpm.max_children<p>**Preprocessing**:</p><p>- JSONPATH: `$.['max children reached']`</p><p>- SIMPLE_CHANGE |
+|PHP-FPM |PHP-FPM: Queue usage |<p>Queue utilization</p> |CALCULATED |php-fpm.listen_queue_usage<p>**Expression**:</p>`last(//php-fpm.listen_queue)/(last(//php-fpm.listen_queue_len)+(last(//php-fpm.listen_queue_len)=0))*100` |
+|PHP-FPM |PHP-FPM: Max children reached |<p>The number of times that pm.max_children has been reached since the php-fpm pool started </p> |DEPENDENT |php-fpm.max_children<p>**Preprocessing**:</p><p>- JSONPATH: `$.['max children reached']`</p><p>- SIMPLE_CHANGE</p> |
 |Zabbix_raw_items |PHP-FPM: Get ping page |<p>-</p> |HTTP_AGENT |php-fpm.get_ping |
 |Zabbix_raw_items |PHP-FPM: Get status page |<p>-</p> |HTTP_AGENT |php-fpm.get_status |
 
@@ -121,13 +121,13 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|PHP-FPM: Service is down |<p>-</p> |`{TEMPLATE_NAME:php-fpm.ping.last()}=0 or {TEMPLATE_NAME:php-fpm.ping.nodata(3m)}=1` |HIGH |<p>Manual close: YES</p> |
-|PHP-FPM: Version has changed (new version: {ITEM.VALUE}) |<p>PHP-FPM version has changed. Ack to close.</p> |`{TEMPLATE_NAME:php-fpm.version.diff()}=1 and {TEMPLATE_NAME:php-fpm.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|PHP-FPM: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`{TEMPLATE_NAME:php-fpm.uptime.nodata(30m)}=1` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- PHP-FPM: Service is down</p> |
-|PHP-FPM: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:php-fpm.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|PHP-FPM: Manager  changed (new value received: {ITEM.VALUE}) |<p>PHP-FPM manager changed. Ack to close.</p> |`{TEMPLATE_NAME:php-fpm.process_manager.diff()}=1` |INFO |<p>Manual close: YES</p> |
-|PHP-FPM: Detected slow requests |<p>PHP-FPM detected slow request. A slow request means that it took more time to execute than expected (defined in the configuration of your pool).</p> |`{TEMPLATE_NAME:php-fpm.slow_requests.min(#3)}>0 ` |WARNING | |
-|PHP-FPM: Queue utilization is high (over {$PHP_FPM.QUEUE.WARN.MAX}% for 15m) |<p>The queue for this pool reached {$PHP_FPM.QUEUE.WARN.MAX}% of its maximum capacity. Items in queue represent the current number of connections that have been initiated on this pool, but not yet accepted.</p> |`{TEMPLATE_NAME:php-fpm.listen_queue_usage.min(15m)}  > {$PHP_FPM.QUEUE.WARN.MAX} ` |WARNING | |
+|PHP-FPM: Service is down |<p>-</p> |`last(/PHP-FPM by HTTP/php-fpm.ping)=0 or nodata(/PHP-FPM by HTTP/php-fpm.ping,3m)=1` |HIGH |<p>Manual close: YES</p> |
+|PHP-FPM: Version has changed (new version: {ITEM.VALUE}) |<p>PHP-FPM version has changed. Ack to close.</p> |`last(/PHP-FPM by HTTP/php-fpm.version,#1)<>last(/PHP-FPM by HTTP/php-fpm.version,#2) and length(last(/PHP-FPM by HTTP/php-fpm.version))>0` |INFO |<p>Manual close: YES</p> |
+|PHP-FPM: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/PHP-FPM by HTTP/php-fpm.uptime,30m)=1` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- PHP-FPM: Service is down</p> |
+|PHP-FPM: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/PHP-FPM by HTTP/php-fpm.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|PHP-FPM: Manager  changed (new value received: {ITEM.VALUE}) |<p>PHP-FPM manager changed. Ack to close.</p> |`last(/PHP-FPM by HTTP/php-fpm.process_manager,#1)<>last(/PHP-FPM by HTTP/php-fpm.process_manager,#2)` |INFO |<p>Manual close: YES</p> |
+|PHP-FPM: Detected slow requests |<p>PHP-FPM detected slow request. A slow request means that it took more time to execute than expected (defined in the configuration of your pool).</p> |`min(/PHP-FPM by HTTP/php-fpm.slow_requests,#3)>0` |WARNING | |
+|PHP-FPM: Queue utilization is high (over {$PHP_FPM.QUEUE.WARN.MAX}% for 15m) |<p>The queue for this pool reached {$PHP_FPM.QUEUE.WARN.MAX}% of its maximum capacity. Items in queue represent the current number of connections that have been initiated on this pool, but not yet accepted.</p> |`min(/PHP-FPM by HTTP/php-fpm.listen_queue_usage,15m) > {$PHP_FPM.QUEUE.WARN.MAX}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/php-fpm_http/template_app_php-fpm_http.yaml b/templates/app/php-fpm_http/template_app_php-fpm_http.yaml
index eae11ae6dba..cf608fb6d59 100644
--- a/templates/app/php-fpm_http/template_app_php-fpm_http.yaml
+++ b/templates/app/php-fpm_http/template_app_php-fpm_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T12:21:11Z'
+  version: '6.0'
+  date: '2021-12-15T06:57:57Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Get PHP-FPM metrics using the Zabbix HTTP agent.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -143,7 +143,7 @@ zabbix_export:
           triggers:
             -
               uuid: 1ad5018fb19d4a9cb9e627f964bfd627
-              expression: 'min(/PHP-FPM by HTTP/php-fpm.listen_queue_usage,15m)  > {$PHP_FPM.QUEUE.WARN.MAX}'
+              expression: 'min(/PHP-FPM by HTTP/php-fpm.listen_queue_usage,15m) > {$PHP_FPM.QUEUE.WARN.MAX}'
               name: 'PHP-FPM: Queue utilization is high (over {$PHP_FPM.QUEUE.WARN.MAX}% for 15m)'
               priority: WARNING
               description: 'The queue for this pool reached {$PHP_FPM.QUEUE.WARN.MAX}% of its maximum capacity. Items in queue represent the current number of connections that have been initiated on this pool, but not yet accepted.'
diff --git a/templates/app/rabbitmq_agent/README.md b/templates/app/rabbitmq_agent/README.md
index bdc0eb532f1..a3a9c393cf8 100644
--- a/templates/app/rabbitmq_agent/README.md
+++ b/templates/app/rabbitmq_agent/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor RabbitMQ by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -19,7 +19,7 @@ This template was tested on:
 
 > See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
 
-Enable the RabbitMQ management plugin. See [RabbitMQ’s documentation](https://www.rabbitmq.com/management.html) to enable it.
+Enable the RabbitMQ management plugin. See [RabbitMQ's documentation](https://www.rabbitmq.com/management.html) to enable it.
 
 Create a user to monitor the service:
 
@@ -48,14 +48,14 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                        | Description                                                | Default            |
-|---------------------------------------------|------------------------------------------------------------|--------------------|
-| {$RABBITMQ.API.CLUSTER_HOST}                | <p>The hostname or IP of RabbitMQ cluster API endpoint</p> | `127.0.0.1`        |
-| {$RABBITMQ.API.PASSWORD}                    | <p>-</p>                                                   | `zabbix`           |
-| {$RABBITMQ.API.PORT}                        | <p>The port of RabbitMQ API endpoint</p>                   | `15672`            |
-| {$RABBITMQ.API.USER}                        | <p>-</p>                                                   | `zbx_monitor`      |
-| {$RABBITMQ.LLD.FILTER.EXCHANGE.MATCHES}     | <p>Filter of discoverable exchanges</p>                    | `.*`               |
-| {$RABBITMQ.LLD.FILTER.EXCHANGE.NOT_MATCHES} | <p>Filter to exclude discovered exchanges</p>              | `CHANGE_IF_NEEDED` |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$RABBITMQ.API.CLUSTER_HOST} |<p>The hostname or IP of RabbitMQ cluster API endpoint</p> |`127.0.0.1` |
+|{$RABBITMQ.API.PASSWORD} |<p>-</p> |`zabbix` |
+|{$RABBITMQ.API.PORT} |<p>The port of RabbitMQ API endpoint</p> |`15672` |
+|{$RABBITMQ.API.USER} |<p>-</p> |`zbx_monitor` |
+|{$RABBITMQ.LLD.FILTER.EXCHANGE.MATCHES} |<p>Filter of discoverable exchanges</p> |`.*` |
+|{$RABBITMQ.LLD.FILTER.EXCHANGE.NOT_MATCHES} |<p>Filter to exclude discovered exchanges</p> |`CHANGE_IF_NEEDED` |
 
 ## Template links
 
@@ -63,65 +63,65 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                           | Description                             | Type      | Key and additional info                                                                                                                                                                                                  |
-|--------------------------------|-----------------------------------------|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Health Check 3.8.10+ discovery | <p>Version 3.8.10+ specific metrics</p> | DEPENDENT | rabbitmq.healthcheck.v3810.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                  |
-| Exchanges discovery            | <p>Individual exchange metrics</p>      | DEPENDENT | rabbitmq.exchanges.discovery<p>**Filter**:</p>AND <p>- A: {#EXCHANGE} MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.EXCHANGE.MATCHES}`</p><p>- B: {#EXCHANGE} NOT_MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.EXCHANGE.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Health Check 3.8.10+ discovery |<p>Version 3.8.10+ specific metrics</p> |DEPENDENT |rabbitmq.healthcheck.v3810.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Exchanges discovery |<p>Individual exchange metrics</p> |DEPENDENT |rabbitmq.exchanges.discovery<p>**Filter**:</p>AND <p>- {#EXCHANGE} MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.EXCHANGE.MATCHES}`</p><p>- {#EXCHANGE} NOT_MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.EXCHANGE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group            | Name                                                                                     | Description                                                                                                                                                                                                                                      | Type           | Key and additional info                                                                                                                                                                                                                                                                                                                                              |
-|------------------|------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| RabbitMQ         | RabbitMQ: Connections total                                                              | <p>Total number of connections</p>                                                                                                                                                                                                               | DEPENDENT      | rabbitmq.overview.object_totals.connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.connections`</p>                                                                                                                                                                                                                                                 |
-| RabbitMQ         | RabbitMQ: Channels total                                                                 | <p>Total number of channels</p>                                                                                                                                                                                                                  | DEPENDENT      | rabbitmq.overview.object_totals.channels<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.channels`</p>                                                                                                                                                                                                                                                       |
-| RabbitMQ         | RabbitMQ: Queues total                                                                   | <p>Total number of queues</p>                                                                                                                                                                                                                    | DEPENDENT      | rabbitmq.overview.object_totals.queues<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.queues`</p>                                                                                                                                                                                                                                                           |
-| RabbitMQ         | RabbitMQ: Consumers total                                                                | <p>Total number of consumers</p>                                                                                                                                                                                                                 | DEPENDENT      | rabbitmq.overview.object_totals.consumers<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.consumers`</p>                                                                                                                                                                                                                                                     |
-| RabbitMQ         | RabbitMQ: Exchanges total                                                                | <p>Total number of exchanges</p>                                                                                                                                                                                                                 | DEPENDENT      | rabbitmq.overview.object_totals.exchanges<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.exchanges`</p>                                                                                                                                                                                                                                                     |
-| RabbitMQ         | RabbitMQ: Messages total                                                                 | <p>Total number of messages (ready plus unacknowledged)</p>                                                                                                                                                                                      | DEPENDENT      | rabbitmq.overview.queue_totals.messages<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages`</p>                                                                                                                                                                                                                                                         |
-| RabbitMQ         | RabbitMQ: Messages ready for delivery                                                    | <p>Number of messages ready for deliver</p>                                                                                                                                                                                                      | DEPENDENT      | rabbitmq.overview.queue_totals.messages.ready<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages_ready`</p>                                                                                                                                                                                                                                             |
-| RabbitMQ         | RabbitMQ: Messages unacknowledged                                                        | <p>Number of unacknowledged messages</p>                                                                                                                                                                                                         | DEPENDENT      | rabbitmq.overview.queue_totals.messages.unacknowledged<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages_unacknowledged`</p>                                                                                                                                                                                                                           |
-| RabbitMQ         | RabbitMQ: Messages acknowledged                                                          | <p>Number of messages delivered to clients and acknowledged</p>                                                                                                                                                                                  | DEPENDENT      | rabbitmq.overview.messages.ack<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.ack`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                                                 |
-| RabbitMQ         | RabbitMQ: Messages acknowledged per second                                               | <p>Rate of messages delivered to clients and acknowledged per second</p>                                                                                                                                                                         | DEPENDENT      | rabbitmq.overview.messages.ack.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.ack_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                               |
-| RabbitMQ         | RabbitMQ: Messages confirmed                                                             | <p>Count of messages confirmed</p>                                                                                                                                                                                                               | DEPENDENT      | rabbitmq.overview.messages.confirm<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.confirm`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                                         |
-| RabbitMQ         | RabbitMQ: Messages confirmed per second                                                  | <p>Rate of messages confirmed per second</p>                                                                                                                                                                                                     | DEPENDENT      | rabbitmq.overview.messages.confirm.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.confirm_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                       |
-| RabbitMQ         | RabbitMQ: Messages delivered                                                             | <p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p>                        | DEPENDENT      | rabbitmq.overview.messages.deliver_get<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.deliver_get`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                                 |
-| RabbitMQ         | RabbitMQ: Messages delivered per second                                                  | <p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> | DEPENDENT      | rabbitmq.overview.messages.deliver_get.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.deliver_get_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                               |
-| RabbitMQ         | RabbitMQ: Messages published                                                             | <p>Count of messages published</p>                                                                                                                                                                                                               | DEPENDENT      | rabbitmq.overview.messages.publish<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                                         |
-| RabbitMQ         | RabbitMQ: Messages published per second                                                  | <p>Rate of messages published per second</p>                                                                                                                                                                                                     | DEPENDENT      | rabbitmq.overview.messages.publish.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                       |
-| RabbitMQ         | RabbitMQ: Messages publish_in                                                            | <p>Count of messages published from channels into this overview</p>                                                                                                                                                                              | DEPENDENT      | rabbitmq.overview.messages.publish_in<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_in`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                                   |
-| RabbitMQ         | RabbitMQ: Messages publish_in per second                                                 | <p>Rate of messages published from channels into this overview per sec</p>                                                                                                                                                                       | DEPENDENT      | rabbitmq.overview.messages.publish_in.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_in_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                 |
-| RabbitMQ         | RabbitMQ: Messages publish_out                                                           | <p>Count of messages published from this overview into queues</p>                                                                                                                                                                                | DEPENDENT      | rabbitmq.overview.messages.publish_out<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_out`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                                 |
-| RabbitMQ         | RabbitMQ: Messages publish_out per second                                                | <p>Rate of messages published from this overview into queues per second,0,rabbitmq,total msgs pub out rate</p>                                                                                                                                   | DEPENDENT      | rabbitmq.overview.messages.publish_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_out_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                               |
-| RabbitMQ         | RabbitMQ: Messages returned unroutable                                                   | <p>Count of messages returned to publisher as unroutable</p>                                                                                                                                                                                     | DEPENDENT      | rabbitmq.overview.messages.return_unroutable<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.return_unroutable`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                     |
-| RabbitMQ         | RabbitMQ: Messages returned unroutable per second                                        | <p>Rate of messages returned to publisher as unroutable per second</p>                                                                                                                                                                           | DEPENDENT      | rabbitmq.overview.messages.return_unroutable.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.return_unroutable_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                   |
-| RabbitMQ         | RabbitMQ: Messages returned redeliver                                                    | <p>Count of subset of messages in deliver_get which had the redelivered flag set</p>                                                                                                                                                             | DEPENDENT      | rabbitmq.overview.messages.redeliver<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.redeliver`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                                     |
-| RabbitMQ         | RabbitMQ: Messages returned redeliver per second                                         | <p>Rate of subset of messages in deliver_get which had the redelivered flag set per second</p>                                                                                                                                                   | DEPENDENT      | rabbitmq.overview.messages.redeliver.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.redeliver_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                                                   |
-| RabbitMQ         | RabbitMQ: Healthcheck: alarms in effect in the cluster{#SINGLETON}                       | <p>Responds a 200 OK if there are no alarms in effect in the cluster, otherwise responds with a 503 Service Unavailable.</p>                                                                                                                     | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/health/checks/alarms{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged                   | <p>Number of messages delivered to clients and acknowledged</p>                                                                                                                                                                                  | DEPENDENT      | rabbitmq.exchange.messages.ack["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.ack.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                              |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged per second        | <p>Rate of messages delivered to clients and acknowledged per second</p>                                                                                                                                                                         | DEPENDENT      | rabbitmq.exchange.messages.ack.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.ack_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                            |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed                      | <p>Count of messages confirmed</p>                                                                                                                                                                                                               | DEPENDENT      | rabbitmq.exchange.messages.confirm["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.confirm.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                      |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed per second           | <p>Rate of messages confirmed per second</p>                                                                                                                                                                                                     | DEPENDENT      | rabbitmq.exchange.messages.confirm.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.confirm_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                    |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered                      | <p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p>                        | DEPENDENT      | rabbitmq.exchange.messages.deliver_get["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.deliver_get.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                              |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered per second           | <p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> | DEPENDENT      | rabbitmq.exchange.messages.deliver_get.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.deliver_get_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                            |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published                      | <p>Count of messages published</p>                                                                                                                                                                                                               | DEPENDENT      | rabbitmq.exchange.messages.publish["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                      |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published per second           | <p>Rate of messages published per second</p>                                                                                                                                                                                                     | DEPENDENT      | rabbitmq.exchange.messages.publish.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                    |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in                     | <p>Count of messages published from channels into this overview</p>                                                                                                                                                                              | DEPENDENT      | rabbitmq.exchange.messages.publish_in["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_in.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in per second          | <p>Rate of messages published from channels into this overview per sec</p>                                                                                                                                                                       | DEPENDENT      | rabbitmq.exchange.messages.publish_in.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_in_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                              |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out                    | <p>Count of messages published from this overview into queues</p>                                                                                                                                                                                | DEPENDENT      | rabbitmq.exchange.messages.publish_out["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_out.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                              |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out per second         | <p>Rate of messages published from this overview into queues per second,0,rabbitmq,total msgs pub out rate</p>                                                                                                                                   | DEPENDENT      | rabbitmq.exchange.messages.publish_out.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_out_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                            |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable            | <p>Count of messages returned to publisher as unroutable</p>                                                                                                                                                                                     | DEPENDENT      | rabbitmq.exchange.messages.return_unroutable["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.return_unroutable.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                  |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable per second | <p>Rate of messages returned to publisher as unroutable per second</p>                                                                                                                                                                           | DEPENDENT      | rabbitmq.exchange.messages.return_unroutable.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.return_unroutable_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered                    | <p>Count of subset of messages in deliver_get which had the redelivered flag set</p>                                                                                                                                                             | DEPENDENT      | rabbitmq.exchange.messages.redeliver["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.redeliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                  |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered per second         | <p>Rate of subset of messages in deliver_get which had the redelivered flag set per second</p>                                                                                                                                                   | DEPENDENT      | rabbitmq.exchange.messages.redeliver.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.redeliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                |
-| Zabbix_raw_items | RabbitMQ: Get overview                                                                   | <p>The HTTP API endpoint that returns cluster-wide metrics</p>                                                                                                                                                                                   | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p>                                                                                                                                                                         |
-| Zabbix_raw_items | RabbitMQ: Get exchanges                                                                  | <p>The HTTP API endpoint that returns exchanges metrics</p>                                                                                                                                                                                      | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p>                                                                                                                                                                        |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|RabbitMQ |RabbitMQ: Connections total |<p>Total number of connections</p> |DEPENDENT |rabbitmq.overview.object_totals.connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.connections`</p> |
+|RabbitMQ |RabbitMQ: Channels total |<p>Total number of channels</p> |DEPENDENT |rabbitmq.overview.object_totals.channels<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.channels`</p> |
+|RabbitMQ |RabbitMQ: Queues total |<p>Total number of queues</p> |DEPENDENT |rabbitmq.overview.object_totals.queues<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.queues`</p> |
+|RabbitMQ |RabbitMQ: Consumers total |<p>Total number of consumers</p> |DEPENDENT |rabbitmq.overview.object_totals.consumers<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.consumers`</p> |
+|RabbitMQ |RabbitMQ: Exchanges total |<p>Total number of exchanges</p> |DEPENDENT |rabbitmq.overview.object_totals.exchanges<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.exchanges`</p> |
+|RabbitMQ |RabbitMQ: Messages total |<p>Total number of messages (ready plus unacknowledged)</p> |DEPENDENT |rabbitmq.overview.queue_totals.messages<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages`</p> |
+|RabbitMQ |RabbitMQ: Messages ready for delivery |<p>Number of messages ready for deliver</p> |DEPENDENT |rabbitmq.overview.queue_totals.messages.ready<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages_ready`</p> |
+|RabbitMQ |RabbitMQ: Messages unacknowledged |<p>Number of unacknowledged messages</p> |DEPENDENT |rabbitmq.overview.queue_totals.messages.unacknowledged<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages_unacknowledged`</p> |
+|RabbitMQ |RabbitMQ: Messages acknowledged |<p>Number of messages delivered to clients and acknowledged</p> |DEPENDENT |rabbitmq.overview.messages.ack<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.ack`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages acknowledged per second |<p>Rate of messages delivered to clients and acknowledged per second</p> |DEPENDENT |rabbitmq.overview.messages.ack.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.ack_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages confirmed |<p>Count of messages confirmed</p> |DEPENDENT |rabbitmq.overview.messages.confirm<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.confirm`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages confirmed per second |<p>Rate of messages confirmed per second</p> |DEPENDENT |rabbitmq.overview.messages.confirm.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.confirm_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages delivered |<p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.overview.messages.deliver_get<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.deliver_get`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages delivered per second |<p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.overview.messages.deliver_get.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.deliver_get_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages published |<p>Count of messages published</p> |DEPENDENT |rabbitmq.overview.messages.publish<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages published per second |<p>Rate of messages published per second</p> |DEPENDENT |rabbitmq.overview.messages.publish.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages publish_in |<p>Count of messages published from channels into this overview</p> |DEPENDENT |rabbitmq.overview.messages.publish_in<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_in`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages publish_in per second |<p>Rate of messages published from channels into this overview per sec</p> |DEPENDENT |rabbitmq.overview.messages.publish_in.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_in_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages publish_out |<p>Count of messages published from this overview into queues</p> |DEPENDENT |rabbitmq.overview.messages.publish_out<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_out`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages publish_out per second |<p>Rate of messages published from this overview into queues per second,0,rabbitmq,total msgs pub out rate</p> |DEPENDENT |rabbitmq.overview.messages.publish_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_out_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages returned unroutable |<p>Count of messages returned to publisher as unroutable</p> |DEPENDENT |rabbitmq.overview.messages.return_unroutable<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.return_unroutable`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages returned unroutable per second |<p>Rate of messages returned to publisher as unroutable per second</p> |DEPENDENT |rabbitmq.overview.messages.return_unroutable.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.return_unroutable_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages returned redeliver |<p>Count of subset of messages in deliver_get which had the redelivered flag set</p> |DEPENDENT |rabbitmq.overview.messages.redeliver<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.redeliver`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages returned redeliver per second |<p>Rate of subset of messages in deliver_get which had the redelivered flag set per second</p> |DEPENDENT |rabbitmq.overview.messages.redeliver.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.redeliver_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: alarms in effect in the cluster{#SINGLETON} |<p>Responds a 200 OK if there are no alarms in effect in the cluster, otherwise responds with a 503 Service Unavailable.</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/health/checks/alarms{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged |<p>Number of messages delivered to clients and acknowledged</p> |DEPENDENT |rabbitmq.exchange.messages.ack["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.ack.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged per second |<p>Rate of messages delivered to clients and acknowledged per second</p> |DEPENDENT |rabbitmq.exchange.messages.ack.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.ack_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed |<p>Count of messages confirmed</p> |DEPENDENT |rabbitmq.exchange.messages.confirm["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.confirm.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed per second |<p>Rate of messages confirmed per second</p> |DEPENDENT |rabbitmq.exchange.messages.confirm.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.confirm_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered |<p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.exchange.messages.deliver_get["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.deliver_get.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered per second |<p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.exchange.messages.deliver_get.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.deliver_get_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published |<p>Count of messages published</p> |DEPENDENT |rabbitmq.exchange.messages.publish["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published per second |<p>Rate of messages published per second</p> |DEPENDENT |rabbitmq.exchange.messages.publish.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in |<p>Count of messages published from channels into this overview</p> |DEPENDENT |rabbitmq.exchange.messages.publish_in["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_in.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in per second |<p>Rate of messages published from channels into this overview per sec</p> |DEPENDENT |rabbitmq.exchange.messages.publish_in.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_in_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out |<p>Count of messages published from this overview into queues</p> |DEPENDENT |rabbitmq.exchange.messages.publish_out["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_out.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out per second |<p>Rate of messages published from this overview into queues per second,0,rabbitmq,total msgs pub out rate</p> |DEPENDENT |rabbitmq.exchange.messages.publish_out.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_out_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable |<p>Count of messages returned to publisher as unroutable</p> |DEPENDENT |rabbitmq.exchange.messages.return_unroutable["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.return_unroutable.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable per second |<p>Rate of messages returned to publisher as unroutable per second</p> |DEPENDENT |rabbitmq.exchange.messages.return_unroutable.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.return_unroutable_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered |<p>Count of subset of messages in deliver_get which had the redelivered flag set</p> |DEPENDENT |rabbitmq.exchange.messages.redeliver["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.redeliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered per second |<p>Rate of subset of messages in deliver_get which had the redelivered flag set per second</p> |DEPENDENT |rabbitmq.exchange.messages.redeliver.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.redeliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|Zabbix_raw_items |RabbitMQ: Get overview |<p>The HTTP API endpoint that returns cluster-wide metrics</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p> |
+|Zabbix_raw_items |RabbitMQ: Get exchanges |<p>The HTTP API endpoint that returns exchanges metrics</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p> |
 
 ## Triggers
 
-| Name                                                         | Description                                                           | Expression                                                                                                                                                                               | Severity | Dependencies and additional info |
-|--------------------------------------------------------------|-----------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| RabbitMQ: There are active alarms in the cluster             | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>         | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/health/checks/alarms{#SINGLETON}"].last()}=503` | AVERAGE  |                                  |
-| RabbitMQ: Failed to fetch overview data (or no data for 30m) | <p>Zabbix has not received data for items for the last 30 minutes</p> | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"].nodata(30m)}=1`                      | WARNING  | <p>Manual close: YES</p>         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|RabbitMQ: There are active alarms in the cluster |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ cluster by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/health/checks/alarms{#SINGLETON}"])=0` |AVERAGE | |
+|RabbitMQ: Failed to fetch overview data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/RabbitMQ cluster by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"],30m)=1` |WARNING |<p>Manual close: YES</p> |
 
 ## Feedback
 
@@ -133,11 +133,11 @@ You can also provide a feedback, discuss the template or ask for help with it at
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor RabbitMQ by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `RabbitMQ Node` — (Zabbix version >= 4.2) collects metrics by polling [RabbitMQ management plugin](https://www.rabbitmq.com/management.html) with Zabbix agent.
+Template `RabbitMQ Node` — (Zabbix version >= 4.2) collects metrics by polling [RabbitMQ management plugin](https://www.rabbitmq.com/management.html) with Zabbix agent.
 
 It also uses Zabbix agent to collect `RabbitMQ` Linux process stats like CPU usage, memory usage and whether process is running or not.
 
@@ -149,7 +149,7 @@ This template was tested on:
 
 ## Setup
 
-Enable the RabbitMQ management plugin. See [RabbitMQ’s documentation](https://www.rabbitmq.com/management.html) to enable it.
+Enable the RabbitMQ management plugin. See [RabbitMQ's documentation](https://www.rabbitmq.com/management.html) to enable it.
 
 Create a user to monitor the service:
 
@@ -174,18 +174,18 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                     | Description                                                             | Default            |
-|------------------------------------------|-------------------------------------------------------------------------|--------------------|
-| {$RABBITMQ.API.HOST}                     | <p>The hostname or IP of RabbitMQ API endpoint</p>                      | `127.0.0.1`        |
-| {$RABBITMQ.API.PASSWORD}                 | <p>-</p>                                                                | `zabbix`           |
-| {$RABBITMQ.API.PORT}                     | <p>The port of RabbitMQ API endpoint</p>                                | `15672`            |
-| {$RABBITMQ.API.USER}                     | <p>-</p>                                                                | `zbx_monitor`      |
-| {$RABBITMQ.CLUSTER.NAME}                 | <p>The name of RabbitMQ cluster</p>                                     | `rabbit`           |
-| {$RABBITMQ.LLD.FILTER.QUEUE.MATCHES}     | <p>Filter of discoverable queues</p>                                    | `.*`               |
-| {$RABBITMQ.LLD.FILTER.QUEUE.NOT_MATCHES} | <p>Filter to exclude discovered queues</p>                              | `CHANGE_IF_NEEDED` |
-| {$RABBITMQ.MESSAGES.MAX.WARN}            | <p>Maximum number of messages in the queue for trigger expression</p>   | `1000`             |
-| {$RABBITMQ.PROCESS_NAME}                 | <p>RabbitMQ server process name</p>                                     | `beam.smp`         |
-| {$RABBITMQ.RESPONSE_TIME.MAX.WARN}       | <p>Maximum RabbitMQ response time in seconds for trigger expression</p> | `10`               |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$RABBITMQ.API.HOST} |<p>The hostname or IP of RabbitMQ API endpoint</p> |`127.0.0.1` |
+|{$RABBITMQ.API.PASSWORD} |<p>-</p> |`zabbix` |
+|{$RABBITMQ.API.PORT} |<p>The port of RabbitMQ API endpoint</p> |`15672` |
+|{$RABBITMQ.API.USER} |<p>-</p> |`zbx_monitor` |
+|{$RABBITMQ.CLUSTER.NAME} |<p>The name of RabbitMQ cluster</p> |`rabbit` |
+|{$RABBITMQ.LLD.FILTER.QUEUE.MATCHES} |<p>Filter of discoverable queues</p> |`.*` |
+|{$RABBITMQ.LLD.FILTER.QUEUE.NOT_MATCHES} |<p>Filter to exclude discovered queues</p> |`CHANGE_IF_NEEDED` |
+|{$RABBITMQ.MESSAGES.MAX.WARN} |<p>Maximum number of messages in the queue for trigger expression</p> |`1000` |
+|{$RABBITMQ.PROCESS_NAME} |<p>RabbitMQ server process name</p> |`beam.smp` |
+|{$RABBITMQ.RESPONSE_TIME.MAX.WARN} |<p>Maximum RabbitMQ response time in seconds for trigger expression</p> |`10` |
 
 ## Template links
 
@@ -193,86 +193,86 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                           | Description                                               | Type      | Key and additional info                                                                                                                                                                                                                                                           |
-|--------------------------------|-----------------------------------------------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Health Check 3.8.10+ discovery | <p>Version 3.8.10+ specific metrics</p>                   | DEPENDENT | rabbitmq.healthcheck.v3810.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                                           |
-| Health Check 3.8.9- discovery  | <p>Specific metrics up to and including version 3.8.4</p> | DEPENDENT | rabbitmq.healthcheck.v389.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                                            |
-| Queues discovery               | <p>Individual queue metrics</p>                           | DEPENDENT | rabbitmq.queues.discovery<p>**Filter**:</p>AND <p>- A: {#QUEUE} MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.QUEUE.MATCHES}`</p><p>- B: {#QUEUE} NOT_MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.QUEUE.NOT_MATCHES}`</p><p>- C: {#NODE} MATCHES_REGEX `{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Health Check 3.8.10+ discovery |<p>Version 3.8.10+ specific metrics</p> |DEPENDENT |rabbitmq.healthcheck.v3810.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Health Check 3.8.9- discovery |<p>Specific metrics up to and including version 3.8.4</p> |DEPENDENT |rabbitmq.healthcheck.v389.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Queues discovery |<p>Individual queue metrics</p> |DEPENDENT |rabbitmq.queues.discovery<p>**Filter**:</p>AND <p>- {#QUEUE} MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.QUEUE.MATCHES}`</p><p>- {#QUEUE} NOT_MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.QUEUE.NOT_MATCHES}`</p><p>- {#NODE} MATCHES_REGEX `{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}`</p> |
 
 ## Items collected
 
-| Group            | Name                                                                                           | Description                                                                                                                                                                                                                                                                          | Type           | Key and additional info                                                                                                                                                                                                                                                                                                                                                               |
-|------------------|------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| RabbitMQ         | RabbitMQ: Management plugin version                                                            | <p>Version of the management plugin in use</p>                                                                                                                                                                                                                                       | DEPENDENT      | rabbitmq.node.overview.management_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                                                                                 |
-| RabbitMQ         | RabbitMQ: RabbitMQ version                                                                     | <p>Version of RabbitMQ on the node which processed this request</p>                                                                                                                                                                                                                  | DEPENDENT      | rabbitmq.node.overview.rabbitmq_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.rabbitmq_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                                                                                     |
-| RabbitMQ         | RabbitMQ: Used file descriptors                                                                | <p>Used file descriptors</p>                                                                                                                                                                                                                                                         | DEPENDENT      | rabbitmq.node.fd_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.fd_used`</p>                                                                                                                                                                                                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Free disk space                                                                      | <p>Current free disk space</p>                                                                                                                                                                                                                                                       | DEPENDENT      | rabbitmq.node.disk_free<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free`</p>                                                                                                                                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Memory used                                                                          | <p>Memory used in bytes</p>                                                                                                                                                                                                                                                          | DEPENDENT      | rabbitmq.node.mem_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_used`</p>                                                                                                                                                                                                                                                                                                        |
-| RabbitMQ         | RabbitMQ: Memory limit                                                                         | <p>Memory usage high watermark in bytes</p>                                                                                                                                                                                                                                          | DEPENDENT      | rabbitmq.node.mem_limit<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_limit`</p>                                                                                                                                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Disk free limit                                                                      | <p>Disk free space limit in bytes</p>                                                                                                                                                                                                                                                | DEPENDENT      | rabbitmq.node.disk_free_limit<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free_limit`</p>                                                                                                                                                                                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Runtime run queue                                                                    | <p>Average number of Erlang processes waiting to run</p>                                                                                                                                                                                                                             | DEPENDENT      | rabbitmq.node.run_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.run_queue`</p>                                                                                                                                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Sockets used                                                                         | <p>Number of file descriptors used as sockets</p>                                                                                                                                                                                                                                    | DEPENDENT      | rabbitmq.node.sockets_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.sockets_used`</p>                                                                                                                                                                                                                                                                                                |
-| RabbitMQ         | RabbitMQ: Sockets available                                                                    | <p>File descriptors available for use as sockets</p>                                                                                                                                                                                                                                 | DEPENDENT      | rabbitmq.node.sockets_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.sockets_total`</p>                                                                                                                                                                                                                                                                                              |
-| RabbitMQ         | RabbitMQ: Number of network partitions                                                         | <p>Number of network partitions this node is seeing</p>                                                                                                                                                                                                                              | DEPENDENT      | rabbitmq.node.partitions<p>**Preprocessing**:</p><p>- JSONPATH: `$.partitions`</p><p>- JAVASCRIPT: `return JSON.parse(value).length;`</p>                                                                                                                                                                                                                                             |
-| RabbitMQ         | RabbitMQ: Is running                                                                           | <p>Is the node running or not</p>                                                                                                                                                                                                                                                    | DEPENDENT      | rabbitmq.node.running<p>**Preprocessing**:</p><p>- JSONPATH: `$.running`</p><p>- BOOL_TO_DECIMAL                                                                                                                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Memory alarm                                                                         | <p>Does the host has memory alarm</p>                                                                                                                                                                                                                                                | DEPENDENT      | rabbitmq.node.mem_alarm<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_alarm`</p><p>- BOOL_TO_DECIMAL                                                                                                                                                                                                                                                                                  |
-| RabbitMQ         | RabbitMQ: Disk free alarm                                                                      | <p>Does the node have disk alarm</p>                                                                                                                                                                                                                                                 | DEPENDENT      | rabbitmq.node.disk_free_alarm<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free_alarm`</p><p>- BOOL_TO_DECIMAL                                                                                                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Uptime                                                                               | <p>Uptime in milliseconds</p>                                                                                                                                                                                                                                                        | DEPENDENT      | rabbitmq.node.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p><p>- MULTIPLIER: `0.001`</p>                                                                                                                                                                                                                                                                                |
-| RabbitMQ         | RabbitMQ: Number of processes running                                                          | <p>-</p>                                                                                                                                                                                                                                                                             | ZABBIX_PASSIVE | proc.num["{$RABBITMQ.PROCESS_NAME}"]                                                                                                                                                                                                                                                                                                                                                  |
-| RabbitMQ         | RabbitMQ: Memory usage (rss)                                                                   | <p>Resident set size memory used by process in bytes.</p>                                                                                                                                                                                                                            | ZABBIX_PASSIVE | proc.mem["{$RABBITMQ.PROCESS_NAME}",,,,rss]                                                                                                                                                                                                                                                                                                                                           |
-| RabbitMQ         | RabbitMQ: Memory usage (vsize)                                                                 | <p>Virtual memory size used by process in bytes.</p>                                                                                                                                                                                                                                 | ZABBIX_PASSIVE | proc.mem["{$RABBITMQ.PROCESS_NAME}",,,,vsize]                                                                                                                                                                                                                                                                                                                                         |
-| RabbitMQ         | RabbitMQ: CPU utilization                                                                      | <p>Process CPU utilization percentage.</p>                                                                                                                                                                                                                                           | ZABBIX_PASSIVE | proc.cpu.util["{$RABBITMQ.PROCESS_NAME}"]                                                                                                                                                                                                                                                                                                                                             |
-| RabbitMQ         | RabbitMQ: Service ping                                                                         | <p>-</p>                                                                                                                                                                                                                                                                             | ZABBIX_PASSIVE | net.tcp.service[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                                                                                                                                                                               |
-| RabbitMQ         | RabbitMQ: Service response time                                                                | <p>-</p>                                                                                                                                                                                                                                                                             | ZABBIX_PASSIVE | net.tcp.service.perf[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"]                                                                                                                                                                                                                                                                                                              |
-| RabbitMQ         | RabbitMQ: Healthcheck: local alarms in effect on the this node{#SINGLETON}                     | <p>Responds a 200 OK if there are no local alarms in effect on the target node, otherwise responds with a 503 Service Unavailable.</p>                                                                                                                                               | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/local-alarms{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>                    |
-| RabbitMQ         | RabbitMQ: Healthcheck: expiration date on the certificates{#SINGLETON}                         | <p>Checks the expiration date on the certificates for every listener configured to use TLS. Responds a 200 OK if all certificates are valid (have not expired), otherwise responds with a 503 Service Unavailable.</p>                                                               | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/certificate-expiration/1/months{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-| RabbitMQ         | RabbitMQ: Healthcheck: virtual hosts on the this node{#SINGLETON}                              | <p>Responds a 200 OK if all virtual hosts and running on the target node, otherwise responds with a 503 Service Unavailable.</p>                                                                                                                                                     | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/virtual-hosts{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>                   |
-| RabbitMQ         | RabbitMQ: Healthcheck: classic mirrored queues without synchronised mirrors online{#SINGLETON} | <p>Checks if there are classic mirrored queues without synchronised mirrors online (queues that would potentially lose data if the target node is shut down). Responds a 200 OK if there are no such classic mirrored queues, otherwise responds with a 503 Service Unavailable.</p> | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-mirror-sync-critical{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>    |
-| RabbitMQ         | RabbitMQ: Healthcheck: queues with minimum online quorum{#SINGLETON}                           | <p>Checks if there are quorum queues with minimum online quorum (queues that would lose their quorum and availability if the target node is shut down). Responds a 200 OK if there are no such quorum queues, otherwise responds with a 503 Service Unavailable.</p>                 | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-quorum-critical{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>         |
-| RabbitMQ         | RabbitMQ: Healthcheck{#SINGLETON}                                                              | <p>Runs basic healthchecks in the current node. Checks that the rabbit application is running, channels and queues can be listed successfully, and that no alarms are in effect.</p>                                                                                                 | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/healthchecks/node{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p><p>- JSONPATH: `$.status`</p><p>- BOOL_TO_DECIMAL                                                                                                                            |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages                                                    | <p>Count of the total messages in the queue</p>                                                                                                                                                                                                                                      | DEPENDENT      | rabbitmq.queue.messages["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages.first()`</p>                                                                                                                                                                                                                        |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages per second                                         | <p>Count per second of the total messages in the queue</p>                                                                                                                                                                                                                           | DEPENDENT      | rabbitmq.queue.messages.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_details.rate.first()`</p>                                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Consumers                                                   | <p>Number of consumers</p>                                                                                                                                                                                                                                                           | DEPENDENT      | rabbitmq.queue.consumers["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].consumers.first()`</p>                                                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Memory                                                      | <p>Bytes of memory consumed by the Erlang process associated with the queue, including stack, heap and internal structures</p>                                                                                                                                                       | DEPENDENT      | rabbitmq.queue.memory["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].memory.first()`</p>                                                                                                                                                                                                                            |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready                                              | <p>Number of messages ready to be delivered to clients</p>                                                                                                                                                                                                                           | DEPENDENT      | rabbitmq.queue.messages_ready["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_ready.first()`</p>                                                                                                                                                                                                            |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready per second                                   | <p>Number per second of messages ready to be delivered to clients</p>                                                                                                                                                                                                                | DEPENDENT      | rabbitmq.queue.messages_ready.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_ready_details.rate.first()`</p>                                                                                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged                                     | <p>Number of messages delivered to clients but not yet acknowledged</p>                                                                                                                                                                                                              | DEPENDENT      | rabbitmq.queue.messages_unacknowledged["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_unacknowledged.first()`</p>                                                                                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged per second                          | <p>Number per second of messages delivered to clients but not yet acknowledged</p>                                                                                                                                                                                                   | DEPENDENT      | rabbitmq.queue.messages_unacknowledged.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_unacknowledged_details.rate.first()`</p>                                                                                                                                                                        |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged                                       | <p>Number of messages delivered to clients and acknowledged</p>                                                                                                                                                                                                                      | DEPENDENT      | rabbitmq.queue.messages.ack["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.ack.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged per second                            | <p>Number per second of messages delivered to clients and acknowledged</p>                                                                                                                                                                                                           | DEPENDENT      | rabbitmq.queue.messages.ack.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.ack_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                    |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered                                          | <p>Count of messages delivered in acknowledgement mode to consumers</p>                                                                                                                                                                                                              | DEPENDENT      | rabbitmq.queue.messages.deliver["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                              |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second                               | <p>Count of messages delivered in acknowledgement mode to consumers</p>                                                                                                                                                                                                              | DEPENDENT      | rabbitmq.queue.messages.deliver.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                            |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered                                          | <p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p>                                                            | DEPENDENT      | rabbitmq.queue.messages.deliver_get["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_get.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second                               | <p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p>                                     | DEPENDENT      | rabbitmq.queue.messages.deliver_get.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_get_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                    |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published                                          | <p>Count of messages published</p>                                                                                                                                                                                                                                                   | DEPENDENT      | rabbitmq.queue.messages.publish["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.publish.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                              |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published per second                               | <p>Rate per second of messages published</p>                                                                                                                                                                                                                                         | DEPENDENT      | rabbitmq.queue.messages.publish.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.publish_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                            |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered                                        | <p>Count of subset of messages in deliver_get which had the redelivered flag set</p>                                                                                                                                                                                                 | DEPENDENT      | rabbitmq.queue.messages.redeliver["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.redeliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered per second                             | <p>Rate per second of subset of messages in deliver_get which had the redelivered flag set</p>                                                                                                                                                                                       | DEPENDENT      | rabbitmq.queue.messages.redeliver.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.redeliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                        |
-| Zabbix_raw_items | RabbitMQ: Get node overview                                                                    | <p>The HTTP API endpoint that returns cluster-wide metrics</p>                                                                                                                                                                                                                       | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/overview"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p>                                                                                                                                                                                                  |
-| Zabbix_raw_items | RabbitMQ: Get nodes                                                                            | <p>The HTTP API endpoint that returns nodes metrics</p>                                                                                                                                                                                                                              | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p>                                                                                                                                                    |
-| Zabbix_raw_items | RabbitMQ: Get queues                                                                           | <p>The HTTP API endpoint that returns queues metrics</p>                                                                                                                                                                                                                             | ZABBIX_PASSIVE | web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p>                                                                                                                                                                                                    |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|RabbitMQ |RabbitMQ: Management plugin version |<p>Version of the management plugin in use</p> |DEPENDENT |rabbitmq.node.overview.management_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|RabbitMQ |RabbitMQ: RabbitMQ version |<p>Version of RabbitMQ on the node which processed this request</p> |DEPENDENT |rabbitmq.node.overview.rabbitmq_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.rabbitmq_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|RabbitMQ |RabbitMQ: Used file descriptors |<p>Used file descriptors</p> |DEPENDENT |rabbitmq.node.fd_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.fd_used`</p> |
+|RabbitMQ |RabbitMQ: Free disk space |<p>Current free disk space</p> |DEPENDENT |rabbitmq.node.disk_free<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free`</p> |
+|RabbitMQ |RabbitMQ: Memory used |<p>Memory used in bytes</p> |DEPENDENT |rabbitmq.node.mem_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_used`</p> |
+|RabbitMQ |RabbitMQ: Memory limit |<p>Memory usage high watermark in bytes</p> |DEPENDENT |rabbitmq.node.mem_limit<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_limit`</p> |
+|RabbitMQ |RabbitMQ: Disk free limit |<p>Disk free space limit in bytes</p> |DEPENDENT |rabbitmq.node.disk_free_limit<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free_limit`</p> |
+|RabbitMQ |RabbitMQ: Runtime run queue |<p>Average number of Erlang processes waiting to run</p> |DEPENDENT |rabbitmq.node.run_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.run_queue`</p> |
+|RabbitMQ |RabbitMQ: Sockets used |<p>Number of file descriptors used as sockets</p> |DEPENDENT |rabbitmq.node.sockets_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.sockets_used`</p> |
+|RabbitMQ |RabbitMQ: Sockets available |<p>File descriptors available for use as sockets</p> |DEPENDENT |rabbitmq.node.sockets_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.sockets_total`</p> |
+|RabbitMQ |RabbitMQ: Number of network partitions |<p>Number of network partitions this node is seeing</p> |DEPENDENT |rabbitmq.node.partitions<p>**Preprocessing**:</p><p>- JSONPATH: `$.partitions`</p><p>- JAVASCRIPT: `return JSON.parse(value).length;`</p> |
+|RabbitMQ |RabbitMQ: Is running |<p>Is the node running or not</p> |DEPENDENT |rabbitmq.node.running<p>**Preprocessing**:</p><p>- JSONPATH: `$.running`</p><p>- BOOL_TO_DECIMAL</p> |
+|RabbitMQ |RabbitMQ: Memory alarm |<p>Does the host has memory alarm</p> |DEPENDENT |rabbitmq.node.mem_alarm<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_alarm`</p><p>- BOOL_TO_DECIMAL</p> |
+|RabbitMQ |RabbitMQ: Disk free alarm |<p>Does the node have disk alarm</p> |DEPENDENT |rabbitmq.node.disk_free_alarm<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free_alarm`</p><p>- BOOL_TO_DECIMAL</p> |
+|RabbitMQ |RabbitMQ: Uptime |<p>Uptime in milliseconds</p> |DEPENDENT |rabbitmq.node.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p><p>- MULTIPLIER: `0.001`</p> |
+|RabbitMQ |RabbitMQ: Number of processes running |<p>-</p> |ZABBIX_PASSIVE |proc.num["{$RABBITMQ.PROCESS_NAME}"] |
+|RabbitMQ |RabbitMQ: Memory usage (rss) |<p>Resident set size memory used by process in bytes.</p> |ZABBIX_PASSIVE |proc.mem["{$RABBITMQ.PROCESS_NAME}",,,,rss] |
+|RabbitMQ |RabbitMQ: Memory usage (vsize) |<p>Virtual memory size used by process in bytes.</p> |ZABBIX_PASSIVE |proc.mem["{$RABBITMQ.PROCESS_NAME}",,,,vsize] |
+|RabbitMQ |RabbitMQ: CPU utilization |<p>Process CPU utilization percentage.</p> |ZABBIX_PASSIVE |proc.cpu.util["{$RABBITMQ.PROCESS_NAME}"] |
+|RabbitMQ |RabbitMQ: Service ping |<p>-</p> |ZABBIX_PASSIVE |net.tcp.service[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|RabbitMQ |RabbitMQ: Service response time |<p>-</p> |ZABBIX_PASSIVE |net.tcp.service.perf[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"] |
+|RabbitMQ |RabbitMQ: Healthcheck: local alarms in effect on the this node{#SINGLETON} |<p>Responds a 200 OK if there are no local alarms in effect on the target node, otherwise responds with a 503 Service Unavailable.</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/local-alarms{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: expiration date on the certificates{#SINGLETON} |<p>Checks the expiration date on the certificates for every listener configured to use TLS. Responds a 200 OK if all certificates are valid (have not expired), otherwise responds with a 503 Service Unavailable.</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/certificate-expiration/1/months{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: virtual hosts on the this node{#SINGLETON} |<p>Responds a 200 OK if all virtual hosts and running on the target node, otherwise responds with a 503 Service Unavailable.</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/virtual-hosts{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: classic mirrored queues without synchronized mirrors online{#SINGLETON} |<p>Checks if there are classic mirrored queues without synchronized mirrors online (queues that would potentially lose data if the target node is shut down). Responds a 200 OK if there are no such classic mirrored queues, otherwise responds with a 503 Service Unavailable.</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-mirror-sync-critical{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: queues with minimum online quorum{#SINGLETON} |<p>Checks if there are quorum queues with minimum online quorum (queues that would lose their quorum and availability if the target node is shut down). Responds a 200 OK if there are no such quorum queues, otherwise responds with a 503 Service Unavailable.</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-quorum-critical{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck{#SINGLETON} |<p>Runs basic healthchecks in the current node. Checks that the rabbit application is running, channels and queues can be listed successfully, and that no alarms are in effect.</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/healthchecks/node{#SINGLETON}"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p><p>- JSONPATH: `$.status`</p><p>- BOOL_TO_DECIMAL</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages |<p>Count of the total messages in the queue</p> |DEPENDENT |rabbitmq.queue.messages["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages per second |<p>Count per second of the total messages in the queue</p> |DEPENDENT |rabbitmq.queue.messages.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_details.rate.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Consumers |<p>Number of consumers</p> |DEPENDENT |rabbitmq.queue.consumers["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].consumers.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Memory |<p>Bytes of memory consumed by the Erlang process associated with the queue, including stack, heap and internal structures</p> |DEPENDENT |rabbitmq.queue.memory["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].memory.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready |<p>Number of messages ready to be delivered to clients</p> |DEPENDENT |rabbitmq.queue.messages_ready["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_ready.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready per second |<p>Number per second of messages ready to be delivered to clients</p> |DEPENDENT |rabbitmq.queue.messages_ready.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_ready_details.rate.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged |<p>Number of messages delivered to clients but not yet acknowledged</p> |DEPENDENT |rabbitmq.queue.messages_unacknowledged["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_unacknowledged.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged per second |<p>Number per second of messages delivered to clients but not yet acknowledged</p> |DEPENDENT |rabbitmq.queue.messages_unacknowledged.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_unacknowledged_details.rate.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged |<p>Number of messages delivered to clients and acknowledged</p> |DEPENDENT |rabbitmq.queue.messages.ack["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.ack.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged per second |<p>Number per second of messages delivered to clients and acknowledged</p> |DEPENDENT |rabbitmq.queue.messages.ack.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.ack_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered |<p>Count of messages delivered in acknowledgement mode to consumers</p> |DEPENDENT |rabbitmq.queue.messages.deliver["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second |<p>Count of messages delivered in acknowledgement mode to consumers</p> |DEPENDENT |rabbitmq.queue.messages.deliver.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered |<p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.queue.messages.deliver_get["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_get.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second |<p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.queue.messages.deliver_get.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_get_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published |<p>Count of messages published</p> |DEPENDENT |rabbitmq.queue.messages.publish["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.publish.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published per second |<p>Rate per second of messages published</p> |DEPENDENT |rabbitmq.queue.messages.publish.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.publish_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered |<p>Count of subset of messages in deliver_get which had the redelivered flag set</p> |DEPENDENT |rabbitmq.queue.messages.redeliver["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.redeliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered per second |<p>Rate per second of subset of messages in deliver_get which had the redelivered flag set</p> |DEPENDENT |rabbitmq.queue.messages.redeliver.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.redeliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|Zabbix_raw_items |RabbitMQ: Get node overview |<p>The HTTP API endpoint that returns cluster-wide metrics</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/overview"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p> |
+|Zabbix_raw_items |RabbitMQ: Get nodes |<p>The HTTP API endpoint that returns nodes metrics</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p> |
+|Zabbix_raw_items |RabbitMQ: Get queues |<p>The HTTP API endpoint that returns queues metrics</p> |ZABBIX_PASSIVE |web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]<p>**Preprocessing**:</p><p>- REGEX: `\n\s?\n(.*) \1`</p> |
 
 ## Triggers
 
-| Name                                                                                                    | Description                                                            | Expression                                                                                                                                                                                                | Severity | Dependencies and additional info                                                                                          |
-|---------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------------------------------|
-| RabbitMQ: Version has changed (new version: {ITEM.VALUE})                                               | <p>RabbitMQ version has changed. Ack to close.</p>                     | `{TEMPLATE_NAME:rabbitmq.node.overview.rabbitmq_version.diff()}=1 and {TEMPLATE_NAME:rabbitmq.node.overview.rabbitmq_version.strlen()}>0`                                                                 | INFO     | <p>Manual close: YES</p>                                                                                                  |
-| RabbitMQ: Number of network partitions is too high (more than 0 for 5m)                                 | <p>https://www.rabbitmq.com/partitions.html#detecting</p>              | `{TEMPLATE_NAME:rabbitmq.node.partitions.min(5m)}>0`                                                                                                                                                      | WARNING  |                                                                                                                           |
-| RabbitMQ: Node is not running                                                                           | <p>RabbitMQ node is not running</p>                                    | `{TEMPLATE_NAME:rabbitmq.node.running.max(5m)}=0`                                                                                                                                                         | AVERAGE  | <p>**Depends on**:</p><p>- RabbitMQ: Process is not running</p><p>- RabbitMQ: Service is down</p>                         |
-| RabbitMQ: Memory alarm (Memory usage threshold has been reached)                                        | <p>https://www.rabbitmq.com/memory.html</p>                            | `{TEMPLATE_NAME:rabbitmq.node.mem_alarm.last()}=1`                                                                                                                                                        | AVERAGE  |                                                                                                                           |
-| RabbitMQ: Free disk space alarm (Free space threshold has been reached)                                 | <p>https://www.rabbitmq.com/disk-alarms.html</p>                       | `{TEMPLATE_NAME:rabbitmq.node.disk_free_alarm.last()}=1`                                                                                                                                                  | AVERAGE  |                                                                                                                           |
-| RabbitMQ: has been restarted (uptime < 10m)                                                             | <p>Uptime is less than 10 minutes</p>                                  | `{TEMPLATE_NAME:rabbitmq.node.uptime.last()}<10m`                                                                                                                                                         | INFO     | <p>Manual close: YES</p>                                                                                                  |
-| RabbitMQ: Process is not running                                                                        | <p>-</p>                                                               | `{TEMPLATE_NAME:proc.num["{$RABBITMQ.PROCESS_NAME}"].last()}=0`                                                                                                                                           | HIGH     |                                                                                                                           |
-| RabbitMQ: Service is down                                                                               | <p>-</p>                                                               | `{TEMPLATE_NAME:net.tcp.service[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"].last()}=0`                                                                                                            | AVERAGE  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Process is not running</p>                                   |
-| RabbitMQ: Service response time is too high (over {$RABBITMQ.RESPONSE_TIME.MAX.WARN}s for 5m)           | <p>-</p>                                                               | `{TEMPLATE_NAME:net.tcp.service.perf[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"].min(5m)}>{$RABBITMQ.RESPONSE_TIME.MAX.WARN}`                                                                     | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Process is not running</p><p>- RabbitMQ: Service is down</p> |
-| RabbitMQ: There are active alarms in the node                                                           | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/local-alarms{#SINGLETON}"].last()}=503`                    | AVERAGE  |                                                                                                                           |
-| RabbitMQ: There are valid TLS certificates expiring in the next month                                   | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/certificate-expiration/1/months{#SINGLETON}"].last()}=503` | AVERAGE  |                                                                                                                           |
-| RabbitMQ: There are not running virtual hosts                                                           | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/virtual-hosts{#SINGLETON}"].last()}=503`                   | AVERAGE  |                                                                                                                           |
-| RabbitMQ: There are queues that could potentially lose data if the this node goes offline.              | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-mirror-sync-critical{#SINGLETON}"].last()}=503`    | AVERAGE  |                                                                                                                           |
-| RabbitMQ: There are queues that would lose their quorum and availability if the this node is shut down. | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-quorum-critical{#SINGLETON}"].last()}=503`         | AVERAGE  |                                                                                                                           |
-| RabbitMQ: Node healthcheck failed                                                                       | <p>https://www.rabbitmq.com/monitoring.html#health-checks</p>          | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/healthchecks/node{#SINGLETON}"].last()}=0`                               | AVERAGE  |                                                                                                                           |
-| RabbitMQ: Too many messages in queue (over {$RABBITMQ.MESSAGES.MAX.WARN} for 5m)                        | <p>-</p>                                                               | `{TEMPLATE_NAME:rabbitmq.queue.messages["{#VHOST}/{#QUEUE}"].min(5m)}>{$RABBITMQ.MESSAGES.MAX.WARN:"{#QUEUE}"}`                                                                                           | WARNING  |                                                                                                                           |
-| RabbitMQ: Failed to fetch nodes data (or no data for 30m)                                               | <p>Zabbix has not received data for items for the last 30 minutes.</p> | `{TEMPLATE_NAME:web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"].nodata(30m)}=1` | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Process is not running</p><p>- RabbitMQ: Service is down</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|RabbitMQ: Version has changed (new version: {ITEM.VALUE}) |<p>RabbitMQ version has changed. Ack to close.</p> |`last(/RabbitMQ node by Zabbix agent/rabbitmq.node.overview.rabbitmq_version,#1)<>last(/RabbitMQ node by Zabbix agent/rabbitmq.node.overview.rabbitmq_version,#2) and length(last(/RabbitMQ node by Zabbix agent/rabbitmq.node.overview.rabbitmq_version))>0` |INFO |<p>Manual close: YES</p> |
+|RabbitMQ: Number of network partitions is too high (more than 0 for 5m) |<p>https://www.rabbitmq.com/partitions.html#detecting</p> |`min(/RabbitMQ node by Zabbix agent/rabbitmq.node.partitions,5m)>0` |WARNING | |
+|RabbitMQ: Node is not running |<p>RabbitMQ node is not running</p> |`max(/RabbitMQ node by Zabbix agent/rabbitmq.node.running,5m)=0` |AVERAGE |<p>**Depends on**:</p><p>- RabbitMQ: Process is not running</p><p>- RabbitMQ: Service is down</p> |
+|RabbitMQ: Memory alarm (Memory usage threshold has been reached) |<p>https://www.rabbitmq.com/memory.html</p> |`last(/RabbitMQ node by Zabbix agent/rabbitmq.node.mem_alarm)=1` |AVERAGE | |
+|RabbitMQ: Free disk space alarm (Free space threshold has been reached) |<p>https://www.rabbitmq.com/disk-alarms.html</p> |`last(/RabbitMQ node by Zabbix agent/rabbitmq.node.disk_free_alarm)=1` |AVERAGE | |
+|RabbitMQ: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/RabbitMQ node by Zabbix agent/rabbitmq.node.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|RabbitMQ: Process is not running |<p>-</p> |`last(/RabbitMQ node by Zabbix agent/proc.num["{$RABBITMQ.PROCESS_NAME}"])=0` |HIGH | |
+|RabbitMQ: Service is down |<p>-</p> |`last(/RabbitMQ node by Zabbix agent/net.tcp.service[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Process is not running</p> |
+|RabbitMQ: Service response time is too high (over {$RABBITMQ.RESPONSE_TIME.MAX.WARN}s for 5m) |<p>-</p> |`min(/RabbitMQ node by Zabbix agent/net.tcp.service.perf[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"],5m)>{$RABBITMQ.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Process is not running</p><p>- RabbitMQ: Service is down</p> |
+|RabbitMQ: There are active alarms in the node |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/local-alarms{#SINGLETON}"])=0` |AVERAGE | |
+|RabbitMQ: There are valid TLS certificates expiring in the next month |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/certificate-expiration/1/months{#SINGLETON}"])=0` |AVERAGE | |
+|RabbitMQ: There are not running virtual hosts |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/virtual-hosts{#SINGLETON}"])=0` |AVERAGE | |
+|RabbitMQ: There are queues that could potentially lose data if the this node goes offline. |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-mirror-sync-critical{#SINGLETON}"])=0` |AVERAGE | |
+|RabbitMQ: There are queues that would lose their quorum and availability if the this node is shut down. |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-quorum-critical{#SINGLETON}"])=0` |AVERAGE | |
+|RabbitMQ: Node healthcheck failed |<p>https://www.rabbitmq.com/monitoring.html#health-checks</p> |`last(/RabbitMQ node by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/healthchecks/node{#SINGLETON}"])=0` |AVERAGE | |
+|RabbitMQ: Too many messages in queue (over {$RABBITMQ.MESSAGES.MAX.WARN} for 5m) |<p>-</p> |`min(/RabbitMQ node by Zabbix agent/rabbitmq.queue.messages["{#VHOST}/{#QUEUE}"],5m)>{$RABBITMQ.MESSAGES.MAX.WARN:"{#QUEUE}"}` |WARNING | |
+|RabbitMQ: Failed to fetch nodes data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/RabbitMQ node by Zabbix agent/web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"],30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Process is not running</p><p>- RabbitMQ: Service is down</p> |
 
 ## Feedback
 
diff --git a/templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml b/templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml
index 13601a93885..0f683787db5 100644
--- a/templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml
+++ b/templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:21Z'
+  version: '6.0'
+  date: '2022-01-10T07:40:00Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -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/387226-discussion-thread-for-official-zabbix-template-rabbitmq
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -950,6 +950,7 @@ zabbix_export:
               name: 'RabbitMQ: Healthcheck: alarms in effect in the cluster{#SINGLETON}'
               key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/health/checks/alarms{#SINGLETON}"]'
               history: 7d
+              authtype: NONE
               username: '{$RABBITMQ.API.USER}'
               password: '{$RABBITMQ.API.PASSWORD}'
               description: 'Responds a 200 OK if there are no alarms in effect in the cluster, otherwise responds with a 503 Service Unavailable.'
@@ -1001,7 +1002,7 @@ zabbix_export:
                 - |
                   var rabbit_version = parseInt(value.split('.')[0]) * 10000 +
                                        parseInt(value.split('.')[1]) * 100 +
-                                       parseInt(value.split('.')[2]) 
+                                       parseInt(value.split('.')[2])
                   return JSON.stringify(rabbit_version >= 30810 ? [{'{#SINGLETON}': ''}] : []);
       macros:
         -
@@ -1136,7 +1137,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387226-discussion-thread-for-official-zabbix-template-rabbitmq
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -1753,7 +1754,7 @@ zabbix_export:
                 - |
                   var rabbit_version = parseInt(value.split('.')[0]) * 10000 +
                                        parseInt(value.split('.')[1]) * 100 +
-                                       parseInt(value.split('.')[2]) 
+                                       parseInt(value.split('.')[2])
                   return JSON.stringify(rabbit_version < 30810 ? [{'{#SINGLETON}': ''}] : []);
         -
           uuid: 3c0021a3e57142eb806deb5b47b6700a
@@ -1768,6 +1769,7 @@ zabbix_export:
               name: 'RabbitMQ: Healthcheck: expiration date on the certificates{#SINGLETON}'
               key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/certificate-expiration/1/months{#SINGLETON}"]'
               history: 7d
+              authtype: NONE
               username: '{$RABBITMQ.API.USER}'
               password: '{$RABBITMQ.API.PASSWORD}'
               description: 'Checks the expiration date on the certificates for every listener configured to use TLS. Responds a 200 OK if all certificates are valid (have not expired), otherwise responds with a 503 Service Unavailable.'
@@ -1810,6 +1812,7 @@ zabbix_export:
               name: 'RabbitMQ: Healthcheck: local alarms in effect on the this node{#SINGLETON}'
               key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/local-alarms{#SINGLETON}"]'
               history: 7d
+              authtype: NONE
               username: '{$RABBITMQ.API.USER}'
               password: '{$RABBITMQ.API.PASSWORD}'
               description: 'Responds a 200 OK if there are no local alarms in effect on the target node, otherwise responds with a 503 Service Unavailable.'
@@ -1849,12 +1852,13 @@ zabbix_export:
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
             -
               uuid: 7a07966d8dde4f2caa9ff95693b86974
-              name: 'RabbitMQ: Healthcheck: classic mirrored queues without synchronised mirrors online{#SINGLETON}'
+              name: 'RabbitMQ: Healthcheck: classic mirrored queues without synchronized mirrors online{#SINGLETON}'
               key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-mirror-sync-critical{#SINGLETON}"]'
               history: 7d
+              authtype: NONE
               username: '{$RABBITMQ.API.USER}'
               password: '{$RABBITMQ.API.PASSWORD}'
-              description: 'Checks if there are classic mirrored queues without synchronised mirrors online (queues that would potentially lose data if the target node is shut down). Responds a 200 OK if there are no such classic mirrored queues, otherwise responds with a 503 Service Unavailable.'
+              description: 'Checks if there are classic mirrored queues without synchronized mirrors online (queues that would potentially lose data if the target node is shut down). Responds a 200 OK if there are no such classic mirrored queues, otherwise responds with a 503 Service Unavailable.'
               valuemap:
                 name: 'RabbitMQ healthcheck'
               preprocessing:
@@ -1894,6 +1898,7 @@ zabbix_export:
               name: 'RabbitMQ: Healthcheck: queues with minimum online quorum{#SINGLETON}'
               key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/node-is-quorum-critical{#SINGLETON}"]'
               history: 7d
+              authtype: NONE
               username: '{$RABBITMQ.API.USER}'
               password: '{$RABBITMQ.API.PASSWORD}'
               description: 'Checks if there are quorum queues with minimum online quorum (queues that would lose their quorum and availability if the target node is shut down). Responds a 200 OK if there are no such quorum queues, otherwise responds with a 503 Service Unavailable.'
@@ -1936,6 +1941,7 @@ zabbix_export:
               name: 'RabbitMQ: Healthcheck: virtual hosts on the this node{#SINGLETON}'
               key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/health/checks/virtual-hosts{#SINGLETON}"]'
               history: 7d
+              authtype: NONE
               username: '{$RABBITMQ.API.USER}'
               password: '{$RABBITMQ.API.PASSWORD}'
               description: 'Responds a 200 OK if all virtual hosts and running on the target node, otherwise responds with a 503 Service Unavailable.'
@@ -1986,7 +1992,7 @@ zabbix_export:
                 - |
                   var rabbit_version = parseInt(value.split('.')[0]) * 10000 +
                                        parseInt(value.split('.')[1]) * 100 +
-                                       parseInt(value.split('.')[2]) 
+                                       parseInt(value.split('.')[2])
                   return JSON.stringify(rabbit_version >= 30810 ? [{'{#SINGLETON}': ''}] : []);
         -
           uuid: d1d32fc6ae1f445a98144a31214ca825
diff --git a/templates/app/rabbitmq_http/README.md b/templates/app/rabbitmq_http/README.md
index 04c0f1be8d7..31108d71b52 100644
--- a/templates/app/rabbitmq_http/README.md
+++ b/templates/app/rabbitmq_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor RabbitMQ by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -19,7 +19,7 @@ This template was tested on:
 
 > See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/http) for basic instructions.
 
-Enable the RabbitMQ management plugin. See [RabbitMQ’s documentation](https://www.rabbitmq.com/management.html) to enable it.
+Enable the RabbitMQ management plugin. See [RabbitMQ's documentation](https://www.rabbitmq.com/management.html) to enable it.
 
 Create a user to monitor the service:
 
@@ -41,14 +41,14 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                        | Description                                      | Default            |
-|---------------------------------------------|--------------------------------------------------|--------------------|
-| {$RABBITMQ.API.PASSWORD}                    | <p>-</p>                                         | `zabbix`           |
-| {$RABBITMQ.API.PORT}                        | <p>The port of RabbitMQ API endpoint</p>         | `15672`            |
-| {$RABBITMQ.API.SCHEME}                      | <p>Request scheme which may be http or https</p> | `http`             |
-| {$RABBITMQ.API.USER}                        | <p>-</p>                                         | `zbx_monitor`      |
-| {$RABBITMQ.LLD.FILTER.EXCHANGE.MATCHES}     | <p>Filter of discoverable exchanges</p>          | `.*`               |
-| {$RABBITMQ.LLD.FILTER.EXCHANGE.NOT_MATCHES} | <p>Filter to exclude discovered exchanges</p>    | `CHANGE_IF_NEEDED` |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$RABBITMQ.API.PASSWORD} |<p>-</p> |`zabbix` |
+|{$RABBITMQ.API.PORT} |<p>The port of RabbitMQ API endpoint</p> |`15672` |
+|{$RABBITMQ.API.SCHEME} |<p>Request scheme which may be http or https</p> |`http` |
+|{$RABBITMQ.API.USER} |<p>-</p> |`zbx_monitor` |
+|{$RABBITMQ.LLD.FILTER.EXCHANGE.MATCHES} |<p>Filter of discoverable exchanges</p> |`.*` |
+|{$RABBITMQ.LLD.FILTER.EXCHANGE.NOT_MATCHES} |<p>Filter to exclude discovered exchanges</p> |`CHANGE_IF_NEEDED` |
 
 ## Template links
 
@@ -56,65 +56,65 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                           | Description                             | Type      | Key and additional info                                                                                                                                                                                                  |
-|--------------------------------|-----------------------------------------|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Health Check 3.8.10+ discovery | <p>Version 3.8.10+ specific metrics</p> | DEPENDENT | rabbitmq.healthcheck.v3810.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                  |
-| Exchanges discovery            | <p>Individual exchange metrics</p>      | DEPENDENT | rabbitmq.exchanges.discovery<p>**Filter**:</p>AND <p>- A: {#EXCHANGE} MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.EXCHANGE.MATCHES}`</p><p>- B: {#EXCHANGE} NOT_MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.EXCHANGE.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Health Check 3.8.10+ discovery |<p>Version 3.8.10+ specific metrics</p> |DEPENDENT |rabbitmq.healthcheck.v3810.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Exchanges discovery |<p>Individual exchange metrics</p> |DEPENDENT |rabbitmq.exchanges.discovery<p>**Filter**:</p>AND <p>- {#EXCHANGE} MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.EXCHANGE.MATCHES}`</p><p>- {#EXCHANGE} NOT_MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.EXCHANGE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group            | Name                                                                                     | Description                                                                                                                                                                                                                                      | Type       | Key and additional info                                                                                                                                                                                                                                                                               |
-|------------------|------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| RabbitMQ         | RabbitMQ: Connections total                                                              | <p>Total number of connections</p>                                                                                                                                                                                                               | DEPENDENT  | rabbitmq.overview.object_totals.connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.connections`</p>                                                                                                                                                                                  |
-| RabbitMQ         | RabbitMQ: Channels total                                                                 | <p>Total number of channels</p>                                                                                                                                                                                                                  | DEPENDENT  | rabbitmq.overview.object_totals.channels<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.channels`</p>                                                                                                                                                                                        |
-| RabbitMQ         | RabbitMQ: Queues total                                                                   | <p>Total number of queues</p>                                                                                                                                                                                                                    | DEPENDENT  | rabbitmq.overview.object_totals.queues<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.queues`</p>                                                                                                                                                                                            |
-| RabbitMQ         | RabbitMQ: Consumers total                                                                | <p>Total number of consumers</p>                                                                                                                                                                                                                 | DEPENDENT  | rabbitmq.overview.object_totals.consumers<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.consumers`</p>                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Exchanges total                                                                | <p>Total number of exchanges</p>                                                                                                                                                                                                                 | DEPENDENT  | rabbitmq.overview.object_totals.exchanges<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.exchanges`</p>                                                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Messages total                                                                 | <p>Total number of messages (ready plus unacknowledged)</p>                                                                                                                                                                                      | DEPENDENT  | rabbitmq.overview.queue_totals.messages<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages`</p>                                                                                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Messages ready for delivery                                                    | <p>Number of messages ready for deliver</p>                                                                                                                                                                                                      | DEPENDENT  | rabbitmq.overview.queue_totals.messages.ready<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages_ready`</p>                                                                                                                                                                              |
-| RabbitMQ         | RabbitMQ: Messages unacknowledged                                                        | <p>Number of unacknowledged messages</p>                                                                                                                                                                                                         | DEPENDENT  | rabbitmq.overview.queue_totals.messages.unacknowledged<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages_unacknowledged`</p>                                                                                                                                                            |
-| RabbitMQ         | RabbitMQ: Messages acknowledged                                                          | <p>Number of messages delivered to clients and acknowledged</p>                                                                                                                                                                                  | DEPENDENT  | rabbitmq.overview.messages.ack<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.ack`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                                  |
-| RabbitMQ         | RabbitMQ: Messages acknowledged per second                                               | <p>Rate of messages delivered to clients and acknowledged per second</p>                                                                                                                                                                         | DEPENDENT  | rabbitmq.overview.messages.ack.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.ack_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                |
-| RabbitMQ         | RabbitMQ: Messages confirmed                                                             | <p>Count of messages confirmed</p>                                                                                                                                                                                                               | DEPENDENT  | rabbitmq.overview.messages.confirm<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.confirm`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Messages confirmed per second                                                  | <p>Rate of messages confirmed per second</p>                                                                                                                                                                                                     | DEPENDENT  | rabbitmq.overview.messages.confirm.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.confirm_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                        |
-| RabbitMQ         | RabbitMQ: Messages delivered                                                             | <p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p>                        | DEPENDENT  | rabbitmq.overview.messages.deliver_get<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.deliver_get`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                  |
-| RabbitMQ         | RabbitMQ: Messages delivered per second                                                  | <p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> | DEPENDENT  | rabbitmq.overview.messages.deliver_get.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.deliver_get_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                |
-| RabbitMQ         | RabbitMQ: Messages published                                                             | <p>Count of messages published</p>                                                                                                                                                                                                               | DEPENDENT  | rabbitmq.overview.messages.publish<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Messages published per second                                                  | <p>Rate of messages published per second</p>                                                                                                                                                                                                     | DEPENDENT  | rabbitmq.overview.messages.publish.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                        |
-| RabbitMQ         | RabbitMQ: Messages publish_in                                                            | <p>Count of messages published from channels into this overview</p>                                                                                                                                                                              | DEPENDENT  | rabbitmq.overview.messages.publish_in<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_in`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                    |
-| RabbitMQ         | RabbitMQ: Messages publish_in per second                                                 | <p>Rate of messages published from channels into this overview per sec</p>                                                                                                                                                                       | DEPENDENT  | rabbitmq.overview.messages.publish_in.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_in_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                  |
-| RabbitMQ         | RabbitMQ: Messages publish_out                                                           | <p>Count of messages published from this overview into queues</p>                                                                                                                                                                                | DEPENDENT  | rabbitmq.overview.messages.publish_out<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_out`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                  |
-| RabbitMQ         | RabbitMQ: Messages publish_out per second                                                | <p>Rate of messages published from this overview into queues per second,0,rabbitmq,total msgs pub out rate</p>                                                                                                                                   | DEPENDENT  | rabbitmq.overview.messages.publish_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_out_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                |
-| RabbitMQ         | RabbitMQ: Messages returned unroutable                                                   | <p>Count of messages returned to publisher as unroutable</p>                                                                                                                                                                                     | DEPENDENT  | rabbitmq.overview.messages.return_unroutable<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.return_unroutable`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Messages returned unroutable per second                                        | <p>Rate of messages returned to publisher as unroutable per second</p>                                                                                                                                                                           | DEPENDENT  | rabbitmq.overview.messages.return_unroutable.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.return_unroutable_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                    |
-| RabbitMQ         | RabbitMQ: Messages returned redeliver                                                    | <p>Count of subset of messages in deliver_get which had the redelivered flag set</p>                                                                                                                                                             | DEPENDENT  | rabbitmq.overview.messages.redeliver<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.redeliver`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                                      |
-| RabbitMQ         | RabbitMQ: Messages returned redeliver per second                                         | <p>Rate of subset of messages in deliver_get which had the redelivered flag set per second</p>                                                                                                                                                   | DEPENDENT  | rabbitmq.overview.messages.redeliver.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.redeliver_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                                                                                    |
-| RabbitMQ         | RabbitMQ: Healthcheck: alarms in effect in the cluster{#SINGLETON}                       | <p>Responds a 200 OK if there are no alarms in effect in the cluster, otherwise responds with a 503 Service Unavailable.</p>                                                                                                                     | HTTP_AGENT | rabbitmq.healthcheck.alarms[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>                                                    |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged                   | <p>Number of messages delivered to clients and acknowledged</p>                                                                                                                                                                                  | DEPENDENT  | rabbitmq.exchange.messages.ack["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.ack.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                               |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged per second        | <p>Rate of messages delivered to clients and acknowledged per second</p>                                                                                                                                                                         | DEPENDENT  | rabbitmq.exchange.messages.ack.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.ack_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                             |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed                      | <p>Count of messages confirmed</p>                                                                                                                                                                                                               | DEPENDENT  | rabbitmq.exchange.messages.confirm["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.confirm.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                       |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed per second           | <p>Rate of messages confirmed per second</p>                                                                                                                                                                                                     | DEPENDENT  | rabbitmq.exchange.messages.confirm.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.confirm_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                     |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered                      | <p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p>                        | DEPENDENT  | rabbitmq.exchange.messages.deliver_get["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.deliver_get.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                               |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered per second           | <p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> | DEPENDENT  | rabbitmq.exchange.messages.deliver_get.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.deliver_get_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>             |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published                      | <p>Count of messages published</p>                                                                                                                                                                                                               | DEPENDENT  | rabbitmq.exchange.messages.publish["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                       |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published per second           | <p>Rate of messages published per second</p>                                                                                                                                                                                                     | DEPENDENT  | rabbitmq.exchange.messages.publish.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                     |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in                     | <p>Count of messages published from channels into this overview</p>                                                                                                                                                                              | DEPENDENT  | rabbitmq.exchange.messages.publish_in["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_in.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                 |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in per second          | <p>Rate of messages published from channels into this overview per sec</p>                                                                                                                                                                       | DEPENDENT  | rabbitmq.exchange.messages.publish_in.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_in_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>               |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out                    | <p>Count of messages published from this overview into queues</p>                                                                                                                                                                                | DEPENDENT  | rabbitmq.exchange.messages.publish_out["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_out.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                               |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out per second         | <p>Rate of messages published from this overview into queues per second,0,rabbitmq,total msgs pub out rate</p>                                                                                                                                   | DEPENDENT  | rabbitmq.exchange.messages.publish_out.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_out_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>             |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable            | <p>Count of messages returned to publisher as unroutable</p>                                                                                                                                                                                     | DEPENDENT  | rabbitmq.exchange.messages.return_unroutable["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.return_unroutable.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                   |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable per second | <p>Rate of messages returned to publisher as unroutable per second</p>                                                                                                                                                                           | DEPENDENT  | rabbitmq.exchange.messages.return_unroutable.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.return_unroutable_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered                    | <p>Count of subset of messages in deliver_get which had the redelivered flag set</p>                                                                                                                                                             | DEPENDENT  | rabbitmq.exchange.messages.redeliver["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.redeliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                   |
-| RabbitMQ         | RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered per second         | <p>Rate of subset of messages in deliver_get which had the redelivered flag set per second</p>                                                                                                                                                   | DEPENDENT  | rabbitmq.exchange.messages.redeliver.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.redeliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                 |
-| Zabbix_raw_items | RabbitMQ: Get overview                                                                   | <p>The HTTP API endpoint that returns cluster-wide metrics</p>                                                                                                                                                                                   | HTTP_AGENT | rabbitmq.get_overview                                                                                                                                                                                                                                                                                 |
-| Zabbix_raw_items | RabbitMQ: Get exchanges                                                                  | <p>The HTTP API endpoint that returns exchanges metrics</p>                                                                                                                                                                                      | HTTP_AGENT | rabbitmq.get_exchanges                                                                                                                                                                                                                                                                                |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|RabbitMQ |RabbitMQ: Connections total |<p>Total number of connections</p> |DEPENDENT |rabbitmq.overview.object_totals.connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.connections`</p> |
+|RabbitMQ |RabbitMQ: Channels total |<p>Total number of channels</p> |DEPENDENT |rabbitmq.overview.object_totals.channels<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.channels`</p> |
+|RabbitMQ |RabbitMQ: Queues total |<p>Total number of queues</p> |DEPENDENT |rabbitmq.overview.object_totals.queues<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.queues`</p> |
+|RabbitMQ |RabbitMQ: Consumers total |<p>Total number of consumers</p> |DEPENDENT |rabbitmq.overview.object_totals.consumers<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.consumers`</p> |
+|RabbitMQ |RabbitMQ: Exchanges total |<p>Total number of exchanges</p> |DEPENDENT |rabbitmq.overview.object_totals.exchanges<p>**Preprocessing**:</p><p>- JSONPATH: `$.object_totals.exchanges`</p> |
+|RabbitMQ |RabbitMQ: Messages total |<p>Total number of messages (ready plus unacknowledged)</p> |DEPENDENT |rabbitmq.overview.queue_totals.messages<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages`</p> |
+|RabbitMQ |RabbitMQ: Messages ready for delivery |<p>Number of messages ready for deliver</p> |DEPENDENT |rabbitmq.overview.queue_totals.messages.ready<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages_ready`</p> |
+|RabbitMQ |RabbitMQ: Messages unacknowledged |<p>Number of unacknowledged messages</p> |DEPENDENT |rabbitmq.overview.queue_totals.messages.unacknowledged<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue_totals.messages_unacknowledged`</p> |
+|RabbitMQ |RabbitMQ: Messages acknowledged |<p>Number of messages delivered to clients and acknowledged</p> |DEPENDENT |rabbitmq.overview.messages.ack<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.ack`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages acknowledged per second |<p>Rate of messages delivered to clients and acknowledged per second</p> |DEPENDENT |rabbitmq.overview.messages.ack.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.ack_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages confirmed |<p>Count of messages confirmed</p> |DEPENDENT |rabbitmq.overview.messages.confirm<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.confirm`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages confirmed per second |<p>Rate of messages confirmed per second</p> |DEPENDENT |rabbitmq.overview.messages.confirm.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.confirm_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages delivered |<p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.overview.messages.deliver_get<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.deliver_get`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages delivered per second |<p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.overview.messages.deliver_get.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.deliver_get_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages published |<p>Count of messages published</p> |DEPENDENT |rabbitmq.overview.messages.publish<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages published per second |<p>Rate of messages published per second</p> |DEPENDENT |rabbitmq.overview.messages.publish.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages publish_in |<p>Count of messages published from channels into this overview</p> |DEPENDENT |rabbitmq.overview.messages.publish_in<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_in`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages publish_in per second |<p>Rate of messages published from channels into this overview per sec</p> |DEPENDENT |rabbitmq.overview.messages.publish_in.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_in_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages publish_out |<p>Count of messages published from this overview into queues</p> |DEPENDENT |rabbitmq.overview.messages.publish_out<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_out`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages publish_out per second |<p>Rate of messages published from this overview into queues per second,0,rabbitmq,total msgs pub out rate</p> |DEPENDENT |rabbitmq.overview.messages.publish_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.publish_out_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages returned unroutable |<p>Count of messages returned to publisher as unroutable</p> |DEPENDENT |rabbitmq.overview.messages.return_unroutable<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.return_unroutable`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages returned unroutable per second |<p>Rate of messages returned to publisher as unroutable per second</p> |DEPENDENT |rabbitmq.overview.messages.return_unroutable.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.return_unroutable_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages returned redeliver |<p>Count of subset of messages in deliver_get which had the redelivered flag set</p> |DEPENDENT |rabbitmq.overview.messages.redeliver<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.redeliver`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Messages returned redeliver per second |<p>Rate of subset of messages in deliver_get which had the redelivered flag set per second</p> |DEPENDENT |rabbitmq.overview.messages.redeliver.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.message_stats.redeliver_details.rate`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: alarms in effect in the cluster{#SINGLETON} |<p>Responds a 200 OK if there are no alarms in effect in the cluster, otherwise responds with a 503 Service Unavailable.</p> |HTTP_AGENT |rabbitmq.healthcheck.alarms[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged |<p>Number of messages delivered to clients and acknowledged</p> |DEPENDENT |rabbitmq.exchange.messages.ack["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.ack.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged per second |<p>Rate of messages delivered to clients and acknowledged per second</p> |DEPENDENT |rabbitmq.exchange.messages.ack.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.ack_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed |<p>Count of messages confirmed</p> |DEPENDENT |rabbitmq.exchange.messages.confirm["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.confirm.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed per second |<p>Rate of messages confirmed per second</p> |DEPENDENT |rabbitmq.exchange.messages.confirm.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.confirm_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered |<p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.exchange.messages.deliver_get["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.deliver_get.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered per second |<p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.exchange.messages.deliver_get.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.deliver_get_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published |<p>Count of messages published</p> |DEPENDENT |rabbitmq.exchange.messages.publish["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published per second |<p>Rate of messages published per second</p> |DEPENDENT |rabbitmq.exchange.messages.publish.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in |<p>Count of messages published from channels into this overview</p> |DEPENDENT |rabbitmq.exchange.messages.publish_in["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_in.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in per second |<p>Rate of messages published from channels into this overview per sec</p> |DEPENDENT |rabbitmq.exchange.messages.publish_in.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_in_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out |<p>Count of messages published from this overview into queues</p> |DEPENDENT |rabbitmq.exchange.messages.publish_out["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_out.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out per second |<p>Rate of messages published from this overview into queues per second,0,rabbitmq,total msgs pub out rate</p> |DEPENDENT |rabbitmq.exchange.messages.publish_out.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.publish_out_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable |<p>Count of messages returned to publisher as unroutable</p> |DEPENDENT |rabbitmq.exchange.messages.return_unroutable["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.return_unroutable.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable per second |<p>Rate of messages returned to publisher as unroutable per second</p> |DEPENDENT |rabbitmq.exchange.messages.return_unroutable.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.return_unroutable_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered |<p>Count of subset of messages in deliver_get which had the redelivered flag set</p> |DEPENDENT |rabbitmq.exchange.messages.redeliver["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.redeliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered per second |<p>Rate of subset of messages in deliver_get which had the redelivered flag set per second</p> |DEPENDENT |rabbitmq.exchange.messages.redeliver.rate["{#VHOST}/{#EXCHANGE}/{#TYPE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#EXCHANGE}" && @.vhost == "{#VHOST}" && @.type =="{#TYPE}")].message_stats.redeliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|Zabbix_raw_items |RabbitMQ: Get overview |<p>The HTTP API endpoint that returns cluster-wide metrics</p> |HTTP_AGENT |rabbitmq.get_overview |
+|Zabbix_raw_items |RabbitMQ: Get exchanges |<p>The HTTP API endpoint that returns exchanges metrics</p> |HTTP_AGENT |rabbitmq.get_exchanges |
 
 ## Triggers
 
-| Name                                                         | Description                                                           | Expression                                                             | Severity | Dependencies and additional info |
-|--------------------------------------------------------------|-----------------------------------------------------------------------|------------------------------------------------------------------------|----------|----------------------------------|
-| RabbitMQ: There are active alarms in the cluster             | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>         | `{TEMPLATE_NAME:rabbitmq.healthcheck.alarms[{#SINGLETON}].last()}=503` | AVERAGE  |                                  |
-| RabbitMQ: Failed to fetch overview data (or no data for 30m) | <p>Zabbix has not received data for items for the last 30 minutes</p> | `{TEMPLATE_NAME:rabbitmq.get_overview.nodata(30m)}=1`                  | WARNING  | <p>Manual close: YES</p>         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|RabbitMQ: There are active alarms in the cluster |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ cluster by HTTP/rabbitmq.healthcheck.alarms[{#SINGLETON}])=0` |AVERAGE | |
+|RabbitMQ: Failed to fetch overview data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/RabbitMQ cluster by HTTP/rabbitmq.get_overview,30m)=1` |WARNING |<p>Manual close: YES</p> |
 
 ## Feedback
 
@@ -126,11 +126,11 @@ You can also provide a feedback, discuss the template or ask for help with it at
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor RabbitMQ by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `RabbitMQ Node` — (Zabbix version >= 4.2) collects metrics by polling [RabbitMQ management plugin](https://www.rabbitmq.com/management.html) with HTTP agent remotely.
+Template `RabbitMQ Node` — (Zabbix version >= 4.2) collects metrics by polling [RabbitMQ management plugin](https://www.rabbitmq.com/management.html) with HTTP agent remotely.
 
 
 
@@ -140,7 +140,7 @@ This template was tested on:
 
 ## Setup
 
-Enable the RabbitMQ management plugin. See [RabbitMQ’s documentation](https://www.rabbitmq.com/management.html) to enable it.
+Enable the RabbitMQ management plugin. See [RabbitMQ's documentation](https://www.rabbitmq.com/management.html) to enable it.
 
 Create a user to monitor the service:
 
@@ -162,17 +162,17 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                     | Description                                                             | Default            |
-|------------------------------------------|-------------------------------------------------------------------------|--------------------|
-| {$RABBITMQ.API.PASSWORD}                 | <p>-</p>                                                                | `zabbix`           |
-| {$RABBITMQ.API.PORT}                     | <p>The port of RabbitMQ API endpoint</p>                                | `15672`            |
-| {$RABBITMQ.API.SCHEME}                   | <p>Request scheme which may be http or https</p>                        | `http`             |
-| {$RABBITMQ.API.USER}                     | <p>-</p>                                                                | `zbx_monitor`      |
-| {$RABBITMQ.CLUSTER.NAME}                 | <p>The name of RabbitMQ cluster</p>                                     | `rabbit`           |
-| {$RABBITMQ.LLD.FILTER.QUEUE.MATCHES}     | <p>Filter of discoverable queues</p>                                    | `.*`               |
-| {$RABBITMQ.LLD.FILTER.QUEUE.NOT_MATCHES} | <p>Filter to exclude discovered queues</p>                              | `CHANGE_IF_NEEDED` |
-| {$RABBITMQ.MESSAGES.MAX.WARN}            | <p>Maximum number of messages in the queue for trigger expression</p>   | `1000`             |
-| {$RABBITMQ.RESPONSE_TIME.MAX.WARN}       | <p>Maximum RabbitMQ response time in seconds for trigger expression</p> | `10`               |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$RABBITMQ.API.PASSWORD} |<p>-</p> |`zabbix` |
+|{$RABBITMQ.API.PORT} |<p>The port of RabbitMQ API endpoint</p> |`15672` |
+|{$RABBITMQ.API.SCHEME} |<p>Request scheme which may be http or https</p> |`http` |
+|{$RABBITMQ.API.USER} |<p>-</p> |`zbx_monitor` |
+|{$RABBITMQ.CLUSTER.NAME} |<p>The name of RabbitMQ cluster</p> |`rabbit` |
+|{$RABBITMQ.LLD.FILTER.QUEUE.MATCHES} |<p>Filter of discoverable queues</p> |`.*` |
+|{$RABBITMQ.LLD.FILTER.QUEUE.NOT_MATCHES} |<p>Filter to exclude discovered queues</p> |`CHANGE_IF_NEEDED` |
+|{$RABBITMQ.MESSAGES.MAX.WARN} |<p>Maximum number of messages in the queue for trigger expression</p> |`1000` |
+|{$RABBITMQ.RESPONSE_TIME.MAX.WARN} |<p>Maximum RabbitMQ response time in seconds for trigger expression</p> |`10` |
 
 ## Template links
 
@@ -180,81 +180,81 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                           | Description                                               | Type      | Key and additional info                                                                                                                                                                                                                                                           |
-|--------------------------------|-----------------------------------------------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Health Check 3.8.10+ discovery | <p>Version 3.8.10+ specific metrics</p>                   | DEPENDENT | rabbitmq.healthcheck.v3810.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                                           |
-| Health Check 3.8.9- discovery  | <p>Specific metrics up to and including version 3.8.4</p> | DEPENDENT | rabbitmq.healthcheck.v389.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                                            |
-| Queues discovery               | <p>Individual queue metrics</p>                           | DEPENDENT | rabbitmq.queues.discovery<p>**Filter**:</p>AND <p>- A: {#QUEUE} MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.QUEUE.MATCHES}`</p><p>- B: {#QUEUE} NOT_MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.QUEUE.NOT_MATCHES}`</p><p>- C: {#NODE} MATCHES_REGEX `{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Health Check 3.8.10+ discovery |<p>Version 3.8.10+ specific metrics</p> |DEPENDENT |rabbitmq.healthcheck.v3810.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Health Check 3.8.9- discovery |<p>Specific metrics up to and including version 3.8.4</p> |DEPENDENT |rabbitmq.healthcheck.v389.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Queues discovery |<p>Individual queue metrics</p> |DEPENDENT |rabbitmq.queues.discovery<p>**Filter**:</p>AND <p>- {#QUEUE} MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.QUEUE.MATCHES}`</p><p>- {#QUEUE} NOT_MATCHES_REGEX `{$RABBITMQ.LLD.FILTER.QUEUE.NOT_MATCHES}`</p><p>- {#NODE} MATCHES_REGEX `{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}`</p> |
 
 ## Items collected
 
-| Group            | Name                                                                                           | Description                                                                                                                                                                                                                                                                          | Type       | Key and additional info                                                                                                                                                                                                                                            |
-|------------------|------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| RabbitMQ         | RabbitMQ: Management plugin version                                                            | <p>Version of the management plugin in use</p>                                                                                                                                                                                                                                       | DEPENDENT  | rabbitmq.node.overview.management_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                              |
-| RabbitMQ         | RabbitMQ: RabbitMQ version                                                                     | <p>Version of RabbitMQ on the node which processed this request</p>                                                                                                                                                                                                                  | DEPENDENT  | rabbitmq.node.overview.rabbitmq_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.rabbitmq_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                  |
-| RabbitMQ         | RabbitMQ: Used file descriptors                                                                | <p>Used file descriptors</p>                                                                                                                                                                                                                                                         | DEPENDENT  | rabbitmq.node.fd_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.fd_used`</p>                                                                                                                                                                                       |
-| RabbitMQ         | RabbitMQ: Free disk space                                                                      | <p>Current free disk space</p>                                                                                                                                                                                                                                                       | DEPENDENT  | rabbitmq.node.disk_free<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free`</p>                                                                                                                                                                                   |
-| RabbitMQ         | RabbitMQ: Disk free limit                                                                      | <p>Disk free space limit in bytes</p>                                                                                                                                                                                                                                                | DEPENDENT  | rabbitmq.node.disk_free_limit<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free_limit`</p>                                                                                                                                                                       |
-| RabbitMQ         | RabbitMQ: Memory used                                                                          | <p>Memory used in bytes</p>                                                                                                                                                                                                                                                          | DEPENDENT  | rabbitmq.node.mem_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_used`</p>                                                                                                                                                                                     |
-| RabbitMQ         | RabbitMQ: Memory limit                                                                         | <p>Memory usage high watermark in bytes</p>                                                                                                                                                                                                                                          | DEPENDENT  | rabbitmq.node.mem_limit<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_limit`</p>                                                                                                                                                                                   |
-| RabbitMQ         | RabbitMQ: Runtime run queue                                                                    | <p>Average number of Erlang processes waiting to run</p>                                                                                                                                                                                                                             | DEPENDENT  | rabbitmq.node.run_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.run_queue`</p>                                                                                                                                                                                   |
-| RabbitMQ         | RabbitMQ: Sockets used                                                                         | <p>Number of file descriptors used as sockets</p>                                                                                                                                                                                                                                    | DEPENDENT  | rabbitmq.node.sockets_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.sockets_used`</p>                                                                                                                                                                             |
-| RabbitMQ         | RabbitMQ: Sockets available                                                                    | <p>File descriptors available for use as sockets</p>                                                                                                                                                                                                                                 | DEPENDENT  | rabbitmq.node.sockets_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.sockets_total`</p>                                                                                                                                                                           |
-| RabbitMQ         | RabbitMQ: Number of network partitions                                                         | <p>Number of network partitions this node is seeing</p>                                                                                                                                                                                                                              | DEPENDENT  | rabbitmq.node.partitions<p>**Preprocessing**:</p><p>- JSONPATH: `$.partitions`</p><p>- JAVASCRIPT: `return JSON.parse(value).length;`</p>                                                                                                                          |
-| RabbitMQ         | RabbitMQ: Is running                                                                           | <p>Is the node running or not</p>                                                                                                                                                                                                                                                    | DEPENDENT  | rabbitmq.node.running<p>**Preprocessing**:</p><p>- JSONPATH: `$.running`</p><p>- BOOL_TO_DECIMAL                                                                                                                                                                   |
-| RabbitMQ         | RabbitMQ: Memory alarm                                                                         | <p>Does the host has memory alarm</p>                                                                                                                                                                                                                                                | DEPENDENT  | rabbitmq.node.mem_alarm<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_alarm`</p><p>- BOOL_TO_DECIMAL                                                                                                                                                               |
-| RabbitMQ         | RabbitMQ: Disk free alarm                                                                      | <p>Does the node have disk alarm</p>                                                                                                                                                                                                                                                 | DEPENDENT  | rabbitmq.node.disk_free_alarm<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free_alarm`</p><p>- BOOL_TO_DECIMAL                                                                                                                                                   |
-| RabbitMQ         | RabbitMQ: Uptime                                                                               | <p>Uptime in milliseconds</p>                                                                                                                                                                                                                                                        | DEPENDENT  | rabbitmq.node.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p><p>- MULTIPLIER: `0.001`</p>                                                                                                                                                             |
-| RabbitMQ         | RabbitMQ: Service ping                                                                         | <p>-</p>                                                                                                                                                                                                                                                                             | SIMPLE     | net.tcp.service[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                                                                     |
-| RabbitMQ         | RabbitMQ: Service response time                                                                | <p>-</p>                                                                                                                                                                                                                                                                             | SIMPLE     | net.tcp.service.perf[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"]                                                                                                                                                                                                    |
-| RabbitMQ         | RabbitMQ: Healthcheck: local alarms in effect on the this node{#SINGLETON}                     | <p>Responds a 200 OK if there are no local alarms in effect on the target node, otherwise responds with a 503 Service Unavailable.</p>                                                                                                                                               | HTTP_AGENT | rabbitmq.healthcheck.local_alarms[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>           |
-| RabbitMQ         | RabbitMQ: Healthcheck: expiration date on the certificates{#SINGLETON}                         | <p>Checks the expiration date on the certificates for every listener configured to use TLS. Responds a 200 OK if all certificates are valid (have not expired), otherwise responds with a 503 Service Unavailable.</p>                                                               | HTTP_AGENT | rabbitmq.healthcheck.certificate_expiration[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-| RabbitMQ         | RabbitMQ: Healthcheck: virtual hosts on the this node{#SINGLETON}                              | <p>Responds a 200 OK if all virtual hosts and running on the target node, otherwise responds with a 503 Service Unavailable.</p>                                                                                                                                                     | HTTP_AGENT | rabbitmq.healthcheck.virtual_hosts[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>          |
-| RabbitMQ         | RabbitMQ: Healthcheck: classic mirrored queues without synchronised mirrors online{#SINGLETON} | <p>Checks if there are classic mirrored queues without synchronised mirrors online (queues that would potentially lose data if the target node is shut down). Responds a 200 OK if there are no such classic mirrored queues, otherwise responds with a 503 Service Unavailable.</p> | HTTP_AGENT | rabbitmq.healthcheck.mirror_sync[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>            |
-| RabbitMQ         | RabbitMQ: Healthcheck: queues with minimum online quorum{#SINGLETON}                           | <p>Checks if there are quorum queues with minimum online quorum (queues that would lose their quorum and availability if the target node is shut down). Responds a 200 OK if there are no such quorum queues, otherwise responds with a 503 Service Unavailable.</p>                 | HTTP_AGENT | rabbitmq.healthcheck.quorum[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>                 |
-| RabbitMQ         | RabbitMQ: Healthcheck{#SINGLETON}                                                              | <p>Runs basic healthchecks in the current node. Checks that the rabbit application is running, channels and queues can be listed successfully, and that no alarms are in effect.</p>                                                                                                 | HTTP_AGENT | rabbitmq.healthcheck[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.status`</p><p>- BOOL_TO_DECIMAL                                                                                                                                                       |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages                                                    | <p>Count of the total messages in the queue</p>                                                                                                                                                                                                                                      | DEPENDENT  | rabbitmq.queue.messages["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages.first()`</p>                                                                                                     |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages per second                                         | <p>Count per second of the total messages in the queue</p>                                                                                                                                                                                                                           | DEPENDENT  | rabbitmq.queue.messages.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_details.rate.first()`</p>                                                                                   |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Consumers                                                   | <p>Number of consumers</p>                                                                                                                                                                                                                                                           | DEPENDENT  | rabbitmq.queue.consumers["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].consumers.first()`</p>                                                                                                   |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Memory                                                      | <p>Bytes of memory consumed by the Erlang process associated with the queue, including stack, heap and internal structures</p>                                                                                                                                                       | DEPENDENT  | rabbitmq.queue.memory["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].memory.first()`</p>                                                                                                         |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready                                              | <p>Number of messages ready to be delivered to clients</p>                                                                                                                                                                                                                           | DEPENDENT  | rabbitmq.queue.messages_ready["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_ready.first()`</p>                                                                                         |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready per second                                   | <p>Number per second of messages ready to be delivered to clients</p>                                                                                                                                                                                                                | DEPENDENT  | rabbitmq.queue.messages_ready.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_ready_details.rate.first()`</p>                                                                       |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged                                     | <p>Number of messages delivered to clients but not yet acknowledged</p>                                                                                                                                                                                                              | DEPENDENT  | rabbitmq.queue.messages_unacknowledged["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_unacknowledged.first()`</p>                                                                       |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged per second                          | <p>Number per second of messages delivered to clients but not yet acknowledged</p>                                                                                                                                                                                                   | DEPENDENT  | rabbitmq.queue.messages_unacknowledged.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_unacknowledged_details.rate.first()`</p>                                                     |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged                                       | <p>Number of messages delivered to clients and acknowledged</p>                                                                                                                                                                                                                      | DEPENDENT  | rabbitmq.queue.messages.ack["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.ack.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                   |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged per second                            | <p>Number per second of messages delivered to clients and acknowledged</p>                                                                                                                                                                                                           | DEPENDENT  | rabbitmq.queue.messages.ack.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.ack_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                 |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered                                          | <p>Count of messages delivered in acknowledgement mode to consumers</p>                                                                                                                                                                                                              | DEPENDENT  | rabbitmq.queue.messages.deliver["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                           |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second                               | <p>Count of messages delivered in acknowledgement mode to consumers</p>                                                                                                                                                                                                              | DEPENDENT  | rabbitmq.queue.messages.deliver.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                         |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered                                          | <p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p>                                                            | DEPENDENT  | rabbitmq.queue.messages.deliver_get["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_get.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                   |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second                               | <p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p>                                     | DEPENDENT  | rabbitmq.queue.messages.deliver_get.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_get_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                 |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published                                          | <p>Count of messages published</p>                                                                                                                                                                                                                                                   | DEPENDENT  | rabbitmq.queue.messages.publish["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.publish.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                           |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published per second                               | <p>Rate per second of messages published</p>                                                                                                                                                                                                                                         | DEPENDENT  | rabbitmq.queue.messages.publish.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.publish_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                         |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered                                        | <p>Count of subset of messages in deliver_get which had the redelivered flag set</p>                                                                                                                                                                                                 | DEPENDENT  | rabbitmq.queue.messages.redeliver["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.redeliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                       |
-| RabbitMQ         | RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered per second                             | <p>Rate per second of subset of messages in deliver_get which had the redelivered flag set</p>                                                                                                                                                                                       | DEPENDENT  | rabbitmq.queue.messages.redeliver.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.redeliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                     |
-| Zabbix_raw_items | RabbitMQ: Get node overview                                                                    | <p>The HTTP API endpoint that returns cluster-wide metrics</p>                                                                                                                                                                                                                       | HTTP_AGENT | rabbitmq.get_node_overview                                                                                                                                                                                                                                         |
-| Zabbix_raw_items | RabbitMQ: Get nodes                                                                            | <p>The HTTP API endpoint that returns nodes metrics</p>                                                                                                                                                                                                                              | HTTP_AGENT | rabbitmq.get_nodes                                                                                                                                                                                                                                                 |
-| Zabbix_raw_items | RabbitMQ: Get queues                                                                           | <p>The HTTP API endpoint that returns queues metrics</p>                                                                                                                                                                                                                             | HTTP_AGENT | rabbitmq.get_queues                                                                                                                                                                                                                                                |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|RabbitMQ |RabbitMQ: Management plugin version |<p>Version of the management plugin in use</p> |DEPENDENT |rabbitmq.node.overview.management_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.management_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|RabbitMQ |RabbitMQ: RabbitMQ version |<p>Version of RabbitMQ on the node which processed this request</p> |DEPENDENT |rabbitmq.node.overview.rabbitmq_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.rabbitmq_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|RabbitMQ |RabbitMQ: Used file descriptors |<p>Used file descriptors</p> |DEPENDENT |rabbitmq.node.fd_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.fd_used`</p> |
+|RabbitMQ |RabbitMQ: Free disk space |<p>Current free disk space</p> |DEPENDENT |rabbitmq.node.disk_free<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free`</p> |
+|RabbitMQ |RabbitMQ: Disk free limit |<p>Disk free space limit in bytes</p> |DEPENDENT |rabbitmq.node.disk_free_limit<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free_limit`</p> |
+|RabbitMQ |RabbitMQ: Memory used |<p>Memory used in bytes</p> |DEPENDENT |rabbitmq.node.mem_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_used`</p> |
+|RabbitMQ |RabbitMQ: Memory limit |<p>Memory usage high watermark in bytes</p> |DEPENDENT |rabbitmq.node.mem_limit<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_limit`</p> |
+|RabbitMQ |RabbitMQ: Runtime run queue |<p>Average number of Erlang processes waiting to run</p> |DEPENDENT |rabbitmq.node.run_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.run_queue`</p> |
+|RabbitMQ |RabbitMQ: Sockets used |<p>Number of file descriptors used as sockets</p> |DEPENDENT |rabbitmq.node.sockets_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.sockets_used`</p> |
+|RabbitMQ |RabbitMQ: Sockets available |<p>File descriptors available for use as sockets</p> |DEPENDENT |rabbitmq.node.sockets_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.sockets_total`</p> |
+|RabbitMQ |RabbitMQ: Number of network partitions |<p>Number of network partitions this node is seeing</p> |DEPENDENT |rabbitmq.node.partitions<p>**Preprocessing**:</p><p>- JSONPATH: `$.partitions`</p><p>- JAVASCRIPT: `return JSON.parse(value).length;`</p> |
+|RabbitMQ |RabbitMQ: Is running |<p>Is the node running or not</p> |DEPENDENT |rabbitmq.node.running<p>**Preprocessing**:</p><p>- JSONPATH: `$.running`</p><p>- BOOL_TO_DECIMAL</p> |
+|RabbitMQ |RabbitMQ: Memory alarm |<p>Does the host has memory alarm</p> |DEPENDENT |rabbitmq.node.mem_alarm<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem_alarm`</p><p>- BOOL_TO_DECIMAL</p> |
+|RabbitMQ |RabbitMQ: Disk free alarm |<p>Does the node have disk alarm</p> |DEPENDENT |rabbitmq.node.disk_free_alarm<p>**Preprocessing**:</p><p>- JSONPATH: `$.disk_free_alarm`</p><p>- BOOL_TO_DECIMAL</p> |
+|RabbitMQ |RabbitMQ: Uptime |<p>Uptime in milliseconds</p> |DEPENDENT |rabbitmq.node.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p><p>- MULTIPLIER: `0.001`</p> |
+|RabbitMQ |RabbitMQ: Service ping |<p>-</p> |SIMPLE |net.tcp.service[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|RabbitMQ |RabbitMQ: Service response time |<p>-</p> |SIMPLE |net.tcp.service.perf[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"] |
+|RabbitMQ |RabbitMQ: Healthcheck: local alarms in effect on the this node{#SINGLETON} |<p>Responds a 200 OK if there are no local alarms in effect on the target node, otherwise responds with a 503 Service Unavailable.</p> |HTTP_AGENT |rabbitmq.healthcheck.local_alarms[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: expiration date on the certificates{#SINGLETON} |<p>Checks the expiration date on the certificates for every listener configured to use TLS. Responds a 200 OK if all certificates are valid (have not expired), otherwise responds with a 503 Service Unavailable.</p> |HTTP_AGENT |rabbitmq.healthcheck.certificate_expiration[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: virtual hosts on the this node{#SINGLETON} |<p>Responds a 200 OK if all virtual hosts and running on the target node, otherwise responds with a 503 Service Unavailable.</p> |HTTP_AGENT |rabbitmq.healthcheck.virtual_hosts[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: classic mirrored queues without synchronized mirrors online{#SINGLETON} |<p>Checks if there are classic mirrored queues without synchronized mirrors online (queues that would potentially lose data if the target node is shut down). Responds a 200 OK if there are no such classic mirrored queues, otherwise responds with a 503 Service Unavailable.</p> |HTTP_AGENT |rabbitmq.healthcheck.mirror_sync[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck: queues with minimum online quorum{#SINGLETON} |<p>Checks if there are quorum queues with minimum online quorum (queues that would lose their quorum and availability if the target node is shut down). Responds a 200 OK if there are no such quorum queues, otherwise responds with a 503 Service Unavailable.</p> |HTTP_AGENT |rabbitmq.healthcheck.quorum[{#SINGLETON}]<p>**Preprocessing**:</p><p>- REGEX: `HTTP\/1\.1\b\s(\d+) \1`</p><p>- JAVASCRIPT: `switch(value){  case '200': return 1  case '503': return 0  default: 2}`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|RabbitMQ |RabbitMQ: Healthcheck{#SINGLETON} |<p>Runs basic healthchecks in the current node. Checks that the rabbit application is running, channels and queues can be listed successfully, and that no alarms are in effect.</p> |HTTP_AGENT |rabbitmq.healthcheck[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.status`</p><p>- BOOL_TO_DECIMAL</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages |<p>Count of the total messages in the queue</p> |DEPENDENT |rabbitmq.queue.messages["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages per second |<p>Count per second of the total messages in the queue</p> |DEPENDENT |rabbitmq.queue.messages.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_details.rate.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Consumers |<p>Number of consumers</p> |DEPENDENT |rabbitmq.queue.consumers["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].consumers.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Memory |<p>Bytes of memory consumed by the Erlang process associated with the queue, including stack, heap and internal structures</p> |DEPENDENT |rabbitmq.queue.memory["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].memory.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready |<p>Number of messages ready to be delivered to clients</p> |DEPENDENT |rabbitmq.queue.messages_ready["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_ready.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready per second |<p>Number per second of messages ready to be delivered to clients</p> |DEPENDENT |rabbitmq.queue.messages_ready.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_ready_details.rate.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged |<p>Number of messages delivered to clients but not yet acknowledged</p> |DEPENDENT |rabbitmq.queue.messages_unacknowledged["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_unacknowledged.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged per second |<p>Number per second of messages delivered to clients but not yet acknowledged</p> |DEPENDENT |rabbitmq.queue.messages_unacknowledged.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].messages_unacknowledged_details.rate.first()`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged |<p>Number of messages delivered to clients and acknowledged</p> |DEPENDENT |rabbitmq.queue.messages.ack["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.ack.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged per second |<p>Number per second of messages delivered to clients and acknowledged</p> |DEPENDENT |rabbitmq.queue.messages.ack.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.ack_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered |<p>Count of messages delivered in acknowledgement mode to consumers</p> |DEPENDENT |rabbitmq.queue.messages.deliver["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second |<p>Count of messages delivered in acknowledgement mode to consumers</p> |DEPENDENT |rabbitmq.queue.messages.deliver.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered |<p>Sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.queue.messages.deliver_get["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_get.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second |<p>Rate per second of the sum of messages delivered in acknowledgement mode to consumers, in no-acknowledgement mode to consumers, in acknowledgement mode in response to basic.get, and in no-acknowledgement mode in response to basic.get</p> |DEPENDENT |rabbitmq.queue.messages.deliver_get.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.deliver_get_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published |<p>Count of messages published</p> |DEPENDENT |rabbitmq.queue.messages.publish["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.publish.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published per second |<p>Rate per second of messages published</p> |DEPENDENT |rabbitmq.queue.messages.publish.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.publish_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered |<p>Count of subset of messages in deliver_get which had the redelivered flag set</p> |DEPENDENT |rabbitmq.queue.messages.redeliver["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.redeliver.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|RabbitMQ |RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered per second |<p>Rate per second of subset of messages in deliver_get which had the redelivered flag set</p> |DEPENDENT |rabbitmq.queue.messages.redeliver.rate["{#VHOST}/{#QUEUE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#QUEUE}" && @.vhost == "{#VHOST}")].message_stats.redeliver_details.rate.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|Zabbix_raw_items |RabbitMQ: Get node overview |<p>The HTTP API endpoint that returns cluster-wide metrics</p> |HTTP_AGENT |rabbitmq.get_node_overview |
+|Zabbix_raw_items |RabbitMQ: Get nodes |<p>The HTTP API endpoint that returns nodes metrics</p> |HTTP_AGENT |rabbitmq.get_nodes |
+|Zabbix_raw_items |RabbitMQ: Get queues |<p>The HTTP API endpoint that returns queues metrics</p> |HTTP_AGENT |rabbitmq.get_queues |
 
 ## Triggers
 
-| Name                                                                                                    | Description                                                            | Expression                                                                                                                                | Severity | Dependencies and additional info                                                 |
-|---------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------------------------------------------------------|
-| RabbitMQ: Version has changed (new version: {ITEM.VALUE})                                               | <p>RabbitMQ version has changed. Ack to close.</p>                     | `{TEMPLATE_NAME:rabbitmq.node.overview.rabbitmq_version.diff()}=1 and {TEMPLATE_NAME:rabbitmq.node.overview.rabbitmq_version.strlen()}>0` | INFO     | <p>Manual close: YES</p>                                                         |
-| RabbitMQ: Number of network partitions is too high (more than 0 for 5m)                                 | <p>https://www.rabbitmq.com/partitions.html#detecting</p>              | `{TEMPLATE_NAME:rabbitmq.node.partitions.min(5m)}>0`                                                                                      | WARNING  |                                                                                  |
-| RabbitMQ: Node is not running                                                                           | <p>RabbitMQ node is not running</p>                                    | `{TEMPLATE_NAME:rabbitmq.node.running.max(5m)}=0`                                                                                         | AVERAGE  | <p>**Depends on**:</p><p>- RabbitMQ: Service is down</p>                         |
-| RabbitMQ: Memory alarm (Memory usage threshold has been reached)                                        | <p>https://www.rabbitmq.com/memory.html</p>                            | `{TEMPLATE_NAME:rabbitmq.node.mem_alarm.last()}=1`                                                                                        | AVERAGE  |                                                                                  |
-| RabbitMQ: Free disk space alarm (Free space threshold has been reached)                                 | <p>https://www.rabbitmq.com/disk-alarms.html</p>                       | `{TEMPLATE_NAME:rabbitmq.node.disk_free_alarm.last()}=1`                                                                                  | AVERAGE  |                                                                                  |
-| RabbitMQ: has been restarted (uptime < 10m)                                                             | <p>Uptime is less than 10 minutes</p>                                  | `{TEMPLATE_NAME:rabbitmq.node.uptime.last()}<10m`                                                                                         | INFO     | <p>Manual close: YES</p>                                                         |
-| RabbitMQ: Service is down                                                                               | <p>-</p>                                                               | `{TEMPLATE_NAME:net.tcp.service[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"].last()}=0`                                                     | AVERAGE  | <p>Manual close: YES</p>                                                         |
-| RabbitMQ: Service response time is too high (over {$RABBITMQ.RESPONSE_TIME.MAX.WARN}s for 5m)           | <p>-</p>                                                               | `{TEMPLATE_NAME:net.tcp.service.perf[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"].min(5m)}>{$RABBITMQ.RESPONSE_TIME.MAX.WARN}`              | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Service is down</p> |
-| RabbitMQ: There are active alarms in the node                                                           | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:rabbitmq.healthcheck.local_alarms[{#SINGLETON}].last()}=503`                                                              | AVERAGE  |                                                                                  |
-| RabbitMQ: There are valid TLS certificates expiring in the next month                                   | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:rabbitmq.healthcheck.certificate_expiration[{#SINGLETON}].last()}=503`                                                    | AVERAGE  |                                                                                  |
-| RabbitMQ: There are not running virtual hosts                                                           | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:rabbitmq.healthcheck.virtual_hosts[{#SINGLETON}].last()}=503`                                                             | AVERAGE  |                                                                                  |
-| RabbitMQ: There are queues that could potentially lose data if the this node goes offline.              | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:rabbitmq.healthcheck.mirror_sync[{#SINGLETON}].last()}=503`                                                               | AVERAGE  |                                                                                  |
-| RabbitMQ: There are queues that would lose their quorum and availability if the this node is shut down. | <p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p>          | `{TEMPLATE_NAME:rabbitmq.healthcheck.quorum[{#SINGLETON}].last()}=503`                                                                    | AVERAGE  |                                                                                  |
-| RabbitMQ: Node healthcheck failed                                                                       | <p>https://www.rabbitmq.com/monitoring.html#health-checks</p>          | `{TEMPLATE_NAME:rabbitmq.healthcheck[{#SINGLETON}].last()}=0`                                                                             | AVERAGE  |                                                                                  |
-| RabbitMQ: Too many messages in queue (over {$RABBITMQ.MESSAGES.MAX.WARN} for 5m)                        | <p>-</p>                                                               | `{TEMPLATE_NAME:rabbitmq.queue.messages["{#VHOST}/{#QUEUE}"].min(5m)}>{$RABBITMQ.MESSAGES.MAX.WARN:"{#QUEUE}"}`                           | WARNING  |                                                                                  |
-| RabbitMQ: Failed to fetch nodes data (or no data for 30m)                                               | <p>Zabbix has not received data for items for the last 30 minutes.</p> | `{TEMPLATE_NAME:rabbitmq.get_nodes.nodata(30m)}=1`                                                                                        | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Service is down</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|RabbitMQ: Version has changed (new version: {ITEM.VALUE}) |<p>RabbitMQ version has changed. Ack to close.</p> |`last(/RabbitMQ node by HTTP/rabbitmq.node.overview.rabbitmq_version,#1)<>last(/RabbitMQ node by HTTP/rabbitmq.node.overview.rabbitmq_version,#2) and length(last(/RabbitMQ node by HTTP/rabbitmq.node.overview.rabbitmq_version))>0` |INFO |<p>Manual close: YES</p> |
+|RabbitMQ: Number of network partitions is too high (more than 0 for 5m) |<p>https://www.rabbitmq.com/partitions.html#detecting</p> |`min(/RabbitMQ node by HTTP/rabbitmq.node.partitions,5m)>0` |WARNING | |
+|RabbitMQ: Node is not running |<p>RabbitMQ node is not running</p> |`max(/RabbitMQ node by HTTP/rabbitmq.node.running,5m)=0` |AVERAGE |<p>**Depends on**:</p><p>- RabbitMQ: Service is down</p> |
+|RabbitMQ: Memory alarm (Memory usage threshold has been reached) |<p>https://www.rabbitmq.com/memory.html</p> |`last(/RabbitMQ node by HTTP/rabbitmq.node.mem_alarm)=1` |AVERAGE | |
+|RabbitMQ: Free disk space alarm (Free space threshold has been reached) |<p>https://www.rabbitmq.com/disk-alarms.html</p> |`last(/RabbitMQ node by HTTP/rabbitmq.node.disk_free_alarm)=1` |AVERAGE | |
+|RabbitMQ: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/RabbitMQ node by HTTP/rabbitmq.node.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|RabbitMQ: Service is down |<p>-</p> |`last(/RabbitMQ node by HTTP/net.tcp.service[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|RabbitMQ: Service response time is too high (over {$RABBITMQ.RESPONSE_TIME.MAX.WARN}s for 5m) |<p>-</p> |`min(/RabbitMQ node by HTTP/net.tcp.service.perf[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"],5m)>{$RABBITMQ.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Service is down</p> |
+|RabbitMQ: There are active alarms in the node |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by HTTP/rabbitmq.healthcheck.local_alarms[{#SINGLETON}])=0` |AVERAGE | |
+|RabbitMQ: There are valid TLS certificates expiring in the next month |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by HTTP/rabbitmq.healthcheck.certificate_expiration[{#SINGLETON}])=0` |AVERAGE | |
+|RabbitMQ: There are not running virtual hosts |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by HTTP/rabbitmq.healthcheck.virtual_hosts[{#SINGLETON}])=0` |AVERAGE | |
+|RabbitMQ: There are queues that could potentially lose data if the this node goes offline. |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by HTTP/rabbitmq.healthcheck.mirror_sync[{#SINGLETON}])=0` |AVERAGE | |
+|RabbitMQ: There are queues that would lose their quorum and availability if the this node is shut down. |<p>http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html</p> |`last(/RabbitMQ node by HTTP/rabbitmq.healthcheck.quorum[{#SINGLETON}])=0` |AVERAGE | |
+|RabbitMQ: Node healthcheck failed |<p>https://www.rabbitmq.com/monitoring.html#health-checks</p> |`last(/RabbitMQ node by HTTP/rabbitmq.healthcheck[{#SINGLETON}])=0` |AVERAGE | |
+|RabbitMQ: Too many messages in queue (over {$RABBITMQ.MESSAGES.MAX.WARN} for 5m) |<p>-</p> |`min(/RabbitMQ node by HTTP/rabbitmq.queue.messages["{#VHOST}/{#QUEUE}"],5m)>{$RABBITMQ.MESSAGES.MAX.WARN:"{#QUEUE}"}` |WARNING | |
+|RabbitMQ: Failed to fetch nodes data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/RabbitMQ node by HTTP/rabbitmq.get_nodes,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- RabbitMQ: Service is down</p> |
 
 ## Feedback
 
diff --git a/templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml b/templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml
index 3a148a7f0f3..7d29f2b4b7f 100644
--- a/templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml
+++ b/templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:17Z'
+  version: '6.0'
+  date: '2022-01-10T07:40:06Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -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/387226-discussion-thread-for-official-zabbix-template-rabbitmq
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -1001,7 +1001,7 @@ zabbix_export:
                 - |
                   var rabbit_version = parseInt(value.split('.')[0]) * 10000 +
                                        parseInt(value.split('.')[1]) * 100 +
-                                       parseInt(value.split('.')[2]) 
+                                       parseInt(value.split('.')[2])
                   return JSON.stringify(rabbit_version >= 30810 ? [{'{#SINGLETON}': ''}] : []);
       macros:
         -
@@ -1136,7 +1136,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387226-discussion-thread-for-official-zabbix-template-rabbitmq
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -1690,7 +1690,7 @@ zabbix_export:
                 - |
                   var rabbit_version = parseInt(value.split('.')[0]) * 10000 +
                                        parseInt(value.split('.')[1]) * 100 +
-                                       parseInt(value.split('.')[2]) 
+                                       parseInt(value.split('.')[2])
                   return JSON.stringify(rabbit_version < 30810 ? [{'{#SINGLETON}': ''}] : []);
         -
           uuid: ab89d103c015400fbbeecaaf9bf01400
@@ -1792,14 +1792,14 @@ zabbix_export:
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
             -
               uuid: 9867c266760a48d981caa1f34f2c3238
-              name: 'RabbitMQ: Healthcheck: classic mirrored queues without synchronised mirrors online{#SINGLETON}'
+              name: 'RabbitMQ: Healthcheck: classic mirrored queues without synchronized mirrors online{#SINGLETON}'
               type: HTTP_AGENT
               key: 'rabbitmq.healthcheck.mirror_sync[{#SINGLETON}]'
               history: 7d
               authtype: BASIC
               username: '{$RABBITMQ.API.USER}'
               password: '{$RABBITMQ.API.PASSWORD}'
-              description: 'Checks if there are classic mirrored queues without synchronised mirrors online (queues that would potentially lose data if the target node is shut down). Responds a 200 OK if there are no such classic mirrored queues, otherwise responds with a 503 Service Unavailable.'
+              description: 'Checks if there are classic mirrored queues without synchronized mirrors online (queues that would potentially lose data if the target node is shut down). Responds a 200 OK if there are no such classic mirrored queues, otherwise responds with a 503 Service Unavailable.'
               valuemap:
                 name: 'RabbitMQ healthcheck'
               preprocessing:
@@ -1938,7 +1938,7 @@ zabbix_export:
                 - |
                   var rabbit_version = parseInt(value.split('.')[0]) * 10000 +
                                        parseInt(value.split('.')[1]) * 100 +
-                                       parseInt(value.split('.')[2]) 
+                                       parseInt(value.split('.')[2])
                   return JSON.stringify(rabbit_version >= 30810 ? [{'{#SINGLETON}': ''}] : []);
         -
           uuid: cc1d85b6045b44b38f588cd9a4c6c62d
diff --git a/templates/app/sharepoint_http/README.md b/templates/app/sharepoint_http/README.md
index a014f1191d5..437ffa2e0bb 100644
--- a/templates/app/sharepoint_http/README.md
+++ b/templates/app/sharepoint_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 SharePoint includes a Representational State Transfer (REST) service. Developers can perform read operations from their SharePoint Add-ins, solutions, and client applications, using REST web technologies and standard Open Data Protocol (OData) syntax. Details in
 https://docs.microsoft.com/ru-ru/sharepoint/dev/sp-add-ins/get-to-know-the-sharepoint-rest-service?tabs=csom
 
@@ -16,7 +16,7 @@ This template was tested on:
 
 > See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/http) for basic instructions.
 
-Create a new host. 
+Create a new host.
 Define macros according to your Sharepoint web portal.
 It is recommended to fill in the values of the filter macros to avoid getting redundant data.
 
@@ -30,12 +30,12 @@ No specific Zabbix configuration is required.
 |Name|Description|Default|
 |----|-----------|-------|
 |{$SHAREPOINT.GET_INTERVAL} |<p>-</p> |`1m` |
-|{$SHAREPOINT.LLD.FILTER.FULL_PATH.MATCHES} |<p>Filter of discoverable dictionaries by full path</p> |`^/` |
-|{$SHAREPOINT.LLD.FILTER.FULL_PATH.NOT_MATCHES} |<p>Filter to exclude discovered dictionaries by full path</p> |`CHANGE_IF_NEEDED` |
-|{$SHAREPOINT.LLD.FILTER.NAME.MATCHES} |<p>Filter of discoverable dictionaries by name</p> |`.*` |
-|{$SHAREPOINT.LLD.FILTER.NAME.NOT_MATCHES} |<p>Filter to exclude discovered dictionaries by name</p> |`CHANGE_IF_NEEDED` |
+|{$SHAREPOINT.LLD.FILTER.FULL_PATH.MATCHES} |<p>Filter of discoverable dictionaries by full path.</p> |`^/` |
+|{$SHAREPOINT.LLD.FILTER.FULL_PATH.NOT_MATCHES} |<p>Filter to exclude discovered dictionaries by full path.</p> |`CHANGE_IF_NEEDED` |
+|{$SHAREPOINT.LLD.FILTER.NAME.MATCHES} |<p>Filter of discoverable dictionaries by name.</p> |`.*` |
+|{$SHAREPOINT.LLD.FILTER.NAME.NOT_MATCHES} |<p>Filter to exclude discovered dictionaries by name.</p> |`CHANGE_IF_NEEDED` |
 |{$SHAREPOINT.LLD.FILTER.TYPE.MATCHES} |<p>Filter of discoverable types.</p> |`FOLDER` |
-|{$SHAREPOINT.LLD.FILTER.TYPE.NOT_MATCHES} |<p>Filter to exclude discovered types</p> |`CHANGE_IF_NEEDED` |
+|{$SHAREPOINT.LLD.FILTER.TYPE.NOT_MATCHES} |<p>Filter to exclude discovered types.</p> |`CHANGE_IF_NEEDED` |
 |{$SHAREPOINT.LLD_INTERVAL} |<p>-</p> |`3h` |
 |{$SHAREPOINT.MAX_HEALT_SCORE} |<p>Must be in the range from 0 to 10</p><p>in details: https://docs.microsoft.com/en-us/openspecs/sharepoint_protocols/ms-wsshp/c60ddeb6-4113-4a73-9e97-26b5c3907d33</p> |`5` |
 |{$SHAREPOINT.PASSWORD} |<p>-</p> |`` |
@@ -51,7 +51,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Directory discovery |<p>-</p> |SCRIPT |sharepoint.directory.discovery<p>**Filter**:</p>AND <p>- A: {#SHAREPOINT.LLD.NAME} MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.NAME.MATCHES}`</p><p>- B: {#SHAREPOINT.LLD.NAME} NOT_MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.NAME.NOT_MATCHES}`</p><p>- C: {#SHAREPOINT.LLD.FULL_PATH} MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.FULL_PATH.MATCHES}`</p><p>- C: {#SHAREPOINT.LLD.FULL_PATH} NOT_MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.FULL_PATH.NOT_MATCHES}`</p><p>- E: {#SHAREPOINT.LLD.TYPE} MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.TYPE.MATCHES}`</p><p>- F: {#SHAREPOINT.LLD.TYPE} NOT_MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.TYPE.NOT_MATCHES}`</p> |
+|Directory discovery |<p>-</p> |SCRIPT |sharepoint.directory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#SHAREPOINT.LLD.NAME} MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.NAME.MATCHES}`</p><p>- {#SHAREPOINT.LLD.NAME} NOT_MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.NAME.NOT_MATCHES}`</p><p>- {#SHAREPOINT.LLD.FULL_PATH} MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.FULL_PATH.MATCHES}`</p><p>- {#SHAREPOINT.LLD.FULL_PATH} NOT_MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.FULL_PATH.NOT_MATCHES}`</p><p>- {#SHAREPOINT.LLD.TYPE} MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.TYPE.MATCHES}`</p><p>- {#SHAREPOINT.LLD.TYPE} NOT_MATCHES_REGEX `{$SHAREPOINT.LLD.FILTER.TYPE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -60,19 +60,19 @@ There are no template links in this template.
 |Sharepoint |Sharepoint: Get directory structure: Status |<p>HTTP response (status) code. Indicates whether the HTTP request was successfully completed. Additional information is available in the server log file.</p> |DEPENDENT |sharepoint.get_dir.status<p>**Preprocessing**:</p><p>- JSONPATH: `$.status`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> DISCARD_VALUE`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Sharepoint |Sharepoint: Get directory structure: Exec time |<p>The time taken to execute the script for obtaining the data structure (in ms). Less is better.</p> |DEPENDENT |sharepoint.get_dir.time<p>**Preprocessing**:</p><p>- JSONPATH: `$.time`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> DISCARD_VALUE`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Sharepoint |Sharepoint: Health score |<p>This item specifies a value between 0 and 10, where 0 represents a low load and a high ability to process requests and 10 represents a high load and that the server is throttling requests to maintain adequate throughput.</p> |HTTP_AGENT |sharepoint.health_score<p>**Preprocessing**:</p><p>- REGEX: `X-SharePointHealthScore\b:\s(\d+) \1`</p><p>- IN_RANGE: `0 10`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|Sharepoint |Sharepoint: Size ({#SHAREPOINT.LLD.FULL_PATH}) |<p>Size of:</p><p>{#SHAREPOINT.LLD.FULL_PATH}</p> |DEPENDENT |sharepoint.size["{#SHAREPOINT.LLD.FULL_PATH}"]<p>**Preprocessing**:</p><p>- JSONPATH: `{#SHAREPOINT.LLD.JSON_PATH}.regsub("(.*)", \1)}.meta.size`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `24h`</p> |
-|Sharepoint |Sharepoint: Modified ({#SHAREPOINT.LLD.FULL_PATH}) |<p>Date of change:</p><p>{#SHAREPOINT.LLD.FULL_PATH}</p> |DEPENDENT |sharepoint.modified["{#SHAREPOINT.LLD.FULL_PATH}"]<p>**Preprocessing**:</p><p>- JSONPATH: `{#SHAREPOINT.LLD.JSON_PATH}.regsub("(.*)", \1)}.meta.modified`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|Sharepoint |Sharepoint: Created ({#SHAREPOINT.LLD.FULL_PATH}) |<p>Date of creation:</p><p>{#SHAREPOINT.LLD.FULL_PATH}</p> |DEPENDENT |sharepoint.created["{#SHAREPOINT.LLD.FULL_PATH}"]<p>**Preprocessing**:</p><p>- JSONPATH: `{#SHAREPOINT.LLD.JSON_PATH}.regsub("(.*)", \1)}.meta.created`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|Zabbix_raw_items |Sharepoint: Get directory structure |<p>Used to get directory structure information</p> |SCRIPT |sharepoint.get_dir<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED: ``</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"status":520,"data":{},"time":0}`</p> |
+|Sharepoint |Sharepoint: Size ({#SHAREPOINT.LLD.FULL_PATH}) |<p>Size of:</p><p>{#SHAREPOINT.LLD.FULL_PATH}</p> |DEPENDENT |sharepoint.size["{#SHAREPOINT.LLD.FULL_PATH}"]<p>**Preprocessing**:</p><p>- JSONPATH: `{{#SHAREPOINT.LLD.JSON_PATH}.regsub("(.*)", \1)}.meta.size`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `24h`</p> |
+|Sharepoint |Sharepoint: Modified ({#SHAREPOINT.LLD.FULL_PATH}) |<p>Date of change:</p><p>{#SHAREPOINT.LLD.FULL_PATH}</p> |DEPENDENT |sharepoint.modified["{#SHAREPOINT.LLD.FULL_PATH}"]<p>**Preprocessing**:</p><p>- JSONPATH: `{{#SHAREPOINT.LLD.JSON_PATH}.regsub("(.*)", \1)}.meta.modified`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|Sharepoint |Sharepoint: Created ({#SHAREPOINT.LLD.FULL_PATH}) |<p>Date of creation:</p><p>{#SHAREPOINT.LLD.FULL_PATH}</p> |DEPENDENT |sharepoint.created["{#SHAREPOINT.LLD.FULL_PATH}"]<p>**Preprocessing**:</p><p>- JSONPATH: `{{#SHAREPOINT.LLD.JSON_PATH}.regsub("(.*)", \1)}.meta.created`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|Zabbix_raw_items |Sharepoint: Get directory structure |<p>Used to get directory structure information</p> |SCRIPT |sharepoint.get_dir<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"status":520,"data":{},"time":0}`</p><p>**Expression**:</p>`The text is too long. Please see the template.` |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Sharepoint: Error getting directory structure. |<p>Error getting directory structure. Check the Zabbix server log for more details.</p> |`{TEMPLATE_NAME:sharepoint.get_dir.status.last()}<>200 ` |WARNING | |
-|Sharepoint: Server responds slowly to API request |<p>-</p> |`{TEMPLATE_NAME:sharepoint.get_dir.time.last()}>2000 ` |WARNING | |
-|Sharepoint: Bad health score | |`{TEMPLATE_NAME:sharepoint.health_score.last()}>"{$SHAREPOINT.MAX_HEALT_SCORE}" ` |AVERAGE | |
-|Sharepoint: Sharepoint object is changed |<p>Updated date of modification of folder / file </p> |`{TEMPLATE_NAME:sharepoint.modified["{#SHAREPOINT.LLD.FULL_PATH}"].diff()}=1` |INFO |<p>Manual close: YES</p> |
+|Sharepoint: Error getting directory structure. |<p>Error getting directory structure. Check the Zabbix server log for more details.</p> |`last(/Microsoft SharePoint by HTTP/sharepoint.get_dir.status)<>200` |WARNING | |
+|Sharepoint: Server responds slowly to API request |<p>-</p> |`last(/Microsoft SharePoint by HTTP/sharepoint.get_dir.time)>2000` |WARNING | |
+|Sharepoint: Bad health score |<p>-</p> |`last(/Microsoft SharePoint by HTTP/sharepoint.health_score)>"{$SHAREPOINT.MAX_HEALT_SCORE}"` |AVERAGE | |
+|Sharepoint: Sharepoint object is changed |<p>Updated date of modification of folder / file </p> |`last(/Microsoft SharePoint by HTTP/sharepoint.modified["{#SHAREPOINT.LLD.FULL_PATH}"],#1)<>last(/Microsoft SharePoint by HTTP/sharepoint.modified["{#SHAREPOINT.LLD.FULL_PATH}"],#2)` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/app/sharepoint_http/template_app_sharepoint_http.yaml b/templates/app/sharepoint_http/template_app_sharepoint_http.yaml
index 63238551a89..07961ad462a 100644
--- a/templates/app/sharepoint_http/template_app_sharepoint_http.yaml
+++ b/templates/app/sharepoint_http/template_app_sharepoint_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:23Z'
+  version: '6.0'
+  date: '2021-12-15T07:20:29Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -14,9 +14,12 @@ zabbix_export:
         Overview:
         Template receives data via HTTP Agent.
         Setup:
-        Create a new host. 
+        Create a new host.
         Define macros according to your Sharepoint web portal.
         It is recommended to fill in the values of the filter macros to avoid getting redundant data.
+        
+        
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -138,9 +141,6 @@ zabbix_export:
               error_handler_params: '{"status":520,"data":{},"time":0}'
           parameters:
             -
-              name: root
-              value: '{$SHAREPOINT.ROOT}'
-            -
               name: password
               value: '{$SHAREPOINT.PASSWORD}'
             -
@@ -149,6 +149,9 @@ zabbix_export:
             -
               name: user
               value: '{$SHAREPOINT.USER}'
+            -
+              name: root
+              value: '{$SHAREPOINT.ROOT}'
           tags:
             -
               tag: Application
@@ -482,34 +485,36 @@ zabbix_export:
         -
           macro: '{$SHAREPOINT.LLD.FILTER.FULL_PATH.MATCHES}'
           value: ^/
-          description: 'Filter of discoverable dictionaries by full path'
+          description: 'Filter of discoverable dictionaries by full path.'
         -
           macro: '{$SHAREPOINT.LLD.FILTER.FULL_PATH.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
-          description: 'Filter to exclude discovered dictionaries by full path'
+          description: 'Filter to exclude discovered dictionaries by full path.'
         -
           macro: '{$SHAREPOINT.LLD.FILTER.NAME.MATCHES}'
           value: '.*'
-          description: 'Filter of discoverable dictionaries by name'
+          description: 'Filter of discoverable dictionaries by name.'
         -
           macro: '{$SHAREPOINT.LLD.FILTER.NAME.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
-          description: 'Filter to exclude discovered dictionaries by name'
+          description: 'Filter to exclude discovered dictionaries by name.'
         -
           macro: '{$SHAREPOINT.LLD.FILTER.TYPE.MATCHES}'
           value: FOLDER
-          description: 'Filter of discoverable types'
+          description: 'Filter of discoverable types.'
         -
           macro: '{$SHAREPOINT.LLD.FILTER.TYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
-          description: 'Filter to exclude discovered types'
+          description: 'Filter to exclude discovered types.'
         -
           macro: '{$SHAREPOINT.LLD_INTERVAL}'
           value: 3h
         -
           macro: '{$SHAREPOINT.MAX_HEALT_SCORE}'
           value: '5'
-          description: 'Must be in the range from 0 to 10 in details: https://docs.microsoft.com/en-us/openspecs/sharepoint_protocols/ms-wsshp/c60ddeb6-4113-4a73-9e97-26b5c3907d33'
+          description: |
+            Must be in the range from 0 to 10
+            in details: https://docs.microsoft.com/en-us/openspecs/sharepoint_protocols/ms-wsshp/c60ddeb6-4113-4a73-9e97-26b5c3907d33
         -
           macro: '{$SHAREPOINT.PASSWORD}'
           type: SECRET_TEXT
diff --git a/templates/app/squid_snmp/README.md b/templates/app/squid_snmp/README.md
index 7d668f882ec..60b6fb22e64 100644
--- a/templates/app/squid_snmp/README.md
+++ b/templates/app/squid_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 This template was tested on:
 
@@ -11,6 +11,8 @@ This template was tested on:
 
 ## Setup
 
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
 ### Setup Squid
 Enable SNMP support following [official documentation](https://wiki.squid-cache.org/Features/Snmp).
 Required parameters in squid.conf:
@@ -76,24 +78,24 @@ There are no template links in this template.
 |Squid |Squid: Request hit ratio per 1 minute |<p>Byte Hit Ratios</p> |SNMP |squid[cacheRequestHitRatio.1] |
 |Squid |Squid: Request hit ratio per 5 minutes |<p>Byte Hit Ratios</p> |SNMP |squid[cacheRequestHitRatio.5] |
 |Squid |Squid: Request hit ratio per 1 hour |<p>Byte Hit Ratios</p> |SNMP |squid[cacheRequestHitRatio.60] |
-|Squid |Squid: Sys page faults per second |<p>Page faults with physical I/O</p> |SNMP |squid[cacheSysPageFaults]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: HTTP requests received per second |<p>Number of HTTP requests received</p> |SNMP |squid[cacheProtoClientHttpRequests]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: HTTP traffic received per second |<p>Number of HTTP traffic received from clients</p> |SNMP |squid[cacheHttpInKb]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: HTTP traffic sent per second |<p>Number of HTTP traffic sent to clients</p> |SNMP |squid[cacheHttpOutKb]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: HTTP Hits sent from cache per second |<p>Number of HTTP Hits sent to clients from cache</p> |SNMP |squid[cacheHttpHits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: HTTP Errors sent per second |<p>Number of HTTP Errors sent to clients</p> |SNMP |squid[cacheHttpErrors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: ICP messages sent per second |<p>Number of ICP messages sent</p> |SNMP |squid[cacheIcpPktsSent]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: ICP messages received per second |<p>Number of ICP messages received</p> |SNMP |squid[cacheIcpPktsRecv]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: ICP traffic transmitted per second |<p>Number of ICP traffic transmitted</p> |SNMP |squid[cacheIcpKbSent]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: ICP traffic received per second |<p>Number of ICP traffic received</p> |SNMP |squid[cacheIcpKbRecv]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: DNS server requests per second |<p>Number of external dns server requests</p> |SNMP |squid[cacheDnsRequests]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: DNS server replies per second |<p>Number of external dns server replies</p> |SNMP |squid[cacheDnsReplies]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: FQDN cache requests per second |<p>Number of FQDN Cache requests</p> |SNMP |squid[cacheFqdnRequests]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: FQDN cache hits per second |<p>Number of FQDN Cache hits</p> |SNMP |squid[cacheFqdnHits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: FQDN cache misses per second |<p>Number of FQDN Cache misses</p> |SNMP |squid[cacheFqdnMisses]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: IP cache requests per second |<p>Number of IP Cache requests</p> |SNMP |squid[cacheIpRequests]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: IP cache hits per second |<p>Number of IP Cache hits</p> |SNMP |squid[cacheIpHits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Squid |Squid: IP cache misses per second |<p>Number of IP Cache misses</p> |SNMP |squid[cacheIpMisses]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Squid |Squid: Sys page faults per second |<p>Page faults with physical I/O</p> |SNMP |squid[cacheSysPageFaults]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: HTTP requests received per second |<p>Number of HTTP requests received</p> |SNMP |squid[cacheProtoClientHttpRequests]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: HTTP traffic received per second |<p>Number of HTTP traffic received from clients</p> |SNMP |squid[cacheHttpInKb]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: HTTP traffic sent per second |<p>Number of HTTP traffic sent to clients</p> |SNMP |squid[cacheHttpOutKb]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: HTTP Hits sent from cache per second |<p>Number of HTTP Hits sent to clients from cache</p> |SNMP |squid[cacheHttpHits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: HTTP Errors sent per second |<p>Number of HTTP Errors sent to clients</p> |SNMP |squid[cacheHttpErrors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: ICP messages sent per second |<p>Number of ICP messages sent</p> |SNMP |squid[cacheIcpPktsSent]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: ICP messages received per second |<p>Number of ICP messages received</p> |SNMP |squid[cacheIcpPktsRecv]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: ICP traffic transmitted per second |<p>Number of ICP traffic transmitted</p> |SNMP |squid[cacheIcpKbSent]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: ICP traffic received per second |<p>Number of ICP traffic received</p> |SNMP |squid[cacheIcpKbRecv]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: DNS server requests per second |<p>Number of external dns server requests</p> |SNMP |squid[cacheDnsRequests]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: DNS server replies per second |<p>Number of external dns server replies</p> |SNMP |squid[cacheDnsReplies]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: FQDN cache requests per second |<p>Number of FQDN Cache requests</p> |SNMP |squid[cacheFqdnRequests]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: FQDN cache hits per second |<p>Number of FQDN Cache hits</p> |SNMP |squid[cacheFqdnHits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: FQDN cache misses per second |<p>Number of FQDN Cache misses</p> |SNMP |squid[cacheFqdnMisses]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: IP cache requests per second |<p>Number of IP Cache requests</p> |SNMP |squid[cacheIpRequests]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: IP cache hits per second |<p>Number of IP Cache hits</p> |SNMP |squid[cacheIpHits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Squid |Squid: IP cache misses per second |<p>Number of IP Cache misses</p> |SNMP |squid[cacheIpMisses]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Squid |Squid: Objects count |<p>Number of objects stored by the cache</p> |SNMP |squid[cacheNumObjCount] |
 |Squid |Squid: Objects LRU expiration age |<p>Storage LRU Expiration Age</p> |SNMP |squid[cacheCurrentLRUExpiration]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Squid |Squid: Objects unlinkd requests |<p>Requests given to unlinkd</p> |SNMP |squid[cacheCurrentUnlinkRequests] |
@@ -114,13 +116,13 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Squid: Port {$SQUID.HTTP.PORT} is down |<p>-</p> |`{TEMPLATE_NAME:net.tcp.service[tcp,,{$SQUID.HTTP.PORT}].last()}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Squid: Squid has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:squid[cacheUptime].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Squid: Squid version has been changed |<p>Squid version has changed. Ack to close.</p> |`{TEMPLATE_NAME:squid[cacheVersionId].diff()}=1 and {TEMPLATE_NAME:squid[cacheVersionId].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Squid: Swap usage is more than low watermark (>{ITEM.VALUE2}%) |<p>-</p> |`{TEMPLATE_NAME:squid[cacheCurrentSwapSize].last()}>{Squid SNMP:squid[cacheSwapLowWM].last()}*{Squid SNMP:squid[cacheSwapMaxSize].last()}/100` |WARNING | |
-|Squid: Swap usage is more than high watermark (>{ITEM.VALUE2}%) |<p>-</p> |`{TEMPLATE_NAME:squid[cacheCurrentSwapSize].last()}>{Squid SNMP:squid[cacheSwapHighWM].last()}*{Squid SNMP:squid[cacheSwapMaxSize].last()}/100` |HIGH | |
-|Squid: Squid is running out of file descriptors (<{$SQUID.FILE.DESC.WARN.MIN}) |<p>-</p> |`{TEMPLATE_NAME:squid[cacheCurrentUnusedFDescrCnt].last()}<{$SQUID.FILE.DESC.WARN.MIN}` |WARNING | |
-|Squid: High sys page faults rate (>{$SQUID.PAGE.FAULT.WARN}% of received HTTP requests) |<p>-</p> |`{TEMPLATE_NAME:squid[cacheSysPageFaults].avg(5m)}>{Squid SNMP:squid[cacheProtoClientHttpRequests].avg(5m)}/100*{$SQUID.PAGE.FAULT.WARN}` |WARNING | |
+|Squid: Port {$SQUID.HTTP.PORT} is down |<p>-</p> |`last(/Squid SNMP/net.tcp.service[tcp,,{$SQUID.HTTP.PORT}])=0` |AVERAGE |<p>Manual close: YES</p> |
+|Squid: Squid has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Squid SNMP/squid[cacheUptime])<10m` |INFO |<p>Manual close: YES</p> |
+|Squid: Squid version has been changed |<p>Squid version has changed. Ack to close.</p> |`last(/Squid SNMP/squid[cacheVersionId],#1)<>last(/Squid SNMP/squid[cacheVersionId],#2) and length(last(/Squid SNMP/squid[cacheVersionId]))>0` |INFO |<p>Manual close: YES</p> |
+|Squid: Swap usage is more than low watermark (>{ITEM.VALUE2}%) |<p>-</p> |`last(/Squid SNMP/squid[cacheCurrentSwapSize])>last(/Squid SNMP/squid[cacheSwapLowWM])*last(/Squid SNMP/squid[cacheSwapMaxSize])/100` |WARNING | |
+|Squid: Swap usage is more than high watermark (>{ITEM.VALUE2}%) |<p>-</p> |`last(/Squid SNMP/squid[cacheCurrentSwapSize])>last(/Squid SNMP/squid[cacheSwapHighWM])*last(/Squid SNMP/squid[cacheSwapMaxSize])/100` |HIGH | |
+|Squid: Squid is running out of file descriptors (<{$SQUID.FILE.DESC.WARN.MIN}) |<p>-</p> |`last(/Squid SNMP/squid[cacheCurrentUnusedFDescrCnt])<{$SQUID.FILE.DESC.WARN.MIN}` |WARNING | |
+|Squid: High sys page faults rate (>{$SQUID.PAGE.FAULT.WARN}% of received HTTP requests) |<p>-</p> |`avg(/Squid SNMP/squid[cacheSysPageFaults],5m)>avg(/Squid SNMP/squid[cacheProtoClientHttpRequests],5m)/100*{$SQUID.PAGE.FAULT.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/squid_snmp/template_app_squid_snmp.yaml b/templates/app/squid_snmp/template_app_squid_snmp.yaml
index 7f53bf4510a..64e7eb075b5 100644
--- a/templates/app/squid_snmp/template_app_squid_snmp.yaml
+++ b/templates/app/squid_snmp/template_app_squid_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T06:57:07Z'
+  version: '6.0'
+  date: '2022-01-10T07:40:16Z'
   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/409339-discussion-thread-for-official-zabbix-template-squid
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -1051,7 +1051,7 @@ zabbix_export:
             key: 'squid[cacheDnsReplies]'
     -
       uuid: e301cc76e0ff4e22bc66a46b19230c33
-      name: 'Squid: Domain name (FQDN) cache ctatistics'
+      name: 'Squid: Domain name (FQDN) cache statistics'
       graph_items:
         -
           color: 1A7C11
diff --git a/templates/app/systemd/README.md b/templates/app/systemd/README.md
index c418530730e..5e7886f1272 100644
--- a/templates/app/systemd/README.md
+++ b/templates/app/systemd/README.md
@@ -52,8 +52,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Service units discovery |<p>Discover systemd service units and their details.</p> |ZABBIX_PASSIVE |systemd.unit.discovery[service]<p>**Filter**:</p>AND <p>- A: {#UNIT.ACTIVESTATE} MATCHES_REGEX `{$SYSTEMD.ACTIVESTATE.SERVICE.MATCHES}`</p><p>- B: {#UNIT.ACTIVESTATE} NOT_MATCHES_REGEX `{$SYSTEMD.ACTIVESTATE.SERVICE.NOT_MATCHES}`</p><p>- C: {#UNIT.UNITFILESTATE} MATCHES_REGEX `{$SYSTEMD.UNITFILESTATE.SERVICE.MATCHES}`</p><p>- D: {#UNIT.UNITFILESTATE} NOT_MATCHES_REGEX `{$SYSTEMD.UNITFILESTATE.SERVICE.NOT_MATCHES}`</p><p>- E: {#UNIT.NAME} NOT_MATCHES_REGEX `{$SYSTEMD.NAME.SERVICE.NOT_MATCHES}`</p><p>- F: {#UNIT.NAME} MATCHES_REGEX `{$SYSTEMD.NAME.SERVICE.MATCHES}`</p> |
-|Socket units discovery |<p>Discover systemd socket units and their details.</p> |ZABBIX_PASSIVE |systemd.unit.discovery[socket]<p>**Filter**:</p>AND <p>- A: {#UNIT.ACTIVESTATE} MATCHES_REGEX `{$SYSTEMD.ACTIVESTATE.SOCKET.MATCHES}`</p><p>- B: {#UNIT.ACTIVESTATE} NOT_MATCHES_REGEX `{$SYSTEMD.ACTIVESTATE.SOCKET.NOT_MATCHES}`</p><p>- C: {#UNIT.UNITFILESTATE} MATCHES_REGEX `{$SYSTEMD.UNITFILESTATE.SOCKET.MATCHES}`</p><p>- D: {#UNIT.UNITFILESTATE} NOT_MATCHES_REGEX `{$SYSTEMD.UNITFILESTATE.SOCKET.NOT_MATCHES}`</p><p>- E: {#UNIT.NAME} NOT_MATCHES_REGEX `{$SYSTEMD.NAME.SOCKET.NOT_MATCHES}`</p><p>- F: {#UNIT.NAME} MATCHES_REGEX `{$SYSTEMD.NAME.SOCKET.MATCHES}`</p> |
+|Service units discovery |<p>Discover systemd service units and their details.</p> |ZABBIX_PASSIVE |systemd.unit.discovery[service]<p>**Filter**:</p>AND <p>- {#UNIT.ACTIVESTATE} MATCHES_REGEX `{$SYSTEMD.ACTIVESTATE.SERVICE.MATCHES}`</p><p>- {#UNIT.ACTIVESTATE} NOT_MATCHES_REGEX `{$SYSTEMD.ACTIVESTATE.SERVICE.NOT_MATCHES}`</p><p>- {#UNIT.UNITFILESTATE} MATCHES_REGEX `{$SYSTEMD.UNITFILESTATE.SERVICE.MATCHES}`</p><p>- {#UNIT.UNITFILESTATE} NOT_MATCHES_REGEX `{$SYSTEMD.UNITFILESTATE.SERVICE.NOT_MATCHES}`</p><p>- {#UNIT.NAME} NOT_MATCHES_REGEX `{$SYSTEMD.NAME.SERVICE.NOT_MATCHES}`</p><p>- {#UNIT.NAME} MATCHES_REGEX `{$SYSTEMD.NAME.SERVICE.MATCHES}`</p> |
+|Socket units discovery |<p>Discover systemd socket units and their details.</p> |ZABBIX_PASSIVE |systemd.unit.discovery[socket]<p>**Filter**:</p>AND <p>- {#UNIT.ACTIVESTATE} MATCHES_REGEX `{$SYSTEMD.ACTIVESTATE.SOCKET.MATCHES}`</p><p>- {#UNIT.ACTIVESTATE} NOT_MATCHES_REGEX `{$SYSTEMD.ACTIVESTATE.SOCKET.NOT_MATCHES}`</p><p>- {#UNIT.UNITFILESTATE} MATCHES_REGEX `{$SYSTEMD.UNITFILESTATE.SOCKET.MATCHES}`</p><p>- {#UNIT.UNITFILESTATE} NOT_MATCHES_REGEX `{$SYSTEMD.UNITFILESTATE.SOCKET.NOT_MATCHES}`</p><p>- {#UNIT.NAME} NOT_MATCHES_REGEX `{$SYSTEMD.NAME.SOCKET.NOT_MATCHES}`</p><p>- {#UNIT.NAME} MATCHES_REGEX `{$SYSTEMD.NAME.SOCKET.MATCHES}`</p> |
 
 ## Items collected
 
@@ -62,8 +62,8 @@ There are no template links in this template.
 |Systemd |{#UNIT.NAME}: Active state |<p>State value that reflects whether the unit is currently active or not. The following states are currently defined: "active", "reloading", "inactive", "failed", "activating", and "deactivating".</p> |DEPENDENT |systemd.service.active_state["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.ActiveState.state`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Systemd |{#UNIT.NAME}: Load state |<p>State value that reflects whether the configuration file of this unit has been loaded. The following states are currently defined: "loaded", "error", and "masked".</p> |DEPENDENT |systemd.service.load_state["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.LoadState.state`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |Systemd |{#UNIT.NAME}: Unit file state |<p>Encodes the install state of the unit file of FragmentPath. It currently knows the following states: "enabled", "enabled-runtime", "linked", "linked-runtime", "masked", "masked-runtime", "static", "disabled", and "invalid".</p> |DEPENDENT |systemd.service.unitfile_state["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.UnitFileState.state`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
-|Systemd |{#UNIT.NAME}: Active time |<p>Number of seconds since unit entered the active state.</p> |DEPENDENT |systemd.service.uptime["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Systemd |{#UNIT.NAME}: Connections accepted per sec |<p>The number of accepted socket connections (NAccepted) per second.</p> |DEPENDENT |systemd.socket.conn_accepted.rate["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.NAccepted`</p><p>- CHANGE_PER_SECOND |
+|Systemd |{#UNIT.NAME}: Active time |<p>Number of seconds since unit entered the active state.</p> |DEPENDENT |systemd.service.uptime["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Systemd |{#UNIT.NAME}: Connections accepted per sec |<p>The number of accepted socket connections (NAccepted) per second.</p> |DEPENDENT |systemd.socket.conn_accepted.rate["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.NAccepted`</p><p>- CHANGE_PER_SECOND</p> |
 |Systemd |{#UNIT.NAME}: Connections connected |<p>The current number of socket connections (NConnections).</p> |DEPENDENT |systemd.socket.conn_count["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.NConnections`</p> |
 |Zabbix_raw_items |{#UNIT.NAME}: Get unit info |<p>Returns all properties of a systemd service unit.</p><p> Unit description: {#UNIT.DESCRIPTION}.</p> |ZABBIX_PASSIVE |systemd.unit.get["{#UNIT.NAME}"] |
 |Zabbix_raw_items |{#UNIT.NAME}: Get unit info |<p>Returns all properties of a systemd socket unit.</p><p> Unit description: {#UNIT.DESCRIPTION}.</p> |ZABBIX_PASSIVE |systemd.unit.get["{#UNIT.NAME}",Socket] |
@@ -72,8 +72,8 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|{#UNIT.NAME}: Service is not running |<p>-</p> |`{TEMPLATE_NAME:systemd.service.active_state["{#UNIT.NAME}"].last()}<>1` |WARNING |<p>Manual close: YES</p> |
-|{#UNIT.NAME}: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:systemd.service.uptime["{#UNIT.NAME}"].last()}<10m` |INFO |<p>Manual close: YES</p> |
+|{#UNIT.NAME}: Service is not running |<p>-</p> |`last(/Systemd by Zabbix agent 2/systemd.service.active_state["{#UNIT.NAME}"])<>1` |WARNING |<p>Manual close: YES</p> |
+|{#UNIT.NAME}: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Systemd by Zabbix agent 2/systemd.service.uptime["{#UNIT.NAME}"])<10m` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/app/systemd/template_app_systemd.yaml b/templates/app/systemd/template_app_systemd.yaml
index 7adbe1fe942..fc388194dd3 100644
--- a/templates/app/systemd/template_app_systemd.yaml
+++ b/templates/app/systemd/template_app_systemd.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-08T14:51:22Z'
+  version: '6.0'
+  date: '2021-12-15T06:58:10Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -161,7 +161,6 @@ zabbix_export:
                             return Math.floor(Date.now()/1000)-Number(data.ActiveEnterTimestamp)/1000000;
                           }
                         return null;
-                      
               master_item:
                 key: 'systemd.unit.get["{#UNIT.NAME}"]'
               tags:
diff --git a/templates/app/tomcat_jmx/README.md b/templates/app/tomcat_jmx/README.md
index aea40f9e1d8..06c19588479 100644
--- a/templates/app/tomcat_jmx/README.md
+++ b/templates/app/tomcat_jmx/README.md
@@ -1,16 +1,15 @@
 
-# Apache Tomcat JMX
+# Apache Tomcat by JMX
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official JMX Template for Apache Tomcat.
 
 
 This template was tested on:
 
 - Apache Tomcat, version 8.5.59
-- Zabbix, version 5.4
 
 ## Setup
 
@@ -47,20 +46,20 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Global request processors discovery |<p>Discovery for GlobalRequesProcessor</p> |JMX |jmx.discovery[beans,"Catalina:type=GlobalRequestProcessor,name=*"]<p>**Filter**:</p>AND <p>- A: {#JMXNAME} MATCHES_REGEX `{$TOMCAT.LLD.FILTER.MATCHES:"GlobalRequesProcessor"}`</p><p>- B: {#JMXNAME} NOT_MATCHES_REGEX `{$TOMCAT.LLD.FILTER.NOT_MATCHES:"GlobalRequesProcessor"}`</p> |
-|Protocol handlers discovery |<p>Discovery for ProtocolHandler</p> |JMX |jmx.discovery[attributes,"Catalina:type=ProtocolHandler,port=*"]<p>**Filter**:</p>AND <p>- A: {#JMXATTR} MATCHES_REGEX `^name$`</p> |
-|Thread pools discovery |<p>Discovery for ThreadPool</p> |JMX |jmx.discovery[beans,"Catalina:type=ThreadPool,name=*"]<p>**Filter**:</p>AND <p>- A: {#JMXNAME} MATCHES_REGEX `{$TOMCAT.LLD.FILTER.MATCHES:"ThreadPool"}`</p><p>- B: {#JMXNAME} NOT_MATCHES_REGEX `{$TOMCAT.LLD.FILTER.NOT_MATCHES:"ThreadPool"}`</p> |
-|Contexts discovery |<p>Discovery for contexts</p> |JMX |jmx.discovery[beans,"Catalina:type=Manager,host=*,context=*"]<p>**Filter**:</p>AND <p>- A: {#JMXHOST} MATCHES_REGEX `{$TOMCAT.LLD.FILTER.MATCHES:"Manager"}`</p><p>- B: {#JMXHOST} NOT_MATCHES_REGEX `{$TOMCAT.LLD.FILTER.NOT_MATCHES:"Manager"}`</p> |
+|Global request processors discovery |<p>Discovery for GlobalRequesProcessor</p> |JMX |jmx.discovery[beans,"Catalina:type=GlobalRequestProcessor,name=*"]<p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$TOMCAT.LLD.FILTER.MATCHES:"GlobalRequesProcessor"}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$TOMCAT.LLD.FILTER.NOT_MATCHES:"GlobalRequesProcessor"}`</p> |
+|Protocol handlers discovery |<p>Discovery for ProtocolHandler</p> |JMX |jmx.discovery[attributes,"Catalina:type=ProtocolHandler,port=*"]<p>**Filter**:</p>AND <p>- {#JMXATTR} MATCHES_REGEX `^name$`</p> |
+|Thread pools discovery |<p>Discovery for ThreadPool</p> |JMX |jmx.discovery[beans,"Catalina:type=ThreadPool,name=*"]<p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$TOMCAT.LLD.FILTER.MATCHES:"ThreadPool"}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$TOMCAT.LLD.FILTER.NOT_MATCHES:"ThreadPool"}`</p> |
+|Contexts discovery |<p>Discovery for contexts</p> |JMX |jmx.discovery[beans,"Catalina:type=Manager,host=*,context=*"]<p>**Filter**:</p>AND <p>- {#JMXHOST} MATCHES_REGEX `{$TOMCAT.LLD.FILTER.MATCHES:"Manager"}`</p><p>- {#JMXHOST} NOT_MATCHES_REGEX `{$TOMCAT.LLD.FILTER.NOT_MATCHES:"Manager"}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
 |Tomcat |Tomcat: Version |<p>The version of the Tomcat.</p> |JMX |jmx["Catalina:type=Server",serverInfo]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Tomcat |{#JMXNAME}: Bytes received per second |<p>Bytes received rate by processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},bytesReceived]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Tomcat |{#JMXNAME}: Bytes sent per second |<p>Bytes sent rate by processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},bytesSent]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Tomcat |{#JMXNAME}: Errors per second |<p>Error rate of request processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},errorCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Tomcat |{#JMXNAME}: Requests per second |<p>Rate of requests served by request processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},requestCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Tomcat |{#JMXNAME}: Bytes received per second |<p>Bytes received rate by processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},bytesReceived]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Tomcat |{#JMXNAME}: Bytes sent per second |<p>Bytes sent rate by processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},bytesSent]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Tomcat |{#JMXNAME}: Errors per second |<p>Error rate of request processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},errorCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Tomcat |{#JMXNAME}: Requests per second |<p>Rate of requests served by request processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},requestCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Tomcat |{#JMXNAME}: Requests processing time |<p>The total time to process all incoming requests of request processor {#JMXNAME}</p> |JMX |jmx[{#JMXOBJ},processingTime]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
 |Tomcat |{#JMXVALUE}: Gzip compression status |<p>Gzip compression status on {#JMXNAME}. Enabling gzip compression may save server bandwidth.</p> |JMX |jmx[{#JMXOBJ},compression]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Tomcat |{#JMXNAME}: Threads count |<p>Amount of threads the thread pool has right now, both busy and free.</p> |JMX |jmx[{#JMXOBJ},currentThreadCount]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
@@ -68,17 +67,17 @@ There are no template links in this template.
 |Tomcat |{#JMXNAME}: Threads busy |<p>Number of the requests that are being currently handled.</p> |JMX |jmx[{#JMXOBJ},currentThreadsBusy] |
 |Tomcat |{#JMXHOST}{#JMXCONTEXT}: Sessions active |<p>Active sessions of the application.</p> |JMX |jmx[{#JMXOBJ},activeSessions] |
 |Tomcat |{#JMXHOST}{#JMXCONTEXT}: Sessions active maximum so far |<p>Maximum number of active sessions so far.</p> |JMX |jmx[{#JMXOBJ},maxActive] |
-|Tomcat |{#JMXHOST}{#JMXCONTEXT}: Sessions created per second |<p>Rate of sessions created by this application per second.</p> |JMX |jmx[{#JMXOBJ},sessionCounter]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Tomcat |{#JMXHOST}{#JMXCONTEXT}: Sessions rejected per second |<p>Rate of sessions we rejected due to maxActive being reached.</p> |JMX |jmx[{#JMXOBJ},rejectedSessions]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Tomcat |{#JMXHOST}{#JMXCONTEXT}: Sessions created per second |<p>Rate of sessions created by this application per second.</p> |JMX |jmx[{#JMXOBJ},sessionCounter]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Tomcat |{#JMXHOST}{#JMXCONTEXT}: Sessions rejected per second |<p>Rate of sessions we rejected due to maxActive being reached.</p> |JMX |jmx[{#JMXOBJ},rejectedSessions]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Tomcat |{#JMXHOST}{#JMXCONTEXT}: Sessions allowed maximum |<p>The maximum number of active Sessions allowed, or -1 for no limit.</p> |JMX |jmx[{#JMXOBJ},maxActiveSessions] |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Tomcat: Version has been changed |<p>Tomcat version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["Catalina:type=Server",serverInfo].diff()}=1 and {TEMPLATE_NAME:jmx["Catalina:type=Server",serverInfo].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|{#JMXVALUE}: Gzip compression is disabled |<p>gzip compression is disabled for connector {#JMXVALUE}.</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},compression].str(off)} = 1` |INFO |<p>Manual close: YES</p> |
-|{#JMXNAME}: Busy worker threads count are more than {$TOMCAT.THREADS.MAX.PCT:"{#JMXNAME}"}% of the limit for {$TOMCAT.THREADS.MAX.TIME:"{#JMXNAME}"} |<p>When current threads busy counter reaches the limit, no more requests could be handled, and the application chokes.</p> |`{TEMPLATE_NAME:jmx[{#JMXOBJ},currentThreadsBusy].min({$TOMCAT.THREADS.MAX.TIME:"{#JMXNAME}"})}>{Apache Tomcat JMX:jmx[{#JMXOBJ},maxThreads].last()}*{$TOMCAT.THREADS.MAX.PCT:"{#JMXNAME}"}/100` |HIGH | |
+|Tomcat: Version has been changed |<p>Tomcat version has changed. Ack to close.</p> |`last(/Apache Tomcat by JMX/jmx["Catalina:type=Server",serverInfo],#1)<>last(/Apache Tomcat by JMX/jmx["Catalina:type=Server",serverInfo],#2) and length(last(/Apache Tomcat by JMX/jmx["Catalina:type=Server",serverInfo]))>0` |INFO |<p>Manual close: YES</p> |
+|{#JMXVALUE}: Gzip compression is disabled |<p>gzip compression is disabled for connector {#JMXVALUE}.</p> |`find(/Apache Tomcat by JMX/jmx[{#JMXOBJ},compression],,"like","off") = 1` |INFO |<p>Manual close: YES</p> |
+|{#JMXNAME}: Busy worker threads count are more than {$TOMCAT.THREADS.MAX.PCT:"{#JMXNAME}"}% of the limit for {$TOMCAT.THREADS.MAX.TIME:"{#JMXNAME}"} |<p>When current threads busy counter reaches the limit, no more requests could be handled, and the application chokes.</p> |`min(/Apache Tomcat by JMX/jmx[{#JMXOBJ},currentThreadsBusy],{$TOMCAT.THREADS.MAX.TIME:"{#JMXNAME}"})>last(/Apache Tomcat by JMX/jmx[{#JMXOBJ},maxThreads])*{$TOMCAT.THREADS.MAX.PCT:"{#JMXNAME}"}/100` |HIGH | |
 
 ## Feedback
 
diff --git a/templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml b/templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml
index ad71b51cc20..d7fea97f235 100644
--- a/templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml
+++ b/templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:20Z'
+  version: '6.0'
+  date: '2021-12-15T06:58:14Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -8,8 +8,8 @@ zabbix_export:
   templates:
     -
       uuid: 3cc8c9ae7055458c9a803597007f70bd
-      template: 'Apache Tomcat JMX'
-      name: 'Apache Tomcat JMX'
+      template: 'Apache Tomcat by JMX'
+      name: 'Apache Tomcat by JMX'
       description: |
         The template to monitor Apache Tomcat by Zabbix that work without any external scripts.
         The metrics are collected by JMX.
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/411862-discussion-thread-for-official-zabbix-template-tomcat
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -46,7 +46,7 @@ zabbix_export:
           triggers:
             -
               uuid: 152d235652914aa2af78334385334214
-              expression: 'last(/Apache Tomcat JMX/jmx["Catalina:type=Server",serverInfo],#1)<>last(/Apache Tomcat JMX/jmx["Catalina:type=Server",serverInfo],#2) and length(last(/Apache Tomcat JMX/jmx["Catalina:type=Server",serverInfo]))>0'
+              expression: 'last(/Apache Tomcat by JMX/jmx["Catalina:type=Server",serverInfo],#1)<>last(/Apache Tomcat by JMX/jmx["Catalina:type=Server",serverInfo],#2) and length(last(/Apache Tomcat by JMX/jmx["Catalina:type=Server",serverInfo]))>0'
               name: 'Tomcat: Version has been changed'
               priority: INFO
               description: 'Tomcat version has changed. Ack to close.'
@@ -93,7 +93,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 7d707de73a164f1db6b69e4dcb8c6ae9
-                  expression: 'find(/Apache Tomcat JMX/jmx[{#JMXOBJ},compression],,"like","off") = 1'
+                  expression: 'find(/Apache Tomcat by JMX/jmx[{#JMXOBJ},compression],,"like","off") = 1'
                   name: '{#JMXVALUE}: Gzip compression is disabled'
                   priority: INFO
                   description: 'gzip compression is disabled for connector {#JMXVALUE}.'
@@ -228,14 +228,14 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},bytesSent]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},bytesReceived]'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
         -
@@ -350,28 +350,28 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},maxActive]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},activeSessions]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},rejectedSessions]'
                 -
                   sortorder: '3'
                   drawtype: GRADIENT_LINE
                   color: A54F10
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},maxActiveSessions]'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
         -
@@ -451,7 +451,7 @@ zabbix_export:
           trigger_prototypes:
             -
               uuid: 7a15296553a447f6aebf4958631b6704
-              expression: 'min(/Apache Tomcat JMX/jmx[{#JMXOBJ},currentThreadsBusy],{$TOMCAT.THREADS.MAX.TIME:"{#JMXNAME}"})>last(/Apache Tomcat JMX/jmx[{#JMXOBJ},maxThreads])*{$TOMCAT.THREADS.MAX.PCT:"{#JMXNAME}"}/100'
+              expression: 'min(/Apache Tomcat by JMX/jmx[{#JMXOBJ},currentThreadsBusy],{$TOMCAT.THREADS.MAX.TIME:"{#JMXNAME}"})>last(/Apache Tomcat by JMX/jmx[{#JMXOBJ},maxThreads])*{$TOMCAT.THREADS.MAX.PCT:"{#JMXNAME}"}/100'
               name: '{#JMXNAME}: Busy worker threads count are more than {$TOMCAT.THREADS.MAX.PCT:"{#JMXNAME}"}% of the limit for {$TOMCAT.THREADS.MAX.TIME:"{#JMXNAME}"}'
               priority: HIGH
               description: 'When current threads busy counter reaches the limit, no more requests could be handled, and the application chokes.'
@@ -464,21 +464,21 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},maxThreads]'
                 -
                   sortorder: '1'
                   drawtype: GRADIENT_LINE
                   color: 2774A4
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},currentThreadCount]'
                 -
                   sortorder: '2'
                   drawtype: GRADIENT_LINE
                   color: F63100
                   item:
-                    host: 'Apache Tomcat JMX'
+                    host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},currentThreadsBusy]'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
       macros:
diff --git a/templates/app/travis_http/README.md b/templates/app/travis_ci_http/README.md
index 88a29ee09a2..3e50d373b1c 100644
--- a/templates/app/travis_http/README.md
+++ b/templates/app/travis_ci_http/README.md
@@ -50,7 +50,7 @@ There are no template links in this template.
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Travis |Travis: Get health |<p>Getting home JSON using Travis API.</p> |HTTP_AGENT |travis.get_health<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- JAVASCRIPT: `return JSON.parse(value).config ? 1 : 0`</p> |
+|Travis |Travis: Get health |<p>Getting home JSON using Travis API.</p> |HTTP_AGENT |travis.get_health<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- JAVASCRIPT: `return JSON.parse(value).config ? 1 : 0`</p> |
 |Travis |Travis: Jobs passed |<p>Total count of passed jobs in all repos.</p> |DEPENDENT |travis.jobs.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs.length()`</p> |
 |Travis |Travis: Jobs active |<p>Active jobs in all repos.</p> |DEPENDENT |travis.jobs.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs[?(@.state == "started")].length()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |Travis |Travis: Jobs in queue |<p>Jobs in queue in all repos.</p> |DEPENDENT |travis.jobs.queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.jobs[?(@.state == "received")].length()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
@@ -61,7 +61,7 @@ There are no template links in this template.
 |Travis |Travis: Repo [{#SLUG}]: Builds passed |<p>Count of all passed builds in {#SLUG} repo.</p> |DEPENDENT |travis.repo.builds.passed[{#SLUG}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.parse(value).builds.filter(function (e){return e.state == "passed"}).length`</p> |
 |Travis |Travis: Repo [{#SLUG}]: Builds failed |<p>Count of all failed builds in {#SLUG} repo.</p> |DEPENDENT |travis.repo.builds.failed[{#SLUG}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Travis |Travis: Repo [{#SLUG}]: Builds total |<p>Count of total builds in {#SLUG} repo.</p> |DEPENDENT |travis.repo.builds.total[{#SLUG}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.builds.length()`</p> |
-|Travis |Travis: Repo [{#SLUG}]: Builds passed, % |<p>Percent of passed builds in {#SLUG} repo.</p> |CALCULATED |travis.repo.builds.passed.pct[{#SLUG}]<p>**Expression**:</p>`last(travis.repo.builds.passed[{#SLUG}])/last(travis.repo.builds.total[{#SLUG}])*100` |
+|Travis |Travis: Repo [{#SLUG}]: Builds passed, % |<p>Percent of passed builds in {#SLUG} repo.</p> |CALCULATED |travis.repo.builds.passed.pct[{#SLUG}]<p>**Expression**:</p>`last(//travis.repo.builds.passed[{#SLUG}])/last(//travis.repo.builds.total[{#SLUG}])*100` |
 |Travis |Travis: Repo [{#SLUG}]: Description |<p>Description of Travis repo (git project description).</p> |DEPENDENT |travis.repo.description[{#SLUG}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.repositories[?(@.slug == "{#SLUG}")].description.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Travis |Travis: Repo [{#SLUG}]: Last build duration |<p>Last build duration in {#SLUG} repo.</p> |DEPENDENT |travis.repo.last_build.duration[{#SLUG}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.builds[0].duration`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Travis |Travis: Repo [{#SLUG}]: Last build state |<p>Last build state in {#SLUG} repo.</p> |DEPENDENT |travis.repo.last_build.state[{#SLUG}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.builds[0].state`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -77,10 +77,10 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Travis: Service is unavailable |<p>Travis API is unavailable. Please check if the correct macros are set.</p> |`{TEMPLATE_NAME:travis.get_health.last()}=0` |HIGH |<p>Manual close: YES</p> |
-|Travis: Failed to fetch home page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`{TEMPLATE_NAME:travis.get_health.nodata(30m)}=1` |WARNING |<p>Manual close: YES</p> |
-|Travis: Repo [{#SLUG}]: Percent of successful builds are < {$TRAVIS.BUILDS.SUCCESS.PERCENT}% |<p>Low successful builds rate.</p> |`{TEMPLATE_NAME:travis.repo.builds.passed.pct[{#SLUG}].last()}<{$TRAVIS.BUILDS.SUCCESS.PERCENT}` |WARNING |<p>Manual close: YES</p> |
-|Travis: Repo [{#SLUG}]: Last build status is 'errored' |<p>Last build status is errored.</p> |`{TEMPLATE_NAME:travis.repo.last_build.state[{#SLUG}].str(errored)}=1` |WARNING |<p>Manual close: YES</p> |
+|Travis: Service is unavailable |<p>Travis API is unavailable. Please check if the correct macros are set.</p> |`last(/Travis CI by HTTP/travis.get_health)=0` |HIGH |<p>Manual close: YES</p> |
+|Travis: Failed to fetch home page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Travis CI by HTTP/travis.get_health,30m)=1` |WARNING |<p>Manual close: YES</p> |
+|Travis: Repo [{#SLUG}]: Percent of successful builds are < {$TRAVIS.BUILDS.SUCCESS.PERCENT}% |<p>Low successful builds rate.</p> |`last(/Travis CI by HTTP/travis.repo.builds.passed.pct[{#SLUG}])<{$TRAVIS.BUILDS.SUCCESS.PERCENT}` |WARNING |<p>Manual close: YES</p> |
+|Travis: Repo [{#SLUG}]: Last build status is 'errored' |<p>Last build status is errored.</p> |`find(/Travis CI by HTTP/travis.repo.last_build.state[{#SLUG}],,"like","errored")=1` |WARNING |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/app/travis_http/template_app_travis_ci_http.yaml b/templates/app/travis_ci_http/template_app_travis_ci_http.yaml
index 295184bccb6..c230416b22a 100644
--- a/templates/app/travis_http/template_app_travis_ci_http.yaml
+++ b/templates/app/travis_ci_http/template_app_travis_ci_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-08-18T12:34:02Z'
+  date: '2021-12-15T08:56:34Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -14,13 +14,13 @@ zabbix_export:
         Template for monitoring Travis CI https://travis-ci.com
         You must set {$TRAVIS.API.TOKEN} and {$TRAVIS.API.URL} macros.
           {$TRAVIS.API.TOKEN} is a Travis API authentication token located in User -> Settings -> API authentication.
-          {$TRAVIS.API.URL} could be in 3 different variations:
+          {$TRAVIS.API.URL} could be in 2 different variations:
            - for a private project : api.travis-ci.com
            - for an enterprise projects: api.example.com (where you replace example.com with the domain Travis CI is running on)
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -79,7 +79,6 @@ zabbix_export:
             -
               name: limit
               value: '0'
-          status_codes: ''
           headers:
             -
               name: Travis-API-Version
@@ -148,7 +147,6 @@ zabbix_export:
           value_type: TEXT
           description: 'Getting jobs using Travis API.'
           url: 'https://{$TRAVIS.API.URL}/jobs'
-          status_codes: ''
           headers:
             -
               name: Travis-API-Version
@@ -174,7 +172,6 @@ zabbix_export:
             -
               name: limit
               value: '0'
-          status_codes: ''
           headers:
             -
               name: Travis-API-Version
@@ -414,7 +411,6 @@ zabbix_export:
                 -
                   name: limit
                   value: '50'
-              status_codes: ''
               headers:
                 -
                   name: Travis-API-Version
@@ -440,7 +436,6 @@ zabbix_export:
                 -
                   name: limit
                   value: '50'
-              status_codes: ''
               headers:
                 -
                   name: Travis-API-Version
@@ -588,7 +583,7 @@ zabbix_export:
                   var result = [];
                   
                   JSON.parse(value).repositories.forEach(function (e) {
-                  result.push({ '{#ID}': e.id, '{#SLUG}': e.slug });
+                      result.push({ '{#ID}': e.id, '{#SLUG}': e.slug });
                   });
                   
                   return JSON.stringify(result)
diff --git a/templates/app/vault_http/README.md b/templates/app/vault_http/README.md
index 82302cb6526..66812c5b4b3 100644
--- a/templates/app/vault_http/README.md
+++ b/templates/app/vault_http/README.md
@@ -3,11 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor HashiCorp Vault by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `Vault by HTTP` — collects metrics by HTTP agent from `/sys/metrics` API endpoint.
+Template `Vault by HTTP` — collects metrics by HTTP agent from `/sys/metrics` API endpoint.
 See https://www.vaultproject.io/api-docs/system/metrics.
 
 
@@ -32,19 +32,18 @@ No specific Zabbix configuration is required.
 
 |Name|Description|Default|
 |----|-----------|-------|
-|{$VAULT.ACCESSOR.LIST} |<p>Vault accessor list for monitoring token expiration time.</p> |`` |
 |{$VAULT.API.PORT} |<p>Vault port.</p> |`8200` |
 |{$VAULT.API.SCHEME} |<p>Vault API scheme.</p> |`http` |
-|{$VAULT.HOST} |<p>Vault host name</p> |`<PUT YOUR VAULT HOST>` |
+|{$VAULT.HOST} |<p>Vault host name.</p> |`<PUT YOUR VAULT HOST>` |
 |{$VAULT.LEADERSHIP.LOSSES.MAX.WARN} |<p>Maximum number of Vault leadership losses.</p> |`5` |
-|{$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} |<p>Maximum number of Vault leadership setyp failed.</p> |`5` |
+|{$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} |<p>Maximum number of Vault leadership setup failed.</p> |`5` |
 |{$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} |<p>Maximum number of Vault leadership step downs.</p> |`5` |
 |{$VAULT.LLD.FILTER.STORAGE.MATCHES} |<p>Filter of discoverable storage backends.</p> |`.+` |
-|{$VAULT.OPEN.FDS.MAX.WARN} |<p>Maximum percentage of used file descriptors for trigger expression</p> |`90` |
-|{$VAULT.TOKEN} |<p>Vault auth token.</p> |`<PUT YOUR AUTH TOKEN>` |
+|{$VAULT.OPEN.FDS.MAX.WARN} |<p>Maximum percentage of used file descriptors for trigger expression.</p> |`90` |
 |{$VAULT.TOKEN.ACCESSORS} |<p>Vault accessors separated by spaces for monitoring token expiration time.</p> |`` |
 |{$VAULT.TOKEN.TTL.MIN.CRIT} |<p>Token TTL critical threshold.</p> |`3d` |
 |{$VAULT.TOKEN.TTL.MIN.WARN} |<p>Token TTL warning threshold.</p> |`7d` |
+|{$VAULT.TOKEN} |<p>Vault auth token.</p> |`<PUT YOUR AUTH TOKEN>` |
 
 ## Template links
 
@@ -54,135 +53,138 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Token metrics discovery |<p>Tokens metrics doscovery.</p> |DEPENDENT |vault.tokens.discovery |
-|Storage metrics discovery |<p>Storage metrics discovery.</p> |DEPENDENT |vault.storage.discovery<p>**Filter**:</p>AND <p>- A: {#STORAGE} MATCHES_REGEX `{$VAULT.LLD.FILTER.STORAGE.MATCHES}`</p> |
+|Storage metrics discovery |<p>Storage backend metrics discovery.</p> |DEPENDENT |vault.storage.discovery<p>**Filter**:</p>AND <p>- {#STORAGE} MATCHES_REGEX `{$VAULT.LLD.FILTER.STORAGE.MATCHES}`</p> |
 |Mountpoint metrics discovery |<p>Mountpoint metrics discovery.</p> |DEPENDENT |vault.mountpoint.discovery |
 |WAL metrics discovery |<p>Discovery for WAL metrics.</p> |DEPENDENT |vault.wal.discovery |
 |Replication metrics discovery |<p>Discovery for replication metrics.</p> |DEPENDENT |vault.replication.discovery |
+|Token metrics discovery |<p>Tokens metrics discovery.</p> |DEPENDENT |vault.tokens.discovery |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Vault |Vault: Initialized |<p>Initialization status.</p> |DEPENDENT |vault.health.initialized<p>**Preprocessing**:</p><p>- JSONPATH: `$.initialized`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Vault |Vault: Sealed |<p>Seal status.</p> |DEPENDENT |vault.health.sealed<p>**Preprocessing**:</p><p>- JSONPATH: `$.sealed`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Vault |Vault: Standby |<p>Standby status.</p> |DEPENDENT |vault.health.standby<p>**Preprocessing**:</p><p>- JSONPATH: `$.standby`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Vault |Vault: Performance standby |<p>Performance standby status.</p> |DEPENDENT |vault.health.performance_standby<p>**Preprocessing**:</p><p>- JSONPATH: `$.performance_standby`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Initialized |<p>Initialization status.</p> |DEPENDENT |vault.health.initialized<p>**Preprocessing**:</p><p>- JSONPATH: `$.initialized`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Sealed |<p>Seal status.</p> |DEPENDENT |vault.health.sealed<p>**Preprocessing**:</p><p>- JSONPATH: `$.sealed`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Standby |<p>Standby status.</p> |DEPENDENT |vault.health.standby<p>**Preprocessing**:</p><p>- JSONPATH: `$.standby`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Performance standby |<p>Performance standby status.</p> |DEPENDENT |vault.health.performance_standby<p>**Preprocessing**:</p><p>- JSONPATH: `$.performance_standby`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Vault |Vault: Performance replication |<p>Performance replication mode</p><p>https://www.vaultproject.io/docs/enterprise/replication</p> |DEPENDENT |vault.health.replication_performance_mode<p>**Preprocessing**:</p><p>- JSONPATH: `$.replication_performance_mode`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Vault |Vault: Disaster Recovery replication |<p>Disaster recovery replication mode</p><p>https://www.vaultproject.io/docs/enterprise/replication</p> |DEPENDENT |vault.health.replication_dr_mode<p>**Preprocessing**:</p><p>- JSONPATH: `$.replication_dr_mode`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Vault |Vault: Version |<p>Server version.</p> |DEPENDENT |vault.health.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Vault |Vault: Healthcheck |<p>Vault healthcheck.</p> |DEPENDENT |vault.health.check<p>**Preprocessing**:</p><p>- JSONPATH: `$.healthcheck`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Vault |Vault: HA enabled |<p>HA enabled status.</p> |DEPENDENT |vault.leader.ha_enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.ha_enabled`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Vault |Vault: Is leader |<p>Leader status.</p> |DEPENDENT |vault.leader.is_self<p>**Preprocessing**:</p><p>- JSONPATH: `$.is_self`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: HA enabled |<p>HA enabled status.</p> |DEPENDENT |vault.leader.ha_enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.ha_enabled`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Is leader |<p>Leader status.</p> |DEPENDENT |vault.leader.is_self<p>**Preprocessing**:</p><p>- JSONPATH: `$.is_self`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Vault |Vault: Get metrics error |<p>Get metrics error.</p> |DEPENDENT |vault.get_metrics.error<p>**Preprocessing**:</p><p>- JSONPATH: `$.errors[0]`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Vault |Vault: Process CPU seconds, total |<p>Total user and system CPU time spent in seconds.</p> |DEPENDENT |vault.metrics.process.cpu.seconds.total<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_cpu_seconds_total `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Open file descriptors, max |<p>Maximum number of open file descriptors.</p> |DEPENDENT |vault.metrics.process.max.fds<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_max_fds `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Vault |Vault: Open file descriptors, current |<p>Number of open file descriptors.</p> |DEPENDENT |vault.metrics.process.open.fds<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_open_fds `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Process resident memory |<p>Resident memory size in bytes.</p> |DEPENDENT |vault.metrics.process.resident_memory.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_resident_memory_bytes `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Uptime |<p>Server uptime.</p> |DEPENDENT |vault.metrics.process.uptime<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_start_time_seconds `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return Math.floor(Date.now()/1000 - Number(value));`</p> |
-|Vault |Vault: Process virtual memory, current |<p>Virtual memory size in bytes.</p> |DEPENDENT |vault.metrics.process.virtual_memory.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_virtual_memory_bytes `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Process virtual memory, max |<p>Maximum amount of virtual memory available in bytes.</p> |DEPENDENT |vault.metrics.process.virtual_memory.max.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_virtual_memory_max_bytes `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Vault |Vault: Audit log requests, rate |<p>Number of all audit log requests across all audit log devices.</p> |DEPENDENT |vault.metrics.audit.log.request.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_audit_log_request_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Audit log request failures, rate |<p>Number of audit log request failures.</p> |DEPENDENT |vault.metrics.audit.log.request.failure.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_audit_log_request_failure `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Audit log response, rate |<p>Number of audit log responses across all audit log devices.</p> |DEPENDENT |vault.metrics.audit.log.response.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_audit_log_response_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Audit log response failures, rate |<p>Number of audit log response failures.</p> |DEPENDENT |vault.metrics.audit.log.response.failure.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_audit_log_response_failure `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Barrier DELETE ops, rate |<p>Number of DELETE operations at the barrier.</p> |DEPENDENT |vault.metrics.barrier.delete.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_barrier_delete_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Barrier GET ops, rate |<p>Number of GET operations at the barrier.</p> |DEPENDENT |vault.metrics.vault.barrier.get.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_barrier_get_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Barrier LIST ops, rate |<p>Number of LIST operations at the barrier.</p> |DEPENDENT |vault.metrics.barrier.list.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_barrier_list_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Barrier PUT ops, rate |<p>Number of PUT operations at the barrier.</p> |DEPENDENT |vault.metrics.barrier.put.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_barrier_put_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Cache hit, rate |<p>Number of times a value was retrieved from the LRU cache.</p> |DEPENDENT |vault.metrics.cache.hit.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_cache_hit `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Cache miss, rate |<p>Number of times a value was not in the LRU cache. The results in a read from the configured storage.</p> |DEPENDENT |vault.metrics.cache.miss.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_cache_miss `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Cache write, rate |<p>Number of times a value was written to the LRU cache.</p> |DEPENDENT |vault.metrics.cache.write.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_cache_write `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Check token, rate |<p>Number of token checks handled by Vault corecore.</p> |DEPENDENT |vault.metrics.core.check.token.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_check_token_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Fetch ACL and token, rate |<p>Number of ACL and corresponding token entry fetches handled by Vault core.</p> |DEPENDENT |vault.metrics.core.fetch.acl_and_token<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_fetch_acl_and_token_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Requests, rate |<p>Number of requests handled by Vault core.</p> |DEPENDENT |vault.metrics.core.handle.request<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_handle_request_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|Vault |Vault: Process CPU seconds, total |<p>Total user and system CPU time spent in seconds.</p> |DEPENDENT |vault.metrics.process.cpu.seconds.total<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_cpu_seconds_total`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Open file descriptors, max |<p>Maximum number of open file descriptors.</p> |DEPENDENT |vault.metrics.process.max.fds<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_max_fds`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Open file descriptors, current |<p>Number of open file descriptors.</p> |DEPENDENT |vault.metrics.process.open.fds<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_open_fds`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Process resident memory |<p>Resident memory size in bytes.</p> |DEPENDENT |vault.metrics.process.resident_memory.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_resident_memory_bytes`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Uptime |<p>Server uptime.</p> |DEPENDENT |vault.metrics.process.uptime<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_start_time_seconds`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return Math.floor(Date.now()/1000 - Number(value));`</p> |
+|Vault |Vault: Process virtual memory, current |<p>Virtual memory size in bytes.</p> |DEPENDENT |vault.metrics.process.virtual_memory.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_virtual_memory_bytes`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Process virtual memory, max |<p>Maximum amount of virtual memory available in bytes.</p> |DEPENDENT |vault.metrics.process.virtual_memory.max.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `process_virtual_memory_max_bytes`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Audit log requests, rate |<p>Number of all audit log requests across all audit log devices.</p> |DEPENDENT |vault.metrics.audit.log.request.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_audit_log_request_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Audit log request failures, rate |<p>Number of audit log request failures.</p> |DEPENDENT |vault.metrics.audit.log.request.failure.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_audit_log_request_failure`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Audit log response, rate |<p>Number of audit log responses across all audit log devices.</p> |DEPENDENT |vault.metrics.audit.log.response.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_audit_log_response_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Audit log response failures, rate |<p>Number of audit log response failures.</p> |DEPENDENT |vault.metrics.audit.log.response.failure.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_audit_log_response_failure`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Barrier DELETE ops, rate |<p>Number of DELETE operations at the barrier.</p> |DEPENDENT |vault.metrics.barrier.delete.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_barrier_delete_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Barrier GET ops, rate |<p>Number of GET operations at the barrier.</p> |DEPENDENT |vault.metrics.vault.barrier.get.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_barrier_get_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Barrier LIST ops, rate |<p>Number of LIST operations at the barrier.</p> |DEPENDENT |vault.metrics.barrier.list.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_barrier_list_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Barrier PUT ops, rate |<p>Number of PUT operations at the barrier.</p> |DEPENDENT |vault.metrics.barrier.put.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_barrier_put_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Cache hit, rate |<p>Number of times a value was retrieved from the LRU cache.</p> |DEPENDENT |vault.metrics.cache.hit.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_cache_hit`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Cache miss, rate |<p>Number of times a value was not in the LRU cache. The results in a read from the configured storage.</p> |DEPENDENT |vault.metrics.cache.miss.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_cache_miss`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Cache write, rate |<p>Number of times a value was written to the LRU cache.</p> |DEPENDENT |vault.metrics.cache.write.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_cache_write`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Check token, rate |<p>Number of token checks handled by Vault corecore.</p> |DEPENDENT |vault.metrics.core.check.token.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_check_token_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Fetch ACL and token, rate |<p>Number of ACL and corresponding token entry fetches handled by Vault core.</p> |DEPENDENT |vault.metrics.core.fetch.acl_and_token<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_fetch_acl_and_token_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Requests, rate |<p>Number of requests handled by Vault core.</p> |DEPENDENT |vault.metrics.core.handle.request<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_handle_request_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
 |Vault |Vault: Leadership setup failed, counter |<p>Cluster leadership setup failures which have occurred in a highly available Vault cluster.</p> |DEPENDENT |vault.metrics.core.leadership.setup_failed<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_core_leadership_setup_failed`</p><p>- JSONPATH: `$[?(@.name=="vault_core_leadership_setup_failed")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |Vault |Vault: Leadership setup lost, counter |<p>Cluster leadership losses which have occurred in a highly available Vault cluster.</p> |DEPENDENT |vault.metrics.core.leadership_lost<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_core_leadership_lost_count`</p><p>- JSONPATH: `$[?(@.name=="vault_core_leadership_lost_count")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-|Vault |Vault: Post-unseal ops, counter |<p>Duration of time taken by post-unseal operations handled by Vault core</p> |DEPENDENT |vault.metrics.core.post_unseal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_post_unseal_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Pre-seal ops, counter |<p>Duration of time taken by pre-seal operations</p> |DEPENDENT |vault.metrics.core.pre_seal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_pre_seal_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Requested seal ops, counter |<p>Duration of time taken by requested seal operations.</p> |DEPENDENT |vault.metrics.core.seal_with_request<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_seal_with_request_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Seal ops, counter |<p>Duration of time taken by seal operations.</p> |DEPENDENT |vault.metrics.core.seal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_seal_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Internal seal ops, counter |<p>Duration of time taken by internal seal operations.</p> |DEPENDENT |vault.metrics.core.seal_internal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_seal_internal_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Post-unseal ops, counter |<p>Duration of time taken by post-unseal operations handled by Vault core.</p> |DEPENDENT |vault.metrics.core.post_unseal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_post_unseal_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Pre-seal ops, counter |<p>Duration of time taken by pre-seal operations.</p> |DEPENDENT |vault.metrics.core.pre_seal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_pre_seal_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Requested seal ops, counter |<p>Duration of time taken by requested seal operations.</p> |DEPENDENT |vault.metrics.core.seal_with_request<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_seal_with_request_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Seal ops, counter |<p>Duration of time taken by seal operations.</p> |DEPENDENT |vault.metrics.core.seal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_seal_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Internal seal ops, counter |<p>Duration of time taken by internal seal operations.</p> |DEPENDENT |vault.metrics.core.seal_internal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_seal_internal_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |Vault |Vault: Leadership step downs, counter |<p>Cluster leadership step down.</p> |DEPENDENT |vault.metrics.core.step_down<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_core_step_down_count`</p><p>- JSONPATH: `$[?(@.name=="vault_core_step_down_count")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-|Vault |Vault: Unseal ops, counter |<p>Duration of time taken by unseal operations.</p> |DEPENDENT |vault.metrics.core.unseal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_unseal_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Fetch lease times, counter |<p>Time taken to fetch lease times.</p> |DEPENDENT |vault.metrics.expire.fetch.lease.times<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_fetch_lease_times_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Fetch lease times by token, counter |<p>Time taken to fetch lease times by token.</p> |DEPENDENT |vault.metrics.expire.fetch.lease.times.by_token<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_fetch_lease_times_by_token_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Number of expiring leases |<p>Number of all leases which are eligible for eventual expiry.</p> |DEPENDENT |vault.metrics.expire.num_leases<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_num_leases `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Expire revoke, count |<p>Time taken to revoke a token.</p> |DEPENDENT |vault.metrics.expire.revoke<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_revoke_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Expire revoke force, count |<p>Time taken to forcibly revoke a token.</p> |DEPENDENT |vault.metrics.expire.revoke.force<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_revoke_force_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Expire revoke prefix, count |<p>Tokens revoke on a prefix.</p> |DEPENDENT |vault.metrics.expire.revoke.prefix<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_revoke_prefix_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Revoke secrets by token, count |<p>Time taken to revoke all secrets issued with a given token.</p> |DEPENDENT |vault.metrics.expire.revoke.by_token<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_revoke_by_token_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Expire renew, count |<p>Time taken to renew a lease.</p> |DEPENDENT |vault.metrics.expire.renew<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_renew_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Renew token, count |<p>Time taken to renew a token which does not need to invoke a logical backend.</p> |DEPENDENT |vault.metrics.expire.renew_token<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_renew_token_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Register ops, count |<p>Time taken for register operations.</p> |DEPENDENT |vault.metrics.expire.register<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_register_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Register auth ops, count |<p>Time taken for register authentication operations which create lease entries without lease ID.</p> |DEPENDENT |vault.metrics.expire.register.auth<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_register_auth_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Policy GET ops, rate |<p>Number of operations to get a policy.</p> |DEPENDENT |vault.metrics.policy.get_policy.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_policy_get_policy_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Policy LIST ops, rate |<p>Number of operations to list policies.</p> |DEPENDENT |vault.metrics.policy.list_policies.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_policy_list_policies_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Policy DELETE ops, rate |<p>Number of operations to delete a policy.</p> |DEPENDENT |vault.metrics.policy.delete_policy.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_policy_delete_policy_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Policy SET ops, rate |<p>Number of operations to set a policy.</p> |DEPENDENT |vault.metrics.policy.set_policy.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_policy_set_policy_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Token create, count |<p>The time taken to create a token.</p> |DEPENDENT |vault.metrics.token.create<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_create_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Token createAccessor, count |<p>The time taken to create a token accessor.</p> |DEPENDENT |vault.metrics.token.createAccessor<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_createAccessor_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Token lookup, rate |<p>Number of token look up.</p> |DEPENDENT |vault.metrics.token.lookup.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_lookup_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Token revoke, count |<p>The time taken to look up a token.</p> |DEPENDENT |vault.metrics.token.revoke<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_revoke_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Token revoke tree, count |<p>Time taken to revoke a token tree.</p> |DEPENDENT |vault.metrics.token.revoke.tree<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_revoke_tree_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Token store, count |<p>Time taken to store an updated token entry without writing to the secondary index.</p> |DEPENDENT |vault.metrics.token.store<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_store_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Runtime allocated bytes |<p>Number of bytes allocated by the Vault process. This could burst from time to time, but should return to a steady state value.</p> |DEPENDENT |vault.metrics.runtime.alloc.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_alloc_bytes `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Runtime freed objects |<p>Number of freed objects.</p> |DEPENDENT |vault.metrics.runtime.free.count<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_free_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Runtime heap objects |<p>Number of objects on the heap. This is a good general memory pressure indicator worth establishing a baseline and thresholds for alerting.</p> |DEPENDENT |vault.metrics.runtime.heap.objects<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_heap_objects `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Runtime malloc count, rate |<p>Cumulative count of allocated heap objects.</p> |DEPENDENT |vault.metrics.runtime.malloc.count.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_malloc_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Runtime num goroutines |<p>Number of goroutines. This serves as a general system load indicator worth establishing a baseline and thresholds for alerting.</p> |DEPENDENT |vault.metrics.runtime.num_goroutines<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_num_goroutines `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Runtime sys bytes |<p>Number of bytes allocated to Vault. This includes what is being used by Vault's heap and what has been reclaimed but not given back to the operating system.</p> |DEPENDENT |vault.metrics.runtime.sys.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_sys_bytes `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Runtime GC pause, total |<p>The total garbage collector pause time since Vault was last started.</p> |DEPENDENT |vault.metrics.total.gc.pause<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_total_gc_pause_ns `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `1.0E-9`</p> |
-|Vault |Vault: Runtime GC runs, total |<p>Total number of garbage collection runs since Vault was last started.</p> |DEPENDENT |vault.metrics.runtime.total.gc.runs<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_total_gc_runs `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Unseal ops, counter |<p>Duration of time taken by unseal operations.</p> |DEPENDENT |vault.metrics.core.unseal<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_core_unseal_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Fetch lease times, counter |<p>Time taken to fetch lease times.</p> |DEPENDENT |vault.metrics.expire.fetch.lease.times<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_fetch_lease_times_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Fetch lease times by token, counter |<p>Time taken to fetch lease times by token.</p> |DEPENDENT |vault.metrics.expire.fetch.lease.times.by_token<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_fetch_lease_times_by_token_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Number of expiring leases |<p>Number of all leases which are eligible for eventual expiry.</p> |DEPENDENT |vault.metrics.expire.num_leases<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_num_leases`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Expire revoke, count |<p>Time taken to revoke a token.</p> |DEPENDENT |vault.metrics.expire.revoke<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_revoke_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Expire revoke force, count |<p>Time taken to forcibly revoke a token.</p> |DEPENDENT |vault.metrics.expire.revoke.force<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_revoke_force_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Expire revoke prefix, count |<p>Tokens revoke on a prefix.</p> |DEPENDENT |vault.metrics.expire.revoke.prefix<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_revoke_prefix_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Revoke secrets by token, count |<p>Time taken to revoke all secrets issued with a given token.</p> |DEPENDENT |vault.metrics.expire.revoke.by_token<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_revoke_by_token_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Expire renew, count |<p>Time taken to renew a lease.</p> |DEPENDENT |vault.metrics.expire.renew<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_renew_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Renew token, count |<p>Time taken to renew a token which does not need to invoke a logical backend.</p> |DEPENDENT |vault.metrics.expire.renew_token<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_renew_token_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Register ops, count |<p>Time taken for register operations.</p> |DEPENDENT |vault.metrics.expire.register<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_register_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Register auth ops, count |<p>Time taken for register authentication operations which create lease entries without lease ID.</p> |DEPENDENT |vault.metrics.expire.register.auth<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_expire_register_auth_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Policy GET ops, rate |<p>Number of operations to get a policy.</p> |DEPENDENT |vault.metrics.policy.get_policy.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_policy_get_policy_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Policy LIST ops, rate |<p>Number of operations to list policies.</p> |DEPENDENT |vault.metrics.policy.list_policies.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_policy_list_policies_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Policy DELETE ops, rate |<p>Number of operations to delete a policy.</p> |DEPENDENT |vault.metrics.policy.delete_policy.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_policy_delete_policy_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Policy SET ops, rate |<p>Number of operations to set a policy.</p> |DEPENDENT |vault.metrics.policy.set_policy.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_policy_set_policy_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Token create, count |<p>The time taken to create a token.</p> |DEPENDENT |vault.metrics.token.create<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_create_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Token createAccessor, count |<p>The time taken to create a token accessor.</p> |DEPENDENT |vault.metrics.token.createAccessor<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_createAccessor_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Token lookup, rate |<p>Number of token look up.</p> |DEPENDENT |vault.metrics.token.lookup.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_lookup_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Token revoke, count |<p>The time taken to look up a token.</p> |DEPENDENT |vault.metrics.token.revoke<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_revoke_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Token revoke tree, count |<p>Time taken to revoke a token tree.</p> |DEPENDENT |vault.metrics.token.revoke.tree<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_revoke_tree_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Token store, count |<p>Time taken to store an updated token entry without writing to the secondary index.</p> |DEPENDENT |vault.metrics.token.store<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_token_store_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Runtime allocated bytes |<p>Number of bytes allocated by the Vault process. This could burst from time to time, but should return to a steady state value.</p> |DEPENDENT |vault.metrics.runtime.alloc.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_alloc_bytes`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Runtime freed objects |<p>Number of freed objects.</p> |DEPENDENT |vault.metrics.runtime.free.count<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_free_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Runtime heap objects |<p>Number of objects on the heap. This is a good general memory pressure indicator worth establishing a baseline and thresholds for alerting.</p> |DEPENDENT |vault.metrics.runtime.heap.objects<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_heap_objects`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Runtime malloc count |<p>Cumulative count of allocated heap objects.</p> |DEPENDENT |vault.metrics.runtime.malloc.count<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_malloc_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Runtime num goroutines |<p>Number of goroutines. This serves as a general system load indicator worth establishing a baseline and thresholds for alerting.</p> |DEPENDENT |vault.metrics.runtime.num_goroutines<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_num_goroutines`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Runtime sys bytes |<p>Number of bytes allocated to Vault. This includes what is being used by Vault's heap and what has been reclaimed but not given back to the operating system.</p> |DEPENDENT |vault.metrics.runtime.sys.bytes<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_sys_bytes`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Runtime GC pause, total |<p>The total garbage collector pause time since Vault was last started.</p> |DEPENDENT |vault.metrics.total.gc.pause<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_total_gc_pause_ns`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `1.0E-9`</p> |
+|Vault |Vault: Runtime GC runs, total |<p>Total number of garbage collection runs since Vault was last started.</p> |DEPENDENT |vault.metrics.runtime.total.gc.runs<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_runtime_total_gc_runs`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |Vault |Vault: Token count, total |<p>Total number of service tokens available for use; counts all un-expired and un-revoked tokens in Vault's token store. This measurement is performed every 10 minutes.</p> |DEPENDENT |vault.metrics.token<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_token_count`</p><p>- JSONPATH: `$[?(@.name=="vault_token_count")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |Vault |Vault: Token count by auth, total |<p>Total number of service tokens that were created by a auth method.</p> |DEPENDENT |vault.metrics.token.by_auth<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_token_count_by_auth`</p><p>- JSONPATH: `$[?(@.name=="vault_token_count_by_auth")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |Vault |Vault: Token count by policy, total |<p>Total number of service tokens that have a policy attached.</p> |DEPENDENT |vault.metrics.token.by_policy<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_token_count_by_policy`</p><p>- JSONPATH: `$[?(@.name=="vault_token_count_by_policy")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-|Vault |Vault: Token count by ttl, total |<p>Number of service tokens, grouped by the TTL range they were assigned at creation</p> |DEPENDENT |vault.metrics.token.by_ttl<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_token_count_by_ttl`</p><p>- JSONPATH: `$[?(@.name=="vault_token_count_by_ttl")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-|Vault |Vault: Token creation, rate |<p>Number of service or batch tokens created.</p> |DEPENDENT |vault.metrics.token.creation.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_token_creation`</p><p>- JSONPATH: `$[?(@.name=="vault_token_creation")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Secret kv entries |<p>Number of entries in each key-value secret engine</p> |DEPENDENT |vault.metrics.secret.kv.count<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_secret_kv_count`</p><p>- JSONPATH: `$[?(@.name=="vault_secret_kv_count")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-|Vault |Vault: Token secret lease creation, rate |<p>Counts the number of leases created by secret engines.</p> |DEPENDENT |vault.metrics.secret.lease.creation.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_secret_lease_creation`</p><p>- JSONPATH: `$[?(@.name=="vault_secret_lease_creation")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Storage [{#STORAGE}] {#OPERATION} ops, rate |<p>Number of a {#OPERATION} operation against the {#STORAGE} storage backend</p> |DEPENDENT |vault.metrics.storage.rate[{#STORAGE}, {#OPERATION}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{#PATTERN_C} `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Rollback attempt [{#MOUNTPOINT}] ops, rate |<p>Number of operations to perform a rollback operation on the given mount point.</p> |DEPENDENT |vault.metrics.rollback.attempt.rate[{#MOUNTPOINT}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{#PATTERN_C} `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Route rollback [{#MOUNTPOINT}] ops, rate |<p>Number of operations to dispatch a rollback operation to a backend, and for that backend to process it. Rollback operations are automatically scheduled to clean up partial errors.</p> |DEPENDENT |vault.metrics.route.rollback.rate[{#MOUNTPOINT}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{#PATTERN_C} `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|Vault |Vault: Delete WALs, count{#SINGLETON} |<p>Time taken to delete a Write Ahead Log (WAL)</p> |DEPENDENT |vault.metrics.wal.deletewals[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_deletewals_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: GC deleted WAL{#SINGLETON} |<p>Number of Write Ahead Logs (WAL) deleted during each garbage collection run</p> |DEPENDENT |vault.metrics.wal.gc.deleted[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_gc_deleted `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: WALs on disk, total{#SINGLETON} |<p>Total Number of Write Ahead Logs (WAL) on disk</p> |DEPENDENT |vault.metrics.wal.gc.total[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_gc_total `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Load WALs, count{#SINGLETON} |<p>Time taken to load a Write Ahead Log (WAL)</p> |DEPENDENT |vault.metrics.wal.loadWAL[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_loadWAL_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Persist WALs, count{#SINGLETON} |<p>Time taken to persist a Write Ahead Log (WAL)</p> |DEPENDENT |vault.metrics.wal.persistwals[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_persistwals_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Flush ready WAL, count{#SINGLETON} |<p>Time taken to flush a ready Write Ahead Log (WAL) to storage</p> |DEPENDENT |vault.metrics.wal.flushready[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_flushready_count `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Stream WAL missing guard, count{#SINGLETON} |<p>Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is not matched/found</p> |DEPENDENT |vault.metrics.logshipper.streamWALs.missing_guard[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `logshipper_streamWALs_missing_guard `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Stream WAL guard found, count{#SINGLETON} |<p>Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is matched/found</p> |DEPENDENT |vault.metrics.logshipper.streamWALs.guard_found[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `logshipper_streamWALs_guard_found `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Merkle commit index{#SINGLETON} |<p>The last committed index in the Merkle Tree.</p> |DEPENDENT |vault.metrics.replication.merkle.commit_index[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_merkle_commit_index `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Last WAL{#SINGLETON} |<p>The index of the last WAL.</p> |DEPENDENT |vault.metrics.replication.wal.last_wal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_wal_last_wal `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Last DR WAL{#SINGLETON} |<p>The index of the last DR WAL.</p> |DEPENDENT |vault.metrics.replication.wal.last_dr_wal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_wal_last_dr_wal `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Last performance WAL{#SINGLETON} |<p>The index of the last Performance WAL.</p> |DEPENDENT |vault.metrics.replication.wal.last_performance_wal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_wal_last_performance_wal `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Vault |Vault: Last remote WAL{#SINGLETON} |<p>The index of the last remote WAL.</p> |DEPENDENT |vault.metrics.replication.fsm.last_remote_wal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_fsm_last_remote_wal `</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Zabbix_raw_items |Vault: Get health |<p>-</p> |HTTP_AGENT |vault.get_health<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED: </p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"healthcheck": 0}` |
-|Zabbix_raw_items |Vault: Get leader |<p>-</p> |HTTP_AGENT |vault.get_leader<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED: </p><p>⛔️ON_FAIL: `DISCARD_VALUE -> ` |
-|Zabbix_raw_items |Vault: Get metrics |<p>-</p> |HTTP_AGENT |vault.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED: </p><p>⛔️ON_FAIL: `DISCARD_VALUE -> ` |
-|Zabbix_raw_items |Vault: Get tokens |<p>-</p> |SCRIPT |vault.get_tokens |
+|Vault |Vault: Token count by ttl, total |<p>Number of service tokens, grouped by the TTL range they were assigned at creation.</p> |DEPENDENT |vault.metrics.token.by_ttl<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_token_count_by_ttl`</p><p>- JSONPATH: `$[?(@.name=="vault_token_count_by_ttl")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|Vault |Vault: Token creation, rate |<p>Number of service or batch tokens created.</p> |DEPENDENT |vault.metrics.token.creation.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_token_creation`</p><p>- JSONPATH: `$[?(@.name=="vault_token_creation")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Secret kv entries |<p>Number of entries in each key-value secret engine.</p> |DEPENDENT |vault.metrics.secret.kv.count<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_secret_kv_count`</p><p>- JSONPATH: `$[?(@.name=="vault_secret_kv_count")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|Vault |Vault: Token secret lease creation, rate |<p>Counts the number of leases created by secret engines.</p> |DEPENDENT |vault.metrics.secret.lease.creation.rate<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `vault_secret_lease_creation`</p><p>- JSONPATH: `$[?(@.name=="vault_secret_lease_creation")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Storage [{#STORAGE}] {#OPERATION} ops, rate |<p>Number of a {#OPERATION} operation against the {#STORAGE} storage backend.</p> |DEPENDENT |vault.metrics.storage.rate[{#STORAGE}, {#OPERATION}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{#PATTERN_C}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Rollback attempt [{#MOUNTPOINT}] ops, rate |<p>Number of operations to perform a rollback operation on the given mount point.</p> |DEPENDENT |vault.metrics.rollback.attempt.rate[{#MOUNTPOINT}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{#PATTERN_C}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Route rollback [{#MOUNTPOINT}] ops, rate |<p>Number of operations to dispatch a rollback operation to a backend, and for that backend to process it. Rollback operations are automatically scheduled to clean up partial errors.</p> |DEPENDENT |vault.metrics.route.rollback.rate[{#MOUNTPOINT}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{#PATTERN_C}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|Vault |Vault: Delete WALs, count{#SINGLETON} |<p>Time taken to delete a Write Ahead Log (WAL).</p> |DEPENDENT |vault.metrics.wal.deletewals[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_deletewals_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: GC deleted WAL{#SINGLETON} |<p>Number of Write Ahead Logs (WAL) deleted during each garbage collection run.</p> |DEPENDENT |vault.metrics.wal.gc.deleted[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_gc_deleted`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: WALs on disk, total{#SINGLETON} |<p>Total Number of Write Ahead Logs (WAL) on disk.</p> |DEPENDENT |vault.metrics.wal.gc.total[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_gc_total`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Load WALs, count{#SINGLETON} |<p>Time taken to load a Write Ahead Log (WAL).</p> |DEPENDENT |vault.metrics.wal.loadWAL[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_loadWAL_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Persist WALs, count{#SINGLETON} |<p>Time taken to persist a Write Ahead Log (WAL).</p> |DEPENDENT |vault.metrics.wal.persistwals[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_persistwals_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Flush ready WAL, count{#SINGLETON} |<p>Time taken to flush a ready Write Ahead Log (WAL) to storage.</p> |DEPENDENT |vault.metrics.wal.flushready[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `vault_wal_flushready_count`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Stream WAL missing guard, count{#SINGLETON} |<p>Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is not matched/found.</p> |DEPENDENT |vault.metrics.logshipper.streamWALs.missing_guard[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `logshipper_streamWALs_missing_guard`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Stream WAL guard found, count{#SINGLETON} |<p>Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is matched/found.</p> |DEPENDENT |vault.metrics.logshipper.streamWALs.guard_found[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `logshipper_streamWALs_guard_found`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Merkle commit index{#SINGLETON} |<p>The last committed index in the Merkle Tree.</p> |DEPENDENT |vault.metrics.replication.merkle.commit_index[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_merkle_commit_index`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Last WAL{#SINGLETON} |<p>The index of the last WAL.</p> |DEPENDENT |vault.metrics.replication.wal.last_wal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_wal_last_wal`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Last DR WAL{#SINGLETON} |<p>The index of the last DR WAL.</p> |DEPENDENT |vault.metrics.replication.wal.last_dr_wal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_wal_last_dr_wal`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Last performance WAL{#SINGLETON} |<p>The index of the last Performance WAL.</p> |DEPENDENT |vault.metrics.replication.wal.last_performance_wal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_wal_last_performance_wal`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Last remote WAL{#SINGLETON} |<p>The index of the last remote WAL.</p> |DEPENDENT |vault.metrics.replication.fsm.last_remote_wal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `replication_fsm_last_remote_wal`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Vault |Vault: Token [{#TOKEN_NAME}] error |<p>Token lookup error text.</p> |DEPENDENT |vault.token_via_accessor.error["{#ACCESSOR}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.accessor == "{#ACCESSOR}")].error.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Token [{#TOKEN_NAME}] has TTL |<p>The Token has TTL.</p> |DEPENDENT |vault.token_via_accessor.has_ttl["{#ACCESSOR}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.accessor == "{#ACCESSOR}")].has_ttl.first()`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Vault |Vault: Token [{#TOKEN_NAME}] TTL |<p>The TTL period of the token.</p> |DEPENDENT |vault.token_via_accessor.ttl["{#ACCESSOR}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.accessor == "{#ACCESSOR}")].ttl.first()`</p> |
+|Zabbix_raw_items |Vault: Get health |<p>-</p> |HTTP_AGENT |vault.get_health<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"healthcheck": 0}`</p> |
+|Zabbix_raw_items |Vault: Get leader |<p>-</p> |HTTP_AGENT |vault.get_leader<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p> |
+|Zabbix_raw_items |Vault: Get metrics |<p>-</p> |HTTP_AGENT |vault.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p> |
 |Zabbix_raw_items |Vault: Clear metrics |<p>-</p> |DEPENDENT |vault.clear_metrics<p>**Preprocessing**:</p><p>- CHECK_JSON_ERROR: `$.errors`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Zabbix_raw_items |Vault: Get tokens |<p>Get information about tokens via their accessors. Accessors are defined in the macro "{$VAULT.TOKEN.ACCESSORS}".</p> |SCRIPT |vault.get_tokens<p>**Expression**:</p>`The text is too long. Please see the template.` |
 |Zabbix_raw_items |Vault: Check WAL discovery |<p>-</p> |DEPENDENT |vault.check_wal_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_wal_(?:.+)$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return JSON.stringify(value !== "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
 |Zabbix_raw_items |Vault: Check replication discovery |<p>-</p> |DEPENDENT |vault.check_replication_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^replication_(?:.+)$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return JSON.stringify(value !== "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Zabbix_raw_items |Vault: Check storage discovery |<p>-</p> |DEPENDENT |vault.check_storage_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_(?:.+)_(?:get|put|list|delete)_count$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Zabbix_raw_items |Vault: Check mountpoint discovery |<p>-</p> |DEPENDENT |vault.check_mountpoint_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_rollback_attempt_(?:.+?)_count$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
+|Zabbix_raw_items |Vault: Check storage discovery |<p>-</p> |DEPENDENT |vault.check_storage_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_(?:.+)_(?:get|put|list|delete)_count$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Zabbix_raw_items |Vault: Check mountpoint discovery |<p>-</p> |DEPENDENT |vault.check_mountpoint_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_rollback_attempt_(?:.+?)_count$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Vault: Vault server is sealed |<p>https://www.vaultproject.io/docs/concepts/seal</p> |`{TEMPLATE_NAME:vault.health.sealed.last()}=1` |AVERAGE | |
-|Vault: Version has changed (new version: {ITEM.VALUE}) |<p>Vault version has changed. Ack to close.</p> |`{TEMPLATE_NAME:vault.health.version.diff()}=1 and {TEMPLATE_NAME:vault.health.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Vault: Vault server is not responding |<p>-</p> |`{TEMPLATE_NAME:vault.health.check.last()}=0` |HIGH | |
-|Vault: Failed to get metrics (error: {ITEM.VALUE}) |<p>-</p> |`{TEMPLATE_NAME:vault.get_metrics.error.strlen()}>0` |WARNING |<p>**Depends on**:</p><p>- Vault: Vault server is sealed</p> |
-|Vault: Current number of open files is too high (over {$VAULT.OPEN.FDS.MAX.WARN}% for 5m) |<p>-</p> |`{TEMPLATE_NAME:vault.metrics.process.open.fds.min(5m)}/{HashiCorp Vault by HTTP:vault.metrics.process.max.fds.last()}*100>{$VAULT.OPEN.FDS.MAX.WARN}` |WARNING | |
-|Vault: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:vault.metrics.process.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Vault: High frequency of leadership setup failures (over {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} for 1h) |<p>There have been more than {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} Vault leadership setup failures in the past 1h</p> |`{TEMPLATE_NAME:vault.metrics.core.leadership.setup_failed.delta(1h)}>{$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN}` |AVERAGE | |
-|Vault: High frequency of leadership losses (over {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} for 1h) |<p>There have been more than {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} Vault leadership losses in the past 1h</p> |`{TEMPLATE_NAME:vault.metrics.core.leadership_lost.delta(1h)}>{$VAULT.LEADERSHIP.LOSSES.MAX.WARN}` |AVERAGE | |
-|Vault: High frequency of leadership step downs (over {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} for 1h) |<p>There have been more than {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} Vault leadership step downs in the past 1h</p> |`{TEMPLATE_NAME:vault.metrics.core.step_down.delta(1h)}>{$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN}` |AVERAGE | |
-|Vault: Token [{#TOKEN_NAME}] lookup error occurred | |`{TEMPLATE_NAME:vault.token_via_accessor.error["{#ACCESSOR}"].strlen()}>0` |WARNING |<p>**Depends on**:</p><p>- Vault: Vault server is sealed |
-|Vault: Token [{#TOKEN_NAME}] will expire soon (less than {$VAULT.TOKEN.TTL.MIN.CRIT}) | |`{TEMPLATE_NAME:vault.token_via_accessor.has_ttl["{#ACCESSOR}"].last()}=1 and {TEMPLATE_NAME:vault.token_via_accessor.ttl["{#ACCESSOR}"].last()}<{$VAULT.TOKEN.TTL.MIN.CRIT}` |AVERAGE | |
-|Vault: Token [{#TOKEN_NAME}] will expire soon (less than {$VAULT.TOKEN.TTL.MIN.WARN}) | |`{TEMPLATE_NAME:vault.token_via_accessor.has_ttl["{#ACCESSOR}"].last()}=1 and {TEMPLATE_NAME:vault.token_via_accessor.ttl["{#ACCESSOR}"].last()}<{$VAULT.TOKEN.TTL.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Vault: Token [{#TOKEN_NAME}] will expire soon (less than {$VAULT.TOKEN.TTL.MIN.CRIT}) |
+|Vault: Vault server is sealed |<p>https://www.vaultproject.io/docs/concepts/seal</p> |`last(/HashiCorp Vault by HTTP/vault.health.sealed)=1` |AVERAGE | |
+|Vault: Version has changed (new version: {ITEM.VALUE}) |<p>Vault version has changed. Ack to close.</p> |`last(/HashiCorp Vault by HTTP/vault.health.version,#1)<>last(/HashiCorp Vault by HTTP/vault.health.version,#2) and length(last(/HashiCorp Vault by HTTP/vault.health.version))>0` |INFO |<p>Manual close: YES</p> |
+|Vault: Vault server is not responding |<p>-</p> |`last(/HashiCorp Vault by HTTP/vault.health.check)=0` |HIGH | |
+|Vault: Failed to get metrics (error: {ITEM.VALUE}) |<p>-</p> |`length(last(/HashiCorp Vault by HTTP/vault.get_metrics.error))>0` |WARNING |<p>**Depends on**:</p><p>- Vault: Vault server is sealed</p> |
+|Vault: Current number of open files is too high (over {$VAULT.OPEN.FDS.MAX.WARN}% for 5m) |<p>-</p> |`min(/HashiCorp Vault by HTTP/vault.metrics.process.open.fds,5m)/last(/HashiCorp Vault by HTTP/vault.metrics.process.max.fds)*100>{$VAULT.OPEN.FDS.MAX.WARN}` |WARNING | |
+|Vault: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/HashiCorp Vault by HTTP/vault.metrics.process.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Vault: High frequency of leadership setup failures (over {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} for 1h) |<p>There have been more than {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} Vault leadership setup failures in the past 1h.</p> |`(max(/HashiCorp Vault by HTTP/vault.metrics.core.leadership.setup_failed,1h)-min(/HashiCorp Vault by HTTP/vault.metrics.core.leadership.setup_failed,1h))>{$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN}` |AVERAGE | |
+|Vault: High frequency of leadership losses (over {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} for 1h) |<p>There have been more than {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} Vault leadership losses in the past 1h.</p> |`(max(/HashiCorp Vault by HTTP/vault.metrics.core.leadership_lost,1h)-min(/HashiCorp Vault by HTTP/vault.metrics.core.leadership_lost,1h))>{$VAULT.LEADERSHIP.LOSSES.MAX.WARN}` |AVERAGE | |
+|Vault: High frequency of leadership step downs (over {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} for 1h) |<p>There have been more than {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} Vault leadership step downs in the past 1h.</p> |`(max(/HashiCorp Vault by HTTP/vault.metrics.core.step_down,1h)-min(/HashiCorp Vault by HTTP/vault.metrics.core.step_down,1h))>{$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN}` |AVERAGE | |
+|Vault: Token [{#TOKEN_NAME}] lookup error occurred |<p>-</p> |`length(last(/HashiCorp Vault by HTTP/vault.token_via_accessor.error["{#ACCESSOR}"]))>0` |WARNING |<p>**Depends on**:</p><p>- Vault: Vault server is sealed</p> |
+|Vault: Token [{#TOKEN_NAME}] will expire soon (less than {$VAULT.TOKEN.TTL.MIN.CRIT}) |<p>-</p> |`last(/HashiCorp Vault by HTTP/vault.token_via_accessor.has_ttl["{#ACCESSOR}"])=1 and last(/HashiCorp Vault by HTTP/vault.token_via_accessor.ttl["{#ACCESSOR}"])<{$VAULT.TOKEN.TTL.MIN.CRIT}` |AVERAGE | |
+|Vault: Token [{#TOKEN_NAME}] will expire soon (less than {$VAULT.TOKEN.TTL.MIN.WARN}) |<p>-</p> |`last(/HashiCorp Vault by HTTP/vault.token_via_accessor.has_ttl["{#ACCESSOR}"])=1 and last(/HashiCorp Vault by HTTP/vault.token_via_accessor.ttl["{#ACCESSOR}"])<{$VAULT.TOKEN.TTL.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Vault: Token [{#TOKEN_NAME}] will expire soon (less than {$VAULT.TOKEN.TTL.MIN.CRIT})</p> |
 
 ## Feedback
 
diff --git a/templates/app/vault_http/template_app_vault.yaml b/templates/app/vault_http/template_app_vault_http.yaml
index 4202fd127b5..d512afbb9a9 100644
--- a/templates/app/vault_http/template_app_vault.yaml
+++ b/templates/app/vault_http/template_app_vault_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-13T12:28:17Z'
+  date: '2022-01-10T07:40:33Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -1078,7 +1078,7 @@ zabbix_export:
               expression: '(max(/HashiCorp Vault by HTTP/vault.metrics.core.leadership.setup_failed,1h)-min(/HashiCorp Vault by HTTP/vault.metrics.core.leadership.setup_failed,1h))>{$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN}'
               name: 'Vault: High frequency of leadership setup failures (over {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} for 1h)'
               priority: AVERAGE
-              description: 'There have been more than {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} Vault leadership setup failures in the past 1h'
+              description: 'There have been more than {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} Vault leadership setup failures in the past 1h.'
         -
           uuid: f0ca68774b5842d7803d2c2619958184
           name: 'Vault: Leadership setup lost, counter'
@@ -1110,7 +1110,7 @@ zabbix_export:
               expression: '(max(/HashiCorp Vault by HTTP/vault.metrics.core.leadership_lost,1h)-min(/HashiCorp Vault by HTTP/vault.metrics.core.leadership_lost,1h))>{$VAULT.LEADERSHIP.LOSSES.MAX.WARN}'
               name: 'Vault: High frequency of leadership losses (over {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} for 1h)'
               priority: AVERAGE
-              description: 'There have been more than {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} Vault leadership losses in the past 1h'
+              description: 'There have been more than {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} Vault leadership losses in the past 1h.'
         -
           uuid: 2bdb273b513d4a06914cd6ea11ac2368
           name: 'Vault: Post-unseal ops, counter'
@@ -1118,7 +1118,7 @@ zabbix_export:
           key: vault.metrics.core.post_unseal
           delay: '0'
           history: 7d
-          description: 'Duration of time taken by post-unseal operations handled by Vault core'
+          description: 'Duration of time taken by post-unseal operations handled by Vault core.'
           preprocessing:
             -
               type: PROMETHEUS_PATTERN
@@ -1140,7 +1140,7 @@ zabbix_export:
           key: vault.metrics.core.pre_seal
           delay: '0'
           history: 7d
-          description: 'Duration of time taken by pre-seal operations'
+          description: 'Duration of time taken by pre-seal operations.'
           preprocessing:
             -
               type: PROMETHEUS_PATTERN
@@ -1253,7 +1253,7 @@ zabbix_export:
               expression: '(max(/HashiCorp Vault by HTTP/vault.metrics.core.step_down,1h)-min(/HashiCorp Vault by HTTP/vault.metrics.core.step_down,1h))>{$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN}'
               name: 'Vault: High frequency of leadership step downs (over {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} for 1h)'
               priority: AVERAGE
-              description: 'There have been more than {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} Vault leadership step downs in the past 1h'
+              description: 'There have been more than {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} Vault leadership step downs in the past 1h.'
         -
           uuid: 075c83114d1746b6b773579404e0268d
           name: 'Vault: Unseal ops, counter'
@@ -1988,7 +1988,7 @@ zabbix_export:
           key: vault.metrics.secret.kv.count
           delay: '0'
           history: 7d
-          description: 'Number of entries in each key-value secret engine'
+          description: 'Number of entries in each key-value secret engine.'
           preprocessing:
             -
               type: PROMETHEUS_TO_JSON
@@ -2118,7 +2118,7 @@ zabbix_export:
           key: vault.metrics.token.by_ttl
           delay: '0'
           history: 7d
-          description: 'Number of service tokens, grouped by the TTL range they were assigned at creation'
+          description: 'Number of service tokens, grouped by the TTL range they were assigned at creation.'
           preprocessing:
             -
               type: PROMETHEUS_TO_JSON
@@ -2443,7 +2443,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is matched/found'
+              description: 'Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is matched/found.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2466,7 +2466,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is not matched/found'
+              description: 'Number of incidences where the starting Merkle Tree index used to begin streaming WAL entries is not matched/found.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2621,7 +2621,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Number of a {#OPERATION} operation against the {#STORAGE} storage backend'
+              description: 'Number of a {#OPERATION} operation against the {#STORAGE} storage backend.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2648,11 +2648,11 @@ zabbix_export:
           type: DEPENDENT
           key: vault.tokens.discovery
           delay: '0'
-          description: 'Tokens metrics doscovery.'
+          description: 'Tokens metrics discovery.'
           item_prototypes:
             -
               uuid: 9a9359e74c3a48b1bbada84d772e665a
-              name: 'Token [{#TOKEN_NAME}] error'
+              name: 'Vault: Token [{#TOKEN_NAME}] error'
               type: DEPENDENT
               key: 'vault.token_via_accessor.error["{#ACCESSOR}"]'
               delay: '0'
@@ -2689,7 +2689,7 @@ zabbix_export:
                       expression: 'last(/HashiCorp Vault by HTTP/vault.health.sealed)=1'
             -
               uuid: caa3f9ca96b14b929dd75238602fead9
-              name: 'Token [{#TOKEN_NAME}] has TTL'
+              name: 'Vault: Token [{#TOKEN_NAME}] has TTL'
               type: DEPENDENT
               key: 'vault.token_via_accessor.has_ttl["{#ACCESSOR}"]'
               delay: '0'
@@ -2718,7 +2718,7 @@ zabbix_export:
                   value: 'Vault: Token {#TOKEN_NAME}'
             -
               uuid: 0f872d9d811c44f6a9a9f8f5089ca0a1
-              name: 'Token [{#TOKEN_NAME}] TTL'
+              name: 'Vault: Token [{#TOKEN_NAME}] TTL'
               type: DEPENDENT
               key: 'vault.token_via_accessor.ttl["{#ACCESSOR}"]'
               delay: '0'
@@ -2776,7 +2776,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Time taken to delete a Write Ahead Log (WAL)'
+              description: 'Time taken to delete a Write Ahead Log (WAL).'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2799,7 +2799,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Time taken to flush a ready Write Ahead Log (WAL) to storage'
+              description: 'Time taken to flush a ready Write Ahead Log (WAL) to storage.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2822,7 +2822,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Number of Write Ahead Logs (WAL) deleted during each garbage collection run'
+              description: 'Number of Write Ahead Logs (WAL) deleted during each garbage collection run.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2845,7 +2845,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Total Number of Write Ahead Logs (WAL) on disk'
+              description: 'Total Number of Write Ahead Logs (WAL) on disk.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2868,7 +2868,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Time taken to load a Write Ahead Log (WAL)'
+              description: 'Time taken to load a Write Ahead Log (WAL).'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2891,7 +2891,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Time taken to persist a Write Ahead Log (WAL)'
+              description: 'Time taken to persist a Write Ahead Log (WAL).'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2920,7 +2920,7 @@ zabbix_export:
         -
           macro: '{$VAULT.HOST}'
           value: '<PUT YOUR VAULT HOST>'
-          description: 'Vault host name'
+          description: 'Vault host name.'
         -
           macro: '{$VAULT.LEADERSHIP.LOSSES.MAX.WARN}'
           value: '5'
@@ -2928,7 +2928,7 @@ zabbix_export:
         -
           macro: '{$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN}'
           value: '5'
-          description: 'Maximum number of Vault leadership setyp failed.'
+          description: 'Maximum number of Vault leadership setup failed.'
         -
           macro: '{$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN}'
           value: '5'
@@ -2940,7 +2940,7 @@ zabbix_export:
         -
           macro: '{$VAULT.OPEN.FDS.MAX.WARN}'
           value: '90'
-          description: 'Maximum percentage of used file descriptors for trigger expression'
+          description: 'Maximum percentage of used file descriptors for trigger expression.'
         -
           macro: '{$VAULT.TOKEN}'
           value: '<PUT YOUR AUTH TOKEN>'
diff --git a/templates/app/wildfly_domain_jmx/README.md b/templates/app/wildfly_domain_jmx/README.md
index cf1cdf550ac..b8169bceb2b 100644
--- a/templates/app/wildfly_domain_jmx/README.md
+++ b/templates/app/wildfly_domain_jmx/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official JMX Template for WildFly Domain Controller.
 
 
@@ -15,7 +15,7 @@ This template was tested on:
 
 > See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/jmx) for basic instructions.
 
-Metrics are collected by JMX.  
+Metrics are collected by JMX.
 This template works with Domain Controller.
 
 1. Enable and configure JMX access to WildFly. See documentation for [instructions](https://docs.wildfly.org/23/Admin_Guide.html#JMX).
@@ -50,8 +50,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Deployments discovery |<p>Discovery deployments metrics.</p> |JMX |jmx.get[beans,"jboss.as.expr:deployment=*,server-group=*"]<p>**Filter**:</p>AND <p>- A: {#DEPLOYMENT} MATCHES_REGEX `{$WILDFLY.DEPLOYMENT.MATCHES}`</p><p>- B: {#DEPLOYMENT} NOT_MATCHES_REGEX `{$WILDFLY.DEPLOYMENT.NOT_MATCHES}`</p> |
-|Servers discovery |<p>Discovery instances in domain.</p> |JMX |jmx.get[beans,"jboss.as:host=master,server-config=*"]<p>**Filter**:</p>AND <p>- A: {#SERVER} MATCHES_REGEX `{$WILDFLY.SERVER.MATCHES}`</p><p>- B: {#SERVER} NOT_MATCHES_REGEX `{$WILDFLY.SERVER.NOT_MATCHES}`</p> |
+|Deployments discovery |<p>Discovery deployments metrics.</p> |JMX |jmx.get[beans,"jboss.as.expr:deployment=*,server-group=*"]<p>**Filter**:</p>AND <p>- {#DEPLOYMENT} MATCHES_REGEX `{$WILDFLY.DEPLOYMENT.MATCHES}`</p><p>- {#DEPLOYMENT} NOT_MATCHES_REGEX `{$WILDFLY.DEPLOYMENT.NOT_MATCHES}`</p> |
+|Servers discovery |<p>Discovery instances in domain.</p> |JMX |jmx.get[beans,"jboss.as:host=master,server-config=*"]<p>**Filter**:</p>AND <p>- {#SERVER} MATCHES_REGEX `{$WILDFLY.SERVER.MATCHES}`</p><p>- {#SERVER} NOT_MATCHES_REGEX `{$WILDFLY.SERVER.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -62,9 +62,9 @@ There are no template links in this template.
 |WildFly |WildFly: Process type |<p>The type of process represented by this root resource.</p> |JMX |jmx["jboss.as:management-root=server","processType"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |WildFly |WildFly: Version |<p>The version of the WildFly Core based product release</p> |JMX |jmx["jboss.as:management-root=server","productVersion"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |WildFly |WildFly: Uptime |<p>WildFly server uptime.</p> |JMX |jmx["java.lang:type=Runtime","Uptime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
-|WildFly |WildFly deployment [{#DEPLOYMENT}]: Enabled |<p>Boolean indicating whether the deployment content is currently deployed in the runtime (or should be deployed in the runtime the next time the server starts.)</p> |JMX |jmx["{#JMXOBJ}",enabled]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|WildFly |WildFly deployment [{#DEPLOYMENT}]: Managed |<p>Indicates if the deployment is managed (aka uses the ContentRepository).</p> |JMX |jmx["{#JMXOBJ}",managed]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|WildFly |WildFly domain: Server {#SERVER}: Autostart |<p>Whether or not this server should be started when the Host Controller starts.</p> |JMX |jmx["{#JMXOBJ}",autoStart]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly deployment [{#DEPLOYMENT}]: Enabled |<p>Boolean indicating whether the deployment content is currently deployed in the runtime (or should be deployed in the runtime the next time the server starts.)</p> |JMX |jmx["{#JMXOBJ}",enabled]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly deployment [{#DEPLOYMENT}]: Managed |<p>Indicates if the deployment is managed (aka uses the ContentRepository).</p> |JMX |jmx["{#JMXOBJ}",managed]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly domain: Server {#SERVER}: Autostart |<p>Whether or not this server should be started when the Host Controller starts.</p> |JMX |jmx["{#JMXOBJ}",autoStart]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |WildFly |WildFly domain: Server {#SERVER}: Status |<p>The current status of the server.</p> |JMX |jmx["{#JMXOBJ}",status]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |WildFly |WildFly domain: Server {#SERVER}: Server group |<p>The name of a server group from the domain model.</p> |JMX |jmx["{#JMXOBJ}",group]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 
@@ -72,10 +72,10 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|WildFly: Version has changed (new version: {ITEM.VALUE}) |<p>WildFly version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["jboss.as:management-root=server","productVersion"].diff()}=1 and {TEMPLATE_NAME:jmx["jboss.as:management-root=server","productVersion"].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|WildFly: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:jmx["java.lang:type=Runtime","Uptime"].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|WildFly domain: Server {#SERVER}: Server status has changed (new status: {ITEM.VALUE}) |<p>Server status has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",status].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",status].strlen()}>0` |WARNING |<p>Manual close: YES</p> |
-|WildFly domain: Server {#SERVER}: Server group has changed (new group: {ITEM.VALUE}) |<p>Server group has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",group].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",group].strlen()}>0` |INFO |<p>Manual close: YES</p> |
+|WildFly: Version has changed (new version: {ITEM.VALUE}) |<p>WildFly version has changed. Ack to close.</p> |`last(/WildFly Domain by JMX/jmx["jboss.as:management-root=server","productVersion"],#1)<>last(/WildFly Domain by JMX/jmx["jboss.as:management-root=server","productVersion"],#2) and length(last(/WildFly Domain by JMX/jmx["jboss.as:management-root=server","productVersion"]))>0` |INFO |<p>Manual close: YES</p> |
+|WildFly: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/WildFly Domain by JMX/jmx["java.lang:type=Runtime","Uptime"])<10m` |INFO |<p>Manual close: YES</p> |
+|WildFly domain: Server {#SERVER}: Server status has changed (new status: {ITEM.VALUE}) |<p>Server status has changed. Ack to close.</p> |`last(/WildFly Domain by JMX/jmx["{#JMXOBJ}",status],#1)<>last(/WildFly Domain by JMX/jmx["{#JMXOBJ}",status],#2) and length(last(/WildFly Domain by JMX/jmx["{#JMXOBJ}",status]))>0` |WARNING |<p>Manual close: YES</p> |
+|WildFly domain: Server {#SERVER}: Server group has changed (new group: {ITEM.VALUE}) |<p>Server group has changed. Ack to close.</p> |`last(/WildFly Domain by JMX/jmx["{#JMXOBJ}",group],#1)<>last(/WildFly Domain by JMX/jmx["{#JMXOBJ}",group],#2) and length(last(/WildFly Domain by JMX/jmx["{#JMXOBJ}",group]))>0` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml b/templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml
index 98494ec4eb0..aa0a2fbf566 100644
--- a/templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml
+++ b/templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:25Z'
+  version: '6.0'
+  date: '2021-12-15T06:58:33Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
diff --git a/templates/app/wildfly_server_jmx/README.md b/templates/app/wildfly_server_jmx/README.md
index 02529ddc295..e7ba6a947fe 100644
--- a/templates/app/wildfly_server_jmx/README.md
+++ b/templates/app/wildfly_server_jmx/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official JMX Template for WildFly server.
 
 
@@ -15,7 +15,7 @@ This template was tested on:
 
 > See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/jmx) for basic instructions.
 
-Metrics are collected by JMX.  
+Metrics are collected by JMX.
 This template works with standalone and domain instances.
 
 1. Enable and configure JMX access to WildFly. See documentation for [instructions](https://docs.wildfly.org/23/Admin_Guide.html#JMX).
@@ -49,7 +49,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Deployments discovery |<p>Discovery deployments metrics.</p> |JMX |jmx.get[beans,"jboss.as.expr:deployment=*"]<p>**Filter**:</p>AND <p>- A: {#DEPLOYMENT} MATCHES_REGEX `{$WILDFLY.DEPLOYMENT.MATCHES}`</p><p>- B: {#DEPLOYMENT} NOT_MATCHES_REGEX `{$WILDFLY.DEPLOYMENT.NOT_MATCHES}`</p> |
+|Deployments discovery |<p>Discovery deployments metrics.</p> |JMX |jmx.get[beans,"jboss.as.expr:deployment=*"]<p>**Filter**:</p>AND <p>- {#DEPLOYMENT} MATCHES_REGEX `{$WILDFLY.DEPLOYMENT.MATCHES}`</p><p>- {#DEPLOYMENT} NOT_MATCHES_REGEX `{$WILDFLY.DEPLOYMENT.NOT_MATCHES}`</p> |
 |JDBC metrics discovery |<p>-</p> |JMX |jmx.get[beans,"jboss.as:subsystem=datasources,data-source=*,statistics=jdbc"] |
 |Pools metrics discovery |<p>-</p> |JMX |jmx.get[beans,"jboss.as:subsystem=datasources,data-source=*,statistics=pool"] |
 |Undertow metrics discovery |<p>-</p> |JMX |jmx.get[beans,"jboss.as:subsystem=undertow,server=*,http-listener=*"] |
@@ -65,28 +65,28 @@ There are no template links in this template.
 |WildFly |WildFly: Server controller state |<p>The current state of the server controller; either STARTING, RUNNING, RESTART_REQUIRED, RELOAD_REQUIRED or STOPPING.</p> |JMX |jmx["jboss.as:management-root=server","serverState"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |WildFly |WildFly: Version |<p>The version of the WildFly Core based product release</p> |JMX |jmx["jboss.as:management-root=server","productVersion"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |WildFly |WildFly: Uptime |<p>WildFly server uptime.</p> |JMX |jmx["java.lang:type=Runtime","Uptime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
-|WildFly |WildFly: Transactions: Total, rate |<p>The total number of transactions (top-level and nested) created per second.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly: Transactions: Aborted, rate |<p>The number of aborted (i.e. rolledback) transactions per second.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfAbortedTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly: Transactions: Application rollbacks, rate |<p>The number of transactions that have been rolled back by application request. This includes those that timeout, since the timeout behavior is considered an attribute of the application configuration.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfApplicationRollbacks"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly: Transactions: Committed, rate |<p>The number of committed transactions</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfCommittedTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly: Transactions: Heuristics, rate |<p>The number of transactions which have terminated with heuristic outcomes.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfHeuristics"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly: Transactions: Total, rate |<p>The total number of transactions (top-level and nested) created per second.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly: Transactions: Aborted, rate |<p>The number of aborted (i.e. rolledback) transactions per second.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfAbortedTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly: Transactions: Application rollbacks, rate |<p>The number of transactions that have been rolled back by application request. This includes those that timeout, since the timeout behavior is considered an attribute of the application configuration.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfApplicationRollbacks"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly: Transactions: Committed, rate |<p>The number of committed transactions</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfCommittedTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly: Transactions: Heuristics, rate |<p>The number of transactions which have terminated with heuristic outcomes.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfHeuristics"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly: Transactions: Current |<p>The number of transactions that have begun but not yet terminated.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfInflightTransactions"] |
-|WildFly |WildFly: Transactions: Nested, rate |<p>The total number of nested (sub) transactions created.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfNestedTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly: Transactions: ResourceRollbacks, rate |<p>The number of transactions that rolled back due to resource (participant) failure.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfResourceRollbacks"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly: Transactions: System rollbacks, rate |<p>The number of transactions that have been rolled back due to internal system errors.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfSystemRollbacks"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly: Transactions: Timed out, rate |<p>The number of transactions that have rolled back due to timeout.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfTimedOutTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly deployment [{#DEPLOYMENT}]: Status |<p>The current runtime status of a deployment. </p><p>Possible status modes are OK, FAILED, and STOPPED. </p><p>FAILED indicates a dependency is missing or a service could not start. </p><p>STOPPED indicates that the deployment was not enabled or was manually stopped.</p> |JMX |jmx["{#JMXOBJ}",status]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|WildFly |WildFly deployment [{#DEPLOYMENT}]: Enabled |<p>Boolean indicating whether the deployment content is currently deployed in the runtime (or should be deployed in the runtime the next time the server starts.)</p> |JMX |jmx["{#JMXOBJ}",enabled]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|WildFly |WildFly deployment [{#DEPLOYMENT}]: Managed |<p>Indicates if the deployment is managed (aka uses the ContentRepository).</p> |JMX |jmx["{#JMXOBJ}",managed]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|WildFly |WildFly deployment [{#DEPLOYMENT}]: Persistent |<p>Indicates if the deployment is managed (aka uses the ContentRepository).</p> |JMX |jmx["{#JMXOBJ}",persistent]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly: Transactions: Nested, rate |<p>The total number of nested (sub) transactions created.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfNestedTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly: Transactions: ResourceRollbacks, rate |<p>The number of transactions that rolled back due to resource (participant) failure.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfResourceRollbacks"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly: Transactions: System rollbacks, rate |<p>The number of transactions that have been rolled back due to internal system errors.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfSystemRollbacks"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly: Transactions: Timed out, rate |<p>The number of transactions that have rolled back due to timeout.</p> |JMX |jmx["jboss.as:subsystem=transactions","numberOfTimedOutTransactions"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly deployment [{#DEPLOYMENT}]: Status |<p>The current runtime status of a deployment.</p><p>Possible status modes are OK, FAILED, and STOPPED.</p><p>FAILED indicates a dependency is missing or a service could not start.</p><p>STOPPED indicates that the deployment was not enabled or was manually stopped.</p> |JMX |jmx["{#JMXOBJ}",status]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly deployment [{#DEPLOYMENT}]: Enabled |<p>Boolean indicating whether the deployment content is currently deployed in the runtime (or should be deployed in the runtime the next time the server starts.)</p> |JMX |jmx["{#JMXOBJ}",enabled]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly deployment [{#DEPLOYMENT}]: Managed |<p>Indicates if the deployment is managed (aka uses the ContentRepository).</p> |JMX |jmx["{#JMXOBJ}",managed]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly deployment [{#DEPLOYMENT}]: Persistent |<p>Indicates if the deployment is managed (aka uses the ContentRepository).</p> |JMX |jmx["{#JMXOBJ}",persistent]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |WildFly |WildFly deployment [{#DEPLOYMENT}]: Enabled time |<p>Indicates if the deployment is managed (aka uses the ContentRepository).</p> |JMX |jmx["{#JMXOBJ}",enabledTime]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache access, rate |<p>The number of times that the statement cache was accessed  per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheAccessCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache add, rate |<p>The number of statements added to the statement cache per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheAddCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache access, rate |<p>The number of times that the statement cache was accessed  per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheAccessCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache add, rate |<p>The number of statements added to the statement cache per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheAddCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Cache current size |<p>The number of prepared and callable statements currently cached in the statement cache.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheCurrentSize] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache delete, rate |<p>The number of statements discarded from the cache per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheDeleteCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache hit, rate |<p>The number of times that statements from the cache were used per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheHitCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache miss, rate |<p>The number of times that a statement request could not be satisfied with a statement from the cache per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheMissCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Statistics enabled |<p>Define whether runtime statistics are enabled or not.</p> |JMX |jmx["{#JMXOBJ}",statisticsEnabled]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache delete, rate |<p>The number of statements discarded from the cache per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheDeleteCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache hit, rate |<p>The number of times that statements from the cache were used per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheHitCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Cache miss, rate |<p>The number of times that a statement request could not be satisfied with a statement from the cache per second.</p> |JMX |jmx["{#JMXOBJ}",PreparedStatementCacheMissCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Statistics enabled |<p>Define whether runtime statistics are enabled or not.</p> |JMX |jmx["{#JMXOBJ}",statisticsEnabled]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Active |<p>The number of open connections.</p> |JMX |jmx["{#JMXOBJ}",ActiveCount] |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Available |<p>The available count.</p> |JMX |jmx["{#JMXOBJ}",AvailableCount] |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Blocking time, avg |<p>Average Blocking Time for pool.</p> |JMX |jmx["{#JMXOBJ}",AverageBlockingTime] |
@@ -94,51 +94,51 @@ There are no template links in this template.
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Get time, avg |<p>The average time spent obtaining a physical connection.</p> |JMX |jmx["{#JMXOBJ}",AverageGetTime] |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Pool time, avg |<p>The average time for a physical connection spent in the pool.</p> |JMX |jmx["{#JMXOBJ}",AveragePoolTime] |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Usage time, avg |<p>The average time spent using a physical connection</p> |JMX |jmx["{#JMXOBJ}",AverageUsageTime] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Blocking failure, rate |<p>The number of failures trying to obtain a physical connection per second.</p> |JMX |jmx["{#JMXOBJ}",BlockingFailureCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Created, rate |<p>The created per second</p> |JMX |jmx["{#JMXOBJ}",CreatedCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Destroyed, rate |<p>The destroyed count.</p> |JMX |jmx["{#JMXOBJ}",DestroyedCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Blocking failure, rate |<p>The number of failures trying to obtain a physical connection per second.</p> |JMX |jmx["{#JMXOBJ}",BlockingFailureCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Created, rate |<p>The created per second</p> |JMX |jmx["{#JMXOBJ}",CreatedCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Destroyed, rate |<p>The destroyed count.</p> |JMX |jmx["{#JMXOBJ}",DestroyedCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Idle |<p>The number of physical connections currently idle.</p> |JMX |jmx["{#JMXOBJ}",IdleCount] |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: In use |<p>The number of physical connections currently in use.</p> |JMX |jmx["{#JMXOBJ}",InUseCount] |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Used, max |<p>The maximum number of connections used.</p> |JMX |jmx["{#JMXOBJ}",MaxUsedCount] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Statistics enabled |<p>Define whether runtime statistics are enabled or not.</p> |JMX |jmx["{#JMXOBJ}",statisticsEnabled]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Timed out, rate |<p>The timed out connections per second.</p> |JMX |jmx["{#JMXOBJ}",TimedOut]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Statistics enabled |<p>Define whether runtime statistics are enabled or not.</p> |JMX |jmx["{#JMXOBJ}",statisticsEnabled]<p>**Preprocessing**:</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Timed out, rate |<p>The timed out connections per second.</p> |JMX |jmx["{#JMXOBJ}",TimedOut]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: Connections: Wait |<p>The number of requests that had to wait to obtain a physical connection.</p> |JMX |jmx["{#JMXOBJ}",WaitCount] |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Commit time, avg |<p>The average time for a XAResource commit invocation.</p> |JMX |jmx["{#JMXOBJ}",XACommitAverageTime] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Commit, rate |<p>The number of XAResource commit invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XACommitCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Commit, rate |<p>The number of XAResource commit invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XACommitCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: XA: End time, avg |<p>The average time for a XAResource end invocation.</p> |JMX |jmx["{#JMXOBJ}",XAEndAverageTime] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: End, rate |<p>The number of XAResource end invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XAEndCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: End, rate |<p>The number of XAResource end invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XAEndCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Forget time, avg |<p>The average time for a XAResource forget invocation.</p> |JMX |jmx["{#JMXOBJ}",XAForgetAverageTime] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Forget, rate |<p>The number of XAResource forget invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XAForgetCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Forget, rate |<p>The number of XAResource forget invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XAForgetCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Prepare time, avg |<p>The average time for a XAResource prepare invocation.</p> |JMX |jmx["{#JMXOBJ}",XAPrepareAverageTime] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Prepare, rate |<p>The number of XAResource prepare invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XAPrepareCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Prepare, rate |<p>The number of XAResource prepare invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XAPrepareCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Recover time, avg |<p>The average time for a XAResource recover invocation.</p> |JMX |jmx["{#JMXOBJ}",XARecoverAverageTime] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Recover, rate |<p>The number of XAResource recover invocationsper second.</p> |JMX |jmx["{#JMXOBJ}",XARecoverCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Recover, rate |<p>The number of XAResource recover invocationsper second.</p> |JMX |jmx["{#JMXOBJ}",XARecoverCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Rollback time, avg |<p>The average time for a XAResource rollback invocation.</p> |JMX |jmx["{#JMXOBJ}",XARollbackAverageTime] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Rollback, rate |<p>The number of XAResource rollback invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XARollbackCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Rollback, rate |<p>The number of XAResource rollback invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XARollbackCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Start time, avg |<p>The average time for a XAResource start invocation.</p> |JMX |jmx["{#JMXOBJ}",XAStartAverageTime] |
-|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Start rate |<p>The number of XAResource start invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XAStartCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly listener {#HTTP_LISTENER}: Errors, rate |<p>The number of 500 responses that have been sent by this listener per second.</p> |JMX |jmx["{#JMXOBJ}",errorCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly listener {#HTTP_LISTENER}: Requests, rate |<p>The number of requests this listener has served per second.</p> |JMX |jmx["{#JMXOBJ}",requestCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly listener {#HTTP_LISTENER}: Bytes sent, rate |<p>The number of bytes that have been sent out on this listener per second.</p> |JMX |jmx["{#JMXOBJ}",bytesSent]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|WildFly |WildFly listener {#HTTP_LISTENER}: Bytes received, rate |<p>The number of bytes that have been received by this listener per second.</p> |JMX |jmx["{#JMXOBJ}",bytesReceived]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|WildFly |WildFly {#JMX_DATA_SOURCE}: XA: Start rate |<p>The number of XAResource start invocations per second.</p> |JMX |jmx["{#JMXOBJ}",XAStartCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly listener {#HTTP_LISTENER}: Errors, rate |<p>The number of 500 responses that have been sent by this listener per second.</p> |JMX |jmx["{#JMXOBJ}",errorCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly listener {#HTTP_LISTENER}: Requests, rate |<p>The number of requests this listener has served per second.</p> |JMX |jmx["{#JMXOBJ}",requestCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly listener {#HTTP_LISTENER}: Bytes sent, rate |<p>The number of bytes that have been sent out on this listener per second.</p> |JMX |jmx["{#JMXOBJ}",bytesSent]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|WildFly |WildFly listener {#HTTP_LISTENER}: Bytes received, rate |<p>The number of bytes that have been received by this listener per second.</p> |JMX |jmx["{#JMXOBJ}",bytesReceived]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|WildFly: Server needs to restart for configuration change. |<p>-</p> |`{TEMPLATE_NAME:jmx["jboss.as:management-root=server","runtimeConfigurationState"].str(ok)}=0` |WARNING | |
-|WildFly: Server controller is not in RUNNING state |<p>-</p> |`{TEMPLATE_NAME:jmx["jboss.as:management-root=server","serverState"].str(running)}=0` |WARNING |<p>**Depends on**:</p><p>- WildFly: Server needs to restart for configuration change.</p> |
-|WildFly: Version has changed (new version: {ITEM.VALUE}) |<p>WildFly version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["jboss.as:management-root=server","productVersion"].diff()}=1 and {TEMPLATE_NAME:jmx["jboss.as:management-root=server","productVersion"].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|WildFly: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:jmx["java.lang:type=Runtime","Uptime"].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|WildFly: Failed to fetch info data (or no data for 15m) |<p>Zabbix has not received data for items for the last 15 minutes</p> |`{TEMPLATE_NAME:jmx["java.lang:type=Runtime","Uptime"].nodata(15m)}=1` |WARNING | |
-|WildFly deployment [{#DEPLOYMENT}]: Deployment status has changed (new status: {ITEM.VALUE}) |<p>Deployment status has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",status].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",status].strlen()}>0` |WARNING |<p>Manual close: YES</p> |
-|WildFly {#JMX_DATA_SOURCE}: JDBC monitoring statistic is not enabled |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",statisticsEnabled].last()}=0` |INFO | |
-|WildFly {#JMX_DATA_SOURCE}: There are no active connections for 5m |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",ActiveCount].max(5m)}=0` |WARNING | |
-|WildFly {#JMX_DATA_SOURCE}: Connection usage is too high (over {$WILDFLY.CONN.USAGE.WARN.MAX} in 5m) |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",InUseCount].min(5m)}/{WildFly Server by JMX:jmx["{#JMXOBJ}",AvailableCount].last()}*100>{$WILDFLY.CONN.USAGE.WARN.MAX}` |HIGH | |
-|WildFly {#JMX_DATA_SOURCE}: Pools monitoring statistic is not enabled |<p>Zabbix has not received data for items for the last 15 minutes</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",statisticsEnabled].last()}=0` |INFO | |
-|WildFly {#JMX_DATA_SOURCE}: There are timeout  connections |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",TimedOut].last()}>0` |WARNING | |
-|WildFly {#JMX_DATA_SOURCE}: Too many waiting connections (over {$WILDFLY.CONN.WAIT.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",WaitCount].min(5m)}>{$WILDFLY.CONN.WAIT.MAX.WARN}` |WARNING | |
-|WildFly listener {#HTTP_LISTENER}: There are 500 responses by this listener. |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",errorCount].last()}>0` |WARNING | |
+|WildFly: Server needs to restart for configuration change. |<p>-</p> |`find(/WildFly Server by JMX/jmx["jboss.as:management-root=server","runtimeConfigurationState"],,"like","ok")=0` |WARNING | |
+|WildFly: Server controller is not in RUNNING state |<p>-</p> |`find(/WildFly Server by JMX/jmx["jboss.as:management-root=server","serverState"],,"like","running")=0` |WARNING |<p>**Depends on**:</p><p>- WildFly: Server needs to restart for configuration change.</p> |
+|WildFly: Version has changed (new version: {ITEM.VALUE}) |<p>WildFly version has changed. Ack to close.</p> |`last(/WildFly Server by JMX/jmx["jboss.as:management-root=server","productVersion"],#1)<>last(/WildFly Server by JMX/jmx["jboss.as:management-root=server","productVersion"],#2) and length(last(/WildFly Server by JMX/jmx["jboss.as:management-root=server","productVersion"]))>0` |INFO |<p>Manual close: YES</p> |
+|WildFly: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/WildFly Server by JMX/jmx["java.lang:type=Runtime","Uptime"])<10m` |INFO |<p>Manual close: YES</p> |
+|WildFly: Failed to fetch info data (or no data for 15m) |<p>Zabbix has not received data for items for the last 15 minutes</p> |`nodata(/WildFly Server by JMX/jmx["java.lang:type=Runtime","Uptime"],15m)=1` |WARNING | |
+|WildFly deployment [{#DEPLOYMENT}]: Deployment status has changed (new status: {ITEM.VALUE}) |<p>Deployment status has changed. Ack to close.</p> |`last(/WildFly Server by JMX/jmx["{#JMXOBJ}",status],#1)<>last(/WildFly Server by JMX/jmx["{#JMXOBJ}",status],#2) and length(last(/WildFly Server by JMX/jmx["{#JMXOBJ}",status]))>0` |WARNING |<p>Manual close: YES</p> |
+|WildFly {#JMX_DATA_SOURCE}: JDBC monitoring statistic is not enabled |<p>-</p> |`last(/WildFly Server by JMX/jmx["{#JMXOBJ}",statisticsEnabled])=0` |INFO | |
+|WildFly {#JMX_DATA_SOURCE}: There are no active connections for 5m |<p>-</p> |`max(/WildFly Server by JMX/jmx["{#JMXOBJ}",ActiveCount],5m)=0` |WARNING | |
+|WildFly {#JMX_DATA_SOURCE}: Connection usage is too high (over {$WILDFLY.CONN.USAGE.WARN.MAX} in 5m) |<p>-</p> |`min(/WildFly Server by JMX/jmx["{#JMXOBJ}",InUseCount],5m)/last(/WildFly Server by JMX/jmx["{#JMXOBJ}",AvailableCount])*100>{$WILDFLY.CONN.USAGE.WARN.MAX}` |HIGH | |
+|WildFly {#JMX_DATA_SOURCE}: Pools monitoring statistic is not enabled |<p>Zabbix has not received data for items for the last 15 minutes</p> |`last(/WildFly Server by JMX/jmx["{#JMXOBJ}",statisticsEnabled])=0` |INFO | |
+|WildFly {#JMX_DATA_SOURCE}: There are timeout  connections |<p>-</p> |`last(/WildFly Server by JMX/jmx["{#JMXOBJ}",TimedOut])>0` |WARNING | |
+|WildFly {#JMX_DATA_SOURCE}: Too many waiting connections (over {$WILDFLY.CONN.WAIT.MAX.WARN} for 5m) |<p>-</p> |`min(/WildFly Server by JMX/jmx["{#JMXOBJ}",WaitCount],5m)>{$WILDFLY.CONN.WAIT.MAX.WARN}` |WARNING | |
+|WildFly listener {#HTTP_LISTENER}: There are 500 responses by this listener. |<p>-</p> |`last(/WildFly Server by JMX/jmx["{#JMXOBJ}",errorCount])>0` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml b/templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml
index f9327790f8b..f470abe5056 100644
--- a/templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml
+++ b/templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:26Z'
+  version: '6.0'
+  date: '2021-12-15T06:58:37Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -537,9 +537,9 @@ zabbix_export:
               username: '{$WILDFLY.USER}'
               password: '{$WILDFLY.PASSWORD}'
               description: |
-                The current runtime status of a deployment. 
-                Possible status modes are OK, FAILED, and STOPPED. 
-                FAILED indicates a dependency is missing or a service could not start. 
+                The current runtime status of a deployment.
+                Possible status modes are OK, FAILED, and STOPPED.
+                FAILED indicates a dependency is missing or a service could not start.
                 STOPPED indicates that the deployment was not enabled or was manually stopped.
               preprocessing:
                 -
diff --git a/templates/app/zabbix_proxy/README.md b/templates/app/zabbix_proxy/README.md
new file mode 100644
index 00000000000..b6db1795267
--- /dev/null
+++ b/templates/app/zabbix_proxy/README.md
@@ -0,0 +1,114 @@
+
+# Zabbix proxy health
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$ZABBIX.PROXY.UTIL.MAX} |<p>Maximum average percentage of time processes busy in the last minute (default is 75).</p> |`75` |
+|{$ZABBIX.PROXY.UTIL.MIN} |<p>Minimum average percentage of time processes busy in the last minute (default is 65).</p> |`65` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Zabbix proxy |Zabbix proxy: Queue over 10 minutes |<p>Number of monitored items in the queue which are delayed at least by 10 minutes.</p> |INTERNAL |zabbix[queue,10m] |
+|Zabbix proxy |Zabbix proxy: Queue |<p>Number of monitored items in the queue which are delayed at least by 6 seconds.</p> |INTERNAL |zabbix[queue] |
+|Zabbix proxy |Zabbix proxy: Utilization of data sender internal processes, in % |<p>Average percentage of time data sender processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,data sender,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of availability manager internal processes, in % |<p>Average percentage of time availability manager processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,availability manager,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of configuration syncer internal processes, in % |<p>Average percentage of time configuration syncer processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,configuration syncer,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of discoverer data collector processes, in % |<p>Average percentage of time discoverer processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,discoverer,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of heartbeat sender internal processes, in % |<p>Average percentage of time heartbeat sender processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,heartbeat sender,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of ODBC poller data collector processes, in % |<p>Average percentage of time ODBC poller processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,odbc poller,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of history poller data collector processes, in % |<p>Average percentage of time history poller processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,history poller,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of history syncer internal processes, in % |<p>Average percentage of time history syncer processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,history syncer,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of housekeeper internal processes, in % |<p>Average percentage of time housekeeper processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,housekeeper,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of http poller data collector processes, in % |<p>Average percentage of time http poller processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,http poller,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of icmp pinger data collector processes, in % |<p>Average percentage of time icmp pinger processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,icmp pinger,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of ipmi manager internal processes, in % |<p>Average percentage of time ipmi manager processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,ipmi manager,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of ipmi poller data collector processes, in % |<p>Average percentage of time ipmi poller processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,ipmi poller,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of java poller data collector processes, in % |<p>Average percentage of time java poller processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,java poller,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of poller data collector processes, in % |<p>Average percentage of time poller processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,poller,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of preprocessing worker internal processes, in % |<p>Average percentage of time preprocessing worker processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,preprocessing worker,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of preprocessing manager internal processes, in % |<p>Average percentage of time preprocessing manager processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,preprocessing manager,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of self-monitoring internal processes, in % |<p>Average percentage of time self-monitoring processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,self-monitoring,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of snmp trapper data collector processes, in % |<p>Average percentage of time snmp trapper processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,snmp trapper,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of task manager internal processes, in % |<p>Average percentage of time task manager processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,task manager,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of trapper data collector processes, in % |<p>Average percentage of time trapper processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,trapper,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of unreachable poller data collector processes, in % |<p>Average percentage of time unreachable poller processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,unreachable poller,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Utilization of vmware data collector processes, in % |<p>Average percentage of time vmware collector processes have been busy in the last minute.</p> |INTERNAL |zabbix[process,vmware collector,avg,busy] |
+|Zabbix proxy |Zabbix proxy: Configuration cache, % used |<p>Availability statistics of Zabbix configuration cache. Percentage of used buffer.</p> |INTERNAL |zabbix[rcache,buffer,pused] |
+|Zabbix proxy |Zabbix proxy: Version |<p>Version of Zabbix proxy.</p> |INTERNAL |zabbix[version]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Zabbix proxy |Zabbix proxy: VMware cache, % used |<p>Availability statistics of Zabbix vmware cache. Percentage of used buffer.</p> |INTERNAL |zabbix[vmware,buffer,pused] |
+|Zabbix proxy |Zabbix proxy: History write cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used history buffer.</p><p>History cache is used to store item values. A high number indicates performance problems on the database side.</p> |INTERNAL |zabbix[wcache,history,pused] |
+|Zabbix proxy |Zabbix proxy: History index cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used history index buffer.</p><p>History index cache is used to index values stored in history cache.</p> |INTERNAL |zabbix[wcache,index,pused] |
+|Zabbix proxy |Zabbix proxy: Number of processed values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.</p> |INTERNAL |zabbix[wcache,values]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Zabbix proxy: Number of processed numeric (float) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed float values.</p> |INTERNAL |zabbix[wcache,values,float]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Zabbix proxy: Number of processed log values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed log values.</p> |INTERNAL |zabbix[wcache,values,log]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Zabbix proxy: Number of processed not supported values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of times item processing resulted in item becoming unsupported or keeping that state.</p> |INTERNAL |zabbix[wcache,values,not supported]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Zabbix proxy: Number of processed character values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed character/string values.</p> |INTERNAL |zabbix[wcache,values,str]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Zabbix proxy: Number of processed text values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed text values.</p> |INTERNAL |zabbix[wcache,values,text]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Zabbix proxy: Preprocessing queue |<p>Count of values enqueued in the preprocessing queue.</p> |INTERNAL |zabbix[preprocessing_queue] |
+|Zabbix proxy |Zabbix proxy: Number of processed numeric (unsigned) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed numeric (unsigned) values.</p> |INTERNAL |zabbix[wcache,values,uint]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Zabbix proxy: Values waiting to be sent |<p>Number of values in the proxy history table waiting to be sent to the server.</p> |INTERNAL |zabbix[proxy_history] |
+|Zabbix proxy |Zabbix proxy: Required performance |<p>Required performance of Zabbix proxy, in new values per second expected.</p> |INTERNAL |zabbix[requiredperformance] |
+|Zabbix proxy |Zabbix proxy: Uptime |<p>Uptime of Zabbix proxy process in seconds.</p> |INTERNAL |zabbix[uptime] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Zabbix proxy: More than 100 items having missing data for more than 10 minutes |<p>zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.</p> |`min(/Zabbix proxy health/zabbix[queue,10m],10m)>100` |WARNING | |
+|Zabbix proxy: Utilization of data sender processes over {$ZABBIX.PROXY.UTIL.MAX:"data sender"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,data sender,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"data sender"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,data sender,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"data sender"}` |AVERAGE | |
+|Zabbix proxy: Utilization of availability manager processes over {$ZABBIX.PROXY.UTIL.MAX:"availability manager"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,availability manager,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"availability manager"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,availability manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"availability manager"}` |AVERAGE | |
+|Zabbix proxy: Utilization of configuration syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,configuration syncer,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,configuration syncer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"configuration syncer"}` |AVERAGE | |
+|Zabbix proxy: Utilization of discoverer processes over {$ZABBIX.PROXY.UTIL.MAX:"discoverer"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,discoverer,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"discoverer"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,discoverer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"discoverer"}` |AVERAGE | |
+|Zabbix proxy: Utilization of heartbeat sender processes over {$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,heartbeat sender,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,heartbeat sender,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"heartbeat sender"}` |AVERAGE | |
+|Zabbix proxy: Utilization of ODBC poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,odbc poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,odbc poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ODBC poller"}` |AVERAGE | |
+|Zabbix proxy: Utilization of history poller processes over {$ZABBIX.PROXY.UTIL.MAX:"history poller"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,history poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"history poller"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,history poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"history poller"}` |AVERAGE | |
+|Zabbix proxy: Utilization of history syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"history syncer"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,history syncer,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"history syncer"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,history syncer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"history syncer"}` |AVERAGE | |
+|Zabbix proxy: Utilization of housekeeper processes over {$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,housekeeper,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,housekeeper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"housekeeper"}` |AVERAGE | |
+|Zabbix proxy: Utilization of http poller processes over {$ZABBIX.PROXY.UTIL.MAX:"http poller"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,http poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"http poller"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,http poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"http poller"}` |AVERAGE | |
+|Zabbix proxy: Utilization of icmp pinger processes over {$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,icmp pinger,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,icmp pinger,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"icmp pinger"}` |AVERAGE | |
+|Zabbix proxy: Utilization of ipmi manager processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,ipmi manager,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,ipmi manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi manager"}` |AVERAGE | |
+|Zabbix proxy: Utilization of ipmi poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,ipmi poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,ipmi poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi poller"}` |AVERAGE | |
+|Zabbix proxy: Utilization of java poller processes over {$ZABBIX.PROXY.UTIL.MAX:"java poller"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,java poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"java poller"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,java poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"java poller"}` |AVERAGE | |
+|Zabbix proxy: Utilization of poller processes over {$ZABBIX.PROXY.UTIL.MAX:"poller"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"poller"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"poller"}` |AVERAGE | |
+|Zabbix proxy: Utilization of preprocessing worker processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,preprocessing worker,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,preprocessing worker,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing worker"}` |AVERAGE | |
+|Zabbix proxy: Utilization of preprocessing manager processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,preprocessing manager,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,preprocessing manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing manager"}` |AVERAGE | |
+|Zabbix proxy: Utilization of self-monitoring processes over {$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,self-monitoring,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,self-monitoring,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"self-monitoring"}` |AVERAGE | |
+|Zabbix proxy: Utilization of snmp trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,snmp trapper,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,snmp trapper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"snmp trapper"}` |AVERAGE | |
+|Zabbix proxy: Utilization of task manager processes over {$ZABBIX.PROXY.UTIL.MAX:"task manager"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,task manager,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"task manager"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,task manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"task manager"}` |AVERAGE | |
+|Zabbix proxy: Utilization of trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"trapper"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,trapper,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"trapper"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,trapper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"trapper"}` |AVERAGE | |
+|Zabbix proxy: Utilization of unreachable poller processes over {$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,unreachable poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,unreachable poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"unreachable poller"}` |AVERAGE | |
+|Zabbix proxy: Utilization of vmware collector processes over {$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}% |<p>-</p> |`avg(/Zabbix proxy health/zabbix[process,vmware collector,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}`<p>Recovery expression:</p>`avg(/Zabbix proxy health/zabbix[process,vmware collector,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"vmware collector"}` |AVERAGE | |
+|Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the configuration cache |<p>Consider increasing CacheSize in the zabbix_proxy.conf configuration file.</p> |`max(/Zabbix proxy health/zabbix[rcache,buffer,pused],10m)>{$ZABBIX.PROXY.UTIL.MAX}` |AVERAGE | |
+|Zabbix proxy: Version has changed (new version: {ITEM.VALUE}) |<p>Zabbix proxy version has changed. Ack to close.</p> |`last(/Zabbix proxy health/zabbix[version],#1)<>last(/Zabbix proxy health/zabbix[version],#2) and length(last(/Zabbix proxy health/zabbix[version]))>0` |INFO |<p>Manual close: YES</p> |
+|Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the vmware cache |<p>Consider increasing VMwareCacheSize in the zabbix_proxy.conf configuration file.</p> |`max(/Zabbix proxy health/zabbix[vmware,buffer,pused],10m)>{$ZABBIX.PROXY.UTIL.MAX}` |AVERAGE | |
+|Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history cache |<p>Consider increasing HistoryCacheSize in the zabbix_proxy.conf configuration file.</p> |`max(/Zabbix proxy health/zabbix[wcache,history,pused],10m)>{$ZABBIX.PROXY.UTIL.MAX}` |AVERAGE | |
+|Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history index cache |<p>Consider increasing HistoryIndexCacheSize in the zabbix_proxy.conf configuration file.</p> |`max(/Zabbix proxy health/zabbix[wcache,index,pused],10m)>{$ZABBIX.PROXY.UTIL.MAX}` |AVERAGE | |
+|Zabbix proxy: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Zabbix proxy health/zabbix[uptime])<10m` |INFO |<p>Manual close: YES</p> |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_zabbix_proxy.yaml b/templates/app/zabbix_proxy/template_app_zabbix_proxy.yaml
index 791bb700d1c..4b47a0e13be 100644
--- a/templates/classic/template_app_zabbix_proxy.yaml
+++ b/templates/app/zabbix_proxy/template_app_zabbix_proxy.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2022-01-07T12:55:44Z'
+  version: '6.0'
+  date: '2022-01-11T22:24:40Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,13 +10,14 @@ zabbix_export:
       uuid: dd114bf0fb2f46bc84840f1bb24e2b23
       template: 'Zabbix proxy health'
       name: 'Zabbix proxy health'
+      description: 'Template tooling version used: 0.39'
       groups:
         -
           name: Templates/Applications
       items:
         -
           uuid: 0230306272c24858b49243ef1c61e2ec
-          name: 'Zabbix preprocessing queue'
+          name: 'Zabbix proxy: Preprocessing queue'
           type: INTERNAL
           key: 'zabbix[preprocessing_queue]'
           history: 1w
@@ -27,12 +28,13 @@ zabbix_export:
               value: 'Zabbix proxy'
         -
           uuid: 5131f979c17a4346a95f8ba77e7133a4
-          name: 'Utilization of availability manager internal processes, in %'
+          name: 'Zabbix proxy: Utilization of availability manager internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,availability manager,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
+          description: 'Average percentage of time availability manager processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -40,20 +42,20 @@ zabbix_export:
           triggers:
             -
               uuid: 5a8375a8eee642f2940ed813ee062336
-              expression: 'avg(/Zabbix proxy health/zabbix[process,availability manager,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,availability manager,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"availability manager"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,availability manager,avg,busy],10m)<65'
-              name: 'Zabbix availability manager processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,availability manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"availability manager"}'
+              name: 'Zabbix proxy: Utilization of availability manager processes over {$ZABBIX.PROXY.UTIL.MAX:"availability manager"}%'
               priority: AVERAGE
         -
           uuid: 3d1bfa64a447427da0b463c3617b212e
-          name: 'Utilization of configuration syncer internal processes, in %'
+          name: 'Zabbix proxy: Utilization of configuration syncer internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,configuration syncer,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time configuration syncer processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -61,20 +63,20 @@ zabbix_export:
           triggers:
             -
               uuid: 27eb861e2e6f43f69f17b8ba65bfedcc
-              expression: 'avg(/Zabbix proxy health/zabbix[process,configuration syncer,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,configuration syncer,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,configuration syncer,avg,busy],10m)<65'
-              name: 'Zabbix configuration syncer processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,configuration syncer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"configuration syncer"}'
+              name: 'Zabbix proxy: Utilization of configuration syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}%'
               priority: AVERAGE
         -
           uuid: 69eefd6aba164d71b0a2b8d2df06e9a3
-          name: 'Utilization of data sender internal processes, in %'
+          name: 'Zabbix proxy: Utilization of data sender internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,data sender,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time data sender processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -82,21 +84,20 @@ zabbix_export:
           triggers:
             -
               uuid: e8fd57784b9e4289aa4515cfa7c6c4ad
-              expression: 'avg(/Zabbix proxy health/zabbix[process,data sender,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,data sender,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"data sender"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,data sender,avg,busy],10m)<65'
-              name: 'Zabbix data sender processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,data sender,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"data sender"}'
+              name: 'Zabbix proxy: Utilization of data sender processes over {$ZABBIX.PROXY.UTIL.MAX:"data sender"}%'
               priority: AVERAGE
         -
           uuid: 1d00c5ef345f4827a921ff3e3617d316
-          name: 'Utilization of discoverer data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of discoverer data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,discoverer,avg,busy]'
           history: 1w
           value_type: FLOAT
-          allowed_hosts: localhost
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time discoverer processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -104,20 +105,20 @@ zabbix_export:
           triggers:
             -
               uuid: 080bd8d98f204d8580cbb1088f07d57b
-              expression: 'avg(/Zabbix proxy health/zabbix[process,discoverer,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,discoverer,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"discoverer"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,discoverer,avg,busy],10m)<65'
-              name: 'Zabbix discoverer processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,discoverer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"discoverer"}'
+              name: 'Zabbix proxy: Utilization of discoverer processes over {$ZABBIX.PROXY.UTIL.MAX:"discoverer"}%'
               priority: AVERAGE
         -
           uuid: a1a7b0f3c34248a0993c305cd76fea5a
-          name: 'Utilization of heartbeat sender internal processes, in %'
+          name: 'Zabbix proxy: Utilization of heartbeat sender internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,heartbeat sender,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time heartbeat sender processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -125,19 +126,20 @@ zabbix_export:
           triggers:
             -
               uuid: 51e9b56f0d854808949c5c89a53edadf
-              expression: 'avg(/Zabbix proxy health/zabbix[process,heartbeat sender,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,heartbeat sender,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,heartbeat sender,avg,busy],10m)<65'
-              name: 'Zabbix heartbeat sender processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,heartbeat sender,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"heartbeat sender"}'
+              name: 'Zabbix proxy: Utilization of heartbeat sender processes over {$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}%'
               priority: AVERAGE
         -
           uuid: d34bb8623fff4fb99f87167534299654
-          name: 'Utilization of history poller data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of history poller data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,history poller,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
+          description: 'Average percentage of time history poller processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -145,20 +147,20 @@ zabbix_export:
           triggers:
             -
               uuid: 7ee08ecfeafc488583e8e4719b8a1be1
-              expression: 'avg(/Zabbix proxy health/zabbix[process,history poller,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,history poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"history poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,history poller,avg,busy],10m)<65'
-              name: 'Zabbix history poller processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,history poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"history poller"}'
+              name: 'Zabbix proxy: Utilization of history poller processes over {$ZABBIX.PROXY.UTIL.MAX:"history poller"}%'
               priority: AVERAGE
         -
           uuid: 7dde8cd03e5043a2bd484f7213a5f112
-          name: 'Utilization of history syncer internal processes, in %'
+          name: 'Zabbix proxy: Utilization of history syncer internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,history syncer,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time history syncer processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -166,20 +168,20 @@ zabbix_export:
           triggers:
             -
               uuid: 52fb303ec9164aa28821117f3a559fe3
-              expression: 'avg(/Zabbix proxy health/zabbix[process,history syncer,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,history syncer,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"history syncer"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,history syncer,avg,busy],10m)<65'
-              name: 'Zabbix history syncer processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,history syncer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"history syncer"}'
+              name: 'Zabbix proxy: Utilization of history syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"history syncer"}%'
               priority: AVERAGE
         -
           uuid: 31f0355f4d7c4de6b0d6f206d1ca9fa3
-          name: 'Utilization of housekeeper internal processes, in %'
+          name: 'Zabbix proxy: Utilization of housekeeper internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,housekeeper,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time housekeeper processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -187,20 +189,20 @@ zabbix_export:
           triggers:
             -
               uuid: b6cbede80a4847ed94a0ba818b7ca261
-              expression: 'avg(/Zabbix proxy health/zabbix[process,housekeeper,avg,busy],30m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,housekeeper,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,housekeeper,avg,busy],30m)<65'
-              name: 'Zabbix housekeeper processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,housekeeper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"housekeeper"}'
+              name: 'Zabbix proxy: Utilization of housekeeper processes over {$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}%'
               priority: AVERAGE
         -
           uuid: 782b11dbe3ce47e3b9098c43d83057ad
-          name: 'Utilization of http poller data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of http poller data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,http poller,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time http poller processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -208,20 +210,20 @@ zabbix_export:
           triggers:
             -
               uuid: e93e5a3dd27f4d378bbfe2c8e5b009e7
-              expression: 'avg(/Zabbix proxy health/zabbix[process,http poller,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,http poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"http poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,http poller,avg,busy],10m)<65'
-              name: 'Zabbix http poller processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,http poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"http poller"}'
+              name: 'Zabbix proxy: Utilization of http poller processes over {$ZABBIX.PROXY.UTIL.MAX:"http poller"}%'
               priority: AVERAGE
         -
           uuid: 9b899ab317b447d1a82d1136e0a2ff6f
-          name: 'Utilization of icmp pinger data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of icmp pinger data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,icmp pinger,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time icmp pinger processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -229,20 +231,20 @@ zabbix_export:
           triggers:
             -
               uuid: d514f4a08bcd4fe2b696015a74ffafcf
-              expression: 'avg(/Zabbix proxy health/zabbix[process,icmp pinger,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,icmp pinger,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,icmp pinger,avg,busy],10m)<65'
-              name: 'Zabbix icmp pinger processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,icmp pinger,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"icmp pinger"}'
+              name: 'Zabbix proxy: Utilization of icmp pinger processes over {$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}%'
               priority: AVERAGE
         -
           uuid: 52b3123dfef94d8bba1b1a13314a9d4f
-          name: 'Utilization of ipmi manager internal processes, in %'
+          name: 'Zabbix proxy: Utilization of ipmi manager internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,ipmi manager,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time ipmi manager processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -250,20 +252,20 @@ zabbix_export:
           triggers:
             -
               uuid: 751e3000367f42d9af0d4418f3472a91
-              expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi manager,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi manager,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi manager,avg,busy],10m)<65'
-              name: 'Zabbix ipmi manager processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi manager"}'
+              name: 'Zabbix proxy: Utilization of ipmi manager processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}%'
               priority: AVERAGE
         -
           uuid: 7cfb2f1504dd4b0aaac804b132d49bc5
-          name: 'Utilization of ipmi poller data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of ipmi poller data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,ipmi poller,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time ipmi poller processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -271,20 +273,20 @@ zabbix_export:
           triggers:
             -
               uuid: 99ce9f0ed6204860b7b943e9e3a5fbc0
-              expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi poller,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi poller,avg,busy],10m)<65'
-              name: 'Zabbix ipmi poller processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi poller"}'
+              name: 'Zabbix proxy: Utilization of ipmi poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}%'
               priority: AVERAGE
         -
           uuid: 02214c0c38394bef8d648369584ae30b
-          name: 'Utilization of java poller data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of java poller data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,java poller,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time java poller processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -292,20 +294,20 @@ zabbix_export:
           triggers:
             -
               uuid: 5b8cc59c21b145739e346479124c48f5
-              expression: 'avg(/Zabbix proxy health/zabbix[process,java poller,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,java poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"java poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,java poller,avg,busy],10m)<65'
-              name: 'Zabbix java poller processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,java poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"java poller"}'
+              name: 'Zabbix proxy: Utilization of java poller processes over {$ZABBIX.PROXY.UTIL.MAX:"java poller"}%'
               priority: AVERAGE
         -
           uuid: 06bdbdcfdbc04c24ad387b256e430801
-          name: 'Utilization of ODBC poller data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of ODBC poller data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,odbc poller,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time ODBC poller processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -313,21 +315,20 @@ zabbix_export:
           triggers:
             -
               uuid: 3177430235ac4eeaa23b8c39987989cc
-              expression: 'avg(/Zabbix proxy health/zabbix[process,odbc poller,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,odbc poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,odbc poller,avg,busy],10m)<65'
-              name: 'Zabbix ODBC poller processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,odbc poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ODBC poller"}'
+              name: 'Zabbix proxy: Utilization of ODBC poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}%'
               priority: AVERAGE
         -
           uuid: 334398ad893e4146bc1b9370eef9df59
-          name: 'Utilization of poller data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of poller data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,poller,avg,busy]'
           history: 1w
           value_type: FLOAT
-          allowed_hosts: localhost
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time poller processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -335,19 +336,20 @@ zabbix_export:
           triggers:
             -
               uuid: 3f93b378367e48f89abe304ccb624047
-              expression: 'avg(/Zabbix proxy health/zabbix[process,poller,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,poller,avg,busy],10m)<65'
-              name: 'Zabbix poller processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"poller"}'
+              name: 'Zabbix proxy: Utilization of poller processes over {$ZABBIX.PROXY.UTIL.MAX:"poller"}%'
               priority: AVERAGE
         -
           uuid: 20705fe12d4c40a4a27306b66ec9a69d
-          name: 'Utilization of preprocessing manager internal processes, in %'
+          name: 'Zabbix proxy: Utilization of preprocessing manager internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,preprocessing manager,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
+          description: 'Average percentage of time preprocessing manager processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -355,19 +357,20 @@ zabbix_export:
           triggers:
             -
               uuid: 1ed29eb53708417a827adbdf4d8f145b
-              expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing manager,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing manager,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing manager,avg,busy],10m)<65'
-              name: 'Zabbix preprocessing manager processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing manager"}'
+              name: 'Zabbix proxy: Utilization of preprocessing manager processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}%'
               priority: AVERAGE
         -
           uuid: 9c7916375cf841fb8edaf383b93a0522
-          name: 'Utilization of preprocessing worker internal processes, in %'
+          name: 'Zabbix proxy: Utilization of preprocessing worker internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,preprocessing worker,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
+          description: 'Average percentage of time preprocessing worker processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -375,20 +378,20 @@ zabbix_export:
           triggers:
             -
               uuid: 22831f081149400a86cb18930de0cc20
-              expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing worker,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing worker,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing worker,avg,busy],10m)<65'
-              name: 'Zabbix preprocessing worker processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing worker,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing worker"}'
+              name: 'Zabbix proxy: Utilization of preprocessing worker processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}%'
               priority: AVERAGE
         -
           uuid: 1fd488bbb4af450cb2b5e8c81b739f29
-          name: 'Utilization of self-monitoring internal processes, in %'
+          name: 'Zabbix proxy: Utilization of self-monitoring internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,self-monitoring,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time self-monitoring processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -396,20 +399,20 @@ zabbix_export:
           triggers:
             -
               uuid: cc9569f75bd44b5cbce4a4c556cd2949
-              expression: 'avg(/Zabbix proxy health/zabbix[process,self-monitoring,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,self-monitoring,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,self-monitoring,avg,busy],10m)<65'
-              name: 'Zabbix self-monitoring processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,self-monitoring,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"self-monitoring"}'
+              name: 'Zabbix proxy: Utilization of self-monitoring processes over {$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}%'
               priority: AVERAGE
         -
           uuid: 77ab21500d734deea86938a1a90035e0
-          name: 'Utilization of snmp trapper data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of snmp trapper data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,snmp trapper,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time snmp trapper processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -417,20 +420,20 @@ zabbix_export:
           triggers:
             -
               uuid: bb0a46beffbc457faea9362d4325c676
-              expression: 'avg(/Zabbix proxy health/zabbix[process,snmp trapper,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,snmp trapper,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,snmp trapper,avg,busy],10m)<65'
-              name: 'Zabbix snmp trapper processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,snmp trapper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"snmp trapper"}'
+              name: 'Zabbix proxy: Utilization of snmp trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}%'
               priority: AVERAGE
         -
           uuid: 94d1aa1bff2d499f9e29dd9cafd04b9e
-          name: 'Utilization of task manager internal processes, in %'
+          name: 'Zabbix proxy: Utilization of task manager internal processes, in %'
           type: INTERNAL
           key: 'zabbix[process,task manager,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time task manager processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -438,20 +441,20 @@ zabbix_export:
           triggers:
             -
               uuid: 9a42dad8cef04138944f3a1b8c797f4e
-              expression: 'avg(/Zabbix proxy health/zabbix[process,task manager,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,task manager,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"task manager"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,task manager,avg,busy],10m)<65'
-              name: 'Zabbix task manager processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,task manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"task manager"}'
+              name: 'Zabbix proxy: Utilization of task manager processes over {$ZABBIX.PROXY.UTIL.MAX:"task manager"}%'
               priority: AVERAGE
         -
           uuid: 8d99635291d14ae8a5ba7d794540bde2
-          name: 'Utilization of trapper data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of trapper data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,trapper,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time trapper processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -459,20 +462,20 @@ zabbix_export:
           triggers:
             -
               uuid: 95ad6d80dc9c4f46a4e255d13f1b01a3
-              expression: 'avg(/Zabbix proxy health/zabbix[process,trapper,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,trapper,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"trapper"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,trapper,avg,busy],10m)<65'
-              name: 'Zabbix trapper processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,trapper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"trapper"}'
+              name: 'Zabbix proxy: Utilization of trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"trapper"}%'
               priority: AVERAGE
         -
           uuid: 7b0f5b75d4854b84a7e1f51975732e25
-          name: 'Utilization of unreachable poller data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of unreachable poller data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,unreachable poller,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time unreachable poller processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -480,20 +483,20 @@ zabbix_export:
           triggers:
             -
               uuid: a28abd3f43f843af9646a1f8b1ca056a
-              expression: 'avg(/Zabbix proxy health/zabbix[process,unreachable poller,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,unreachable poller,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,unreachable poller,avg,busy],10m)<65'
-              name: 'Zabbix unreachable poller processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,unreachable poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"unreachable poller"}'
+              name: 'Zabbix proxy: Utilization of unreachable poller processes over {$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}%'
               priority: AVERAGE
         -
           uuid: a5a7076a175c400f866a4d873d12e1e4
-          name: 'Utilization of vmware data collector processes, in %'
+          name: 'Zabbix proxy: Utilization of vmware data collector processes, in %'
           type: INTERNAL
           key: 'zabbix[process,vmware collector,avg,busy]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Average percentage of time vmware collector processes have been busy in the last minute.'
           tags:
             -
               tag: Application
@@ -501,19 +504,29 @@ zabbix_export:
           triggers:
             -
               uuid: a1051b5ac8334125a40cb36a95605284
-              expression: 'avg(/Zabbix proxy health/zabbix[process,vmware collector,avg,busy],10m)>75'
+              expression: 'avg(/Zabbix proxy health/zabbix[process,vmware collector,avg,busy],10m)>{$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,vmware collector,avg,busy],10m)<65'
-              name: 'Zabbix vmware collector processes more than 75% busy'
+              recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,vmware collector,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"vmware collector"}'
+              name: 'Zabbix proxy: Utilization of vmware collector processes over {$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}%'
               priority: AVERAGE
         -
+          uuid: 3b66d42ec1fa4dc7a41750aacf6e68f3
+          name: 'Zabbix proxy: Values waiting to be sent'
+          type: INTERNAL
+          key: 'zabbix[proxy_history]'
+          history: 1w
+          description: 'Number of values in the proxy history table waiting to be sent to the server.'
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+        -
           uuid: 2fa1c8d8fcb94d4c83cf4e291420a690
-          name: 'Zabbix queue over 10 minutes'
+          name: 'Zabbix proxy: Queue over 10 minutes'
           type: INTERNAL
           key: 'zabbix[queue,10m]'
-          delay: 10m
           history: 1w
-          request_method: POST
+          description: 'Number of monitored items in the queue which are delayed at least by 10 minutes.'
           tags:
             -
               tag: Application
@@ -522,29 +535,29 @@ zabbix_export:
             -
               uuid: f28d8231e0f2486bb68963719359789c
               expression: 'min(/Zabbix proxy health/zabbix[queue,10m],10m)>100'
-              name: 'More than 100 items having missing data for more than 10 minutes'
+              name: 'Zabbix proxy: More than 100 items having missing data for more than 10 minutes'
               priority: WARNING
-              description: 'zabbix[queue,10m] item is collecting data about how many items are missing data for more than 10 minutes'
+              description: 'zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.'
         -
           uuid: cfbb623cca754fd49d4f606ab52f658d
-          name: 'Zabbix queue'
+          name: 'Zabbix proxy: Queue'
           type: INTERNAL
           key: 'zabbix[queue]'
           history: 1w
-          request_method: POST
+          description: 'Number of monitored items in the queue which are delayed at least by 6 seconds.'
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 606d1d43812341db8260a233295a4a4e
-          name: 'Zabbix configuration cache, % used'
+          name: 'Zabbix proxy: Configuration cache, % used'
           type: INTERNAL
           key: 'zabbix[rcache,buffer,pused]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer.'
           tags:
             -
               tag: Application
@@ -552,19 +565,77 @@ zabbix_export:
           triggers:
             -
               uuid: 98ae52367f69476dbeb9c50e5f28b429
-              expression: 'max(/Zabbix proxy health/zabbix[rcache,buffer,pused],10m)>75'
-              name: 'More than 75% used in the configuration cache'
+              expression: 'max(/Zabbix proxy health/zabbix[rcache,buffer,pused],10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the configuration cache'
               priority: AVERAGE
-              description: 'Consider increasing CacheSize in the zabbix_proxy.conf configuration file'
+              description: 'Consider increasing CacheSize in the zabbix_proxy.conf configuration file.'
+        -
+          uuid: ef820395239d4a108980fe53017a89fc
+          name: 'Zabbix proxy: Required performance'
+          type: INTERNAL
+          key: 'zabbix[requiredperformance]'
+          history: 1w
+          value_type: FLOAT
+          description: 'Required performance of Zabbix proxy, in new values per second expected.'
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+        -
+          uuid: ef920914bc00432ea4d4007d09e081df
+          name: 'Zabbix proxy: Uptime'
+          type: INTERNAL
+          key: 'zabbix[uptime]'
+          history: 1w
+          units: uptime
+          description: 'Uptime of Zabbix proxy process in seconds.'
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+          triggers:
+            -
+              uuid: b505a16c50f64adb8c5528907925f798
+              expression: 'last(/Zabbix proxy health/zabbix[uptime])<10m'
+              name: 'Zabbix proxy: has been restarted (uptime < 10m)'
+              priority: INFO
+              description: 'Uptime is less than 10 minutes'
+              manual_close: 'YES'
+        -
+          uuid: 4d38d6d107714c96ae2ed2af44fddb60
+          name: 'Zabbix proxy: Version'
+          type: INTERNAL
+          key: 'zabbix[version]'
+          history: 1w
+          trends: '0'
+          value_type: CHAR
+          description: 'Version of Zabbix proxy.'
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+          triggers:
+            -
+              uuid: bf7eef07faf14fc4b2603ae952f001da
+              expression: 'last(/Zabbix proxy health/zabbix[version],#1)<>last(/Zabbix proxy health/zabbix[version],#2) and length(last(/Zabbix proxy health/zabbix[version]))>0'
+              name: 'Zabbix proxy: Version has changed (new version: {ITEM.VALUE})'
+              priority: INFO
+              description: 'Zabbix proxy version has changed. Ack to close.'
+              manual_close: 'YES'
         -
           uuid: fc7412c1a02240b7931d3511743a2662
-          name: 'Zabbix vmware cache, % used'
+          name: 'Zabbix proxy: VMware cache, % used'
           type: INTERNAL
           key: 'zabbix[vmware,buffer,pused]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer.'
           tags:
             -
               tag: Application
@@ -572,19 +643,21 @@ zabbix_export:
           triggers:
             -
               uuid: 69707cc61b7d408f8683dae435183d4f
-              expression: 'max(/Zabbix proxy health/zabbix[vmware,buffer,pused],10m)>75'
-              name: 'More than 75% used in the vmware cache'
+              expression: 'max(/Zabbix proxy health/zabbix[vmware,buffer,pused],10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the vmware cache'
               priority: AVERAGE
-              description: 'Consider increasing VMwareCacheSize in the zabbix_proxy.conf configuration file'
+              description: 'Consider increasing VMwareCacheSize in the zabbix_proxy.conf configuration file.'
         -
           uuid: aec73d2a7e444702b352c75998bf636e
-          name: 'Zabbix history write cache, % used'
+          name: 'Zabbix proxy: History write cache, % used'
           type: INTERNAL
           key: 'zabbix[wcache,history,pused]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: |
+            Statistics and availability of Zabbix write cache. Percentage of used history buffer.
+            History cache is used to store item values. A high number indicates performance problems on the database side.
           tags:
             -
               tag: Application
@@ -592,19 +665,21 @@ zabbix_export:
           triggers:
             -
               uuid: dc5a87f6c62d47b08ddd4578aa5f293f
-              expression: 'max(/Zabbix proxy health/zabbix[wcache,history,pused],10m)>75'
-              name: 'More than 75% used in the history cache'
+              expression: 'max(/Zabbix proxy health/zabbix[wcache,history,pused],10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history cache'
               priority: AVERAGE
-              description: 'Consider increasing HistoryCacheSize in the zabbix_proxy.conf configuration file'
+              description: 'Consider increasing HistoryCacheSize in the zabbix_proxy.conf configuration file.'
         -
           uuid: 8c4c7802497d4de4988278edc29f8eb1
-          name: 'Zabbix history index cache, % used'
+          name: 'Zabbix proxy: History index cache, % used'
           type: INTERNAL
           key: 'zabbix[wcache,index,pused]'
           history: 1w
           value_type: FLOAT
           units: '%'
-          request_method: POST
+          description: |
+            Statistics and availability of Zabbix write cache. Percentage of used history index buffer.
+            History index cache is used to index values stored in history cache.
           tags:
             -
               tag: Application
@@ -612,129 +687,152 @@ zabbix_export:
           triggers:
             -
               uuid: 92b94edb126d48af9e5e959357e2107b
-              expression: 'max(/Zabbix proxy health/zabbix[wcache,index,pused],10m)>75'
-              name: 'More than 75% used in the history index cache'
+              expression: 'max(/Zabbix proxy health/zabbix[wcache,index,pused],10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history index cache'
               priority: AVERAGE
-              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_proxy.conf configuration file'
+              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_proxy.conf configuration file.'
         -
           uuid: ba5efd0ed21d4ac39e1375788b7198de
-          name: 'Number of processed numeric (float) values per second'
+          name: 'Zabbix proxy: Number of processed numeric (float) values per second'
           type: INTERNAL
           key: 'zabbix[wcache,values,float]'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed float values.
           preprocessing:
             -
               type: CHANGE_PER_SECOND
               parameters:
                 - ''
-          request_method: POST
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 47cdd6ef01734ec1ab15b0ab43d147ca
-          name: 'Number of processed log values per second'
+          name: 'Zabbix proxy: Number of processed log values per second'
           type: INTERNAL
           key: 'zabbix[wcache,values,log]'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed log values.
           preprocessing:
             -
               type: CHANGE_PER_SECOND
               parameters:
                 - ''
-          request_method: POST
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 46574db1d70545f6af89e8607d22f5bb
-          name: 'Number of processed not supported values per second'
+          name: 'Zabbix proxy: Number of processed not supported values per second'
           type: INTERNAL
           key: 'zabbix[wcache,values,not supported]'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of times item processing resulted in item becoming unsupported or keeping that state.
           preprocessing:
             -
               type: CHANGE_PER_SECOND
               parameters:
                 - ''
-          request_method: POST
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 5f0c3ed0998e499aaa1e4a30726928fc
-          name: 'Number of processed character values per second'
+          name: 'Zabbix proxy: Number of processed character values per second'
           type: INTERNAL
           key: 'zabbix[wcache,values,str]'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed character/string values.
           preprocessing:
             -
               type: CHANGE_PER_SECOND
               parameters:
                 - ''
-          request_method: POST
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 1c259b08b3ff445f9b2f24a02c07c5db
-          name: 'Number of processed text values per second'
+          name: 'Zabbix proxy: Number of processed text values per second'
           type: INTERNAL
           key: 'zabbix[wcache,values,text]'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed text values.
           preprocessing:
             -
               type: CHANGE_PER_SECOND
               parameters:
                 - ''
-          request_method: POST
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 8e4b9641b173415c8608ee4863bcd547
-          name: 'Number of processed numeric (unsigned) values per second'
+          name: 'Zabbix proxy: Number of processed numeric (unsigned) values per second'
           type: INTERNAL
           key: 'zabbix[wcache,values,uint]'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed numeric (unsigned) values.
           preprocessing:
             -
               type: CHANGE_PER_SECOND
               parameters:
                 - ''
-          request_method: POST
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 5229b786efc84f01bb31f2819c47d9f4
-          name: 'Number of processed values per second'
+          name: 'Zabbix proxy: Number of processed values per second'
           type: INTERNAL
           key: 'zabbix[wcache,values]'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.
           preprocessing:
             -
               type: CHANGE_PER_SECOND
               parameters:
                 - ''
-          request_method: POST
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
+      macros:
+        -
+          macro: '{$ZABBIX.PROXY.UTIL.MAX}'
+          value: '75'
+          description: 'Maximum average percentage of time processes busy in the last minute (default is 75).'
+        -
+          macro: '{$ZABBIX.PROXY.UTIL.MIN}'
+          value: '65'
+          description: 'Minimum average percentage of time processes busy in the last minute (default is 65).'
       dashboards:
         -
           uuid: c12bdb602db645a292d0cbba39d58e9f
@@ -745,7 +843,7 @@ zabbix_export:
                 -
                   type: GRAPH_CLASSIC
                   width: '12'
-                  height: '6'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -755,13 +853,13 @@ zabbix_export:
                       type: GRAPH
                       name: graphid
                       value:
-                        name: 'Zabbix proxy performance'
+                        name: 'Zabbix proxy: Zabbix proxy performance'
                         host: 'Zabbix proxy health'
                 -
                   type: GRAPH_CLASSIC
                   x: '12'
                   width: '12'
-                  height: '6'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -771,11 +869,11 @@ zabbix_export:
                       type: GRAPH
                       name: graphid
                       value:
-                        name: 'Zabbix data gathering process busy %'
+                        name: 'Zabbix proxy: Zabbix data gathering process busy %'
                         host: 'Zabbix proxy health'
                 -
                   type: GRAPH_CLASSIC
-                  'y': '6'
+                  'y': '5'
                   width: '12'
                   height: '5'
                   fields:
@@ -787,12 +885,12 @@ zabbix_export:
                       type: GRAPH
                       name: graphid
                       value:
-                        name: 'Zabbix internal process busy %'
+                        name: 'Zabbix proxy: Zabbix internal process busy %'
                         host: 'Zabbix proxy health'
                 -
                   type: GRAPH_CLASSIC
                   x: '12'
-                  'y': '6'
+                  'y': '5'
                   width: '12'
                   height: '5'
                   fields:
@@ -804,12 +902,12 @@ zabbix_export:
                       type: GRAPH
                       name: graphid
                       value:
-                        name: 'Zabbix cache usage, % used'
+                        name: 'Zabbix proxy: Zabbix cache usage, % used'
                         host: 'Zabbix proxy health'
   graphs:
     -
       uuid: 40b649050cb8420888abcae129eafe27
-      name: 'Zabbix cache usage, % used'
+      name: 'Zabbix proxy: Zabbix cache usage, % used'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
       graph_items:
@@ -838,158 +936,155 @@ zabbix_export:
             key: 'zabbix[vmware,buffer,pused]'
     -
       uuid: 7635642bf94249e39d420a6eba1f6649
-      name: 'Zabbix data gathering process busy %'
+      name: 'Zabbix proxy: Zabbix data gathering process busy %'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
       graph_items:
         -
-          sortorder: '1'
           color: '990099'
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,trapper,avg,busy]'
         -
-          sortorder: '2'
+          sortorder: '1'
           color: '990000'
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,poller,avg,busy]'
         -
-          sortorder: '3'
+          sortorder: '2'
           color: 0000EE
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,ipmi poller,avg,busy]'
         -
-          sortorder: '4'
+          sortorder: '3'
           color: FF33FF
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,discoverer,avg,busy]'
         -
-          sortorder: '5'
+          sortorder: '4'
           color: '007700'
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,icmp pinger,avg,busy]'
         -
-          sortorder: '6'
+          sortorder: '5'
           color: '003300'
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,http poller,avg,busy]'
         -
-          sortorder: '7'
+          sortorder: '6'
           color: 33FFFF
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,unreachable poller,avg,busy]'
         -
-          sortorder: '8'
+          sortorder: '7'
           color: DD0000
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,java poller,avg,busy]'
         -
-          sortorder: '9'
+          sortorder: '8'
           color: '000099'
-          calc_fnc: ALL
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,snmp trapper,avg,busy]'
         -
-          sortorder: '10'
+          sortorder: '9'
           color: 00FF00
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,vmware collector,avg,busy]'
         -
-          sortorder: '11'
-          color: BB2A02
+          sortorder: '10'
+          color: 5A2B57
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,history poller,avg,busy]'
         -
-          sortorder: '12'
+          sortorder: '11'
           color: 9FA8DA
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,odbc poller,avg,busy]'
     -
       uuid: 60a3dcc84e494c17b656395d78d9b9e9
-      name: 'Zabbix internal process busy %'
+      name: 'Zabbix proxy: Zabbix internal process busy %'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
       graph_items:
         -
-          sortorder: '1'
           color: FFAA00
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,housekeeper,avg,busy]'
         -
-          sortorder: '2'
+          sortorder: '1'
           color: '990099'
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,configuration syncer,avg,busy]'
         -
-          sortorder: '3'
+          sortorder: '2'
           color: EE0000
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,history syncer,avg,busy]'
         -
-          sortorder: '4'
+          sortorder: '3'
           color: FF66FF
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,self-monitoring,avg,busy]'
         -
-          sortorder: '5'
+          sortorder: '4'
           color: 0000EE
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,heartbeat sender,avg,busy]'
         -
-          sortorder: '6'
+          sortorder: '5'
           color: 00EE00
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,data sender,avg,busy]'
         -
-          sortorder: '7'
+          sortorder: '6'
           color: '009999'
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,task manager,avg,busy]'
         -
-          sortorder: '8'
+          sortorder: '7'
           color: BBBB00
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,ipmi manager,avg,busy]'
         -
-          sortorder: '9'
+          sortorder: '8'
           color: '990000'
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,preprocessing manager,avg,busy]'
         -
-          sortorder: '10'
+          sortorder: '9'
           color: '008800'
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,preprocessing worker,avg,busy]'
         -
-          sortorder: '11'
-          color: BB2A02
+          sortorder: '10'
+          color: 2B5429
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[process,availability manager,avg,busy]'
     -
       uuid: 787ad6ca2967415c8a1daa4a4400c12d
-      name: 'Zabbix internal queues'
+      name: 'Zabbix proxy: Zabbix internal queues'
       graph_items:
         -
           color: '008800'
@@ -998,7 +1093,7 @@ zabbix_export:
             key: 'zabbix[preprocessing_queue]'
     -
       uuid: d03bdc914520474084d6809312cdf097
-      name: 'Zabbix proxy performance'
+      name: 'Zabbix proxy: Zabbix proxy performance'
       graph_items:
         -
           drawtype: GRADIENT_LINE
@@ -1008,9 +1103,7 @@ zabbix_export:
             key: 'zabbix[wcache,values]'
         -
           sortorder: '1'
-          drawtype: GRADIENT_LINE
           color: C80000
-          yaxisside: RIGHT
           item:
             host: 'Zabbix proxy health'
             key: 'zabbix[queue]'
diff --git a/templates/app/zabbix_proxy_remote/README.md b/templates/app/zabbix_proxy_remote/README.md
new file mode 100644
index 00000000000..ed5905ad898
--- /dev/null
+++ b/templates/app/zabbix_proxy_remote/README.md
@@ -0,0 +1,116 @@
+
+# Remote Zabbix proxy health
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$ZABBIX.PROXY.ADDRESS} |<p>IP/DNS/network mask list of proxies to be remotely queried (default is 127.0.0.1).</p> |`127.0.0.1` |
+|{$ZABBIX.PROXY.PORT} |<p>Port of proxy to be remotely queried (default is 10051).</p> |`10051` |
+|{$ZABBIX.PROXY.UTIL.MAX} |<p>Maximum average percentage of time processes busy in the last minute (default is 75).</p> |`75` |
+|{$ZABBIX.PROXY.UTIL.MIN} |<p>Minimum average percentage of time processes busy in the last minute (default is 65).</p> |`65` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Zabbix_raw_items |Remote Zabbix proxy: Zabbix stats |<p>Zabbix server statistics master item.</p> |INTERNAL |zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}] |
+|Zabbix proxy |Remote Zabbix proxy: Zabbix stats queue over 10m |<p>Number of monitored items in the queue which are delayed at least by 10 minutes.</p> |INTERNAL |zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m]<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Zabbix stats queue |<p>Number of monitored items in the queue which are delayed at least by 6 seconds.</p> |INTERNAL |zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue]<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of data sender internal processes, in % |<p>Average percentage of time data sender processes have been busy in the last minute.</p> |DEPENDENT |process.data_sender.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['data sender'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes data sender not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of availability manager internal processes, in % |<p>Average percentage of time availability manager processes have been busy in the last minute.</p> |DEPENDENT |process.availability_manager.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['availability manager'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes availability manager not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of configuration syncer internal processes, in % |<p>Average percentage of time configuration syncer processes have been busy in the last minute.</p> |DEPENDENT |process.configuration_syncer.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['configuration syncer'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes configuration syncer not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of discoverer data collector processes, in % |<p>Average percentage of time discoverer processes have been busy in the last minute.</p> |DEPENDENT |process.discoverer.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['discoverer'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes discoverer not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of heartbeat sender internal processes, in % |<p>Average percentage of time heartbeat sender processes have been busy in the last minute.</p> |DEPENDENT |process.heartbeat_sender.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['heartbeat sender'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes heartbeat sender not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of ODBC poller data collector processes, in % |<p>Average percentage of time ODBC poller processes have been busy in the last minute.</p> |DEPENDENT |process.odbc_poller.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['odbc poller'].busy.avg`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of history poller data collector processes, in % |<p>Average percentage of time history poller processes have been busy in the last minute.</p> |DEPENDENT |process.history_poller.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['history poller'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes history poller not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of history syncer internal processes, in % |<p>Average percentage of time history syncer processes have been busy in the last minute.</p> |DEPENDENT |process.history_syncer.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['history syncer'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes history syncer not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of housekeeper internal processes, in % |<p>Average percentage of time housekeeper processes have been busy in the last minute.</p> |DEPENDENT |process.housekeeper.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['housekeeper'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes housekeeper not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of http poller data collector processes, in % |<p>Average percentage of time http poller processes have been busy in the last minute.</p> |DEPENDENT |process.http_poller.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['http poller'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes http poller not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of icmp pinger data collector processes, in % |<p>Average percentage of time icmp pinger processes have been busy in the last minute.</p> |DEPENDENT |process.icmp_pinger.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['icmp pinger'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes icmp pinger not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of ipmi manager internal processes, in % |<p>Average percentage of time ipmi manager processes have been busy in the last minute.</p> |DEPENDENT |process.ipmi_manager.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['ipmi manager'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes ipmi manager not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of ipmi poller data collector processes, in % |<p>Average percentage of time ipmi poller processes have been busy in the last minute.</p> |DEPENDENT |process.ipmi_poller.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['ipmi poller'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes ipmi poller not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of java poller data collector processes, in % |<p>Average percentage of time java poller processes have been busy in the last minute.</p> |DEPENDENT |process.java_poller.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['java poller'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes java poller not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of poller data collector processes, in % |<p>Average percentage of time poller processes have been busy in the last minute.</p> |DEPENDENT |process.poller.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['poller'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes poller not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of preprocessing worker internal processes, in % |<p>Average percentage of time preprocessing worker processes have been busy in the last minute.</p> |DEPENDENT |process.preprocessing_worker.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['preprocessing worker'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes preprocessing worker not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of preprocessing manager internal processes, in % |<p>Average percentage of time preprocessing manager processes have been busy in the last minute.</p> |DEPENDENT |process.preprocessing_manager.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['preprocessing manager'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes preprocessing manager not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of self-monitoring internal processes, in % |<p>Average percentage of time self-monitoring processes have been busy in the last minute.</p> |DEPENDENT |process.self-monitoring.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['self-monitoring'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes self-monitoring not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of snmp trapper data collector processes, in % |<p>Average percentage of time snmp trapper processes have been busy in the last minute.</p> |DEPENDENT |process.snmp_trapper.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['snmp trapper'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes snmp trapper not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of task manager internal processes, in % |<p>Average percentage of time task manager processes have been busy in the last minute.</p> |DEPENDENT |process.task_manager.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['task manager'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes task manager not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of trapper data collector processes, in % |<p>Average percentage of time trapper processes have been busy in the last minute.</p> |DEPENDENT |process.trapper.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['trapper'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes trapper not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of unreachable poller data collector processes, in % |<p>Average percentage of time unreachable poller processes have been busy in the last minute.</p> |DEPENDENT |process.unreachable_poller.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['unreachable poller'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes unreachable poller not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Utilization of vmware data collector processes, in % |<p>Average percentage of time vmware collector processes have been busy in the last minute.</p> |DEPENDENT |process.vmware_collector.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['vmware collector'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes vmware collector not started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Configuration cache, % used |<p>Availability statistics of Zabbix configuration cache. Percentage of used buffer.</p> |DEPENDENT |rcache.buffer.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.rcache.pused`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Version |<p>Version of Zabbix proxy.</p> |DEPENDENT |version<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Zabbix proxy |Remote Zabbix proxy: VMware cache, % used |<p>Availability statistics of Zabbix vmware cache. Percentage of used buffer.</p> |DEPENDENT |vmware.buffer.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vmware.pused`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> No vmware collector processes started`</p> |
+|Zabbix proxy |Remote Zabbix proxy: History write cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used history buffer.</p><p>History cache is used to store item values. A high number indicates performance problems on the database side.</p> |DEPENDENT |wcache.history.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.history.pused`</p> |
+|Zabbix proxy |Remote Zabbix proxy: History index cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used history index buffer.</p><p>History index cache is used to index values stored in history cache.</p> |DEPENDENT |wcache.index.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.index.pused`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Number of processed values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.</p> |DEPENDENT |wcache.values<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.all`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Remote Zabbix proxy: Number of processed numeric (float) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed float values.</p> |DEPENDENT |wcache.values.float<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.float`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Remote Zabbix proxy: Number of processed log values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed log values.</p> |DEPENDENT |wcache.values.log<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.log`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Remote Zabbix proxy: Number of processed not supported values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of times item processing resulted in item becoming unsupported or keeping that state.</p> |DEPENDENT |wcache.values.not_supported<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values['not supported']`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Remote Zabbix proxy: Number of processed character values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed character/string values.</p> |DEPENDENT |wcache.values.str<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.str`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Remote Zabbix proxy: Number of processed text values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed text values.</p> |DEPENDENT |wcache.values.text<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.text`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Remote Zabbix proxy: Preprocessing queue |<p>Count of values enqueued in the preprocessing queue.</p> |DEPENDENT |preprocessing_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.preprocessing_queue`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Number of processed numeric (unsigned) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed numeric (unsigned) values.</p> |DEPENDENT |wcache.values.uint<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.uint`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix proxy |Remote Zabbix proxy: Required performance |<p>Required performance of Zabbix proxy, in new values per second expected.</p> |DEPENDENT |requiredperformance<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.requiredperformance`</p> |
+|Zabbix proxy |Remote Zabbix proxy: Uptime |<p>Uptime of Zabbix proxy process in seconds.</p> |DEPENDENT |uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.uptime`</p> |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Remote Zabbix proxy: More than 100 items having missing data for more than 10 minutes |<p>zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.</p> |`min(/Remote Zabbix proxy health/zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m],10m)>100` |WARNING | |
+|Remote Zabbix proxy: Utilization of data sender processes over {$ZABBIX.PROXY.UTIL.MAX:"data sender"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.data_sender.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"data sender"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.data_sender.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"data sender"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of availability manager processes over {$ZABBIX.PROXY.UTIL.MAX:"availability manager"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.availability_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"availability manager"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.availability_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"availability manager"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of configuration syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.configuration_syncer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.configuration_syncer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"configuration syncer"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of discoverer processes over {$ZABBIX.PROXY.UTIL.MAX:"discoverer"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.discoverer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"discoverer"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.discoverer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"discoverer"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of heartbeat sender processes over {$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.heartbeat_sender.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.heartbeat_sender.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"heartbeat sender"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of ODBC poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.odbc_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.odbc_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ODBC poller"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of history poller processes over {$ZABBIX.PROXY.UTIL.MAX:"history poller"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.history_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"history poller"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.history_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"history poller"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of history syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"history syncer"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.history_syncer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"history syncer"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.history_syncer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"history syncer"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of housekeeper processes over {$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.housekeeper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.housekeeper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"housekeeper"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of http poller processes over {$ZABBIX.PROXY.UTIL.MAX:"http poller"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.http_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"http poller"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.http_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"http poller"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of icmp pinger processes over {$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.icmp_pinger.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.icmp_pinger.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"icmp pinger"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of ipmi manager processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.ipmi_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.ipmi_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi manager"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of ipmi poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.ipmi_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.ipmi_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi poller"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of java poller processes over {$ZABBIX.PROXY.UTIL.MAX:"java poller"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.java_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"java poller"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.java_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"java poller"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of poller processes over {$ZABBIX.PROXY.UTIL.MAX:"poller"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"poller"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"poller"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of preprocessing worker processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.preprocessing_worker.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.preprocessing_worker.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing worker"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of preprocessing manager processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.preprocessing_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.preprocessing_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing manager"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of self-monitoring processes over {$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.self-monitoring.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.self-monitoring.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"self-monitoring"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of snmp trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.snmp_trapper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.snmp_trapper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"snmp trapper"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of task manager processes over {$ZABBIX.PROXY.UTIL.MAX:"task manager"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.task_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"task manager"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.task_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"task manager"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"trapper"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.trapper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"trapper"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.trapper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"trapper"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of unreachable poller processes over {$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.unreachable_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.unreachable_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"unreachable poller"}` |AVERAGE | |
+|Remote Zabbix proxy: Utilization of vmware collector processes over {$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}% |<p>-</p> |`avg(/Remote Zabbix proxy health/process.vmware_collector.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}`<p>Recovery expression:</p>`avg(/Remote Zabbix proxy health/process.vmware_collector.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"vmware collector"}` |AVERAGE | |
+|Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the configuration cache |<p>Consider increasing CacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix proxy health/rcache.buffer.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}` |AVERAGE | |
+|Remote Zabbix proxy: Version has changed (new version: {ITEM.VALUE}) |<p>Remote Zabbix proxy version has changed. Ack to close.</p> |`last(/Remote Zabbix proxy health/version,#1)<>last(/Remote Zabbix proxy health/version,#2) and length(last(/Remote Zabbix proxy health/version))>0` |INFO |<p>Manual close: YES</p> |
+|Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the vmware cache |<p>Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix proxy health/vmware.buffer.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}` |AVERAGE | |
+|Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history cache |<p>Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix proxy health/wcache.history.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}` |AVERAGE | |
+|Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history index cache |<p>Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix proxy health/wcache.index.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}` |AVERAGE | |
+|Remote Zabbix proxy: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Remote Zabbix proxy health/uptime)<10m` |INFO |<p>Manual close: YES</p> |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_remote_zabbix_proxy.yaml b/templates/app/zabbix_proxy_remote/template_app_remote_zabbix_proxy.yaml
index d1a6efc942d..eac8a1613c7 100644
--- a/templates/classic/template_app_remote_zabbix_proxy.yaml
+++ b/templates/app/zabbix_proxy_remote/template_app_remote_zabbix_proxy.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2022-01-07T13:02:24Z'
+  version: '6.0'
+  date: '2022-01-11T22:24:15Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,25 +10,49 @@ zabbix_export:
       uuid: 970c2342146549768e6b91a26089bcdf
       template: 'Remote Zabbix proxy health'
       name: 'Remote Zabbix proxy health'
+      description: 'Template tooling version used: 0.39'
       groups:
         -
           name: Templates/Applications
       items:
         -
+          uuid: e6654e9406b74b28909dc166b2805125
+          name: 'Remote Zabbix proxy: Preprocessing queue'
+          type: DEPENDENT
+          key: preprocessing_queue
+          delay: '0'
+          history: 1w
+          description: 'Count of values enqueued in the preprocessing queue.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.preprocessing_queue
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+        -
           uuid: 189d41565cdf4f459468c43d1b1d0961
-          name: 'Utilization of availability manager internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of availability manager internal processes, in %'
           type: DEPENDENT
           key: process.availability_manager.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time availability manager processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''availability manager''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes availability manager not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -36,26 +60,30 @@ zabbix_export:
           triggers:
             -
               uuid: 77e66d2f6b0e48fa8a7ec5dd213eab35
-              expression: 'avg(/Remote Zabbix proxy health/process.availability_manager.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.availability_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"availability manager"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.availability_manager.avg.busy,10m)<65'
-              name: 'Zabbix availability manager processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.availability_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"availability manager"}'
+              name: 'Remote Zabbix proxy: Utilization of availability manager processes over {$ZABBIX.PROXY.UTIL.MAX:"availability manager"}%'
               priority: AVERAGE
         -
           uuid: 457a086236ab40eda5c9758eabacb73d
-          name: 'Utilization of configuration syncer internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of configuration syncer internal processes, in %'
           type: DEPENDENT
           key: process.configuration_syncer.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time configuration syncer processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''configuration syncer''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes configuration syncer not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -63,26 +91,30 @@ zabbix_export:
           triggers:
             -
               uuid: 67089f59f77641c8ab487e2c44d563a2
-              expression: 'avg(/Remote Zabbix proxy health/process.configuration_syncer.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.configuration_syncer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.configuration_syncer.avg.busy,10m)<65'
-              name: 'Zabbix configuration syncer processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.configuration_syncer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"configuration syncer"}'
+              name: 'Remote Zabbix proxy: Utilization of configuration syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}%'
               priority: AVERAGE
         -
           uuid: ff9c1cb7fb234ad2b793c4f296b79834
-          name: 'Utilization of data sender internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of data sender internal processes, in %'
           type: DEPENDENT
           key: process.data_sender.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time data sender processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''data sender''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes data sender not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -90,26 +122,30 @@ zabbix_export:
           triggers:
             -
               uuid: f2208ef37274449fb2b61f5f55e615f1
-              expression: 'avg(/Remote Zabbix proxy health/process.data_sender.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.data_sender.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"data sender"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.data_sender.avg.busy,10m)<65'
-              name: 'Zabbix data sender processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.data_sender.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"data sender"}'
+              name: 'Remote Zabbix proxy: Utilization of data sender processes over {$ZABBIX.PROXY.UTIL.MAX:"data sender"}%'
               priority: AVERAGE
         -
           uuid: 504c144b92d5435b91c2c0c120bd9439
-          name: 'Utilization of discoverer data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of discoverer data collector processes, in %'
           type: DEPENDENT
           key: process.discoverer.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time discoverer processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
-                - $.data.process.discoverer.busy.avg
+                - '$.data.process[''discoverer''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes discoverer not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -117,26 +153,30 @@ zabbix_export:
           triggers:
             -
               uuid: c5a739eef8cb43f099ee902c9eb23d6e
-              expression: 'avg(/Remote Zabbix proxy health/process.discoverer.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.discoverer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"discoverer"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.discoverer.avg.busy,10m)<65'
-              name: 'Zabbix discoverer processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.discoverer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"discoverer"}'
+              name: 'Remote Zabbix proxy: Utilization of discoverer processes over {$ZABBIX.PROXY.UTIL.MAX:"discoverer"}%'
               priority: AVERAGE
         -
           uuid: 9ca58c0a87f54733ae9794d052092944
-          name: 'Utilization of heartbeat sender internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of heartbeat sender internal processes, in %'
           type: DEPENDENT
           key: process.heartbeat_sender.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time heartbeat sender processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''heartbeat sender''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes heartbeat sender not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -144,26 +184,30 @@ zabbix_export:
           triggers:
             -
               uuid: f75e8a72ae1642999c7560387f189129
-              expression: 'avg(/Remote Zabbix proxy health/process.heartbeat_sender.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.heartbeat_sender.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.heartbeat_sender.avg.busy,10m)<65'
-              name: 'Zabbix heartbeat sender processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.heartbeat_sender.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"heartbeat sender"}'
+              name: 'Remote Zabbix proxy: Utilization of heartbeat sender processes over {$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}%'
               priority: AVERAGE
         -
           uuid: 27c6471f0b184586aad8966a44a0c20f
-          name: 'Utilization of history poller data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of history poller data collector processes, in %'
           type: DEPENDENT
           key: process.history_poller.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time history poller processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''history poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes history poller not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -171,26 +215,30 @@ zabbix_export:
           triggers:
             -
               uuid: afcd2486a21b42ae97f53353b3642301
-              expression: 'avg(/Remote Zabbix proxy health/process.history_poller.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.history_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"history poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.history_poller.avg.busy,10m)<65'
-              name: 'Zabbix history poller processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.history_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"history poller"}'
+              name: 'Remote Zabbix proxy: Utilization of history poller processes over {$ZABBIX.PROXY.UTIL.MAX:"history poller"}%'
               priority: AVERAGE
         -
           uuid: c710e445710b4d98bd4ebcd5770c7d5a
-          name: 'Utilization of history syncer internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of history syncer internal processes, in %'
           type: DEPENDENT
           key: process.history_syncer.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time history syncer processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''history syncer''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes history syncer not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -198,26 +246,30 @@ zabbix_export:
           triggers:
             -
               uuid: 872ca8a02ff948d0ab4f5000249bbf5b
-              expression: 'avg(/Remote Zabbix proxy health/process.history_syncer.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.history_syncer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"history syncer"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.history_syncer.avg.busy,10m)<65'
-              name: 'Zabbix history syncer processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.history_syncer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"history syncer"}'
+              name: 'Remote Zabbix proxy: Utilization of history syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"history syncer"}%'
               priority: AVERAGE
         -
           uuid: 50c3587febc14c118ca2868c24e42770
-          name: 'Utilization of housekeeper internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of housekeeper internal processes, in %'
           type: DEPENDENT
           key: process.housekeeper.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time housekeeper processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
-                - $.data.process.housekeeper.busy.avg
+                - '$.data.process[''housekeeper''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes housekeeper not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -225,26 +277,30 @@ zabbix_export:
           triggers:
             -
               uuid: 43d8ef15170e4edd80eea85ad9990d73
-              expression: 'avg(/Remote Zabbix proxy health/process.housekeeper.avg.busy,30m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.housekeeper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.housekeeper.avg.busy,30m)<65'
-              name: 'Zabbix housekeeper processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.housekeeper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"housekeeper"}'
+              name: 'Remote Zabbix proxy: Utilization of housekeeper processes over {$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}%'
               priority: AVERAGE
         -
           uuid: 4f335477bd654368a7870dc5cd21e114
-          name: 'Utilization of http poller data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of http poller data collector processes, in %'
           type: DEPENDENT
           key: process.http_poller.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time http poller processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''http poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes http poller not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -252,26 +308,30 @@ zabbix_export:
           triggers:
             -
               uuid: 9c391ba5350d401b9ca56f7cd29cd457
-              expression: 'avg(/Remote Zabbix proxy health/process.http_poller.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.http_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"http poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.http_poller.avg.busy,10m)<65'
-              name: 'Zabbix http poller processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.http_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"http poller"}'
+              name: 'Remote Zabbix proxy: Utilization of http poller processes over {$ZABBIX.PROXY.UTIL.MAX:"http poller"}%'
               priority: AVERAGE
         -
           uuid: f03927fd354a490e95521e5922a19ad3
-          name: 'Utilization of icmp pinger data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of icmp pinger data collector processes, in %'
           type: DEPENDENT
           key: process.icmp_pinger.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time icmp pinger processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''icmp pinger''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes icmp pinger not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -279,26 +339,30 @@ zabbix_export:
           triggers:
             -
               uuid: 8a0abc8ff0dd42b0926b5840fe5b0e2f
-              expression: 'avg(/Remote Zabbix proxy health/process.icmp_pinger.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.icmp_pinger.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.icmp_pinger.avg.busy,10m)<65'
-              name: 'Zabbix icmp pinger processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.icmp_pinger.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"icmp pinger"}'
+              name: 'Remote Zabbix proxy: Utilization of icmp pinger processes over {$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}%'
               priority: AVERAGE
         -
           uuid: fb560cce51714f9c8b5164f7587930e5
-          name: 'Utilization of ipmi manager internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of ipmi manager internal processes, in %'
           type: DEPENDENT
           key: process.ipmi_manager.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time ipmi manager processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''ipmi manager''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes ipmi manager not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -306,26 +370,30 @@ zabbix_export:
           triggers:
             -
               uuid: a2aed809416b46beba8ed63554d9b7d5
-              expression: 'avg(/Remote Zabbix proxy health/process.ipmi_manager.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.ipmi_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.ipmi_manager.avg.busy,10m)<65'
-              name: 'Zabbix ipmi manager processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.ipmi_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi manager"}'
+              name: 'Remote Zabbix proxy: Utilization of ipmi manager processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}%'
               priority: AVERAGE
         -
           uuid: c4ff983246e7450f96af03da274df151
-          name: 'Utilization of ipmi poller data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of ipmi poller data collector processes, in %'
           type: DEPENDENT
           key: process.ipmi_poller.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time ipmi poller processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''ipmi poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes ipmi poller not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -333,26 +401,30 @@ zabbix_export:
           triggers:
             -
               uuid: e7c748c36e5740d684a5c4c68682f321
-              expression: 'avg(/Remote Zabbix proxy health/process.ipmi_poller.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.ipmi_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.ipmi_poller.avg.busy,10m)<65'
-              name: 'Zabbix ipmi poller processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.ipmi_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi poller"}'
+              name: 'Remote Zabbix proxy: Utilization of ipmi poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}%'
               priority: AVERAGE
         -
           uuid: c37b027a671449dca92cfbf1b15e711f
-          name: 'Utilization of java poller data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of java poller data collector processes, in %'
           type: DEPENDENT
           key: process.java_poller.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time java poller processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''java poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes java poller not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -360,26 +432,28 @@ zabbix_export:
           triggers:
             -
               uuid: ef46070fc30b46c7be1ce3574e578449
-              expression: 'avg(/Remote Zabbix proxy health/process.java_poller.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.java_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"java poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.java_poller.avg.busy,10m)<65'
-              name: 'Zabbix java poller processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.java_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"java poller"}'
+              name: 'Remote Zabbix proxy: Utilization of java poller processes over {$ZABBIX.PROXY.UTIL.MAX:"java poller"}%'
               priority: AVERAGE
         -
           uuid: 7c0d7d097e004d0db25eab55ceb6b87c
-          name: 'Utilization of ODBC poller data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of ODBC poller data collector processes, in %'
           type: DEPENDENT
           key: process.odbc_poller.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time ODBC poller processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''odbc poller''].busy.avg'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -387,26 +461,30 @@ zabbix_export:
           triggers:
             -
               uuid: 7f83ff01200c4862aa22057b079da6f8
-              expression: 'avg(/Remote Zabbix proxy health/process.odbc_poller.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.odbc_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.odbc_poller.avg.busy,10m)<65'
-              name: 'Zabbix ODBC poller processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.odbc_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ODBC poller"}'
+              name: 'Remote Zabbix proxy: Utilization of ODBC poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}%'
               priority: AVERAGE
         -
           uuid: e44b8cc43d5c49c5a81ed33c5cc44c82
-          name: 'Utilization of poller data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of poller data collector processes, in %'
           type: DEPENDENT
           key: process.poller.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time poller processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
-                - $.data.process.poller.busy.avg
+                - '$.data.process[''poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes poller not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -414,26 +492,92 @@ zabbix_export:
           triggers:
             -
               uuid: 6afb9db9e11842c28c059abd31c7a134
-              expression: 'avg(/Remote Zabbix proxy health/process.poller.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"poller"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"poller"}'
+              name: 'Remote Zabbix proxy: Utilization of poller processes over {$ZABBIX.PROXY.UTIL.MAX:"poller"}%'
+              priority: AVERAGE
+        -
+          uuid: c4746528d75a41898a7ded21701de019
+          name: 'Remote Zabbix proxy: Utilization of preprocessing manager internal processes, in %'
+          type: DEPENDENT
+          key: process.preprocessing_manager.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time preprocessing manager processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''preprocessing manager''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes preprocessing manager not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+          triggers:
+            -
+              uuid: 4c681b0775b54fd79e4aba669e219967
+              expression: 'avg(/Remote Zabbix proxy health/process.preprocessing_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.preprocessing_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing manager"}'
+              name: 'Remote Zabbix proxy: Utilization of preprocessing manager processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}%'
+              priority: AVERAGE
+        -
+          uuid: 5b10c9859c3443459b5e993015ae68fc
+          name: 'Remote Zabbix proxy: Utilization of preprocessing worker internal processes, in %'
+          type: DEPENDENT
+          key: process.preprocessing_worker.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time preprocessing worker processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''preprocessing worker''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes preprocessing worker not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+          triggers:
+            -
+              uuid: f1c97c56e2d04cabaaa4c9b41e2bbad3
+              expression: 'avg(/Remote Zabbix proxy health/process.preprocessing_worker.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.poller.avg.busy,10m)<65'
-              name: 'Zabbix poller processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.preprocessing_worker.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing worker"}'
+              name: 'Remote Zabbix proxy: Utilization of preprocessing worker processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}%'
               priority: AVERAGE
         -
           uuid: fbfe2a05b2914c9d8b1b39aa7320aaf3
-          name: 'Utilization of self-monitoring internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of self-monitoring internal processes, in %'
           type: DEPENDENT
           key: process.self-monitoring.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time self-monitoring processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''self-monitoring''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes self-monitoring not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -441,26 +585,30 @@ zabbix_export:
           triggers:
             -
               uuid: fee719ea91524972897c19ce4b17bd54
-              expression: 'avg(/Remote Zabbix proxy health/process.self-monitoring.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.self-monitoring.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.self-monitoring.avg.busy,10m)<65'
-              name: 'Zabbix self-monitoring processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.self-monitoring.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"self-monitoring"}'
+              name: 'Remote Zabbix proxy: Utilization of self-monitoring processes over {$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}%'
               priority: AVERAGE
         -
           uuid: 3c06aed8f9ca4790b23132498e32701f
-          name: 'Utilization of snmp trapper data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of snmp trapper data collector processes, in %'
           type: DEPENDENT
           key: process.snmp_trapper.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time snmp trapper processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''snmp trapper''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes snmp trapper not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -468,26 +616,30 @@ zabbix_export:
           triggers:
             -
               uuid: 9ca70574386f4b968bcda64a5d267d58
-              expression: 'avg(/Remote Zabbix proxy health/process.snmp_trapper.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.snmp_trapper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.snmp_trapper.avg.busy,10m)<65'
-              name: 'Zabbix snmp trapper processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.snmp_trapper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"snmp trapper"}'
+              name: 'Remote Zabbix proxy: Utilization of snmp trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}%'
               priority: AVERAGE
         -
           uuid: 48ab13daaf0541bdbf317226c753472c
-          name: 'Utilization of task manager internal processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of task manager internal processes, in %'
           type: DEPENDENT
           key: process.task_manager.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time task manager processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''task manager''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes task manager not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -495,26 +647,30 @@ zabbix_export:
           triggers:
             -
               uuid: 9d7d15a747484530a61102175cbc4478
-              expression: 'avg(/Remote Zabbix proxy health/process.task_manager.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.task_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"task manager"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.task_manager.avg.busy,10m)<65'
-              name: 'Zabbix task manager processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.task_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"task manager"}'
+              name: 'Remote Zabbix proxy: Utilization of task manager processes over {$ZABBIX.PROXY.UTIL.MAX:"task manager"}%'
               priority: AVERAGE
         -
           uuid: d37a6ebb128d4221a34c8d78736ea90b
-          name: 'Utilization of trapper data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of trapper data collector processes, in %'
           type: DEPENDENT
           key: process.trapper.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time trapper processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
-                - $.data.process.trapper.busy.avg
+                - '$.data.process[''trapper''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes trapper not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -522,26 +678,30 @@ zabbix_export:
           triggers:
             -
               uuid: 49a9e3e1b17146f7861daf6994956d4f
-              expression: 'avg(/Remote Zabbix proxy health/process.trapper.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.trapper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"trapper"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.trapper.avg.busy,10m)<65'
-              name: 'Zabbix trapper processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.trapper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"trapper"}'
+              name: 'Remote Zabbix proxy: Utilization of trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"trapper"}%'
               priority: AVERAGE
         -
           uuid: a0c56d8570eb4cb39e119fc61d7092d1
-          name: 'Utilization of unreachable poller data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of unreachable poller data collector processes, in %'
           type: DEPENDENT
           key: process.unreachable_poller.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time unreachable poller processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''unreachable poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes unreachable poller not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -549,26 +709,30 @@ zabbix_export:
           triggers:
             -
               uuid: e446ec803eaf4ace9b7d1fdc7a89cba6
-              expression: 'avg(/Remote Zabbix proxy health/process.unreachable_poller.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.unreachable_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.unreachable_poller.avg.busy,10m)<65'
-              name: 'Zabbix unreachable poller processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.unreachable_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"unreachable poller"}'
+              name: 'Remote Zabbix proxy: Utilization of unreachable poller processes over {$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}%'
               priority: AVERAGE
         -
           uuid: 54d7e2578b594022ad406b40c9dd57fe
-          name: 'Utilization of vmware data collector processes, in %'
+          name: 'Remote Zabbix proxy: Utilization of vmware data collector processes, in %'
           type: DEPENDENT
           key: process.vmware_collector.avg.busy
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time vmware collector processes have been busy in the last minute.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - '$.data.process[''vmware collector''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes vmware collector not started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -576,26 +740,28 @@ zabbix_export:
           triggers:
             -
               uuid: 30147687074f45e7ab0dce81a1b7cf07
-              expression: 'avg(/Remote Zabbix proxy health/process.vmware_collector.avg.busy,10m)>75'
+              expression: 'avg(/Remote Zabbix proxy health/process.vmware_collector.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}'
               recovery_mode: RECOVERY_EXPRESSION
-              recovery_expression: 'avg(/Remote Zabbix proxy health/process.vmware_collector.avg.busy,10m)<65'
-              name: 'Zabbix vmware collector processes more than 75% busy'
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.vmware_collector.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"vmware collector"}'
+              name: 'Remote Zabbix proxy: Utilization of vmware collector processes over {$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}%'
               priority: AVERAGE
         -
           uuid: 72dd891d7ced4cefb7de988dadf81f3b
-          name: 'Configuration cache, % used'
+          name: 'Remote Zabbix proxy: Configuration cache, % used'
           type: DEPENDENT
           key: rcache.buffer.pused
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - $.data.rcache.pused
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -603,13 +769,61 @@ zabbix_export:
           triggers:
             -
               uuid: 6aaad09f92f3419c9aa7164f2191a45a
-              expression: 'max(/Remote Zabbix proxy health/rcache.buffer.pused,10m)>75'
-              name: 'More than 75% used in the configuration cache'
+              expression: 'max(/Remote Zabbix proxy health/rcache.buffer.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the configuration cache'
               priority: AVERAGE
-              description: 'Consider increasing CacheSize in the zabbix_proxy.conf configuration file'
+              description: 'Consider increasing CacheSize in the zabbix_server.conf configuration file.'
+        -
+          uuid: 0df481994c454884b6be2e2132248af7
+          name: 'Remote Zabbix proxy: Required performance'
+          type: DEPENDENT
+          key: requiredperformance
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: 'Required performance of Zabbix proxy, in new values per second expected.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.requiredperformance
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+        -
+          uuid: 28d87aef584644e9a3adcde33966b4e1
+          name: 'Remote Zabbix proxy: Uptime'
+          type: DEPENDENT
+          key: uptime
+          delay: '0'
+          history: 1w
+          units: uptime
+          description: 'Uptime of Zabbix proxy process in seconds.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.uptime
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: Application
+              value: 'Zabbix proxy'
+          triggers:
+            -
+              uuid: 8940efd3c68b4ded80ea1e89d55dfa7c
+              expression: 'last(/Remote Zabbix proxy health/uptime)<10m'
+              name: 'Remote Zabbix proxy: has been restarted (uptime < 10m)'
+              priority: INFO
+              description: 'Uptime is less than 10 minutes'
+              manual_close: 'YES'
         -
           uuid: ba19f24c2e234ac89a12a4a7aceeff93
-          name: Version
+          name: 'Remote Zabbix proxy: Version'
           type: DEPENDENT
           key: version
           delay: '0'
@@ -627,7 +841,7 @@ zabbix_export:
               parameters:
                 - 1d
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -636,25 +850,29 @@ zabbix_export:
             -
               uuid: 224ec99fda0d443cba8a6c75da5a27cb
               expression: 'last(/Remote Zabbix proxy health/version,#1)<>last(/Remote Zabbix proxy health/version,#2) and length(last(/Remote Zabbix proxy health/version))>0'
-              name: 'Zabbix version has changed (new version: {ITEM.VALUE})'
+              name: 'Remote Zabbix proxy: Version has changed (new version: {ITEM.VALUE})'
               priority: INFO
-              description: 'Zabbix proxy version has changed. Ack to close.'
+              description: 'Remote Zabbix proxy version has changed. Ack to close.'
               manual_close: 'YES'
         -
           uuid: 7e6ffd55fe6842219f6e0d3c81ffa309
-          name: 'VMware cache, % used'
+          name: 'Remote Zabbix proxy: VMware cache, % used'
           type: DEPENDENT
           key: vmware.buffer.pused
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - $.data.vmware.pused
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'No vmware collector processes started'
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -662,25 +880,29 @@ zabbix_export:
           triggers:
             -
               uuid: ac2a42046de340e1968802d92678947c
-              expression: 'max(/Remote Zabbix proxy health/vmware.buffer.pused,10m)>75'
-              name: 'More than 75% used in the vmware cache'
+              expression: 'max(/Remote Zabbix proxy health/vmware.buffer.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the vmware cache'
               priority: AVERAGE
-              description: 'Consider increasing VMwareCacheSize in the zabbix_proxy.conf configuration file'
+              description: 'Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 2abf18f2a9c9412ca81d615f45d4ca5f
-          name: 'History write cache, % used'
+          name: 'Remote Zabbix proxy: History write cache, % used'
           type: DEPENDENT
           key: wcache.history.pused
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: |
+            Statistics and availability of Zabbix write cache. Percentage of used history buffer.
+            History cache is used to store item values. A high number indicates performance problems on the database side.
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - $.data.wcache.history.pused
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -688,25 +910,29 @@ zabbix_export:
           triggers:
             -
               uuid: c14095c38d17486fa8fde22bd5a9d737
-              expression: 'max(/Remote Zabbix proxy health/wcache.history.pused,10m)>75'
-              name: 'More than 75% used in the history cache'
+              expression: 'max(/Remote Zabbix proxy health/wcache.history.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history cache'
               priority: AVERAGE
-              description: 'Consider increasing HistoryCacheSize in the zabbix_proxy.conf configuration file'
+              description: 'Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: a907ff2d6d8e4389b116eb3ec01dacfe
-          name: 'History index cache, % used'
+          name: 'Remote Zabbix proxy: History index cache, % used'
           type: DEPENDENT
           key: wcache.index.pused
           delay: '0'
           history: 1w
           value_type: FLOAT
+          units: '%'
+          description: |
+            Statistics and availability of Zabbix write cache. Percentage of used history index buffer.
+            History index cache is used to index values stored in history cache.
           preprocessing:
             -
               type: JSONPATH
               parameters:
                 - $.data.wcache.index.pused
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
@@ -714,18 +940,21 @@ zabbix_export:
           triggers:
             -
               uuid: 43f9a4fc049e45e5b8bbb0980b518dd0
-              expression: 'max(/Remote Zabbix proxy health/wcache.index.pused,10m)>75'
-              name: 'More than 75% used in the history index cache'
+              expression: 'max(/Remote Zabbix proxy health/wcache.index.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history index cache'
               priority: AVERAGE
-              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_proxy.conf configuration file'
+              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 0238a93001a3438988b9b5cc4cbcc68e
-          name: 'Number of processed values per second'
+          name: 'Remote Zabbix proxy: Number of processed values per second'
           type: DEPENDENT
           key: wcache.values
           delay: '0'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.
           preprocessing:
             -
               type: JSONPATH
@@ -736,19 +965,22 @@ zabbix_export:
               parameters:
                 - ''
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: f20ff449693a479895b7f3b450b93787
-          name: 'Number of processed numeric (float) values per second'
+          name: 'Remote Zabbix proxy: Number of processed numeric (float) values per second'
           type: DEPENDENT
           key: wcache.values.float
           delay: '0'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed float values.
           preprocessing:
             -
               type: JSONPATH
@@ -759,19 +991,22 @@ zabbix_export:
               parameters:
                 - ''
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: b20b00f97a424b8e9c69ebb749a94d65
-          name: 'Number of processed log values per second'
+          name: 'Remote Zabbix proxy: Number of processed log values per second'
           type: DEPENDENT
           key: wcache.values.log
           delay: '0'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed log values.
           preprocessing:
             -
               type: JSONPATH
@@ -782,19 +1017,22 @@ zabbix_export:
               parameters:
                 - ''
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 927b1387d969466eba000855837887c7
-          name: 'Number of processed not supported values per second'
+          name: 'Remote Zabbix proxy: Number of processed not supported values per second'
           type: DEPENDENT
           key: wcache.values.not_supported
           delay: '0'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of times item processing resulted in item becoming unsupported or keeping that state.
           preprocessing:
             -
               type: JSONPATH
@@ -805,19 +1043,22 @@ zabbix_export:
               parameters:
                 - ''
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 334584cfea704011b8ae70436e47e2ff
-          name: 'Number of processed character values per second'
+          name: 'Remote Zabbix proxy: Number of processed character values per second'
           type: DEPENDENT
           key: wcache.values.str
           delay: '0'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed character/string values.
           preprocessing:
             -
               type: JSONPATH
@@ -828,19 +1069,22 @@ zabbix_export:
               parameters:
                 - ''
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: 35b053f8ce89430b989387eb3075b582
-          name: 'Number of processed text values per second'
+          name: 'Remote Zabbix proxy: Number of processed text values per second'
           type: DEPENDENT
           key: wcache.values.text
           delay: '0'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed text values.
           preprocessing:
             -
               type: JSONPATH
@@ -851,19 +1095,22 @@ zabbix_export:
               parameters:
                 - ''
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: c53f480b861249c4a1ca12571faa4487
-          name: 'Number of processed numeric (unsigned) values per second'
+          name: 'Remote Zabbix proxy: Number of processed numeric (unsigned) values per second'
           type: DEPENDENT
           key: wcache.values.uint
           delay: '0'
           history: 1w
           value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed numeric (unsigned) values.
           preprocessing:
             -
               type: JSONPATH
@@ -874,18 +1121,18 @@ zabbix_export:
               parameters:
                 - ''
           master_item:
-            key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
           tags:
             -
               tag: Application
               value: 'Zabbix proxy'
         -
           uuid: c9b9ee0faefd4cefbac32f548539266e
-          name: 'Zabbix stats queue over $5'
+          name: 'Remote Zabbix proxy: Zabbix stats queue over 10m'
           type: INTERNAL
-          key: 'zabbix[stats,{$ADDRESS},{$PORT},queue,10m]'
-          delay: 10m
+          key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m]'
           history: 1w
+          description: 'Number of monitored items in the queue which are delayed at least by 10 minutes.'
           preprocessing:
             -
               type: JSONPATH
@@ -898,16 +1145,17 @@ zabbix_export:
           triggers:
             -
               uuid: 71cd927153ef4b8480a8f13fc6b4def8
-              expression: 'min(/Remote Zabbix proxy health/zabbix[stats,{$ADDRESS},{$PORT},queue,10m],10m)>100'
-              name: 'More than 100 items having missing data for more than 10 minutes'
+              expression: 'min(/Remote Zabbix proxy health/zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m],10m)>100'
+              name: 'Remote Zabbix proxy: More than 100 items having missing data for more than 10 minutes'
               priority: WARNING
-              description: 'zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes'
+              description: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.'
         -
           uuid: 128bcd3c019946b593f3256858cf8397
-          name: 'Zabbix stats queue'
+          name: 'Remote Zabbix proxy: Zabbix stats queue'
           type: INTERNAL
-          key: 'zabbix[stats,{$ADDRESS},{$PORT},queue]'
+          key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue]'
           history: 1w
+          description: 'Number of monitored items in the queue which are delayed at least by 6 seconds.'
           preprocessing:
             -
               type: JSONPATH
@@ -919,22 +1167,34 @@ zabbix_export:
               value: 'Zabbix proxy'
         -
           uuid: c3d4e015efe7459f8207096a04b296f0
-          name: 'Zabbix stats'
+          name: 'Remote Zabbix proxy: Zabbix stats'
           type: INTERNAL
-          key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
-          history: '0'
+          key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          history: 0d
           trends: '0'
           value_type: TEXT
-          description: 'Zabbix proxy statistics master item.'
+          description: 'Zabbix server statistics master item.'
           tags:
             -
               tag: Application
-              value: 'Zabbix proxy'
+              value: 'Zabbix raw items'
       macros:
         -
-          macro: '{$ADDRESS}'
+          macro: '{$ZABBIX.PROXY.ADDRESS}'
+          value: 127.0.0.1
+          description: 'IP/DNS/network mask list of proxies to be remotely queried (default is 127.0.0.1).'
+        -
+          macro: '{$ZABBIX.PROXY.PORT}'
+          value: '10051'
+          description: 'Port of proxy to be remotely queried (default is 10051).'
         -
-          macro: '{$PORT}'
+          macro: '{$ZABBIX.PROXY.UTIL.MAX}'
+          value: '75'
+          description: 'Maximum average percentage of time processes busy in the last minute (default is 75).'
+        -
+          macro: '{$ZABBIX.PROXY.UTIL.MIN}'
+          value: '65'
+          description: 'Minimum average percentage of time processes busy in the last minute (default is 65).'
       dashboards:
         -
           uuid: 73c77a8555bc4a7d814d2cf54164f15f
@@ -945,7 +1205,7 @@ zabbix_export:
                 -
                   type: GRAPH_CLASSIC
                   width: '12'
-                  height: '6'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -955,13 +1215,13 @@ zabbix_export:
                       type: GRAPH
                       name: graphid
                       value:
-                        name: 'Zabbix proxy performance'
+                        name: 'Remote Zabbix proxy: Zabbix proxy performance'
                         host: 'Remote Zabbix proxy health'
                 -
                   type: GRAPH_CLASSIC
                   x: '12'
                   width: '12'
-                  height: '6'
+                  height: '5'
                   fields:
                     -
                       type: INTEGER
@@ -971,11 +1231,11 @@ zabbix_export:
                       type: GRAPH
                       name: graphid
                       value:
-                        name: 'Zabbix data gathering process busy %'
+                        name: 'Remote Zabbix proxy: Zabbix data gathering process busy %'
                         host: 'Remote Zabbix proxy health'
                 -
                   type: GRAPH_CLASSIC
-                  'y': '6'
+                  'y': '5'
                   width: '12'
                   height: '5'
                   fields:
@@ -987,12 +1247,12 @@ zabbix_export:
                       type: GRAPH
                       name: graphid
                       value:
-                        name: 'Zabbix internal process busy %'
+                        name: 'Remote Zabbix proxy: Zabbix internal process busy %'
                         host: 'Remote Zabbix proxy health'
                 -
                   type: GRAPH_CLASSIC
                   x: '12'
-                  'y': '6'
+                  'y': '5'
                   width: '12'
                   height: '5'
                   fields:
@@ -1004,12 +1264,12 @@ zabbix_export:
                       type: GRAPH
                       name: graphid
                       value:
-                        name: 'Zabbix cache usage, % free'
+                        name: 'Remote Zabbix proxy: Zabbix cache usage, % used'
                         host: 'Remote Zabbix proxy health'
   graphs:
     -
       uuid: 4cc55dd64cab48cc92fbde98135d7f7f
-      name: 'Zabbix cache usage, % free'
+      name: 'Remote Zabbix proxy: Zabbix cache usage, % used'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
       graph_items:
@@ -1038,146 +1298,167 @@ zabbix_export:
             key: vmware.buffer.pused
     -
       uuid: 1daa58364c74486ba4038e56cecf1a41
-      name: 'Zabbix data gathering process busy %'
+      name: 'Remote Zabbix proxy: Zabbix data gathering process busy %'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
       graph_items:
         -
-          sortorder: '1'
           color: '990099'
           item:
             host: 'Remote Zabbix proxy health'
             key: process.trapper.avg.busy
         -
-          sortorder: '2'
+          sortorder: '1'
           color: '990000'
           item:
             host: 'Remote Zabbix proxy health'
             key: process.poller.avg.busy
         -
-          sortorder: '3'
+          sortorder: '2'
           color: 0000EE
           item:
             host: 'Remote Zabbix proxy health'
             key: process.ipmi_poller.avg.busy
         -
-          sortorder: '4'
+          sortorder: '3'
           color: FF33FF
           item:
             host: 'Remote Zabbix proxy health'
             key: process.discoverer.avg.busy
         -
-          sortorder: '5'
-          color: 00EE00
+          sortorder: '4'
+          color: '007700'
           item:
             host: 'Remote Zabbix proxy health'
             key: process.icmp_pinger.avg.busy
         -
-          sortorder: '6'
+          sortorder: '5'
           color: '003300'
           item:
             host: 'Remote Zabbix proxy health'
             key: process.http_poller.avg.busy
         -
-          sortorder: '7'
+          sortorder: '6'
           color: 33FFFF
           item:
             host: 'Remote Zabbix proxy health'
             key: process.unreachable_poller.avg.busy
         -
-          sortorder: '8'
+          sortorder: '7'
           color: DD0000
           item:
             host: 'Remote Zabbix proxy health'
             key: process.java_poller.avg.busy
         -
-          sortorder: '9'
+          sortorder: '8'
           color: '000099'
           item:
             host: 'Remote Zabbix proxy health'
             key: process.snmp_trapper.avg.busy
         -
-          sortorder: '10'
+          sortorder: '9'
           color: 00FF00
           item:
             host: 'Remote Zabbix proxy health'
             key: process.vmware_collector.avg.busy
         -
-          sortorder: '11'
-          color: BB2A02
+          sortorder: '10'
+          color: 5A2B57
           item:
             host: 'Remote Zabbix proxy health'
             key: process.history_poller.avg.busy
         -
-          sortorder: '12'
+          sortorder: '11'
           color: 9FA8DA
           item:
             host: 'Remote Zabbix proxy health'
             key: process.odbc_poller.avg.busy
     -
       uuid: 87379405c456407ebab6e033c3cae37a
-      name: 'Zabbix internal process busy %'
+      name: 'Remote Zabbix proxy: Zabbix internal process busy %'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
       graph_items:
         -
-          sortorder: '1'
           color: FFAA00
           item:
             host: 'Remote Zabbix proxy health'
             key: process.housekeeper.avg.busy
         -
-          sortorder: '2'
+          sortorder: '1'
           color: '990099'
           item:
             host: 'Remote Zabbix proxy health'
             key: process.configuration_syncer.avg.busy
         -
-          sortorder: '3'
+          sortorder: '2'
           color: EE0000
           item:
             host: 'Remote Zabbix proxy health'
             key: process.history_syncer.avg.busy
         -
-          sortorder: '4'
+          sortorder: '3'
           color: FF66FF
           item:
             host: 'Remote Zabbix proxy health'
             key: process.self-monitoring.avg.busy
         -
-          sortorder: '5'
-          color: '960000'
+          sortorder: '4'
+          color: 0000EE
           item:
             host: 'Remote Zabbix proxy health'
             key: process.heartbeat_sender.avg.busy
         -
-          sortorder: '6'
+          sortorder: '5'
+          color: 00EE00
           item:
             host: 'Remote Zabbix proxy health'
             key: process.data_sender.avg.busy
         -
-          sortorder: '7'
+          sortorder: '6'
           color: '009999'
           item:
             host: 'Remote Zabbix proxy health'
             key: process.task_manager.avg.busy
         -
-          sortorder: '8'
+          sortorder: '7'
           color: BBBB00
           item:
             host: 'Remote Zabbix proxy health'
             key: process.ipmi_manager.avg.busy
         -
+          sortorder: '8'
+          color: '990000'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.preprocessing_manager.avg.busy
+        -
           sortorder: '9'
-          color: F230E0
+          color: '008800'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.preprocessing_worker.avg.busy
+        -
+          sortorder: '10'
+          color: 2B5429
           item:
             host: 'Remote Zabbix proxy health'
             key: process.availability_manager.avg.busy
     -
+      uuid: 40e3574cc0ca4877b331156ff7d1a941
+      name: 'Remote Zabbix proxy: Zabbix internal queues'
+      graph_items:
+        -
+          color: '008800'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: preprocessing_queue
+    -
       uuid: ee5c00806cad4a5bb65bd3bcd734c88f
-      name: 'Zabbix proxy performance'
+      name: 'Remote Zabbix proxy: Zabbix proxy performance'
       graph_items:
         -
+          drawtype: GRADIENT_LINE
           color: 00C800
           item:
             host: 'Remote Zabbix proxy health'
@@ -1187,4 +1468,4 @@ zabbix_export:
           color: C80000
           item:
             host: 'Remote Zabbix proxy health'
-            key: 'zabbix[stats,{$ADDRESS},{$PORT},queue]'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue]'
diff --git a/templates/app/zabbix_server/README.md b/templates/app/zabbix_server/README.md
index 204bff6075f..c5c43ef6e74 100644
--- a/templates/app/zabbix_server/README.md
+++ b/templates/app/zabbix_server/README.md
@@ -22,19 +22,19 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|High availability cluster node discovery |<p>LLD rule with item and trigger prototypes for node discovery</p> |DEPENDENT |zabbix.nodes.discovery |
+|High availability cluster node discovery |<p>LLD rule with item and trigger prototypes for node discovery.</p> |DEPENDENT |zabbix.nodes.discovery |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Cluster |Zabbix server: Cluster node [{#NODE.NAME}]: Address |<p>Node IPv4 address</p> |DEPENDENT |zabbix.nodes.address[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=="{#NODE.ID}")].address.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
-|Cluster |Zabbix server: Cluster node [{#NODE.NAME}]: Last access time |<p>Last access time</p> |DEPENDENT |zabbix.nodes.lastaccess.time[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=="{#NODE.ID}")].lastaccess.first()`</p> |
-|Cluster |Zabbix server: Cluster node [{#NODE.NAME}]: Last access age |<p>Time between database unix_timestamp() and last access time</p> |DEPENDENT |zabbix.nodes.lastaccess.age[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=="{#NODE.ID}")].lastaccess_age.first()`</p> |
-|Cluster |Zabbix server: Cluster node [{#NODE.NAME}]: Status |<p>Node status</p> |DEPENDENT |zabbix.nodes.status[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=="{#NODE.ID}")].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
-|Zabbix_raw_items |Zabbix server: Zabbix stats cluster |<p>Zabbix cluster statistics master item.</p> |INTERNAL |zabbix[cluster,discovery,nodes] |
-|Zabbix_server |Zabbix server: Queue over 10 minutes |<p>Number of monitored items in the queue which are delayed at least by 10 minutes</p> |INTERNAL |zabbix[queue,10m] |
-|Zabbix_server |Zabbix server: Queue |<p>Number of monitored items in the queue which are delayed at least by 6 seconds</p> |INTERNAL |zabbix[queue] |
+|Cluster |Cluster node [{#NODE.NAME}]: Address |<p>Node IPv4 address.</p> |DEPENDENT |zabbix.nodes.address[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=="{#NODE.ID}")].address.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
+|Cluster |Cluster node [{#NODE.NAME}]: Last access time |<p>Last access time.</p> |DEPENDENT |zabbix.nodes.lastaccess.time[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=="{#NODE.ID}")].lastaccess.first()`</p> |
+|Cluster |Cluster node [{#NODE.NAME}]: Last access age |<p>Time between database unix_timestamp() and last access time.</p> |DEPENDENT |zabbix.nodes.lastaccess.age[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=="{#NODE.ID}")].lastaccess_age.first()`</p> |
+|Cluster |Cluster node [{#NODE.NAME}]: Status |<p>Cluster node status.</p> |DEPENDENT |zabbix.nodes.status[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=="{#NODE.ID}")].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
+|Zabbix_raw_items |Zabbix stats cluster |<p>Zabbix cluster statistics master item.</p> |INTERNAL |zabbix[cluster,discovery,nodes] |
+|Zabbix_server |Zabbix server: Queue over 10 minutes |<p>Number of monitored items in the queue which are delayed at least by 10 minutes.</p> |INTERNAL |zabbix[queue,10m] |
+|Zabbix_server |Zabbix server: Queue |<p>Number of monitored items in the queue which are delayed at least by 6 seconds.</p> |INTERNAL |zabbix[queue] |
 |Zabbix_server |Zabbix server: Utilization of alert manager internal processes, in % |<p>Average percentage of time alert manager processes have been busy in the last minute</p> |INTERNAL |zabbix[process,alert manager,avg,busy] |
 |Zabbix_server |Zabbix server: Utilization of alert syncer internal processes, in % |<p>Average percentage of time alert syncer processes have been busy in the last minute</p> |INTERNAL |zabbix[process,alert syncer,avg,busy] |
 |Zabbix_server |Zabbix server: Utilization of alerter internal processes, in % |<p>Average percentage of time alerter processes have been busy in the last minute</p> |INTERNAL |zabbix[process,alerter,avg,busy] |
@@ -67,74 +67,74 @@ There are no template links in this template.
 |Zabbix_server |Zabbix server: Utilization of trapper data collector processes, in % |<p>Average percentage of time trapper processes have been busy in the last minute</p> |INTERNAL |zabbix[process,trapper,avg,busy] |
 |Zabbix_server |Zabbix server: Utilization of unreachable poller data collector processes, in % |<p>Average percentage of time unreachable poller processes have been busy in the last minute</p> |INTERNAL |zabbix[process,unreachable poller,avg,busy] |
 |Zabbix_server |Zabbix server: Utilization of vmware data collector processes, in % |<p>Average percentage of time vmware collector processes have been busy in the last minute</p> |INTERNAL |zabbix[process,vmware collector,avg,busy] |
-|Zabbix_server |Zabbix server: Configuration cache, % used |<p>Availability statistics of Zabbix configuration cache. Percentage of used buffer</p> |INTERNAL |zabbix[rcache,buffer,pused] |
+|Zabbix_server |Zabbix server: Configuration cache, % used |<p>Availability statistics of Zabbix configuration cache. Percentage of used buffer.</p> |INTERNAL |zabbix[rcache,buffer,pused] |
 |Zabbix_server |Zabbix server: Trend function cache, % unique requests |<p>Effectiveness statistics of the Zabbix trend function cache. Percentage of cached items from cached items + requests. Low percentage most likely means that the cache size can be reduced.</p> |INTERNAL |zabbix[tcache,cache,pitems] |
-|Zabbix_server |Zabbix server: Trend function cache, % misses |<p>Effectiveness statistics of the Zabbix trend function cache.	Percentage of cache misses</p> |INTERNAL |zabbix[tcache,cache,pmisses] |
-|Zabbix_server |Zabbix server: Value cache, % used |<p>Availability statistics of Zabbix value cache. Percentage of used buffer</p> |INTERNAL |zabbix[vcache,buffer,pused] |
-|Zabbix_server |Zabbix server: Value cache hits |<p>Effectiveness statistics of Zabbix value cache. Number of cache hits (history values taken from the cache)</p> |INTERNAL |zabbix[vcache,cache,hits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Zabbix server: Value cache misses |<p>Effectiveness statistics of Zabbix value cache. Number of cache misses (history values taken from the database)</p> |INTERNAL |zabbix[vcache,cache,misses]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Zabbix server: Value cache operating mode |<p>Value cache operating mode</p> |INTERNAL |zabbix[vcache,cache,mode] |
+|Zabbix_server |Zabbix server: Trend function cache, % misses |<p>Effectiveness statistics of the Zabbix trend function cache. Percentage of cache misses.</p> |INTERNAL |zabbix[tcache,cache,pmisses] |
+|Zabbix_server |Zabbix server: Value cache, % used |<p>Availability statistics of Zabbix value cache. Percentage of used buffer.</p> |INTERNAL |zabbix[vcache,buffer,pused] |
+|Zabbix_server |Zabbix server: Value cache hits |<p>Effectiveness statistics of Zabbix value cache. Number of cache hits (history values taken from the cache).</p> |INTERNAL |zabbix[vcache,cache,hits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Zabbix server: Value cache misses |<p>Effectiveness statistics of Zabbix value cache. Number of cache misses (history values taken from the database).</p> |INTERNAL |zabbix[vcache,cache,misses]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Zabbix server: Value cache operating mode |<p>Value cache operating mode.</p> |INTERNAL |zabbix[vcache,cache,mode] |
 |Zabbix_server |Zabbix server: Version |<p>Version of Zabbix server.</p> |INTERNAL |zabbix[version]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Zabbix_server |Zabbix server: VMware cache, % used |<p>Availability statistics of Zabbix vmware cache. Percentage of used buffer</p> |INTERNAL |zabbix[vmware,buffer,pused] |
+|Zabbix_server |Zabbix server: VMware cache, % used |<p>Availability statistics of Zabbix vmware cache. Percentage of used buffer.</p> |INTERNAL |zabbix[vmware,buffer,pused] |
 |Zabbix_server |Zabbix server: History write cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used history buffer.</p><p>History cache is used to store item values. A high number indicates performance problems on the database side.</p> |INTERNAL |zabbix[wcache,history,pused] |
 |Zabbix_server |Zabbix server: History index cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used history index buffer.</p><p>History index cache is used to index values stored in history cache.</p> |INTERNAL |zabbix[wcache,index,pused] |
 |Zabbix_server |Zabbix server: Trend write cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used trend buffer.</p><p>Trend cache stores aggregate for the current hour for all items that receive data.</p> |INTERNAL |zabbix[wcache,trend,pused] |
-|Zabbix_server |Zabbix server: Number of processed values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.</p> |INTERNAL |zabbix[wcache,values]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Zabbix server: Number of processed numeric (float) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed float values.</p> |INTERNAL |zabbix[wcache,values,float]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Zabbix server: Number of processed log values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed log values.</p> |INTERNAL |zabbix[wcache,values,log]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Zabbix server: Number of processed not supported values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of times item processing resulted in item becoming unsupported or keeping that state.</p> |INTERNAL |zabbix[wcache,values,not supported]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Zabbix server: Number of processed character values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed character/string values.</p> |INTERNAL |zabbix[wcache,values,str]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Zabbix server: Number of processed text values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed text values.</p> |INTERNAL |zabbix[wcache,values,text]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Zabbix_server |Zabbix server: Number of processed values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.</p> |INTERNAL |zabbix[wcache,values]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Zabbix server: Number of processed numeric (float) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed float values.</p> |INTERNAL |zabbix[wcache,values,float]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Zabbix server: Number of processed log values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed log values.</p> |INTERNAL |zabbix[wcache,values,log]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Zabbix server: Number of processed not supported values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of times item processing resulted in item becoming unsupported or keeping that state.</p> |INTERNAL |zabbix[wcache,values,not supported]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Zabbix server: Number of processed character values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed character/string values.</p> |INTERNAL |zabbix[wcache,values,str]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Zabbix server: Number of processed text values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed text values.</p> |INTERNAL |zabbix[wcache,values,text]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Zabbix_server |Zabbix server: LLD queue |<p>Count of values enqueued in the low-level discovery processing queue.</p> |INTERNAL |zabbix[lld_queue] |
 |Zabbix_server |Zabbix server: Preprocessing queue |<p>Count of values enqueued in the preprocessing queue.</p> |INTERNAL |zabbix[preprocessing_queue] |
-|Zabbix_server |Zabbix server: Number of processed numeric (unsigned) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed numeric (unsigned) values.</p> |INTERNAL |zabbix[wcache,values,uint]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Zabbix_server |Zabbix server: Number of processed numeric (unsigned) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed numeric (unsigned) values.</p> |INTERNAL |zabbix[wcache,values,uint]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Zabbix server: Cluster node [{#NODE.NAME}]: Status changed |<p>The state of the node has changed. Confirm to close.</p> |`last(/Zabbix server health/zabbix.nodes.status[{#NODE.ID}],#1)<>last(/Zabbix server health/zabbix.nodes.status[{#NODE.ID}],#2)` |INFO |<p>Manual close: YES</p> |
-|Zabbix server: More than 100 items having missing data for more than 10 minutes |<p>zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes</p> |`-` |WARNING | |
-|Zabbix server: Utilization of alert manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of alert syncer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of alerter processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of availability manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of configuration syncer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of discoverer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of escalator processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of history poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of history syncer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of housekeeper processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of http poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of icmp pinger processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of ipmi manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of ipmi poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of java poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of lld manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of lld worker processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of preprocessing worker processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of preprocessing manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of proxy poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of report manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of report writer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of self-monitoring processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of snmp trapper processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of task manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of timer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of service manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of trigger housekeeper processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of trapper processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of unreachable poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: Utilization of vmware collector processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Zabbix server: More than 75% used in the configuration cache |<p>Consider increasing CacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Zabbix server: More than 95% used in the value cache |<p>Consider increasing ValueCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Zabbix server: Zabbix value cache working in low memory mode |<p>Once the low memory mode has been switched on, the value cache will remain in this state for 24 hours, even if the problem that triggered this mode is resolved sooner.</p> |`-` |HIGH | |
+|Cluster node [{#NODE.NAME}]: Status changed |<p>The state of the node has changed. Confirm to close.</p> |`last(/Zabbix server health/zabbix.nodes.status[{#NODE.ID}],#1)<>last(/Zabbix server health/zabbix.nodes.status[{#NODE.ID}],#2)` |INFO |<p>Manual close: YES</p> |
+|Zabbix server: More than 100 items having missing data for more than 10 minutes |<p>zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.</p> |`min(/Zabbix server health/zabbix[queue,10m],10m)>100` |WARNING | |
+|Zabbix server: Utilization of alert manager processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,alert manager,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,alert manager,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of alert syncer processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,alert syncer,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,alert syncer,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of alerter processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,alerter,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,alerter,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of availability manager processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,availability manager,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,availability manager,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of configuration syncer processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,configuration syncer,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,configuration syncer,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of discoverer processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,discoverer,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,discoverer,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of escalator processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,escalator,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,escalator,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of history poller processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,history poller,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,history poller,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of history syncer processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,history syncer,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,history syncer,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of housekeeper processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,housekeeper,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,housekeeper,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of http poller processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,http poller,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,http poller,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of icmp pinger processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,icmp pinger,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,icmp pinger,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of ipmi manager processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,ipmi manager,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,ipmi manager,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of ipmi poller processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,ipmi poller,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,ipmi poller,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of java poller processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,java poller,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,java poller,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of lld manager processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,lld manager,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,lld manager,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of lld worker processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,lld worker,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,lld worker,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of poller processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,poller,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,poller,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of preprocessing worker processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,preprocessing worker,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,preprocessing worker,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of preprocessing manager processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,preprocessing manager,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,preprocessing manager,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of proxy poller processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,proxy poller,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,proxy poller,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of report manager processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,report manager,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,report manager,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of report writer processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,report writer,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,report writer,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of self-monitoring processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,self-monitoring,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,self-monitoring,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of snmp trapper processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,snmp trapper,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,snmp trapper,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of task manager processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,task manager,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,task manager,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of timer processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,timer,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,timer,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of service manager processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,service manager,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,service manager,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of trigger housekeeper processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,trigger housekeeper,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,trigger housekeeper,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of trapper processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,trapper,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,trapper,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of unreachable poller processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,unreachable poller,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,unreachable poller,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: Utilization of vmware collector processes over 75% |<p>-</p> |`avg(/Zabbix server health/zabbix[process,vmware collector,avg,busy],10m)>75`<p>Recovery expression:</p>`avg(/Zabbix server health/zabbix[process,vmware collector,avg,busy],10m)<65` |AVERAGE | |
+|Zabbix server: More than 75% used in the configuration cache |<p>Consider increasing CacheSize in the zabbix_server.conf configuration file.</p> |`max(/Zabbix server health/zabbix[rcache,buffer,pused],10m)>75` |AVERAGE | |
+|Zabbix server: More than 95% used in the value cache |<p>Consider increasing ValueCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Zabbix server health/zabbix[vcache,buffer,pused],10m)>95` |AVERAGE | |
+|Zabbix server: Zabbix value cache working in low memory mode |<p>Once the low memory mode has been switched on, the value cache will remain in this state for 24 hours, even if the problem that triggered this mode is resolved sooner.</p> |`last(/Zabbix server health/zabbix[vcache,cache,mode])=1` |HIGH | |
 |Zabbix server: Version has changed (new version: {ITEM.VALUE}) |<p>Zabbix server version has changed. Ack to close.</p> |`last(/Zabbix server health/zabbix[version],#1)<>last(/Zabbix server health/zabbix[version],#2) and length(last(/Zabbix server health/zabbix[version]))>0` |INFO |<p>Manual close: YES</p> |
-|Zabbix server: More than 75% used in the vmware cache |<p>Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Zabbix server: More than 75% used in the history cache |<p>Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Zabbix server: More than 75% used in the history index cache |<p>Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Zabbix server: More than 75% used in the trends cache |<p>Consider increasing TrendCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
+|Zabbix server: More than 75% used in the vmware cache |<p>Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Zabbix server health/zabbix[vmware,buffer,pused],10m)>75` |AVERAGE | |
+|Zabbix server: More than 75% used in the history cache |<p>Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Zabbix server health/zabbix[wcache,history,pused],10m)>75` |AVERAGE | |
+|Zabbix server: More than 75% used in the history index cache |<p>Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Zabbix server health/zabbix[wcache,index,pused],10m)>75` |AVERAGE | |
+|Zabbix server: More than 75% used in the trends cache |<p>Consider increasing TrendCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Zabbix server health/zabbix[wcache,trend,pused],10m)>75` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/zabbix_server/template_app_zabbix_server.yaml b/templates/app/zabbix_server/template_app_zabbix_server.yaml
index 88b1637ca76..2222cff550d 100644
--- a/templates/app/zabbix_server/template_app_zabbix_server.yaml
+++ b/templates/app/zabbix_server/template_app_zabbix_server.yaml
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: e2d2b4e4ac28483996cc11fe42823d57
       template: 'Zabbix server health'
       name: 'Zabbix server health'
-      description: 'Template tooling version used: 0.38'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Applications
@@ -749,7 +749,7 @@ zabbix_export:
           type: INTERNAL
           key: 'zabbix[queue,10m]'
           history: 1w
-          description: 'Number of monitored items in the queue which are delayed at least by 10 minutes'
+          description: 'Number of monitored items in the queue which are delayed at least by 10 minutes.'
           tags:
             -
               tag: Application
@@ -760,14 +760,14 @@ zabbix_export:
               expression: 'min(/Zabbix server health/zabbix[queue,10m],10m)>100'
               name: 'Zabbix server: More than 100 items having missing data for more than 10 minutes'
               priority: WARNING
-              description: 'zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes'
+              description: 'zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.'
         -
           uuid: aaf58555c0774e848f51a351b6ae8462
           name: 'Zabbix server: Queue'
           type: INTERNAL
           key: 'zabbix[queue]'
           history: 1w
-          description: 'Number of monitored items in the queue which are delayed at least by 6 seconds'
+          description: 'Number of monitored items in the queue which are delayed at least by 6 seconds.'
           tags:
             -
               tag: Application
@@ -780,7 +780,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer'
+          description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer.'
           tags:
             -
               tag: Application
@@ -791,7 +791,7 @@ zabbix_export:
               expression: 'max(/Zabbix server health/zabbix[rcache,buffer,pused],10m)>75'
               name: 'Zabbix server: More than 75% used in the configuration cache'
               priority: AVERAGE
-              description: 'Consider increasing CacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing CacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: b14a5ba6c93f4d6c9dfd820640d34e9b
           name: 'Zabbix server: Trend function cache, % unique requests'
@@ -813,7 +813,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: "Effectiveness statistics of the Zabbix trend function cache.\tPercentage of cache misses"
+          description: 'Effectiveness statistics of the Zabbix trend function cache. Percentage of cache misses.'
           tags:
             -
               tag: Application
@@ -826,7 +826,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: "Availability statistics of Zabbix value cache.\tPercentage of used buffer"
+          description: 'Availability statistics of Zabbix value cache. Percentage of used buffer.'
           tags:
             -
               tag: Application
@@ -837,7 +837,7 @@ zabbix_export:
               expression: 'max(/Zabbix server health/zabbix[vcache,buffer,pused],10m)>95'
               name: 'Zabbix server: More than 95% used in the value cache'
               priority: AVERAGE
-              description: 'Consider increasing ValueCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing ValueCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 69b14487a9744dbb866f2e6ee131d0e5
           name: 'Zabbix server: Value cache hits'
@@ -846,7 +846,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: vps
-          description: 'Effectiveness statistics of Zabbix value cache. Number of cache hits (history values taken from the cache)'
+          description: 'Effectiveness statistics of Zabbix value cache. Number of cache hits (history values taken from the cache).'
           preprocessing:
             -
               type: CHANGE_PER_SECOND
@@ -864,7 +864,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: vps
-          description: 'Effectiveness statistics of Zabbix value cache. Number of cache misses (history values taken from the database)'
+          description: 'Effectiveness statistics of Zabbix value cache. Number of cache misses (history values taken from the database).'
           preprocessing:
             -
               type: CHANGE_PER_SECOND
@@ -880,7 +880,7 @@ zabbix_export:
           type: INTERNAL
           key: 'zabbix[vcache,cache,mode]'
           history: 1w
-          description: 'Value cache operating mode'
+          description: 'Value cache operating mode.'
           valuemap:
             name: 'Value cache operating mode'
           tags:
@@ -928,7 +928,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer'
+          description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer.'
           tags:
             -
               tag: Application
@@ -939,7 +939,7 @@ zabbix_export:
               expression: 'max(/Zabbix server health/zabbix[vmware,buffer,pused],10m)>75'
               name: 'Zabbix server: More than 75% used in the vmware cache'
               priority: AVERAGE
-              description: 'Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 1ae8253bb4da434da3ea6bcb0352115d
           name: 'Zabbix server: History write cache, % used'
@@ -961,7 +961,7 @@ zabbix_export:
               expression: 'max(/Zabbix server health/zabbix[wcache,history,pused],10m)>75'
               name: 'Zabbix server: More than 75% used in the history cache'
               priority: AVERAGE
-              description: 'Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 9fc7faf5455e4e78bdb1406f947bfa08
           name: 'Zabbix server: History index cache, % used'
@@ -983,7 +983,7 @@ zabbix_export:
               expression: 'max(/Zabbix server health/zabbix[wcache,index,pused],10m)>75'
               name: 'Zabbix server: More than 75% used in the history index cache'
               priority: AVERAGE
-              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 5cca0fc9878d4e068467d5a3b8558ed5
           name: 'Zabbix server: Trend write cache, % used'
@@ -1005,7 +1005,7 @@ zabbix_export:
               expression: 'max(/Zabbix server health/zabbix[wcache,trend,pused],10m)>75'
               name: 'Zabbix server: More than 75% used in the trends cache'
               priority: AVERAGE
-              description: 'Consider increasing TrendCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing TrendCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: de63f78f36e74361b6c9993d12d8b7c8
           name: 'Zabbix server: Number of processed numeric (float) values per second'
@@ -1146,7 +1146,7 @@ zabbix_export:
           type: DEPENDENT
           key: zabbix.nodes.discovery
           delay: '0'
-          description: 'LLD rule with item and trigger prototypes for node discovery'
+          description: 'LLD rule with item and trigger prototypes for node discovery.'
           item_prototypes:
             -
               uuid: c5cb7ffbd314494cb1801ae804e9c76e
@@ -1157,7 +1157,7 @@ zabbix_export:
               history: 1w
               trends: '0'
               value_type: CHAR
-              description: 'Node IPv4 address'
+              description: 'Node IPv4 address.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1181,7 +1181,7 @@ zabbix_export:
               delay: '0'
               history: 1w
               units: uptime
-              description: 'Time between database unix_timestamp() and last access time'
+              description: 'Time between database unix_timestamp() and last access time.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1201,7 +1201,7 @@ zabbix_export:
               delay: '0'
               history: 1w
               units: unixtime
-              description: 'Last access time'
+              description: 'Last access time.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1220,7 +1220,7 @@ zabbix_export:
               key: 'zabbix.nodes.status[{#NODE.ID}]'
               delay: '0'
               history: 1w
-              description: 'Cluster node status'
+              description: 'Cluster node status.'
               valuemap:
                 name: 'Cluster node status'
               preprocessing:
@@ -1824,121 +1824,120 @@ zabbix_export:
       ymax_type_1: FIXED
       graph_items:
         -
-          sortorder: '1'
           color: 00EE00
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,timer,avg,busy]'
         -
-          sortorder: '2'
+          sortorder: '1'
           color: 0000EE
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,escalator,avg,busy]'
         -
-          sortorder: '3'
+          sortorder: '2'
           color: FFAA00
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,housekeeper,avg,busy]'
         -
-          sortorder: '4'
+          sortorder: '3'
           color: 00EEEE
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,alerter,avg,busy]'
         -
-          sortorder: '5'
+          sortorder: '4'
           color: '990099'
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,configuration syncer,avg,busy]'
         -
-          sortorder: '6'
+          sortorder: '5'
           color: EE0000
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,history syncer,avg,busy]'
         -
-          sortorder: '7'
+          sortorder: '6'
           color: FF66FF
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,self-monitoring,avg,busy]'
         -
-          sortorder: '8'
+          sortorder: '7'
           color: '009999'
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,task manager,avg,busy]'
         -
-          sortorder: '9'
+          sortorder: '8'
           color: BBBB00
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,ipmi manager,avg,busy]'
         -
-          sortorder: '10'
+          sortorder: '9'
           color: AA0000
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,alert manager,avg,busy]'
         -
-          sortorder: '11'
+          sortorder: '10'
           color: '990000'
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,preprocessing manager,avg,busy]'
         -
-          sortorder: '12'
+          sortorder: '11'
           color: '008800'
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,preprocessing worker,avg,busy]'
         -
-          sortorder: '13'
+          sortorder: '12'
           color: 80B0E0
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,lld manager,avg,busy]'
         -
-          sortorder: '14'
+          sortorder: '13'
           color: 4080B0
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,lld worker,avg,busy]'
         -
-          sortorder: '15'
+          sortorder: '14'
           color: 8000FF
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,alert syncer,avg,busy]'
         -
-          sortorder: '16'
+          sortorder: '15'
           color: 2B5429
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,availability manager,avg,busy]'
         -
-          sortorder: '17'
+          sortorder: '16'
           color: 8048B4
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,report manager,avg,busy]'
         -
-          sortorder: '18'
+          sortorder: '17'
           color: FD5434
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,report writer,avg,busy]'
         -
-          sortorder: '19'
+          sortorder: '18'
           color: 790E1F
           item:
             host: 'Zabbix server health'
             key: 'zabbix[process,service manager,avg,busy]'
         -
-          sortorder: '20'
+          sortorder: '19'
           color: 87AC4D
           item:
             host: 'Zabbix server health'
diff --git a/templates/app/zabbix_server_remote/README.md b/templates/app/zabbix_server_remote/README.md
index 7b841367f61..1530b95bf49 100644
--- a/templates/app/zabbix_server_remote/README.md
+++ b/templates/app/zabbix_server_remote/README.md
@@ -28,19 +28,19 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|High availability cluster node discovery |<p>LLD rule with item and trigger prototypes for node discovery</p> |DEPENDENT |zabbix.nodes.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha`</p> |
+|High availability cluster node discovery |<p>LLD rule with item and trigger prototypes for node discovery.</p> |DEPENDENT |zabbix.nodes.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Cluster |Zabbix server: Cluster node [{#NODE.NAME}]: Address |<p>Node IPv4 address</p> |DEPENDENT |zabbix.nodes.address[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha[?(@.id=="{#NODE.ID}")].address.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
-|Cluster |Zabbix server: Cluster node [{#NODE.NAME}]: Last access time |<p>Last access time</p> |DEPENDENT |zabbix.nodes.lastaccess.time[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha[?(@.id=="{#NODE.ID}")].lastaccess.first()`</p> |
-|Cluster |Zabbix server: Cluster node [{#NODE.NAME}]: Last access age |<p>Time between database unix_timestamp() and last access time</p> |DEPENDENT |zabbix.nodes.lastaccess.age[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha[?(@.id=="{#NODE.ID}")].lastaccess_age.first()`</p> |
-|Cluster |Zabbix server: Cluster node [{#NODE.NAME}]: Status |<p>Node status</p> |DEPENDENT |zabbix.nodes.status[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha[?(@.id=="{#NODE.ID}")].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
+|Cluster |Cluster node [{#NODE.NAME}]: Address |<p>Node IPv4 address.</p> |DEPENDENT |zabbix.nodes.address[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha[?(@.id=="{#NODE.ID}")].address.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
+|Cluster |Cluster node [{#NODE.NAME}]: Last access time |<p>Last access time.</p> |DEPENDENT |zabbix.nodes.lastaccess.time[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha[?(@.id=="{#NODE.ID}")].lastaccess.first()`</p> |
+|Cluster |Cluster node [{#NODE.NAME}]: Last access age |<p>Time between database unix_timestamp() and last access time.</p> |DEPENDENT |zabbix.nodes.lastaccess.age[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha[?(@.id=="{#NODE.ID}")].lastaccess_age.first()`</p> |
+|Cluster |Cluster node [{#NODE.NAME}]: Status |<p>Node status.</p> |DEPENDENT |zabbix.nodes.status[{#NODE.ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.ha[?(@.id=="{#NODE.ID}")].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
 |Zabbix_raw_items |Remote Zabbix server: Zabbix stats |<p>Zabbix server statistics master item.</p> |INTERNAL |zabbix[stats,{$ADDRESS},{$PORT}] |
-|Zabbix_server |Remote Zabbix server: Zabbix stats queue over 10m |<p>Number of monitored items in the queue which are delayed at least by 10 minutes</p> |INTERNAL |zabbix[stats,{$ADDRESS},{$PORT},queue,10m]<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue`</p> |
-|Zabbix_server |Remote Zabbix server: Zabbix stats queue |<p>Number of monitored items in the queue which are delayed at least by 6 seconds</p> |INTERNAL |zabbix[stats,{$ADDRESS},{$PORT},queue]<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue`</p> |
+|Zabbix_server |Remote Zabbix server: Zabbix stats queue over 10m |<p>Number of monitored items in the queue which are delayed at least by 10 minutes.</p> |INTERNAL |zabbix[stats,{$ADDRESS},{$PORT},queue,10m]<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue`</p> |
+|Zabbix_server |Remote Zabbix server: Zabbix stats queue |<p>Number of monitored items in the queue which are delayed at least by 6 seconds.</p> |INTERNAL |zabbix[stats,{$ADDRESS},{$PORT},queue]<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue`</p> |
 |Zabbix_server |Remote Zabbix server: Utilization of alert manager internal processes, in % |<p>Average percentage of time alert manager processes have been busy in the last minute</p> |DEPENDENT |process.alert_manager.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['alert manager'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes alert manager not started`</p> |
 |Zabbix_server |Remote Zabbix server: Utilization of alert syncer internal processes, in % |<p>Average percentage of time alert syncer processes have been busy in the last minute</p> |DEPENDENT |process.alert_syncer.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['alert syncer'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes alert syncer not started`</p> |
 |Zabbix_server |Remote Zabbix server: Utilization of alerter internal processes, in % |<p>Average percentage of time alerter processes have been busy in the last minute</p> |DEPENDENT |process.alerter.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['alerter'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes alerter not started`</p> |
@@ -73,74 +73,74 @@ There are no template links in this template.
 |Zabbix_server |Remote Zabbix server: Utilization of trapper data collector processes, in % |<p>Average percentage of time trapper processes have been busy in the last minute</p> |DEPENDENT |process.trapper.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['trapper'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes trapper not started`</p> |
 |Zabbix_server |Remote Zabbix server: Utilization of unreachable poller data collector processes, in % |<p>Average percentage of time unreachable poller processes have been busy in the last minute</p> |DEPENDENT |process.unreachable_poller.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['unreachable poller'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes unreachable poller not started`</p> |
 |Zabbix_server |Remote Zabbix server: Utilization of vmware data collector processes, in % |<p>Average percentage of time vmware collector processes have been busy in the last minute</p> |DEPENDENT |process.vmware_collector.avg.busy<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.process['vmware collector'].busy.avg`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Processes vmware collector not started`</p> |
-|Zabbix_server |Remote Zabbix server: Configuration cache, % used |<p>Availability statistics of Zabbix configuration cache. Percentage of used buffer</p> |DEPENDENT |rcache.buffer.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.rcache.pused`</p> |
-|Zabbix_server |Remote Zabbix server: Trend function cache, % unique requests |<p>Effectiveness statistics of the Zabbix trend function cache. Percentage of cached items from cached items + requests. Low percentage most likely means that the cache size can be reduced.</p> |DEPENDENT |tcache.pitems<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.tcache.pitems`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Not supported this version`</p> |
-|Zabbix_server |Remote Zabbix server: Trend function cache, % misses |<p>Effectiveness statistics of the Zabbix trend function cache.	Percentage of cache misses</p> |DEPENDENT |tcache.pmisses<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.tcache.pmisses`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Not supported this version`</p> |
-|Zabbix_server |Remote Zabbix server: Value cache, % used |<p>Availability statistics of Zabbix value cache. Percentage of used buffer</p> |DEPENDENT |vcache.buffer.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vcache.buffer.pused`</p> |
-|Zabbix_server |Remote Zabbix server: Value cache hits |<p>Effectiveness statistics of Zabbix value cache. Number of cache hits (history values taken from the cache)</p> |DEPENDENT |vcache.cache.hits<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vcache.cache.hits`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Remote Zabbix server: Value cache misses |<p>Effectiveness statistics of Zabbix value cache. Number of cache misses (history values taken from the database)</p> |DEPENDENT |vcache.cache.misses<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vcache.cache.misses`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Remote Zabbix server: Value cache operating mode |<p>Value cache operating mode</p> |DEPENDENT |vcache.cache.mode<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vcache.cache.mode`</p> |
+|Zabbix_server |Remote Zabbix server: Configuration cache, % used |<p>Availability statistics of Zabbix configuration cache. Percentage of used buffer.</p> |DEPENDENT |rcache.buffer.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.rcache.pused`</p> |
+|Zabbix_server |Remote Zabbix server: Trend function cache, % unique requests |<p>Effectiveness statistics of the Zabbix trend function cache. Percentage</p><p>of cached items from cached items + requests. Low percentage most likely means</p><p>that the cache size can be reduced.</p> |DEPENDENT |tcache.pitems<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.tcache.pitems`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Not supported this version`</p> |
+|Zabbix_server |Remote Zabbix server: Trend function cache, % misses |<p>Effectiveness statistics of the Zabbix trend function cache. Percentage of cache misses.</p> |DEPENDENT |tcache.pmisses<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.tcache.pmisses`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Not supported this version`</p> |
+|Zabbix_server |Remote Zabbix server: Value cache, % used |<p>Availability statistics of Zabbix value cache. Percentage of used buffer.</p> |DEPENDENT |vcache.buffer.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vcache.buffer.pused`</p> |
+|Zabbix_server |Remote Zabbix server: Value cache hits |<p>Effectiveness statistics of Zabbix value cache. Number of cache hits</p><p>(history values taken from the cache).</p> |DEPENDENT |vcache.cache.hits<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vcache.cache.hits`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Remote Zabbix server: Value cache misses |<p>Effectiveness statistics of Zabbix value cache. Number of cache misses</p><p>(history values taken from the database).</p> |DEPENDENT |vcache.cache.misses<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vcache.cache.misses`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Remote Zabbix server: Value cache operating mode |<p>Value cache operating mode.</p> |DEPENDENT |vcache.cache.mode<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vcache.cache.mode`</p> |
 |Zabbix_server |Remote Zabbix server: Version |<p>Version of Zabbix server.</p> |DEPENDENT |version<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Zabbix_server |Remote Zabbix server: VMware cache, % used |<p>Availability statistics of Zabbix vmware cache. Percentage of used buffer</p> |DEPENDENT |vmware.buffer.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vmware.pused`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> No vmware collector processes started`</p> |
+|Zabbix_server |Remote Zabbix server: VMware cache, % used |<p>Availability statistics of Zabbix vmware cache. Percentage of used buffer.</p> |DEPENDENT |vmware.buffer.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.vmware.pused`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> No vmware collector processes started`</p> |
 |Zabbix_server |Remote Zabbix server: History write cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used history buffer.</p><p>History cache is used to store item values. A high number indicates performance problems on the database side.</p> |DEPENDENT |wcache.history.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.history.pused`</p> |
 |Zabbix_server |Remote Zabbix server: History index cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used history index buffer.</p><p>History index cache is used to index values stored in history cache.</p> |DEPENDENT |wcache.index.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.index.pused`</p> |
 |Zabbix_server |Remote Zabbix server: Trend write cache, % used |<p>Statistics and availability of Zabbix write cache. Percentage of used trend buffer.</p><p>Trend cache stores aggregate for the current hour for all items that receive data.</p> |DEPENDENT |wcache.trend.pused<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.trend.pused`</p> |
-|Zabbix_server |Remote Zabbix server: Number of processed values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.</p> |DEPENDENT |wcache.values<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.all`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Remote Zabbix server: Number of processed numeric (float) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed float values.</p> |DEPENDENT |wcache.values.float<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.float`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Remote Zabbix server: Number of processed log values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed log values.</p> |DEPENDENT |wcache.values.log<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.log`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Remote Zabbix server: Number of processed not supported values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of times item processing resulted in item becoming unsupported or keeping that state.</p> |DEPENDENT |wcache.values.not_supported<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values['not supported']`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Remote Zabbix server: Number of processed character values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed character/string values.</p> |DEPENDENT |wcache.values.str<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.str`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_server |Remote Zabbix server: Number of processed text values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed text values.</p> |DEPENDENT |wcache.values.text<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.text`</p><p>- CHANGE_PER_SECOND |
+|Zabbix_server |Remote Zabbix server: Number of processed values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.</p> |DEPENDENT |wcache.values<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.all`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Remote Zabbix server: Number of processed numeric (float) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed float values.</p> |DEPENDENT |wcache.values.float<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.float`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Remote Zabbix server: Number of processed log values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed log values.</p> |DEPENDENT |wcache.values.log<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.log`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Remote Zabbix server: Number of processed not supported values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of times item processing resulted in item becoming unsupported or keeping that state.</p> |DEPENDENT |wcache.values.not_supported<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values['not supported']`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Remote Zabbix server: Number of processed character values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed character/string values.</p> |DEPENDENT |wcache.values.str<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.str`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_server |Remote Zabbix server: Number of processed text values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed text values.</p> |DEPENDENT |wcache.values.text<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.text`</p><p>- CHANGE_PER_SECOND</p> |
 |Zabbix_server |Remote Zabbix server: LLD queue |<p>Count of values enqueued in the low-level discovery processing queue.</p> |DEPENDENT |lld_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.lld_queue`</p> |
 |Zabbix_server |Remote Zabbix server: Preprocessing queue |<p>Count of values enqueued in the preprocessing queue.</p> |DEPENDENT |preprocessing_queue<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.preprocessing_queue`</p> |
-|Zabbix_server |Remote Zabbix server: Number of processed numeric (unsigned) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed numeric (unsigned) values.</p> |DEPENDENT |wcache.values.uint<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.uint`</p><p>- CHANGE_PER_SECOND |
+|Zabbix_server |Remote Zabbix server: Number of processed numeric (unsigned) values per second |<p>Statistics and availability of Zabbix write cache.</p><p>Number of processed numeric (unsigned) values.</p> |DEPENDENT |wcache.values.uint<p>**Preprocessing**:</p><p>- JSONPATH: `$.data.wcache.values.uint`</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Zabbix server: Cluster node [{#NODE.NAME}]: Status changed |<p>The state of the node has changed. Confirm to close.</p> |`last(/Remote Zabbix server health/zabbix.nodes.status[{#NODE.ID}],#1)<>last(/Remote Zabbix server health/zabbix.nodes.status[{#NODE.ID}],#2)` |INFO |<p>Manual close: YES</p> |
-|Remote Zabbix server: More than 100 items having missing data for more than 10 minutes |<p>zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes</p> |`-` |WARNING | |
-|Remote Zabbix server: Utilization of alert manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of alert syncer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of alerter processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of availability manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of configuration syncer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of discoverer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of escalator processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of history poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of history syncer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of housekeeper processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of http poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of icmp pinger processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of ipmi manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of ipmi poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of java poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of lld manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of lld worker processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of preprocessing worker processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of preprocessing manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of proxy poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of report manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of report writer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of self-monitoring processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of snmp trapper processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of task manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of timer processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of service manager processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of trigger housekeeper processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of trapper processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of unreachable poller processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Utilization of vmware collector processes over 75% |<p>-</p> |`-` |AVERAGE | |
-|Remote Zabbix server: More than 75% used in the configuration cache |<p>Consider increasing CacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Remote Zabbix server: More than 95% used in the value cache |<p>Consider increasing ValueCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Remote Zabbix server: Zabbix value cache working in low memory mode |<p>Once the low memory mode has been switched on, the value cache will remain in this state for 24 hours, even if the problem that triggered this mode is resolved sooner.</p> |`-` |HIGH | |
+|Cluster node [{#NODE.NAME}]: Status changed |<p>The state of the node has changed. Confirm to close.</p> |`last(/Remote Zabbix server health/zabbix.nodes.status[{#NODE.ID}],#1)<>last(/Remote Zabbix server health/zabbix.nodes.status[{#NODE.ID}],#2)` |INFO |<p>Manual close: YES</p> |
+|Remote Zabbix server: More than 100 items having missing data for more than 10 minutes |<p>zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about</p><p>how many items are missing data for more than 10 minutes.</p> |`min(/Remote Zabbix server health/zabbix[stats,{$ADDRESS},{$PORT},queue,10m],10m)>100` |WARNING | |
+|Remote Zabbix server: Utilization of alert manager processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.alert_manager.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.alert_manager.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of alert syncer processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.alert_syncer.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.alert_syncer.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of alerter processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.alerter.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.alerter.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of availability manager processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.availability_manager.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.availability_manager.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of configuration syncer processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.configuration_syncer.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.configuration_syncer.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of discoverer processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.discoverer.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.discoverer.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of escalator processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.escalator.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.escalator.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of history poller processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.history_poller.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.history_poller.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of history syncer processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.history_syncer.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.history_syncer.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of housekeeper processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.housekeeper.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.housekeeper.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of http poller processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.http_poller.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.http_poller.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of icmp pinger processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.icmp_pinger.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.icmp_pinger.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of ipmi manager processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.ipmi_manager.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.ipmi_manager.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of ipmi poller processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.ipmi_poller.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.ipmi_poller.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of java poller processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.java_poller.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.java_poller.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of lld manager processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.lld_manager.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.lld_manager.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of lld worker processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.lld_worker.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.lld_worker.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of poller processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.poller.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.poller.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of preprocessing worker processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.preprocessing_worker.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.preprocessing_worker.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of preprocessing manager processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.preprocessing_manager.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.preprocessing_manager.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of proxy poller processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.proxy_poller.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.proxy_poller.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of report manager processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.report_manager.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.report_manager.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of report writer processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.report_writer.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.report_writer.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of self-monitoring processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.self-monitoring.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.self-monitoring.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of snmp trapper processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.snmp_trapper.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.snmp_trapper.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of task manager processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.task_manager.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.task_manager.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of timer processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.timer.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.timer.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of service manager processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.service_manager.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.service_manager.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of trigger housekeeper processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.trigger_housekeeper.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.trigger_housekeeper.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of trapper processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.trapper.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.trapper.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of unreachable poller processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.unreachable_poller.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.unreachable_poller.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: Utilization of vmware collector processes over 75% |<p>-</p> |`avg(/Remote Zabbix server health/process.vmware_collector.avg.busy,10m)>75`<p>Recovery expression:</p>`avg(/Remote Zabbix server health/process.vmware_collector.avg.busy,10m)<65` |AVERAGE | |
+|Remote Zabbix server: More than 75% used in the configuration cache |<p>Consider increasing CacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix server health/rcache.buffer.pused,10m)>75` |AVERAGE | |
+|Remote Zabbix server: More than 95% used in the value cache |<p>Consider increasing ValueCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix server health/vcache.buffer.pused,10m)>95` |AVERAGE | |
+|Remote Zabbix server: Zabbix value cache working in low memory mode |<p>Once the low memory mode has been switched on, the value cache will remain in this state for 24 hours, even if the problem that triggered this mode is resolved sooner.</p> |`last(/Remote Zabbix server health/vcache.cache.mode)=1` |HIGH | |
 |Remote Zabbix server: Version has changed (new version: {ITEM.VALUE}) |<p>Remote Zabbix server version has changed. Ack to close.</p> |`last(/Remote Zabbix server health/version,#1)<>last(/Remote Zabbix server health/version,#2) and length(last(/Remote Zabbix server health/version))>0` |INFO |<p>Manual close: YES</p> |
-|Remote Zabbix server: More than 75% used in the vmware cache |<p>Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Remote Zabbix server: More than 75% used in the history cache |<p>Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Remote Zabbix server: More than 75% used in the history index cache |<p>Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
-|Remote Zabbix server: More than 75% used in the trends cache |<p>Consider increasing TrendCacheSize in the zabbix_server.conf configuration file</p> |`-` |AVERAGE | |
+|Remote Zabbix server: More than 75% used in the vmware cache |<p>Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix server health/vmware.buffer.pused,10m)>75` |AVERAGE | |
+|Remote Zabbix server: More than 75% used in the history cache |<p>Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix server health/wcache.history.pused,10m)>75` |AVERAGE | |
+|Remote Zabbix server: More than 75% used in the history index cache |<p>Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix server health/wcache.index.pused,10m)>75` |AVERAGE | |
+|Remote Zabbix server: More than 75% used in the trends cache |<p>Consider increasing TrendCacheSize in the zabbix_server.conf configuration file.</p> |`max(/Remote Zabbix server health/wcache.trend.pused,10m)>75` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/zabbix_server_remote/template_app_remote_zabbix_server.yaml b/templates/app/zabbix_server_remote/template_app_zabbix_server_remote.yaml
index 06a7db6056c..1e04a6c9132 100644
--- a/templates/app/zabbix_server_remote/template_app_remote_zabbix_server.yaml
+++ b/templates/app/zabbix_server_remote/template_app_zabbix_server_remote.yaml
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: 79b16cbbe593444eae3de66de0cb566b
       template: 'Remote Zabbix server health'
       name: 'Remote Zabbix server health'
-      description: 'Template tooling version used: 0.38'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Applications
@@ -1085,7 +1085,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer'
+          description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer.'
           preprocessing:
             -
               type: JSONPATH
@@ -1103,7 +1103,7 @@ zabbix_export:
               expression: 'max(/Remote Zabbix server health/rcache.buffer.pused,10m)>75'
               name: 'Remote Zabbix server: More than 75% used in the configuration cache'
               priority: AVERAGE
-              description: 'Consider increasing CacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing CacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 1625b3470fbf4bd7aa5b7051e328b37c
           name: 'Remote Zabbix server: Trend function cache, % unique requests'
@@ -1113,7 +1113,10 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: 'Effectiveness statistics of the Zabbix trend function cache. Percentage of cached items from cached items + requests. Low percentage most likely means that the cache size can be reduced.'
+          description: |
+            Effectiveness statistics of the Zabbix trend function cache. Percentage
+            of cached items from cached items + requests. Low percentage most likely means
+            that the cache size can be reduced.
           preprocessing:
             -
               type: JSONPATH
@@ -1136,7 +1139,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: "Effectiveness statistics of the Zabbix trend function cache.\tPercentage of cache misses"
+          description: 'Effectiveness statistics of the Zabbix trend function cache. Percentage of cache misses.'
           preprocessing:
             -
               type: JSONPATH
@@ -1159,7 +1162,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: "Availability statistics of Zabbix value cache.\tPercentage of used buffer"
+          description: 'Availability statistics of Zabbix value cache. Percentage of used buffer.'
           preprocessing:
             -
               type: JSONPATH
@@ -1177,7 +1180,7 @@ zabbix_export:
               expression: 'max(/Remote Zabbix server health/vcache.buffer.pused,10m)>95'
               name: 'Remote Zabbix server: More than 95% used in the value cache'
               priority: AVERAGE
-              description: 'Consider increasing ValueCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing ValueCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 9bd0079126974bf2a61f552de2cdf880
           name: 'Remote Zabbix server: Value cache hits'
@@ -1187,7 +1190,9 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: vps
-          description: 'Effectiveness statistics of Zabbix value cache. Number of cache hits (history values taken from the cache)'
+          description: |
+            Effectiveness statistics of Zabbix value cache. Number of cache hits
+            (history values taken from the cache).
           preprocessing:
             -
               type: JSONPATH
@@ -1212,7 +1217,9 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: vps
-          description: 'Effectiveness statistics of Zabbix value cache. Number of cache misses (history values taken from the database)'
+          description: |
+            Effectiveness statistics of Zabbix value cache. Number of cache misses
+            (history values taken from the database).
           preprocessing:
             -
               type: JSONPATH
@@ -1235,7 +1242,7 @@ zabbix_export:
           key: vcache.cache.mode
           delay: '0'
           history: 1w
-          description: 'Value cache operating mode'
+          description: 'Value cache operating mode.'
           valuemap:
             name: 'Value cache operating mode'
           preprocessing:
@@ -1298,7 +1305,7 @@ zabbix_export:
           history: 1w
           value_type: FLOAT
           units: '%'
-          description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer'
+          description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer.'
           preprocessing:
             -
               type: JSONPATH
@@ -1318,7 +1325,7 @@ zabbix_export:
               expression: 'max(/Remote Zabbix server health/vmware.buffer.pused,10m)>75'
               name: 'Remote Zabbix server: More than 75% used in the vmware cache'
               priority: AVERAGE
-              description: 'Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 98f47a07e2ba4294a9eb2aa1df2ba9f3
           name: 'Remote Zabbix server: History write cache, % used'
@@ -1348,7 +1355,7 @@ zabbix_export:
               expression: 'max(/Remote Zabbix server health/wcache.history.pused,10m)>75'
               name: 'Remote Zabbix server: More than 75% used in the history cache'
               priority: AVERAGE
-              description: 'Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: b1add70210a44b668f06cc3e062173ad
           name: 'Remote Zabbix server: History index cache, % used'
@@ -1378,7 +1385,7 @@ zabbix_export:
               expression: 'max(/Remote Zabbix server health/wcache.index.pused,10m)>75'
               name: 'Remote Zabbix server: More than 75% used in the history index cache'
               priority: AVERAGE
-              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 1f79208bb2ec4e4eb26e6e1b95c3635e
           name: 'Remote Zabbix server: Trend write cache, % used'
@@ -1408,7 +1415,7 @@ zabbix_export:
               expression: 'max(/Remote Zabbix server health/wcache.trend.pused,10m)>75'
               name: 'Remote Zabbix server: More than 75% used in the trends cache'
               priority: AVERAGE
-              description: 'Consider increasing TrendCacheSize in the zabbix_server.conf configuration file'
+              description: 'Consider increasing TrendCacheSize in the zabbix_server.conf configuration file.'
         -
           uuid: 34fe014843974248a98a45596ce43e1a
           name: 'Remote Zabbix server: Number of processed values per second'
@@ -1597,7 +1604,7 @@ zabbix_export:
           type: INTERNAL
           key: 'zabbix[stats,{$ADDRESS},{$PORT},queue,10m]'
           history: 1w
-          description: 'Number of monitored items in the queue which are delayed at least by 10 minutes'
+          description: 'Number of monitored items in the queue which are delayed at least by 10 minutes.'
           preprocessing:
             -
               type: JSONPATH
@@ -1613,14 +1620,16 @@ zabbix_export:
               expression: 'min(/Remote Zabbix server health/zabbix[stats,{$ADDRESS},{$PORT},queue,10m],10m)>100'
               name: 'Remote Zabbix server: More than 100 items having missing data for more than 10 minutes'
               priority: WARNING
-              description: 'zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes'
+              description: |
+                zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about
+                how many items are missing data for more than 10 minutes.
         -
           uuid: c140ebe6c0404ee6b17b5ada2de09f28
           name: 'Remote Zabbix server: Zabbix stats queue'
           type: INTERNAL
           key: 'zabbix[stats,{$ADDRESS},{$PORT},queue]'
           history: 1w
-          description: 'Number of monitored items in the queue which are delayed at least by 6 seconds'
+          description: 'Number of monitored items in the queue which are delayed at least by 6 seconds.'
           preprocessing:
             -
               type: JSONPATH
@@ -1650,7 +1659,7 @@ zabbix_export:
           type: DEPENDENT
           key: zabbix.nodes.discovery
           delay: '0'
-          description: 'LLD rule with item and trigger prototypes for node discovery'
+          description: 'LLD rule with item and trigger prototypes for node discovery.'
           item_prototypes:
             -
               uuid: caca3ccdcec141a3a9c3233ba72b8d0d
@@ -1661,7 +1670,7 @@ zabbix_export:
               history: 1w
               trends: '0'
               value_type: CHAR
-              description: 'Node IPv4 address'
+              description: 'Node IPv4 address.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1685,7 +1694,7 @@ zabbix_export:
               delay: '0'
               history: 1w
               units: uptime
-              description: 'Time between database unix_timestamp() and last access time'
+              description: 'Time between database unix_timestamp() and last access time.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1705,7 +1714,7 @@ zabbix_export:
               delay: '0'
               history: 1w
               units: unixtime
-              description: 'Last access time'
+              description: 'Last access time.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1724,7 +1733,7 @@ zabbix_export:
               key: 'zabbix.nodes.status[{#NODE.ID}]'
               delay: '0'
               history: 1w
-              description: 'Node status'
+              description: 'Node status.'
               valuemap:
                 name: 'Cluster node status'
               preprocessing:
@@ -2338,121 +2347,120 @@ zabbix_export:
       ymax_type_1: FIXED
       graph_items:
         -
-          sortorder: '1'
           color: 00EE00
           item:
             host: 'Remote Zabbix server health'
             key: process.timer.avg.busy
         -
-          sortorder: '2'
+          sortorder: '1'
           color: 0000EE
           item:
             host: 'Remote Zabbix server health'
             key: process.escalator.avg.busy
         -
-          sortorder: '3'
+          sortorder: '2'
           color: FFAA00
           item:
             host: 'Remote Zabbix server health'
             key: process.housekeeper.avg.busy
         -
-          sortorder: '4'
+          sortorder: '3'
           color: 00EEEE
           item:
             host: 'Remote Zabbix server health'
             key: process.alerter.avg.busy
         -
-          sortorder: '5'
+          sortorder: '4'
           color: '990099'
           item:
             host: 'Remote Zabbix server health'
             key: process.configuration_syncer.avg.busy
         -
-          sortorder: '6'
+          sortorder: '5'
           color: EE0000
           item:
             host: 'Remote Zabbix server health'
             key: process.history_syncer.avg.busy
         -
-          sortorder: '7'
+          sortorder: '6'
           color: FF66FF
           item:
             host: 'Remote Zabbix server health'
             key: process.self-monitoring.avg.busy
         -
-          sortorder: '8'
+          sortorder: '7'
           color: '009999'
           item:
             host: 'Remote Zabbix server health'
             key: process.task_manager.avg.busy
         -
-          sortorder: '9'
+          sortorder: '8'
           color: BBBB00
           item:
             host: 'Remote Zabbix server health'
             key: process.ipmi_manager.avg.busy
         -
-          sortorder: '10'
+          sortorder: '9'
           color: AA0000
           item:
             host: 'Remote Zabbix server health'
             key: process.alert_manager.avg.busy
         -
-          sortorder: '11'
+          sortorder: '10'
           color: '990000'
           item:
             host: 'Remote Zabbix server health'
             key: process.preprocessing_manager.avg.busy
         -
-          sortorder: '12'
+          sortorder: '11'
           color: '008800'
           item:
             host: 'Remote Zabbix server health'
             key: process.preprocessing_worker.avg.busy
         -
-          sortorder: '13'
+          sortorder: '12'
           color: 80B0E0
           item:
             host: 'Remote Zabbix server health'
             key: process.lld_manager.avg.busy
         -
-          sortorder: '14'
+          sortorder: '13'
           color: 4080B0
           item:
             host: 'Remote Zabbix server health'
             key: process.lld_worker.avg.busy
         -
-          sortorder: '15'
+          sortorder: '14'
           color: 8000FF
           item:
             host: 'Remote Zabbix server health'
             key: process.alert_syncer.avg.busy
         -
-          sortorder: '16'
+          sortorder: '15'
           color: 2B5429
           item:
             host: 'Remote Zabbix server health'
             key: process.availability_manager.avg.busy
         -
-          sortorder: '17'
+          sortorder: '16'
           color: 8048B4
           item:
             host: 'Remote Zabbix server health'
             key: process.report_manager.avg.busy
         -
-          sortorder: '18'
+          sortorder: '17'
           color: FD5434
           item:
             host: 'Remote Zabbix server health'
             key: process.report_writer.avg.busy
         -
-          sortorder: '19'
+          sortorder: '18'
           color: 790E1F
           item:
             host: 'Remote Zabbix server health'
             key: process.service_manager.avg.busy
         -
-          sortorder: '20'
+          sortorder: '19'
           color: 87AC4D
           item:
             host: 'Remote Zabbix server health'
diff --git a/templates/app/zookeeper_http/README.md b/templates/app/zookeeper_http/README.md
index 95260d9f19f..d5af198e804 100644
--- a/templates/app/zookeeper_http/README.md
+++ b/templates/app/zookeeper_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Apache Zookeeper by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -17,9 +17,9 @@ This template was tested on:
 
 > 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 standalone and cluster instances. Metrics are collected from each Zookeper node by requests to [AdminServer](https://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_adminserver).  
-By default AdminServer is enabled and listens on port 8080.  
-You can enable or configure AdminServer parameters according [official documentations](https://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_adminserver_config).  
+This template works with standalone and cluster instances. Metrics are collected from each Zookeper node by requests to [AdminServer](https://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_adminserver).
+By default AdminServer is enabled and listens on port 8080.
+You can enable or configure AdminServer parameters according [official documentations](https://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_adminserver_config).
 Don't forget to change macros {$ZOOKEEPER.COMMAND_URL}, {$ZOOKEEPER.PORT}, {$ZOOKEEPER.SCHEME}.
 
 
@@ -29,14 +29,14 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                   | Description                                                                                   | Default    |
-|----------------------------------------|-----------------------------------------------------------------------------------------------|------------|
-| {$ZOOKEEPER.COMMAND_URL}               | <p>The URL for listing and issuing commands relative to the root URL (admin.commandURL).</p>  | `commands` |
-| {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN} | <p>Maximum percentage of file descriptors usage alert threshold (for trigger expression).</p> | `85`       |
-| {$ZOOKEEPER.OUTSTANDING_REQ.MAX.WARN}  | <p>Maximum number of outstanding requests (for trigger expression).</p>                       | `10`       |
-| {$ZOOKEEPER.PENDING_SYNCS.MAX.WARN}    | <p>Maximum number of pending syncs from the followers (for trigger expression).</p>           | `10`       |
-| {$ZOOKEEPER.PORT}                      | <p>The port the embedded Jetty server listens on (admin.serverPort).</p>                      | `8080`     |
-| {$ZOOKEEPER.SCHEME}                    | <p>Request scheme which may be http or https</p>                                              | `http`     |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$ZOOKEEPER.COMMAND_URL} |<p>The URL for listing and issuing commands relative to the root URL (admin.commandURL).</p> |`commands` |
+|{$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN} |<p>Maximum percentage of file descriptors usage alert threshold (for trigger expression).</p> |`85` |
+|{$ZOOKEEPER.OUTSTANDING_REQ.MAX.WARN} |<p>Maximum number of outstanding requests (for trigger expression).</p> |`10` |
+|{$ZOOKEEPER.PENDING_SYNCS.MAX.WARN} |<p>Maximum number of pending syncs from the followers (for trigger expression).</p> |`10` |
+|{$ZOOKEEPER.PORT} |<p>The port the embedded Jetty server listens on (admin.serverPort).</p> |`8080` |
+|{$ZOOKEEPER.SCHEME} |<p>Request scheme which may be http or https</p> |`http` |
 
 ## Template links
 
@@ -44,75 +44,75 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                     | Description                                                                                                                                                        | Type       | Key and additional info                                                                                                                                                            |
-|--------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Leader metrics discovery | <p>Additional metrics for leader node</p>                                                                                                                          | DEPENDENT  | zookeeper.metrics.leader<p>**Preprocessing**:</p><p>- JSONPATH: `$.server_state`</p><p>- JAVASCRIPT: `return JSON.stringify(value == 'leader' ? [{'{#SINGLETON}': ''}] : []);`</p> |
-| Clients discovery        | <p>Get list of client connections.</p><p>Note, depending on the number of client connections this operation may be expensive (i.e. impact server performance).</p> | HTTP_AGENT | zookeeper.clients<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                        |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Leader metrics discovery |<p>Additional metrics for leader node</p> |DEPENDENT |zookeeper.metrics.leader<p>**Preprocessing**:</p><p>- JSONPATH: `$.server_state`</p><p>- JAVASCRIPT: `return JSON.stringify(value == 'leader' ? [{'{#SINGLETON}': ''}] : []);`</p> |
+|Clients discovery |<p>Get list of client connections.</p><p>Note, depending on the number of client connections this operation may be expensive (i.e. impact server performance).</p> |HTTP_AGENT |zookeeper.clients<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
-| Group            | Name                                                           | Description                                                                                                                                                                   | Type       | Key and additional info                                                                                                                                                                          |
-|------------------|----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Zabbix_raw_items | Zookeeper: Get server metrics                                  | <p>-</p>                                                                                                                                                                      | HTTP_AGENT | zookeeper.get_metrics                                                                                                                                                                            |
-| Zabbix_raw_items | Zookeeper: Get connections stats                               | <p>Get information on client connections to server. Note, depending on the number of client connections this operation may be expensive (i.e. impact server performance).</p> | HTTP_AGENT | zookeeper.get_connections_stats                                                                                                                                                                  |
-| Zookeeper        | Zookeeper: Server mode                                         | <p>Mode of the server. In an ensemble, this may either be leader or follower. Otherwise, it is standalone</p>                                                                 | DEPENDENT  | zookeeper.server_state<p>**Preprocessing**:</p><p>- JSONPATH: `$.server_state`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                     |
-| Zookeeper        | Zookeeper: Uptime                                              | <p>Uptime of Zookeeper server.</p>                                                                                                                                            | DEPENDENT  | zookeeper.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p><p>- MULTIPLIER: `0.001`</p>                                                                                               |
-| Zookeeper        | Zookeeper: Version                                             | <p>Version of Zookeeper server.</p>                                                                                                                                           | DEPENDENT  | zookeeper.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>- REGEX: `([^,]+)--(.+) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p>                                             |
-| Zookeeper        | Zookeeper: Approximate data size                               | <p>Data tree size in bytes.The size includes the znode path and its value.</p>                                                                                                | DEPENDENT  | zookeeper.approximate_data_size<p>**Preprocessing**:</p><p>- JSONPATH: `$.approximate_data_size`</p>                                                                                             |
-| Zookeeper        | Zookeeper: File descriptors, max                               | <p>Maximum number of file descriptors that a zookeeper server can open.</p>                                                                                                   | DEPENDENT  | zookeeper.max_file_descriptor_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.max_file_descriptor_count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                           |
-| Zookeeper        | Zookeeper: File descriptors, open                              | <p>Number of file descriptors that a zookeeper server has open.</p>                                                                                                           | DEPENDENT  | zookeeper.open_file_descriptor_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.open_file_descriptor_count`</p>                                                                                   |
-| Zookeeper        | Zookeeper: Outstanding requests                                | <p>The number of queued requests when the server is under load and is receiving more sustained requests than it can process.</p>                                              | DEPENDENT  | zookeeper.outstanding_requests<p>**Preprocessing**:</p><p>- JSONPATH: `$.outstanding_requests`</p>                                                                                               |
-| Zookeeper        | Zookeeper: Commit per sec                                      | <p>The number of commits performed per second</p>                                                                                                                             | DEPENDENT  | zookeeper.commit_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.commit_count`</p><p>- CHANGE_PER_SECOND                                                                                    |
-| Zookeeper        | Zookeeper: Diff syncs per sec                                  | <p>Number of diff syncs performed per second</p>                                                                                                                              | DEPENDENT  | zookeeper.diff_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.diff_count`</p><p>- CHANGE_PER_SECOND                                                                                        |
-| Zookeeper        | Zookeeper: Snap syncs per sec                                  | <p>Number of snap syncs performed per second</p>                                                                                                                              | DEPENDENT  | zookeeper.snap_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.snap_count`</p><p>- CHANGE_PER_SECOND                                                                                        |
-| Zookeeper        | Zookeeper: Looking per sec                                     | <p>Rate of transitions into looking state.</p>                                                                                                                                | DEPENDENT  | zookeeper.looking_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.looking_count`</p><p>- CHANGE_PER_SECOND                                                                                  |
-| Zookeeper        | Zookeeper: Alive connections                                   | <p>Number of active clients connected to a zookeeper server.</p>                                                                                                              | DEPENDENT  | zookeeper.num_alive_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.num_alive_connections`</p>                                                                                             |
-| Zookeeper        | Zookeeper: Global sessions                                     | <p>Number of global sessions.</p>                                                                                                                                             | DEPENDENT  | zookeeper.global_sessions<p>**Preprocessing**:</p><p>- JSONPATH: `$.global_sessions`</p>                                                                                                         |
-| Zookeeper        | Zookeeper: Local sessions                                      | <p>Number of local sessions.</p>                                                                                                                                              | DEPENDENT  | zookeeper.local_sessions<p>**Preprocessing**:</p><p>- JSONPATH: `$.local_sessions`</p>                                                                                                           |
-| Zookeeper        | Zookeeper: Drop connections per sec                            | <p>Rate of connection drops.</p>                                                                                                                                              | DEPENDENT  | zookeeper.connection_drop_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connection_drop_count`</p><p>- CHANGE_PER_SECOND                                                                  |
-| Zookeeper        | Zookeeper: Rejected connections per sec                        | <p>Rate of connection rejected.</p>                                                                                                                                           | DEPENDENT  | zookeeper.connection_rejected.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connection_rejected`</p><p>- CHANGE_PER_SECOND                                                                      |
-| Zookeeper        | Zookeeper: Revalidate connections per sec                      | <p>Rate ofconnection revalidations.</p>                                                                                                                                       | DEPENDENT  | zookeeper.connection_revalidate_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connection_revalidate_count`</p><p>- CHANGE_PER_SECOND                                                      |
-| Zookeeper        | Zookeeper: Revalidate per sec                                  | <p>Rate of revalidations.</p>                                                                                                                                                 | DEPENDENT  | zookeeper.revalidate_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.revalidate_count`</p><p>- CHANGE_PER_SECOND                                                                            |
-| Zookeeper        | Zookeeper: Latency, max                                        | <p>The maximum amount of time it takes for the server to respond to a client request.</p>                                                                                     | DEPENDENT  | zookeeper.max_latency<p>**Preprocessing**:</p><p>- JSONPATH: `$.max_latency`</p>                                                                                                                 |
-| Zookeeper        | Zookeeper: Latency, min                                        | <p>The minimum amount of time it takes for the server to respond to a client request.</p>                                                                                     | DEPENDENT  | zookeeper.min_latency<p>**Preprocessing**:</p><p>- JSONPATH: `$.min_latency`</p>                                                                                                                 |
-| Zookeeper        | Zookeeper: Latency, avg                                        | <p>The average amount of time it takes for the server to respond to a client request.</p>                                                                                     | DEPENDENT  | zookeeper.avg_latency<p>**Preprocessing**:</p><p>- JSONPATH: `$.avg_latency`</p>                                                                                                                 |
-| Zookeeper        | Zookeeper: Znode count                                         | <p>The number of znodes in the ZooKeeper namespace (the data)</p>                                                                                                             | DEPENDENT  | zookeeper.znode_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.znode_count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                       |
-| Zookeeper        | Zookeeper: Ephemeral nodes count                               | <p>Number of ephemeral nodes that a zookeeper server has in its data tree.</p>                                                                                                | DEPENDENT  | zookeeper.ephemerals_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.ephemerals_count`</p>                                                                                                       |
-| Zookeeper        | Zookeeper: Watch count                                         | <p>Number of watches currently set on the local ZooKeeper process.</p>                                                                                                        | DEPENDENT  | zookeeper.watch_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.watch_count`</p>                                                                                                                 |
-| Zookeeper        | Zookeeper: Packets sent per sec                                | <p>The number of zookeeper packets sent from a server per second.</p>                                                                                                         | DEPENDENT  | zookeeper.packets_sent<p>**Preprocessing**:</p><p>- JSONPATH: `$.packets_sent`</p><p>- CHANGE_PER_SECOND                                                                                         |
-| Zookeeper        | Zookeeper: Packets received per sec                            | <p>The number of zookeeper packets received by a server per second.</p>                                                                                                       | DEPENDENT  | zookeeper.packets_received.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.packets_received`</p><p>- CHANGE_PER_SECOND                                                                            |
-| Zookeeper        | Zookeeper: Bytes received per sec                              | <p>Number of bytes received per second.</p>                                                                                                                                   | DEPENDENT  | zookeeper.bytes_received_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.bytes_received_count`</p><p>- CHANGE_PER_SECOND                                                                    |
-| Zookeeper        | Zookeeper: Election time, avg                                  | <p>Time between entering and leaving election.</p>                                                                                                                            | DEPENDENT  | zookeeper.avg_election_time<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                            |
-| Zookeeper        | Zookeeper: Elections                                           | <p>Number of elections happened.</p>                                                                                                                                          | DEPENDENT  | zookeeper.cnt_election_time<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                            |
-| Zookeeper        | Zookeeper: Fsync time, avg                                     | <p>Time to fsync transaction log.</p>                                                                                                                                         | DEPENDENT  | zookeeper.avg_fsynctime<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                |
-| Zookeeper        | Zookeeper: Fsync                                               | <p>Count of performed fsyncs.</p>                                                                                                                                             | DEPENDENT  | zookeeper.cnt_fsynctime<p>**Preprocessing**:</p><p>- JAVASCRIPT: `var metrics = JSON.parse(value) return metrics.cnt_fsynctime || metrics.fsynctime_count`</p>                                   |
-| Zookeeper        | Zookeeper: Snapshot write time, avg                            | <p>Average time to write a snapshot.</p>                                                                                                                                      | DEPENDENT  | zookeeper.avg_snapshottime<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                             |
-| Zookeeper        | Zookeeper: Snapshot writes                                     | <p>Count of performed snapshot writes.</p>                                                                                                                                    | DEPENDENT  | zookeeper.cnt_snapshottime<p>**Preprocessing**:</p><p>- JAVASCRIPT: `var metrics = JSON.parse(value) return metrics.snapshottime_count || metrics.cnt_snapshottime`</p>                          |
-| Zookeeper        | Zookeeper: Pending syncs{#SINGLETON}                           | <p>Number of pending syncs to carry out to ZooKeeper ensemble followers.</p>                                                                                                  | DEPENDENT  | zookeeper.pending_syncs[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pending_syncs`</p>                                                                                               |
-| Zookeeper        | Zookeeper: Quorum size{#SINGLETON}                             |                                                                                                                                                                               | DEPENDENT  | zookeeper.quorum_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.quorum_size`</p>                                                                                                   |
-| Zookeeper        | Zookeeper: Synced followers{#SINGLETON}                        | <p>Number of synced followers reported when a node server_state is leader.</p>                                                                                                | DEPENDENT  | zookeeper.synced_followers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.synced_followers`</p>                                                                                         |
-| Zookeeper        | Zookeeper: Synced non-voting follower{#SINGLETON}              | <p>Number of synced voting followers reported when a node server_state is leader.</p>                                                                                         | DEPENDENT  | zookeeper.synced_non_voting_followers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.synced_non_voting_followers`</p>                                                                   |
-| Zookeeper        | Zookeeper: Synced observers{#SINGLETON}                        | <p>Number of synced observers.</p>                                                                                                                                            | DEPENDENT  | zookeeper.synced_observers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.synced_observers`</p>                                                                                         |
-| Zookeeper        | Zookeeper: Learners{#SINGLETON}                                | <p>Number of learners.</p>                                                                                                                                                    | DEPENDENT  | zookeeper.learners[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.learners`</p>                                                                                                         |
-| Zookeeper        | Zookeeper client {#TYPE} [{#CLIENT}]: Latency, max             | <p>The maximum amount of time it takes for the server to respond to a client request.</p>                                                                                     | DEPENDENT  | zookeeper.max_latency[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].max_latency.first()`</p>                                 |
-| Zookeeper        | Zookeeper client {#TYPE} [{#CLIENT}]: Latency, min             | <p>The minimum amount of time it takes for the server to respond to a client request.</p>                                                                                     | DEPENDENT  | zookeeper.min_latency[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].min_latency.first()`</p>                                 |
-| Zookeeper        | Zookeeper client {#TYPE} [{#CLIENT}]: Latency, avg             | <p>The average amount of time it takes for the server to respond to a client request.</p>                                                                                     | DEPENDENT  | zookeeper.avg_latency[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].avg_latency.first()`</p>                                 |
-| Zookeeper        | Zookeeper client {#TYPE} [{#CLIENT}]: Packets sent per sec     | <p>The number of packets sent.</p>                                                                                                                                            | DEPENDENT  | zookeeper.packets_sent[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].packets_sent.first()`</p><p>- CHANGE_PER_SECOND         |
-| Zookeeper        | Zookeeper client {#TYPE} [{#CLIENT}]: Packets received per sec | <p>The number of packets received.</p>                                                                                                                                        | DEPENDENT  | zookeeper.packets_received[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].packets_received.first()`</p><p>- CHANGE_PER_SECOND |
-| Zookeeper        | Zookeeper client {#TYPE} [{#CLIENT}]: Outstanding requests     | <p>The number of queued requests when the server is under load and is receiving more sustained requests than it can process.</p>                                              | DEPENDENT  | zookeeper.outstanding_requests[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].outstanding_requests.first()`</p>               |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Zabbix_raw_items |Zookeeper: Get server metrics |<p>-</p> |HTTP_AGENT |zookeeper.get_metrics |
+|Zabbix_raw_items |Zookeeper: Get connections stats |<p>Get information on client connections to server. Note, depending on the number of client connections this operation may be expensive (i.e. impact server performance).</p> |HTTP_AGENT |zookeeper.get_connections_stats |
+|Zookeeper |Zookeeper: Server mode |<p>Mode of the server. In an ensemble, this may either be leader or follower. Otherwise, it is standalone</p> |DEPENDENT |zookeeper.server_state<p>**Preprocessing**:</p><p>- JSONPATH: `$.server_state`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zookeeper |Zookeeper: Uptime |<p>Uptime of Zookeeper server.</p> |DEPENDENT |zookeeper.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p><p>- MULTIPLIER: `0.001`</p> |
+|Zookeeper |Zookeeper: Version |<p>Version of Zookeeper server.</p> |DEPENDENT |zookeeper.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>- REGEX: `([^,]+)--(.+) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|Zookeeper |Zookeeper: Approximate data size |<p>Data tree size in bytes.The size includes the znode path and its value.</p> |DEPENDENT |zookeeper.approximate_data_size<p>**Preprocessing**:</p><p>- JSONPATH: `$.approximate_data_size`</p> |
+|Zookeeper |Zookeeper: File descriptors, max |<p>Maximum number of file descriptors that a zookeeper server can open.</p> |DEPENDENT |zookeeper.max_file_descriptor_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.max_file_descriptor_count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zookeeper |Zookeeper: File descriptors, open |<p>Number of file descriptors that a zookeeper server has open.</p> |DEPENDENT |zookeeper.open_file_descriptor_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.open_file_descriptor_count`</p> |
+|Zookeeper |Zookeeper: Outstanding requests |<p>The number of queued requests when the server is under load and is receiving more sustained requests than it can process.</p> |DEPENDENT |zookeeper.outstanding_requests<p>**Preprocessing**:</p><p>- JSONPATH: `$.outstanding_requests`</p> |
+|Zookeeper |Zookeeper: Commit per sec |<p>The number of commits performed per second</p> |DEPENDENT |zookeeper.commit_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.commit_count`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Diff syncs per sec |<p>Number of diff syncs performed per second</p> |DEPENDENT |zookeeper.diff_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.diff_count`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Snap syncs per sec |<p>Number of snap syncs performed per second</p> |DEPENDENT |zookeeper.snap_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.snap_count`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Looking per sec |<p>Rate of transitions into looking state.</p> |DEPENDENT |zookeeper.looking_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.looking_count`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Alive connections |<p>Number of active clients connected to a zookeeper server.</p> |DEPENDENT |zookeeper.num_alive_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.num_alive_connections`</p> |
+|Zookeeper |Zookeeper: Global sessions |<p>Number of global sessions.</p> |DEPENDENT |zookeeper.global_sessions<p>**Preprocessing**:</p><p>- JSONPATH: `$.global_sessions`</p> |
+|Zookeeper |Zookeeper: Local sessions |<p>Number of local sessions.</p> |DEPENDENT |zookeeper.local_sessions<p>**Preprocessing**:</p><p>- JSONPATH: `$.local_sessions`</p> |
+|Zookeeper |Zookeeper: Drop connections per sec |<p>Rate of connection drops.</p> |DEPENDENT |zookeeper.connection_drop_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connection_drop_count`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Rejected connections per sec |<p>Rate of connection rejected.</p> |DEPENDENT |zookeeper.connection_rejected.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connection_rejected`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Revalidate connections per sec |<p>Rate ofconnection revalidations.</p> |DEPENDENT |zookeeper.connection_revalidate_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connection_revalidate_count`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Revalidate per sec |<p>Rate of revalidations.</p> |DEPENDENT |zookeeper.revalidate_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.revalidate_count`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Latency, max |<p>The maximum amount of time it takes for the server to respond to a client request.</p> |DEPENDENT |zookeeper.max_latency<p>**Preprocessing**:</p><p>- JSONPATH: `$.max_latency`</p> |
+|Zookeeper |Zookeeper: Latency, min |<p>The minimum amount of time it takes for the server to respond to a client request.</p> |DEPENDENT |zookeeper.min_latency<p>**Preprocessing**:</p><p>- JSONPATH: `$.min_latency`</p> |
+|Zookeeper |Zookeeper: Latency, avg |<p>The average amount of time it takes for the server to respond to a client request.</p> |DEPENDENT |zookeeper.avg_latency<p>**Preprocessing**:</p><p>- JSONPATH: `$.avg_latency`</p> |
+|Zookeeper |Zookeeper: Znode count |<p>The number of znodes in the ZooKeeper namespace (the data)</p> |DEPENDENT |zookeeper.znode_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.znode_count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zookeeper |Zookeeper: Ephemeral nodes count |<p>Number of ephemeral nodes that a zookeeper server has in its data tree.</p> |DEPENDENT |zookeeper.ephemerals_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.ephemerals_count`</p> |
+|Zookeeper |Zookeeper: Watch count |<p>Number of watches currently set on the local ZooKeeper process.</p> |DEPENDENT |zookeeper.watch_count<p>**Preprocessing**:</p><p>- JSONPATH: `$.watch_count`</p> |
+|Zookeeper |Zookeeper: Packets sent per sec |<p>The number of zookeeper packets sent from a server per second.</p> |DEPENDENT |zookeeper.packets_sent<p>**Preprocessing**:</p><p>- JSONPATH: `$.packets_sent`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Packets received per sec |<p>The number of zookeeper packets received by a server per second.</p> |DEPENDENT |zookeeper.packets_received.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.packets_received`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Bytes received per sec |<p>Number of bytes received per second.</p> |DEPENDENT |zookeeper.bytes_received_count.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.bytes_received_count`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper: Election time, avg |<p>Time between entering and leaving election.</p> |DEPENDENT |zookeeper.avg_election_time<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Zookeeper |Zookeeper: Elections |<p>Number of elections happened.</p> |DEPENDENT |zookeeper.cnt_election_time<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Zookeeper |Zookeeper: Fsync time, avg |<p>Time to fsync transaction log.</p> |DEPENDENT |zookeeper.avg_fsynctime<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Zookeeper |Zookeeper: Fsync |<p>Count of performed fsyncs.</p> |DEPENDENT |zookeeper.cnt_fsynctime<p>**Preprocessing**:</p><p>- JAVASCRIPT: `var metrics = JSON.parse(value) return metrics.cnt_fsynctime || metrics.fsynctime_count`</p> |
+|Zookeeper |Zookeeper: Snapshot write time, avg |<p>Average time to write a snapshot.</p> |DEPENDENT |zookeeper.avg_snapshottime<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Zookeeper |Zookeeper: Snapshot writes |<p>Count of performed snapshot writes.</p> |DEPENDENT |zookeeper.cnt_snapshottime<p>**Preprocessing**:</p><p>- JAVASCRIPT: `var metrics = JSON.parse(value) return metrics.snapshottime_count || metrics.cnt_snapshottime`</p> |
+|Zookeeper |Zookeeper: Pending syncs{#SINGLETON} |<p>Number of pending syncs to carry out to ZooKeeper ensemble followers.</p> |DEPENDENT |zookeeper.pending_syncs[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.pending_syncs`</p> |
+|Zookeeper |Zookeeper: Quorum size{#SINGLETON} |<p>-</p> |DEPENDENT |zookeeper.quorum_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.quorum_size`</p> |
+|Zookeeper |Zookeeper: Synced followers{#SINGLETON} |<p>Number of synced followers reported when a node server_state is leader.</p> |DEPENDENT |zookeeper.synced_followers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.synced_followers`</p> |
+|Zookeeper |Zookeeper: Synced non-voting follower{#SINGLETON} |<p>Number of synced voting followers reported when a node server_state is leader.</p> |DEPENDENT |zookeeper.synced_non_voting_followers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.synced_non_voting_followers`</p> |
+|Zookeeper |Zookeeper: Synced observers{#SINGLETON} |<p>Number of synced observers.</p> |DEPENDENT |zookeeper.synced_observers[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.synced_observers`</p> |
+|Zookeeper |Zookeeper: Learners{#SINGLETON} |<p>Number of learners.</p> |DEPENDENT |zookeeper.learners[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.learners`</p> |
+|Zookeeper |Zookeeper client {#TYPE} [{#CLIENT}]: Latency, max |<p>The maximum amount of time it takes for the server to respond to a client request.</p> |DEPENDENT |zookeeper.max_latency[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].max_latency.first()`</p> |
+|Zookeeper |Zookeeper client {#TYPE} [{#CLIENT}]: Latency, min |<p>The minimum amount of time it takes for the server to respond to a client request.</p> |DEPENDENT |zookeeper.min_latency[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].min_latency.first()`</p> |
+|Zookeeper |Zookeeper client {#TYPE} [{#CLIENT}]: Latency, avg |<p>The average amount of time it takes for the server to respond to a client request.</p> |DEPENDENT |zookeeper.avg_latency[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].avg_latency.first()`</p> |
+|Zookeeper |Zookeeper client {#TYPE} [{#CLIENT}]: Packets sent per sec |<p>The number of packets sent.</p> |DEPENDENT |zookeeper.packets_sent[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].packets_sent.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper client {#TYPE} [{#CLIENT}]: Packets received per sec |<p>The number of packets received.</p> |DEPENDENT |zookeeper.packets_received[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].packets_received.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Zookeeper |Zookeeper client {#TYPE} [{#CLIENT}]: Outstanding requests |<p>The number of queued requests when the server is under load and is receiving more sustained requests than it can process.</p> |DEPENDENT |zookeeper.outstanding_requests[{#TYPE},{#CLIENT}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.{#TYPE}.[?(@.remote_socket_address == "{#ADDRESS}")].outstanding_requests.first()`</p> |
 
 ## Triggers
 
-| Name                                                                                               | Description                                                                                                                                                                                                                                  | Expression                                                                                                                                                                     | Severity | Dependencies and additional info |
-|----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| Zookeeper: Server mode has changed (new mode: {ITEM.VALUE})                                        | <p>Zookeeper node state has changed. Ack to close.</p>                                                                                                                                                                                       | `{TEMPLATE_NAME:zookeeper.server_state.diff()}=1 and {TEMPLATE_NAME:zookeeper.server_state.strlen()}>0`                                                                        | INFO     | <p>Manual close: YES</p>         |
-| Zookeeper: has been restarted (uptime < 10m)                                                       | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                        | `{TEMPLATE_NAME:zookeeper.uptime.last()}<10m`                                                                                                                                  | INFO     | <p>Manual close: YES</p>         |
-| Zookeeper: Failed to fetch info data (or no data for 10m)                                          | <p>Zabbix has not received data for items for the last 10 minutes</p>                                                                                                                                                                        | `{TEMPLATE_NAME:zookeeper.uptime.nodata(10m)}=1`                                                                                                                               | WARNING  | <p>Manual close: YES</p>         |
-| Zookeeper: Version has changed (new version: {ITEM.VALUE})                                         | <p>Zookeeper version has changed. Ack to close.</p>                                                                                                                                                                                          | `{TEMPLATE_NAME:zookeeper.version.diff()}=1 and {TEMPLATE_NAME:zookeeper.version.strlen()}>0`                                                                                  | INFO     | <p>Manual close: YES</p>         |
-| Zookeeper: Too many file descriptors used (over {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN}% for 5 min) | <p>Number of file descriptors used more than {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN}% of the available number of file descriptors.</p>                                                                                                        | `{TEMPLATE_NAME:zookeeper.open_file_descriptor_count.min(5m)} * 100 / {Zookeeper by HTTP:zookeeper.max_file_descriptor_count.last()} > {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN}` | WARNING  |                                  |
-| Zookeeper: Too many queued requests (over {$ZOOKEEPER.OUTSTANDING_REQ.MAX.WARN}% for 5 min)        | <p>Number of queued requests in the server. This goes up when the server receives more requests than it can process.</p>                                                                                                                     | `{TEMPLATE_NAME:zookeeper.outstanding_requests.min(5m)}>{$ZOOKEEPER.OUTSTANDING_REQ.MAX.WARN}`                                                                                 | AVERAGE  | <p>Manual close: YES</p>         |
-| Zookeeper: Too many pending syncs (over {$ZOOKEEPER.PENDING_SYNCS.MAX.WARN}% for 5 min)            | <p>-</p>                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:zookeeper.pending_syncs[{#SINGLETON}].min(5m)}>{$ZOOKEEPER.PENDING_SYNCS.MAX.WARN}`                                                                            | AVERAGE  | <p>Manual close: YES</p>         |
-| Zookeeper: Too few active followers                                                                | <p>The number of followers should equal the total size of your ZooKeeper ensemble, minus 1 (the leader is not included in the follower count). If the ensemble fails to maintain quorum, all automatic failover features are suspended. </p> | `{TEMPLATE_NAME:zookeeper.synced_followers[{#SINGLETON}].last()} < {Zookeeper by HTTP:zookeeper.quorum_size[{#SINGLETON}].last()}-1`                                           | AVERAGE  |                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Zookeeper: Server mode has changed (new mode: {ITEM.VALUE}) |<p>Zookeeper node state has changed. Ack to close.</p> |`last(/Zookeeper by HTTP/zookeeper.server_state,#1)<>last(/Zookeeper by HTTP/zookeeper.server_state,#2) and length(last(/Zookeeper by HTTP/zookeeper.server_state))>0` |INFO |<p>Manual close: YES</p> |
+|Zookeeper: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Zookeeper by HTTP/zookeeper.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Zookeeper: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes</p> |`nodata(/Zookeeper by HTTP/zookeeper.uptime,10m)=1` |WARNING |<p>Manual close: YES</p> |
+|Zookeeper: Version has changed (new version: {ITEM.VALUE}) |<p>Zookeeper version has changed. Ack to close.</p> |`last(/Zookeeper by HTTP/zookeeper.version,#1)<>last(/Zookeeper by HTTP/zookeeper.version,#2) and length(last(/Zookeeper by HTTP/zookeeper.version))>0` |INFO |<p>Manual close: YES</p> |
+|Zookeeper: Too many file descriptors used (over {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN}% for 5 min) |<p>Number of file descriptors used more than {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN}% of the available number of file descriptors.</p> |`min(/Zookeeper by HTTP/zookeeper.open_file_descriptor_count,5m) * 100 / last(/Zookeeper by HTTP/zookeeper.max_file_descriptor_count) > {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN}` |WARNING | |
+|Zookeeper: Too many queued requests (over {$ZOOKEEPER.OUTSTANDING_REQ.MAX.WARN}% for 5 min) |<p>Number of queued requests in the server. This goes up when the server receives more requests than it can process.</p> |`min(/Zookeeper by HTTP/zookeeper.outstanding_requests,5m)>{$ZOOKEEPER.OUTSTANDING_REQ.MAX.WARN}` |AVERAGE |<p>Manual close: YES</p> |
+|Zookeeper: Too many pending syncs (over {$ZOOKEEPER.PENDING_SYNCS.MAX.WARN}% for 5 min) |<p>-</p> |`min(/Zookeeper by HTTP/zookeeper.pending_syncs[{#SINGLETON}],5m)>{$ZOOKEEPER.PENDING_SYNCS.MAX.WARN}` |AVERAGE |<p>Manual close: YES</p> |
+|Zookeeper: Too few active followers |<p>The number of followers should equal the total size of your ZooKeeper ensemble, minus 1 (the leader is not included in the follower count). If the ensemble fails to maintain quorum, all automatic failover features are suspended. </p> |`last(/Zookeeper by HTTP/zookeeper.synced_followers[{#SINGLETON}]) < last(/Zookeeper by HTTP/zookeeper.quorum_size[{#SINGLETON}])-1` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/app/zookeeper_http/template_app_zookeeper_http.yaml b/templates/app/zookeeper_http/template_app_zookeeper_http.yaml
index 2b96a467bed..ed82e9d84e4 100644
--- a/templates/app/zookeeper_http/template_app_zookeeper_http.yaml
+++ b/templates/app/zookeeper_http/template_app_zookeeper_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:18Z'
+  version: '6.0'
+  date: '2021-12-15T06:58:41Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -12,12 +12,12 @@ zabbix_export:
       name: 'Zookeeper by HTTP'
       description: |
         Get Apache Zookeeper metrics by HTTP agent.
-          This template works with standalone and cluster instances. Metrics are collected from each Zookeper node by requests to AdminServer.  
+          This template works with standalone and cluster instances. Metrics are collected from each Zookeper node by requests to AdminServer.
           Don't forget to change macros {$ZOOKEEPER.COMMAND_URL}, {$ZOOKEEPER.PORT}, {$ZOOKEEPER.SCHEME}.
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -183,8 +183,8 @@ zabbix_export:
               parameters:
                 - |
                   var metrics = JSON.parse(value);
-                  if (metrics.server_state === "standalone") { 
-                      return 0 
+                  if (metrics.server_state === "standalone") {
+                      return 0
                       }
                   else {
                       return metrics.cnt_election_time || metrics.election_time_count
diff --git a/templates/db/cassandra_jmx/README.md b/templates/db/cassandra_jmx/README.md
index 735cdd19deb..8856d8e8438 100644
--- a/templates/db/cassandra_jmx/README.md
+++ b/templates/db/cassandra_jmx/README.md
@@ -3,14 +3,13 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official JMX Template for Apache Cassandra DBSM.
 
 
 This template was tested on:
 
 - Apache Cassandra, version 3.11.8
-- Zabbix, version 5.0, 5.2
 
 ## Setup
 
@@ -30,14 +29,14 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                    | Default                                                 |
-|-------------------------------------|------------------------------------------------|---------------------------------------------------------|
-| {$CASSANDRA.KEY_SPACE.MATCHES}      | <p>Filter of discoverable key spaces</p>       | `.*`                                                    |
-| {$CASSANDRA.KEY_SPACE.NOT_MATCHES}  | <p>Filter to exclude discovered key spaces</p> | `(system|system_auth|system_distributed|system_schema)` |
-| {$CASSANDRA.PASSWORD}               | <p>-</p>                                       | `zabbix`                                                |
-| {$CASSANDRA.PENDING_TASKS.MAX.HIGH} | <p>-</p>                                       | `500`                                                   |
-| {$CASSANDRA.PENDING_TASKS.MAX.WARN} | <p>-</p>                                       | `350`                                                   |
-| {$CASSANDRA.USER}                   | <p>-</p>                                       | `zabbix`                                                |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CASSANDRA.KEY_SPACE.MATCHES} |<p>Filter of discoverable key spaces</p> |`.*` |
+|{$CASSANDRA.KEY_SPACE.NOT_MATCHES} |<p>Filter to exclude discovered key spaces</p> |`(system|system_auth|system_distributed|system_schema)` |
+|{$CASSANDRA.PASSWORD} |<p>-</p> |`zabbix` |
+|{$CASSANDRA.PENDING_TASKS.MAX.HIGH} |<p>-</p> |`500` |
+|{$CASSANDRA.PENDING_TASKS.MAX.WARN} |<p>-</p> |`350` |
+|{$CASSANDRA.USER} |<p>-</p> |`zabbix` |
 
 ## Template links
 
@@ -45,122 +44,122 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name   | Description                            | Type | Key and additional info                                                                                                                                                                                                                                                            |
-|--------|----------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Tables | <p>Info about keyspaces and tables</p> | JMX  | jmx.discovery[beans,"org.apache.cassandra.metrics:type=Table,keyspace=*,scope=*,name=ReadLatency"]<p>**Filter**:</p>AND <p>- A: {#JMXKEYSPACE} MATCHES_REGEX `{$CASSANDRA.KEY_SPACE.MATCHES}`</p><p>- B: {#JMXKEYSPACE} NOT_MATCHES_REGEX `{$CASSANDRA.KEY_SPACE.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Tables |<p>Info about keyspaces and tables</p> |JMX |jmx.discovery[beans,"org.apache.cassandra.metrics:type=Table,keyspace=*,scope=*,name=ReadLatency"]<p>**Filter**:</p>AND <p>- {#JMXKEYSPACE} MATCHES_REGEX `{$CASSANDRA.KEY_SPACE.MATCHES}`</p><p>- {#JMXKEYSPACE} NOT_MATCHES_REGEX `{$CASSANDRA.KEY_SPACE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group     | Name                                                                     | Description                                                                                                                                                                                          | Type | Key and additional info                                                                                                                                                                         |
-|-----------|--------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Cassandra | Cluster: Nodes down                                                      | <p>-</p>                                                                                                                                                                                             | JMX  | jmx["org.apache.cassandra.net:type=FailureDetector","DownEndpointCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                     |
-| Cassandra | Cluster: Nodes up                                                        | <p>-</p>                                                                                                                                                                                             | JMX  | jmx["org.apache.cassandra.net:type=FailureDetector","UpEndpointCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                       |
-| Cassandra | Cluster: Name                                                            | <p>-</p>                                                                                                                                                                                             | JMX  | jmx["org.apache.cassandra.db:type=StorageService","ClusterName"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                             |
-| Cassandra | Version                                                                  | <p>-</p>                                                                                                                                                                                             | JMX  | jmx["org.apache.cassandra.db:type=StorageService","ReleaseVersion"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                          |
-| Cassandra | Dropped messages: Write (Mutation)                                       | <p>Number of dropped regular writes messages.</p>                                                                                                                                                    | JMX  | jmx["org.apache.cassandra.metrics:type=DroppedMessage,scope=MUTATION,name=Dropped","Count"]                                                                                                     |
-| Cassandra | Dropped messages: Read                                                   | <p>Number of dropped regular reads messages.</p>                                                                                                                                                     | JMX  | jmx["org.apache.cassandra.metrics:type=DroppedMessage,scope=READ,name=Dropped","Count"]                                                                                                         |
-| Cassandra | Storage: Used (bytes)                                                    | <p>Size, in bytes, of the on disk data size this node manages.</p>                                                                                                                                   | JMX  | jmx["org.apache.cassandra.metrics:type=Storage,name=Load","Count"]                                                                                                                              |
-| Cassandra | Storage: Errors                                                          | <p>Number of internal exceptions caught. Under normal exceptions this should be zero.</p>                                                                                                            | JMX  | jmx["org.apache.cassandra.metrics:type=Storage,name=Exceptions","Count"]                                                                                                                        |
-| Cassandra | Storage: Hints                                                           | <p>Number of hint messages written to this node since [re]start. Includes one entry for each host to be hinted per hint.</p>                                                                         | JMX  | jmx["org.apache.cassandra.metrics:type=Storage,name=TotalHints","Count"]                                                                                                                        |
-| Cassandra | Compaction: Number of completed tasks                                    | <p>Number of completed compactions since server [re]start.</p>                                                                                                                                       | JMX  | jmx["org.apache.cassandra.metrics:name=CompletedTasks,type=Compaction","Value"]                                                                                                                 |
-| Cassandra | Compaction: Total compactions completed                                  | <p>Throughput of completed compactions since server [re]start.</p>                                                                                                                                   | JMX  | jmx["org.apache.cassandra.metrics:name=TotalCompactionsCompleted,type=Compaction","Count"]                                                                                                      |
-| Cassandra | Compaction: Pending tasks                                                | <p>Estimated number of compactions remaining to perform.</p>                                                                                                                                         | JMX  | jmx["org.apache.cassandra.metrics:type=Compaction,name=PendingTasks","Value"]                                                                                                                   |
-| Cassandra | Commitlog: Pending tasks                                                 | <p>Number of commit log messages written but yet to be fsync’d.</p>                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:name=PendingTasks,type=CommitLog","Value"]                                                                                                                    |
-| Cassandra | Commitlog: Total size                                                    | <p>Current size, in bytes, used by all the commit log segments.</p>                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:name=TotalCommitLogSize,type=CommitLog","Value"]                                                                                                              |
-| Cassandra | Latency: Read median                                                     | <p>Latency read from disk in milliseconds - median.</p>                                                                                                                                              | JMX  | jmx["org.apache.cassandra.metrics:name=ReadLatency,type=Table","50thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                                           |
-| Cassandra | Latency: Read 75 percentile                                              | <p>Latency read from disk in milliseconds - p75.</p>                                                                                                                                                 | JMX  | jmx["org.apache.cassandra.metrics:name=ReadLatency,type=Table","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                                           |
-| Cassandra | Latency: Read 95 percentile                                              | <p>Latency read from disk in milliseconds - p95.</p>                                                                                                                                                 | JMX  | jmx["org.apache.cassandra.metrics:name=ReadLatency,type=Table","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                                           |
-| Cassandra | Latency: Write median                                                    | <p>Latency write to disk in milliseconds - median.</p>                                                                                                                                               | JMX  | jmx["org.apache.cassandra.metrics:name=WriteLatency,type=Table","50thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                                          |
-| Cassandra | Latency: Write 75 percentile                                             | <p>Latency write to disk in milliseconds - p75.</p>                                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:name=WriteLatency,type=Table","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                                          |
-| Cassandra | Latency: Write 95 percentile                                             | <p>Latency write to disk in milliseconds - p95.</p>                                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:name=WriteLatency,type=Table","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                                          |
-| Cassandra | Latency: Client request read median                                      | <p>Total latency serving data to clients in milliseconds - median.</p>                                                                                                                               | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency","50thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                            |
-| Cassandra | Latency: Client request read 75 percentile                               | <p>Total latency serving data to clients in milliseconds - p75.</p>                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                            |
-| Cassandra | Latency: Client request read 95 percentile                               | <p>Total latency serving data to clients in milliseconds - p95.</p>                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                            |
-| Cassandra | Latency: Client request write median                                     | <p>Total latency serving write requests from clients in milliseconds - median.</p>                                                                                                                   | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency","50thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                           |
-| Cassandra | Latency: Client request write 75 percentile                              | <p>Total latency serving write requests from clients in milliseconds - p75.</p>                                                                                                                      | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                           |
-| Cassandra | Latency: Client request write 95 percentile                              | <p>Total latency serving write requests from clients in milliseconds - p95.</p>                                                                                                                      | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                                           |
-| Cassandra | KeyCache: Capacity                                                       | <p>Cache capacity in bytes.</p>                                                                                                                                                                      | JMX  | jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Capacity","Value"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                          |
-| Cassandra | KeyCache: Entries                                                        | <p>Total number of cache entries.</p>                                                                                                                                                                | JMX  | jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Entries","Value"]                                                                                                              |
-| Cassandra | KeyCache: HitRate                                                        | <p>All time cache hit rate.</p>                                                                                                                                                                      | JMX  | jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=HitRate","Value"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p>                                                           |
-| Cassandra | KeyCache: Hits per second                                                | <p>Rate of cache hits.</p>                                                                                                                                                                           | JMX  | jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Hits","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                                  |
-| Cassandra | KeyCache: requests per second                                            | <p>Rate of cache requests.</p>                                                                                                                                                                       | JMX  | jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Requests","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                              |
-| Cassandra | KeyCache: Size                                                           | <p>Total size of occupied cache, in bytes.</p>                                                                                                                                                       | JMX  | jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Size","Value"]                                                                                                                 |
-| Cassandra | Client connections: Native                                               | <p>Number of clients connected to this nodes native protocol server.</p>                                                                                                                             | JMX  | jmx["org.apache.cassandra.metrics:type=Client,name=connectedNativeClients","Value"]                                                                                                             |
-| Cassandra | Client connections: Trifts                                               | <p>Number of connected to this nodes thrift clients.</p>                                                                                                                                             | JMX  | jmx["org.apache.cassandra.metrics:type=Client,name=connectedThriftClients","Value"]                                                                                                             |
-| Cassandra | Client request: Read per second                                          | <p>The number of client requests per second.</p>                                                                                                                                                     | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                           |
-| Cassandra | Client request: Write per second                                         | <p>The number of local write requests per second.</p>                                                                                                                                                | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                          |
-| Cassandra | Client request: Write Timeouts                                           | <p>Number of write requests timeouts encountered.</p>                                                                                                                                                | JMX  | jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Timeouts","Count"]                                                                                                        |
-| Cassandra | Thread pool.MutationStage: Pending tasks                                 | <p>Number of queued tasks queued up on this pool.</p><p>MutationStage:	Responsible for writes (exclude materialized and counter writes).</p>                                                         | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=MutationStage,name=PendingTasks","Value"]                                                                                 |
-| Cassandra | Thread pool MutationStage: Currently blocked task                        | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MutationStage:	Responsible for writes (exclude materialized and counter writes).</p> | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=MutationStage,name=CurrentlyBlockedTasks","Count"]                                                                        |
-| Cassandra | Thread pool MutationStage: Total blocked tasks                           | <p>Number of tasks that were blocked due to queue saturation.</p><p>MutationStage:	Responsible for writes (exclude materialized and counter writes).</p>                                             | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=MutationStage,name=TotalBlockedTasks","Count"]                                                                            |
-| Cassandra | Thread pool CounterMutationStage: Pending tasks                          | <p>Number of queued tasks queued up on this pool.</p><p>CounterMutationStage:	Responsible for counter writes.</p>                                                                                    | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=CounterMutationStage,name=PendingTasks","Value"]                                                                          |
-| Cassandra | Thread pool CounterMutationStage: Currently blocked task                 | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>CounterMutationStage:	Responsible for counter writes.</p>                            | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=CounterMutationStage,name=CurrentlyBlockedTasks","Count"]                                                                 |
-| Cassandra | Thread pool CounterMutationStage: Total blocked tasks                    | <p>Number of tasks that were blocked due to queue saturation.</p><p>CounterMutationStage:	Responsible for counter writes.</p>                                                                        | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=CounterMutationStage,name=TotalBlockedTasks","Count"]                                                                     |
-| Cassandra | Thread pool ReadStage: Pending tasks                                     | <p>Number of queued tasks queued up on this pool.</p><p>ReadStage:	Local reads run on this thread pool.</p>                                                                                          | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadStage,name=PendingTasks","Value"]                                                                                     |
-| Cassandra | Thread pool ReadStage: Currently blocked task                            | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>ReadStage:	Local reads run on this thread pool.</p>                                  | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadStage,name=CurrentlyBlockedTasks","Count"]                                                                            |
-| Cassandra | Thread pool ReadStage: Total blocked tasks                               | <p>Number of tasks that were blocked due to queue saturation.</p><p>ReadStage:	Local reads run on this thread pool.</p>                                                                              | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadStage,name=TotalBlockedTasks","Count"]                                                                                |
-| Cassandra | Thread pool ViewMutationStage: Pending tasks                             | <p>Number of queued tasks queued up on this pool.</p><p>ViewMutationStage:	Responsible for materialized view writes.</p>                                                                             | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ViewMutationStage,name=PendingTasks","Value"]                                                                             |
-| Cassandra | Thread pool ViewMutationStage: Currently blocked task                    | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>ViewMutationStage:	Responsible for materialized view writes.</p>                     | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ViewMutationStage,name=CurrentlyBlockedTasks","Count"]                                                                    |
-| Cassandra | Thread pool ViewMutationStage: Total blocked tasks                       | <p>Number of tasks that were blocked due to queue saturation.</p><p>ViewMutationStage:	Responsible for materialized view writes.</p>                                                                 | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ViewMutationStage,name=TotalBlockedTasks","Count"]                                                                        |
-| Cassandra | Thread pool MemtableFlushWriter: Pending tasks                           | <p>Number of queued tasks queued up on this pool.</p><p>MemtableFlushWriter:	Writes memtables to disk.</p>                                                                                           | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtableFlushWriter,name=PendingTasks","Value"]                                                                          |
-| Cassandra | Thread pool MemtableFlushWriter: Currently blocked task                  | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MemtableFlushWriter:	Writes memtables to disk.</p>                                   | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtableFlushWriter,name=CurrentlyBlockedTasks","Count"]                                                                 |
-| Cassandra | Thread pool MemtableFlushWriter: Total blocked tasks                     | <p>Number of tasks that were blocked due to queue saturation.</p><p>MemtableFlushWriter:	Writes memtables to disk.</p>                                                                               | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtableFlushWriter,name=TotalBlockedTasks","Count"]                                                                     |
-| Cassandra | Thread pool HintsDispatcher: Pending tasks                               | <p>Number of queued tasks queued up on this pool.</p><p>HintsDispatcher:	Performs hinted handoff.</p>                                                                                                | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=HintsDispatcher,name=PendingTasks","Value"]                                                                              |
-| Cassandra | Thread pool HintsDispatcher: Currently blocked task                      | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>HintsDispatcher:	Performs hinted handoff.</p>                                        | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=HintsDispatcher,name=CurrentlyBlockedTasks","Count"]                                                                     |
-| Cassandra | Thread pool HintsDispatcher: Total blocked tasks                         | <p>Number of tasks that were blocked due to queue saturation.</p><p>HintsDispatcher:	Performs hinted handoff.</p>                                                                                    | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=HintsDispatcher,name=TotalBlockedTasks","Count"]                                                                         |
-| Cassandra | Thread pool MemtablePostFlush: Pending tasks                             | <p>Number of queued tasks queued up on this pool.</p><p>MemtablePostFlush:	Cleans up commit log after memtable is written to disk.</p>                                                               | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtablePostFlush,name=PendingTasks","Value"]                                                                            |
-| Cassandra | Thread pool MemtablePostFlush: Currently blocked task                    | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MemtablePostFlush:	Cleans up commit log after memtable is written to disk.</p>       | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtablePostFlush,name=CurrentlyBlockedTasks","Count"]                                                                   |
-| Cassandra | Thread pool MemtablePostFlush: Total blocked tasks                       | <p>Number of tasks that were blocked due to queue saturation.</p><p>MemtablePostFlush:	Cleans up commit log after memtable is written to disk.</p>                                                   | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtablePostFlush,name=TotalBlockedTasks","Count"]                                                                       |
-| Cassandra | Thread pool MigrationStage: Pending tasks                                | <p>Number of queued tasks queued up on this pool.</p><p>MigrationStage:	Runs schema migrations.</p>                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MigrationStage,name=PendingTasks","Value"]                                                                               |
-| Cassandra | Thread pool MigrationStage: Currently blocked task                       | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MigrationStage:	Runs schema migrations.</p>                                          | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MigrationStage,name=CurrentlyBlockedTasks","Count"]                                                                      |
-| Cassandra | Thread pool MigrationStage: Total blocked tasks                          | <p>Number of tasks that were blocked due to queue saturation.</p><p>MigrationStage:	Runs schema migrations.</p>                                                                                      | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MigrationStage,name=TotalBlockedTasks","Count"]                                                                          |
-| Cassandra | Thread pool MiscStage: Pending tasks                                     | <p>Number of queued tasks queued up on this pool.</p><p>MiscStage:	Misceleneous tasks run here.</p>                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MiscStage,name=PendingTasks","Value"]                                                                                    |
-| Cassandra | Thread pool MiscStage: Currently blocked task                            | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MiscStage:	Misceleneous tasks run here.</p>                                          | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MiscStage,name=CurrentlyBlockedTasks","Count"]                                                                           |
-| Cassandra | Thread pool MiscStage: Total blocked tasks                               | <p>Number of tasks that were blocked due to queue saturation.</p><p>MiscStage:	Misceleneous tasks run here.</p>                                                                                      | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MiscStage,name=TotalBlockedTasks","Count"]                                                                               |
-| Cassandra | Thread pool SecondaryIndexManagement: Pending tasks                      | <p>Number of queued tasks queued up on this pool.</p><p>SecondaryIndexManagement:	Performs updates to secondary indexes.</p>                                                                         | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=SecondaryIndexManagement,name=PendingTasks","Value"]                                                                     |
-| Cassandra | Thread pool SecondaryIndexManagement: Currently blocked task             | <p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>SecondaryIndexManagement:	Performs updates to secondary indexes.</p>                 | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=SecondaryIndexManagement,name=CurrentlyBlockedTasks","Count"]                                                            |
-| Cassandra | Thread pool SecondaryIndexManagement: Total blocked tasks                | <p>Number of tasks that were blocked due to queue saturation.</p><p>SecondaryIndexManagement:	Performs updates to secondary indexes.</p>                                                             | JMX  | jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=SecondaryIndexManagement,name=TotalBlockedTasks","Count"]                                                                |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: SS Tables per read 75 percentile             | <p>The number of SSTable data files accessed per read - p75.</p>                                                                                                                                     | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=SSTablesPerReadHistogram","75thPercentile"]                                                         |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: SS Tables per read 95 percentile             | <p>The number of SSTable data files accessed per read - p95.</p>                                                                                                                                     | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=SSTablesPerReadHistogram","95thPercentile"]                                                         |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Tombstone scanned 75 percentile              | <p>Number of tombstones scanned per read - p75.</p>                                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=TombstoneScannedHistogram","75thPercentile"]                                                        |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Tombstone scanned 95 percentile              | <p>Number of tombstones scanned per read - p95.</p>                                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=TombstoneScannedHistogram","95thPercentile"]                                                        |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Waiting on free memtable space 75 percentile | <p>The time spent waiting for free memtable space either on- or off-heap - p75.</p>                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WaitingOnFreeMemtableSpace","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>  |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Waiting on free memtable space95 percentile  | <p>The time spent waiting for free memtable space either on- or off-heap - p95.</p>                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WaitingOnFreeMemtableSpace","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>  |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Col update time delta75 percentile           | <p>The column update time delta - p75.</p>                                                                                                                                                           | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ColUpdateTimeDeltaHistogram","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Col update time delta 95 percentile          | <p>The column update time delta - p95.</p>                                                                                                                                                           | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ColUpdateTimeDeltaHistogram","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Bloom filter false ratio                     | <p>The ratio of Bloom filter false positives to total checks.</p>                                                                                                                                    | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=BloomFilterFalseRatio","Value"]                                                                     |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Compression ratio                            | <p>The compression ratio for all SSTables.</p>                                                                                                                                                       | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=CompressionRatio","Value"]                                                                          |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: KeyCache hit rate                            | <p>The key cache hit rate.</p>                                                                                                                                                                       | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=KeyCacheHitRate","Value"]                                                                           |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Live SS Table                                | <p>Number of "live" (in use) SSTables.</p>                                                                                                                                                           | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=LiveSSTableCount","Value"]                                                                          |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Max sartition size                           | <p>The size of the largest compacted partition.</p>                                                                                                                                                  | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=MaxPartitionSize","Value"]                                                                          |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Mean partition size                          | <p>The average size of compacted partition.</p>                                                                                                                                                      | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=MeanPartitionSize","Value"]                                                                         |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Pending compactions                          | <p>The number of pending compactions.</p>                                                                                                                                                            | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=PendingCompactions","Value"]                                                                        |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Snapshots size                               | <p>The disk space truly used by snapshots.</p>                                                                                                                                                       | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=SnapshotsSize","Value"]                                                                             |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Compaction bytes written                     | <p>The amount of data that was compacted since (re)start.</p>                                                                                                                                        | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=CompactionBytesWritten","Count"]                                                                    |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Bytes flushed                                | <p>The amount of data that was flushed since (re)start.</p>                                                                                                                                          | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=BytesFlushed","Count"]                                                                              |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Pending flushes                              | <p>The number of pending flushes.</p>                                                                                                                                                                | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=PendingFlushes","Count"]                                                                            |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Live disk space used                         | <p>The disk space used by "live" SSTables (only counts in use files).</p>                                                                                                                            | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=LiveDiskSpaceUsed","Count"]                                                                         |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Disk space used                              | <p>Disk space used.</p>                                                                                                                                                                              | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=TotalDiskSpaceUsed","Count"]                                                                        |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Out of row cache hits                        | <p>The number of row cache hits that do not satisfy the query filter and went to disk.</p>                                                                                                           | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=RowCacheHitOutOfRange","Count"]                                                                     |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Row cache hits                               | <p>The number of row cache hits.</p>                                                                                                                                                                 | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=RowCacheHit","Count"]                                                                               |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Row cache misses                             | <p>The number of table row cache misses.</p>                                                                                                                                                         | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=RowCacheMiss","Count"]                                                                              |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Read latency 75 percentile                   | <p>Latency read from disk in milliseconds.</p>                                                                                                                                                       | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ReadLatency","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                 |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Read latency 95 percentile                   | <p>Latency read from disk in milliseconds.</p>                                                                                                                                                       | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ReadLatency","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                 |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Read per second                              | <p>The number of client requests per second.</p>                                                                                                                                                     | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ReadLatency","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Write latency 75 percentile                  | <p>Latency write to disk in milliseconds.</p>                                                                                                                                                        | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WriteLatency","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Write latency 95 percentile                  | <p>Latency write to disk in milliseconds.</p>                                                                                                                                                        | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WriteLatency","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p>                |
-| Cassandra | {#JMXKEYSPACE}.{#JMXSCOPE}: Write per second                             | <p>The number of local write requests per second.</p>                                                                                                                                                | JMX  | jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WriteLatency","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                               |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Cassandra |Cluster: Nodes down |<p>-</p> |JMX |jmx["org.apache.cassandra.net:type=FailureDetector","DownEndpointCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Cassandra |Cluster: Nodes up |<p>-</p> |JMX |jmx["org.apache.cassandra.net:type=FailureDetector","UpEndpointCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Cassandra |Cluster: Name |<p>-</p> |JMX |jmx["org.apache.cassandra.db:type=StorageService","ClusterName"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Cassandra |Version |<p>-</p> |JMX |jmx["org.apache.cassandra.db:type=StorageService","ReleaseVersion"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Cassandra |Dropped messages: Write (Mutation) |<p>Number of dropped regular writes messages.</p> |JMX |jmx["org.apache.cassandra.metrics:type=DroppedMessage,scope=MUTATION,name=Dropped","Count"] |
+|Cassandra |Dropped messages: Read |<p>Number of dropped regular reads messages.</p> |JMX |jmx["org.apache.cassandra.metrics:type=DroppedMessage,scope=READ,name=Dropped","Count"] |
+|Cassandra |Storage: Used (bytes) |<p>Size, in bytes, of the on disk data size this node manages.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Storage,name=Load","Count"] |
+|Cassandra |Storage: Errors |<p>Number of internal exceptions caught. Under normal exceptions this should be zero.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Storage,name=Exceptions","Count"] |
+|Cassandra |Storage: Hints |<p>Number of hint messages written to this node since [re]start. Includes one entry for each host to be hinted per hint.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Storage,name=TotalHints","Count"] |
+|Cassandra |Compaction: Number of completed tasks |<p>Number of completed compactions since server [re]start.</p> |JMX |jmx["org.apache.cassandra.metrics:name=CompletedTasks,type=Compaction","Value"] |
+|Cassandra |Compaction: Total compactions completed |<p>Throughput of completed compactions since server [re]start.</p> |JMX |jmx["org.apache.cassandra.metrics:name=TotalCompactionsCompleted,type=Compaction","Count"] |
+|Cassandra |Compaction: Pending tasks |<p>Estimated number of compactions remaining to perform.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Compaction,name=PendingTasks","Value"] |
+|Cassandra |Commitlog: Pending tasks |<p>Number of commit log messages written but yet to be fsync'd.</p> |JMX |jmx["org.apache.cassandra.metrics:name=PendingTasks,type=CommitLog","Value"] |
+|Cassandra |Commitlog: Total size |<p>Current size, in bytes, used by all the commit log segments.</p> |JMX |jmx["org.apache.cassandra.metrics:name=TotalCommitLogSize,type=CommitLog","Value"] |
+|Cassandra |Latency: Read median |<p>Latency read from disk in milliseconds - median.</p> |JMX |jmx["org.apache.cassandra.metrics:name=ReadLatency,type=Table","50thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Read 75 percentile |<p>Latency read from disk in milliseconds - p75.</p> |JMX |jmx["org.apache.cassandra.metrics:name=ReadLatency,type=Table","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Read 95 percentile |<p>Latency read from disk in milliseconds - p95.</p> |JMX |jmx["org.apache.cassandra.metrics:name=ReadLatency,type=Table","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Write median |<p>Latency write to disk in milliseconds - median.</p> |JMX |jmx["org.apache.cassandra.metrics:name=WriteLatency,type=Table","50thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Write 75 percentile |<p>Latency write to disk in milliseconds - p75.</p> |JMX |jmx["org.apache.cassandra.metrics:name=WriteLatency,type=Table","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Write 95 percentile |<p>Latency write to disk in milliseconds - p95.</p> |JMX |jmx["org.apache.cassandra.metrics:name=WriteLatency,type=Table","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Client request read median |<p>Total latency serving data to clients in milliseconds - median.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency","50thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Client request read 75 percentile |<p>Total latency serving data to clients in milliseconds - p75.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Client request read 95 percentile |<p>Total latency serving data to clients in milliseconds - p95.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Client request write median |<p>Total latency serving write requests from clients in milliseconds - median.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency","50thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Client request write 75 percentile |<p>Total latency serving write requests from clients in milliseconds - p75.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |Latency: Client request write 95 percentile |<p>Total latency serving write requests from clients in milliseconds - p95.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |KeyCache: Capacity |<p>Cache capacity in bytes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Capacity","Value"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Cassandra |KeyCache: Entries |<p>Total number of cache entries.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Entries","Value"] |
+|Cassandra |KeyCache: HitRate |<p>All time cache hit rate.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=HitRate","Value"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p> |
+|Cassandra |KeyCache: Hits per second |<p>Rate of cache hits.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Hits","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Cassandra |KeyCache: requests per second |<p>Rate of cache requests.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Requests","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Cassandra |KeyCache: Size |<p>Total size of occupied cache, in bytes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Cache,scope=KeyCache,name=Size","Value"] |
+|Cassandra |Client connections: Native |<p>Number of clients connected to this nodes native protocol server.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Client,name=connectedNativeClients","Value"] |
+|Cassandra |Client connections: Trifts |<p>Number of connected to this nodes thrift clients.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Client,name=connectedThriftClients","Value"] |
+|Cassandra |Client request: Read per second |<p>The number of client requests per second.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Read,name=Latency","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Cassandra |Client request: Write per second |<p>The number of local write requests per second.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Latency","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Cassandra |Client request: Write Timeouts |<p>Number of write requests timeouts encountered.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ClientRequest,scope=Write,name=Timeouts","Count"] |
+|Cassandra |Thread pool.MutationStage: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>MutationStage: Responsible for writes (exclude materialized and counter writes).</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=MutationStage,name=PendingTasks","Value"] |
+|Cassandra |Thread pool MutationStage: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MutationStage: Responsible for writes (exclude materialized and counter writes).</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=MutationStage,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool MutationStage: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>MutationStage: Responsible for writes (exclude materialized and counter writes).</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=MutationStage,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool CounterMutationStage: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>CounterMutationStage: Responsible for counter writes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=CounterMutationStage,name=PendingTasks","Value"] |
+|Cassandra |Thread pool CounterMutationStage: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>CounterMutationStage: Responsible for counter writes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=CounterMutationStage,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool CounterMutationStage: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>CounterMutationStage: Responsible for counter writes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=CounterMutationStage,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool ReadStage: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>ReadStage: Local reads run on this thread pool.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadStage,name=PendingTasks","Value"] |
+|Cassandra |Thread pool ReadStage: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>ReadStage: Local reads run on this thread pool.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadStage,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool ReadStage: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>ReadStage: Local reads run on this thread pool.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ReadStage,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool ViewMutationStage: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>ViewMutationStage: Responsible for materialized view writes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ViewMutationStage,name=PendingTasks","Value"] |
+|Cassandra |Thread pool ViewMutationStage: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>ViewMutationStage: Responsible for materialized view writes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ViewMutationStage,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool ViewMutationStage: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>ViewMutationStage: Responsible for materialized view writes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=request,scope=ViewMutationStage,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool MemtableFlushWriter: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>MemtableFlushWriter: Writes memtables to disk.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtableFlushWriter,name=PendingTasks","Value"] |
+|Cassandra |Thread pool MemtableFlushWriter: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MemtableFlushWriter: Writes memtables to disk.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtableFlushWriter,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool MemtableFlushWriter: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>MemtableFlushWriter: Writes memtables to disk.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtableFlushWriter,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool HintsDispatcher: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>HintsDispatcher: Performs hinted handoff.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=HintsDispatcher,name=PendingTasks","Value"] |
+|Cassandra |Thread pool HintsDispatcher: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>HintsDispatcher: Performs hinted handoff.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=HintsDispatcher,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool HintsDispatcher: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>HintsDispatcher: Performs hinted handoff.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=HintsDispatcher,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool MemtablePostFlush: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>MemtablePostFlush: Cleans up commit log after memtable is written to disk.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtablePostFlush,name=PendingTasks","Value"] |
+|Cassandra |Thread pool MemtablePostFlush: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MemtablePostFlush: Cleans up commit log after memtable is written to disk.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtablePostFlush,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool MemtablePostFlush: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>MemtablePostFlush: Cleans up commit log after memtable is written to disk.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MemtablePostFlush,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool MigrationStage: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>MigrationStage: Runs schema migrations.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MigrationStage,name=PendingTasks","Value"] |
+|Cassandra |Thread pool MigrationStage: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MigrationStage: Runs schema migrations.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MigrationStage,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool MigrationStage: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>MigrationStage: Runs schema migrations.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MigrationStage,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool MiscStage: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>MiscStage: Miscellaneous tasks run here.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MiscStage,name=PendingTasks","Value"] |
+|Cassandra |Thread pool MiscStage: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>MiscStage: Miscellaneous tasks run here.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MiscStage,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool MiscStage: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>MiscStage: Miscellaneous tasks run here.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=MiscStage,name=TotalBlockedTasks","Count"] |
+|Cassandra |Thread pool SecondaryIndexManagement: Pending tasks |<p>Number of queued tasks queued up on this pool.</p><p>SecondaryIndexManagement: Performs updates to secondary indexes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=SecondaryIndexManagement,name=PendingTasks","Value"] |
+|Cassandra |Thread pool SecondaryIndexManagement: Currently blocked task |<p>Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.</p><p>SecondaryIndexManagement: Performs updates to secondary indexes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=SecondaryIndexManagement,name=CurrentlyBlockedTasks","Count"] |
+|Cassandra |Thread pool SecondaryIndexManagement: Total blocked tasks |<p>Number of tasks that were blocked due to queue saturation.</p><p>SecondaryIndexManagement: Performs updates to secondary indexes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=ThreadPools,path=internal,scope=SecondaryIndexManagement,name=TotalBlockedTasks","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: SS Tables per read 75 percentile |<p>The number of SSTable data files accessed per read - p75.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=SSTablesPerReadHistogram","75thPercentile"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: SS Tables per read 95 percentile |<p>The number of SSTable data files accessed per read - p95.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=SSTablesPerReadHistogram","95thPercentile"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Tombstone scanned 75 percentile |<p>Number of tombstones scanned per read - p75.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=TombstoneScannedHistogram","75thPercentile"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Tombstone scanned 95 percentile |<p>Number of tombstones scanned per read - p95.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=TombstoneScannedHistogram","95thPercentile"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Waiting on free memtable space 75 percentile |<p>The time spent waiting for free memtable space either on- or off-heap - p75.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WaitingOnFreeMemtableSpace","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Waiting on free memtable space95 percentile |<p>The time spent waiting for free memtable space either on- or off-heap - p95.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WaitingOnFreeMemtableSpace","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Col update time delta75 percentile |<p>The column update time delta - p75.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ColUpdateTimeDeltaHistogram","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Col update time delta 95 percentile |<p>The column update time delta - p95.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ColUpdateTimeDeltaHistogram","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Bloom filter false ratio |<p>The ratio of Bloom filter false positives to total checks.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=BloomFilterFalseRatio","Value"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Compression ratio |<p>The compression ratio for all SSTables.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=CompressionRatio","Value"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: KeyCache hit rate |<p>The key cache hit rate.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=KeyCacheHitRate","Value"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Live SS Table |<p>Number of "live" (in use) SSTables.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=LiveSSTableCount","Value"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Max sartition size |<p>The size of the largest compacted partition.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=MaxPartitionSize","Value"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Mean partition size |<p>The average size of compacted partition.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=MeanPartitionSize","Value"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Pending compactions |<p>The number of pending compactions.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=PendingCompactions","Value"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Snapshots size |<p>The disk space truly used by snapshots.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=SnapshotsSize","Value"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Compaction bytes written |<p>The amount of data that was compacted since (re)start.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=CompactionBytesWritten","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Bytes flushed |<p>The amount of data that was flushed since (re)start.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=BytesFlushed","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Pending flushes |<p>The number of pending flushes.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=PendingFlushes","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Live disk space used |<p>The disk space used by "live" SSTables (only counts in use files).</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=LiveDiskSpaceUsed","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Disk space used |<p>Disk space used.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=TotalDiskSpaceUsed","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Out of row cache hits |<p>The number of row cache hits that do not satisfy the query filter and went to disk.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=RowCacheHitOutOfRange","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Row cache hits |<p>The number of row cache hits.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=RowCacheHit","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Row cache misses |<p>The number of table row cache misses.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=RowCacheMiss","Count"] |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Read latency 75 percentile |<p>Latency read from disk in milliseconds.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ReadLatency","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Read latency 95 percentile |<p>Latency read from disk in milliseconds.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ReadLatency","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Read per second |<p>The number of client requests per second.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ReadLatency","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Write latency 75 percentile |<p>Latency write to disk in milliseconds.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WriteLatency","75thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Write latency 95 percentile |<p>Latency write to disk in milliseconds.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WriteLatency","95thPercentile"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
+|Cassandra |{#JMXKEYSPACE}.{#JMXSCOPE}: Write per second |<p>The number of local write requests per second.</p> |JMX |jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=WriteLatency","Count"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
-| Name                                                                      | Description                                                           | Expression                                                                                                                                                                                        | Severity | Dependencies and additional info                                                                         |
-|---------------------------------------------------------------------------|-----------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------------------------------------------------------------------------------|
-| There are down nodes in cluster                                           | <p>-</p>                                                              | `{TEMPLATE_NAME:jmx["org.apache.cassandra.net:type=FailureDetector","DownEndpointCount"].last()}>0`                                                                                               | AVERAGE  |                                                                                                          |
-| Version has changed (new version: {ITEM.VALUE})                           | <p>Cassandra version has changed. Ack to close.</p>                   | `{TEMPLATE_NAME:jmx["org.apache.cassandra.db:type=StorageService","ReleaseVersion"].diff()}=1 and {TEMPLATE_NAME:jmx["org.apache.cassandra.db:type=StorageService","ReleaseVersion"].strlen()}>0` | INFO     | <p>Manual close: YES</p>                                                                                 |
-| Failed to fetch info data (or no data for 15m)                            | <p>Zabbix has not received data for items for the last 15 minutes</p> | `{TEMPLATE_NAME:jmx["org.apache.cassandra.metrics:type=Storage,name=Load","Count"].nodata(15m)}=1`                                                                                                | WARNING  |                                                                                                          |
-| Too many storage exceptions                                               | <p>-</p>                                                              | `{TEMPLATE_NAME:jmx["org.apache.cassandra.metrics:type=Storage,name=Exceptions","Count"].min(5m)}>0`                                                                                              | WARNING  |                                                                                                          |
-| Many pending tasks (over {$CASSANDRA.PENDING_TASKS.MAX.WARN} for 15m)     | <p>-</p>                                                              | `{TEMPLATE_NAME:jmx["org.apache.cassandra.metrics:type=Compaction,name=PendingTasks","Value"].min(15m)}>{$CASSANDRA.PENDING_TASKS.MAX.WARN}`                                                      | WARNING  | <p>**Depends on**:</p><p>- Too many pending tasks (over {$CASSANDRA.PENDING_TASKS.MAX.HIGH} for 15m)</p> |
-| Too many pending tasks (over {$CASSANDRA.PENDING_TASKS.MAX.HIGH} for 15m) | <p>-</p>                                                              | `{TEMPLATE_NAME:jmx["org.apache.cassandra.metrics:type=Compaction,name=PendingTasks","Value"].min(15m)}>{$CASSANDRA.PENDING_TASKS.MAX.HIGH}`                                                      | AVERAGE  |                                                                                                          |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|There are down nodes in cluster |<p>-</p> |`last(/Apache Cassandra by JMX/jmx["org.apache.cassandra.net:type=FailureDetector","DownEndpointCount"])>0` |AVERAGE | |
+|Version has changed (new version: {ITEM.VALUE}) |<p>Cassandra version has changed. Ack to close.</p> |`last(/Apache Cassandra by JMX/jmx["org.apache.cassandra.db:type=StorageService","ReleaseVersion"],#1)<>last(/Apache Cassandra by JMX/jmx["org.apache.cassandra.db:type=StorageService","ReleaseVersion"],#2) and length(last(/Apache Cassandra by JMX/jmx["org.apache.cassandra.db:type=StorageService","ReleaseVersion"]))>0` |INFO |<p>Manual close: YES</p> |
+|Failed to fetch info data (or no data for 15m) |<p>Zabbix has not received data for items for the last 15 minutes</p> |`nodata(/Apache Cassandra by JMX/jmx["org.apache.cassandra.metrics:type=Storage,name=Load","Count"],15m)=1` |WARNING | |
+|Too many storage exceptions |<p>-</p> |`min(/Apache Cassandra by JMX/jmx["org.apache.cassandra.metrics:type=Storage,name=Exceptions","Count"],5m)>0` |WARNING | |
+|Many pending tasks (over {$CASSANDRA.PENDING_TASKS.MAX.WARN} for 15m) |<p>-</p> |`min(/Apache Cassandra by JMX/jmx["org.apache.cassandra.metrics:type=Compaction,name=PendingTasks","Value"],15m)>{$CASSANDRA.PENDING_TASKS.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Too many pending tasks (over {$CASSANDRA.PENDING_TASKS.MAX.HIGH} for 15m)</p> |
+|Too many pending tasks (over {$CASSANDRA.PENDING_TASKS.MAX.HIGH} for 15m) |<p>-</p> |`min(/Apache Cassandra by JMX/jmx["org.apache.cassandra.metrics:type=Compaction,name=PendingTasks","Value"],15m)>{$CASSANDRA.PENDING_TASKS.MAX.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml b/templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml
index c026d1a5a81..43aa51185c0 100644
--- a/templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml
+++ b/templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:42Z'
+  version: '6.0'
+  date: '2022-01-10T07:41:19Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/410057-discussion-thread-for-official-zabbix-template-apache-cassandra
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -94,7 +94,7 @@ zabbix_export:
           history: 7d
           username: '{$CASSANDRA.USER}'
           password: '{$CASSANDRA.PASSWORD}'
-          description: 'Number of commit log messages written but yet to be fsync’d.'
+          description: 'Number of commit log messages written but yet to be fsync''d.'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -699,7 +699,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            HintsDispatcher:Performs hinted handoff.
+            HintsDispatcher: Performs hinted handoff.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -715,7 +715,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            HintsDispatcher:Performs hinted handoff.
+            HintsDispatcher: Performs hinted handoff.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -731,7 +731,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            HintsDispatcher:Performs hinted handoff.
+            HintsDispatcher: Performs hinted handoff.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -747,7 +747,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            MemtableFlushWriter:Writes memtables to disk.
+            MemtableFlushWriter: Writes memtables to disk.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -763,7 +763,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            MemtableFlushWriter:Writes memtables to disk.
+            MemtableFlushWriter: Writes memtables to disk.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -779,7 +779,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            MemtableFlushWriter:Writes memtables to disk.
+            MemtableFlushWriter: Writes memtables to disk.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -795,7 +795,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            MemtablePostFlush:Cleans up commit log after memtable is written to disk.
+            MemtablePostFlush: Cleans up commit log after memtable is written to disk.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -811,7 +811,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            MemtablePostFlush:Cleans up commit log after memtable is written to disk.
+            MemtablePostFlush: Cleans up commit log after memtable is written to disk.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -827,7 +827,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            MemtablePostFlush:Cleans up commit log after memtable is written to disk.
+            MemtablePostFlush: Cleans up commit log after memtable is written to disk.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -843,7 +843,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            MigrationStage:Runs schema migrations.
+            MigrationStage: Runs schema migrations.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -859,7 +859,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            MigrationStage:Runs schema migrations.
+            MigrationStage: Runs schema migrations.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -875,7 +875,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            MigrationStage:Runs schema migrations.
+            MigrationStage: Runs schema migrations.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -891,7 +891,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            MiscStage:Misceleneous tasks run here.
+            MiscStage: Miscellaneous tasks run here.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -907,7 +907,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            MiscStage:Misceleneous tasks run here.
+            MiscStage: Miscellaneous tasks run here.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -923,7 +923,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            MiscStage:Misceleneous tasks run here.
+            MiscStage: Miscellaneous tasks run here.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -939,7 +939,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            SecondaryIndexManagement:Performs updates to secondary indexes.
+            SecondaryIndexManagement: Performs updates to secondary indexes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -955,7 +955,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            SecondaryIndexManagement:Performs updates to secondary indexes.
+            SecondaryIndexManagement: Performs updates to secondary indexes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -971,7 +971,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            SecondaryIndexManagement:Performs updates to secondary indexes.
+            SecondaryIndexManagement: Performs updates to secondary indexes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -987,7 +987,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            CounterMutationStage:Responsible for counter writes.
+            CounterMutationStage: Responsible for counter writes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1003,7 +1003,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            CounterMutationStage:Responsible for counter writes.
+            CounterMutationStage: Responsible for counter writes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1019,7 +1019,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            CounterMutationStage:Responsible for counter writes.
+            CounterMutationStage: Responsible for counter writes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1035,7 +1035,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            MutationStage:Responsible for writes (exclude materialized and counter writes).
+            MutationStage: Responsible for writes (exclude materialized and counter writes).
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1051,7 +1051,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            MutationStage:Responsible for writes (exclude materialized and counter writes).
+            MutationStage: Responsible for writes (exclude materialized and counter writes).
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1067,7 +1067,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            MutationStage:Responsible for writes (exclude materialized and counter writes).
+            MutationStage: Responsible for writes (exclude materialized and counter writes).
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1083,7 +1083,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            ReadStage:Local reads run on this thread pool.
+            ReadStage: Local reads run on this thread pool.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1099,7 +1099,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            ReadStage:Local reads run on this thread pool.
+            ReadStage: Local reads run on this thread pool.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1115,7 +1115,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            ReadStage:Local reads run on this thread pool.
+            ReadStage: Local reads run on this thread pool.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1131,7 +1131,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that are currently blocked due to queue saturation but on retry will become unblocked.
-            ViewMutationStage:Responsible for materialized view writes.
+            ViewMutationStage: Responsible for materialized view writes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1147,7 +1147,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of queued tasks queued up on this pool.
-            ViewMutationStage:Responsible for materialized view writes.
+            ViewMutationStage: Responsible for materialized view writes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
@@ -1163,7 +1163,7 @@ zabbix_export:
           password: '{$CASSANDRA.PASSWORD}'
           description: |
             Number of tasks that were blocked due to queue saturation.
-            ViewMutationStage:Responsible for materialized view writes.
+            ViewMutationStage: Responsible for materialized view writes.
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
diff --git a/templates/db/clickhouse_http/README.md b/templates/db/clickhouse_http/README.md
index 491b55351ae..1e07fbf9d6d 100644
--- a/templates/db/clickhouse_http/README.md
+++ b/templates/db/clickhouse_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor ClickHouse by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -20,7 +20,7 @@ This template was tested on:
 Create a user to monitor the service:
 
 ```
-create file /etc/clickhouse-server/users.d/zabbix.xml 
+create file /etc/clickhouse-server/users.d/zabbix.xml
 <yandex>
     <users>
       <zabbix>
@@ -32,8 +32,8 @@ create file /etc/clickhouse-server/users.d/zabbix.xml
           <database>test</database>
         </allow_databases>
       </zabbix>
-    </user>
-  </yandex>   
+    </users>
+  </yandex>
 
 ```
 
@@ -50,24 +50,24 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                                   | Description                                                                                     | Default            |
-|--------------------------------------------------------|-------------------------------------------------------------------------------------------------|--------------------|
-| {$CLICKHOUSE.DELAYED.FILES.DISTRIBUTED.COUNT.MAX.WARN} | <p>Maximum size of distributed files queue to insert for trigger expression.</p>                | `600`              |
-| {$CLICKHOUSE.DELAYED.INSERTS.MAX.WARN}                 | <p>Maximum number of delayed inserts for trigger expression.</p>                                | `0`                |
-| {$CLICKHOUSE.LLD.FILTER.DB.MATCHES}                    | <p>Filter of discoverable databases</p>                                                         | `.*`               |
-| {$CLICKHOUSE.LLD.FILTER.DB.NOT_MATCHES}                | <p>Filter to exclude discovered databases</p>                                                   | `CHANGE_IF_NEEDED` |
-| {$CLICKHOUSE.LLD.FILTER.DICT.MATCHES}                  | <p>Filter of discoverable dictionaries</p>                                                      | `.*`               |
-| {$CLICKHOUSE.LLD.FILTER.DICT.NOT_MATCHES}              | <p>Filter to exclude discovered dictionaries</p>                                                | `CHANGE_IF_NEEDED` |
-| {$CLICKHOUSE.LOG_POSITION.DIFF.MAX.WARN}               | <p>Maximum diff between log_pointer and log_max_index.</p>                                      | `30`               |
-| {$CLICKHOUSE.NETWORK.ERRORS.MAX.WARN}                  | <p>Maximum number of smth for trigger expression</p>                                            | `5`                |
-| {$CLICKHOUSE.PARTS.PER.PARTITION.WARN}                 | <p>Maximum number of parts per partition for trigger expression.</p>                            | `300`              |
-| {$CLICKHOUSE.PASSWORD}                                 | <p>-</p>                                                                                        | `zabbix_pass`      |
-| {$CLICKHOUSE.PORT}                                     | <p>The port of ClickHouse HTTP endpoint</p>                                                     | `8123`             |
-| {$CLICKHOUSE.QUERY_TIME.MAX.WARN}                      | <p>Maximum ClickHouse query time in seconds for trigger expression</p>                          | `600`              |
-| {$CLICKHOUSE.QUEUE.SIZE.MAX.WARN}                      | <p>Maximum size of the queue for operations waiting to be performed for trigger expression.</p> | `20`               |
-| {$CLICKHOUSE.REPLICA.MAX.WARN}                         | <p>Replication lag across all tables for trigger expression.</p>                                | `600`              |
-| {$CLICKHOUSE.SCHEME}                                   | <p>Request scheme which may be http or https</p>                                                | `http`             |
-| {$CLICKHOUSE.USER}                                     | <p>-</p>                                                                                        | `zabbix`           |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CLICKHOUSE.DELAYED.FILES.DISTRIBUTED.COUNT.MAX.WARN} |<p>Maximum size of distributed files queue to insert for trigger expression.</p> |`600` |
+|{$CLICKHOUSE.DELAYED.INSERTS.MAX.WARN} |<p>Maximum number of delayed inserts for trigger expression.</p> |`0` |
+|{$CLICKHOUSE.LLD.FILTER.DB.MATCHES} |<p>Filter of discoverable databases</p> |`.*` |
+|{$CLICKHOUSE.LLD.FILTER.DB.NOT_MATCHES} |<p>Filter to exclude discovered databases</p> |`CHANGE_IF_NEEDED` |
+|{$CLICKHOUSE.LLD.FILTER.DICT.MATCHES} |<p>Filter of discoverable dictionaries</p> |`.*` |
+|{$CLICKHOUSE.LLD.FILTER.DICT.NOT_MATCHES} |<p>Filter to exclude discovered dictionaries</p> |`CHANGE_IF_NEEDED` |
+|{$CLICKHOUSE.LOG_POSITION.DIFF.MAX.WARN} |<p>Maximum diff between log_pointer and log_max_index.</p> |`30` |
+|{$CLICKHOUSE.NETWORK.ERRORS.MAX.WARN} |<p>Maximum number of smth for trigger expression</p> |`5` |
+|{$CLICKHOUSE.PARTS.PER.PARTITION.WARN} |<p>Maximum number of parts per partition for trigger expression.</p> |`300` |
+|{$CLICKHOUSE.PASSWORD} |<p>-</p> |`zabbix_pass` |
+|{$CLICKHOUSE.PORT} |<p>The port of ClickHouse HTTP endpoint</p> |`8123` |
+|{$CLICKHOUSE.QUERY_TIME.MAX.WARN} |<p>Maximum ClickHouse query time in seconds for trigger expression</p> |`600` |
+|{$CLICKHOUSE.QUEUE.SIZE.MAX.WARN} |<p>Maximum size of the queue for operations waiting to be performed for trigger expression.</p> |`20` |
+|{$CLICKHOUSE.REPLICA.MAX.WARN} |<p>Replication lag across all tables for trigger expression.</p> |`600` |
+|{$CLICKHOUSE.SCHEME} |<p>Request scheme which may be http or https</p> |`http` |
+|{$CLICKHOUSE.USER} |<p>-</p> |`zabbix` |
 
 ## Template links
 
@@ -75,112 +75,112 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name         | Description                    | Type      | Key and additional info                                                                                                                                                                                           |
-|--------------|--------------------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Tables       | <p>Info about tables</p>       | DEPENDENT | clickhouse.tables.discovery<p>**Filter**:</p>AND <p>- A: {#DB} MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DB.MATCHES}`</p><p>- B: {#DB} NOT_MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DB.NOT_MATCHES}`</p>               |
-| Replicas     | <p>Info about replicas</p>     | DEPENDENT | clickhouse.replicas.discovery<p>**Filter**:</p>AND <p>- A: {#DB} MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DB.MATCHES}`</p><p>- B: {#DB} NOT_MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DB.NOT_MATCHES}`</p>             |
-| Dictionaries | <p>Info about dictionaries</p> | DEPENDENT | clickhouse.dictionaries.discovery<p>**Filter**:</p>AND <p>- A: {#NAME} MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DICT.MATCHES}`</p><p>- B: {#NAME} NOT_MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DICT.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Tables |<p>Info about tables</p> |DEPENDENT |clickhouse.tables.discovery<p>**Filter**:</p>AND <p>- {#DB} MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DB.MATCHES}`</p><p>- {#DB} NOT_MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DB.NOT_MATCHES}`</p> |
+|Replicas |<p>Info about replicas</p> |DEPENDENT |clickhouse.replicas.discovery<p>**Filter**:</p>AND <p>- {#DB} MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DB.MATCHES}`</p><p>- {#DB} NOT_MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DB.NOT_MATCHES}`</p> |
+|Dictionaries |<p>Info about dictionaries</p> |DEPENDENT |clickhouse.dictionaries.discovery<p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DICT.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$CLICKHOUSE.LLD.FILTER.DICT.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group                | Name                                                           | Description                                                                                                                                                                                                                                                                                                                                                                                                     | Type       | Key and additional info                                                                                                                                                                                                         |
-|----------------------|----------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| ClickHouse           | ClickHouse: Longest currently running query time               | <p>Get longest running query.</p>                                                                                                                                                                                                                                                                                                                                                                               | HTTP_AGENT | clickhouse.process.elapsed                                                                                                                                                                                                      |
-| ClickHouse           | ClickHouse: Check port availability                            | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                        | SIMPLE     | net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                    |
-| ClickHouse           | ClickHouse: Ping                                               |                                                                                                                                                                                                                                                                                                                                                                                                                 | HTTP_AGENT | clickhouse.ping<p>**Preprocessing**:</p><p>- REGEX: `Ok\. 1`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                                |
-| ClickHouse           | ClickHouse: Version                                            | <p>Version of the server</p>                                                                                                                                                                                                                                                                                                                                                                                    | HTTP_AGENT | clickhouse.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                           |
-| ClickHouse           | ClickHouse: Revision                                           | <p>Revision of the server.</p>                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | clickhouse.revision<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Revision")].value.first()`</p>                                                                                                                     |
-| ClickHouse           | ClickHouse: Uptime                                             | <p>Number of seconds since ClickHouse server start</p>                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT  | clickhouse.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Uptime")].value.first()`</p>                                                                                                                         |
-| ClickHouse           | ClickHouse: New queries per second                             | <p>Number of queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.</p>                                                                                     | DEPENDENT  | clickhouse.query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.data.event == "Query")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                                       |
-| ClickHouse           | ClickHouse: New SELECT queries per second                      | <p>Number of SELECT queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.</p>                                                                              | DEPENDENT  | clickhouse.select_query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "SelectQuery")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                               |
-| ClickHouse           | ClickHouse: New INSERT queries per second                      | <p>Number of INSERT queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.</p>                                                                              | DEPENDENT  | clickhouse.insert_query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "InsertQuery")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                               |
-| ClickHouse           | ClickHouse: Delayed insert queries                             | <p>"Number of INSERT queries that are throttled due to high number of active data parts for partition in a MergeTree table."</p>                                                                                                                                                                                                                                                                                | DEPENDENT  | clickhouse.insert.delay<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DelayedInserts")].value.first()`</p>                                                                                                           |
-| ClickHouse           | ClickHouse: Current running queries                            | <p>Number of executing queries</p>                                                                                                                                                                                                                                                                                                                                                                              | DEPENDENT  | clickhouse.query.current<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Query")].value.first()`</p>                                                                                                                   |
-| ClickHouse           | ClickHouse: Current running merges                             | <p>Number of executing background merges</p>                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | clickhouse.merge.current<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Merge")].value.first()`</p>                                                                                                                   |
-| ClickHouse           | ClickHouse: Inserted bytes per second                          | <p>The number of uncompressed bytes inserted in all tables.</p>                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT  | clickhouse.inserted_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "InsertedBytes")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                           |
-| ClickHouse           | ClickHouse: Read bytes per second                              | <p>"Number of bytes (the number of bytes before decompression) read from compressed sources (files, network)."</p>                                                                                                                                                                                                                                                                                              | DEPENDENT  | clickhouse.read_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ReadCompressedBytes")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                         |
-| ClickHouse           | ClickHouse: Inserted rows per second                           | <p>The number of rows inserted in all tables.</p>                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT  | clickhouse.inserted_rows.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "InsertedRows")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                             |
-| ClickHouse           | ClickHouse: Merged rows per second                             | <p>Rows read for background merges.</p>                                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT  | clickhouse.merge_rows.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "MergedRows")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                                  |
-| ClickHouse           | ClickHouse: Uncompressed bytes merged per second               | <p>Uncompressed bytes that were read for background merges</p>                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | clickhouse.merge_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "MergedUncompressedBytes")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                    |
-| ClickHouse           | ClickHouse: Max count of parts per partition across all tables | <p>"Clickhouse MergeTree table engine split each INSERT query to partitions (PARTITION BY expression) and add one or more PARTS per INSERT inside each partition, </p><p>after that background merge process run."</p>                                                                                                                                                                                          | DEPENDENT  | clickhouse.max.part.count.for.partition<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MaxPartCountForPartition")].value.first()`</p>                                                                                 |
-| ClickHouse           | ClickHouse: Current TCP connections                            | <p>Number of connections to TCP server (clients with native interface).</p>                                                                                                                                                                                                                                                                                                                                     | DEPENDENT  | clickhouse.connections.tcp<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "TCPConnection")].value.first()`</p>                                                                                                         |
-| ClickHouse           | ClickHouse: Current HTTP connections                           | <p>Number of connections to HTTP server.</p>                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | clickhouse.connections.http<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "HTTPConnection")].value.first()`</p>                                                                                                       |
-| ClickHouse           | ClickHouse: Current distribute connections                     | <p>Number of connections to remote servers sending data that was INSERTed into Distributed tables.</p>                                                                                                                                                                                                                                                                                                          | DEPENDENT  | clickhouse.connections.distribute<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DistributedSend")].value.first()`</p>                                                                                                |
-| ClickHouse           | ClickHouse: Current MySQL connections                          | <p>Number of connections to MySQL server.</p>                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT  | clickhouse.connections.mysql<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MySQLConnection")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                                                                |
-| ClickHouse           | ClickHouse: Current Interserver connections                    | <p>Number of connections from other replicas to fetch parts.</p>                                                                                                                                                                                                                                                                                                                                                | DEPENDENT  | clickhouse.connections.interserver<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "InterserverConnection")].value.first()`</p>                                                                                         |
-| ClickHouse           | ClickHouse: Network errors per second                          | <p>Network errors (timeouts and connection failures) during query execution, background pool tasks and DNS cache update.</p>                                                                                                                                                                                                                                                                                    | DEPENDENT  | clickhouse.network.error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "NetworkErrors")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                                            |
-| ClickHouse           | ClickHouse: Read syscalls in fly                               | <p>Number of read (read, pread, io_getevents, etc.) syscalls in fly</p>                                                                                                                                                                                                                                                                                                                                         | DEPENDENT  | clickhouse.read<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Read")].value.first()`</p>                                                                                                                             |
-| ClickHouse           | ClickHouse: Write syscalls in fly                              | <p>Number of write (write, pwrite, io_getevents, etc.) syscalls in fly</p>                                                                                                                                                                                                                                                                                                                                      | DEPENDENT  | clickhouse.write<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Write")].value.first()`</p>                                                                                                                           |
-| ClickHouse           | ClickHouse: Allocated bytes                                    | <p>"Total number of bytes allocated by the application."</p>                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | clickhouse.jemalloc.allocated<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "jemalloc.allocated")].value.first()`</p>                                                                                                 |
-| ClickHouse           | ClickHouse: Resident memory                                    | <p>"Maximum number of bytes in physically resident data pages mapped by the allocator, </p><p>comprising all pages dedicated to allocator metadata, pages backing active allocations, </p><p>and unused dirty pages."</p>                                                                                                                                                                                       | DEPENDENT  | clickhouse.jemalloc.resident<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "jemalloc.resident")].value.first()`</p>                                                                                                   |
-| ClickHouse           | ClickHouse: Mapped memory                                      | <p>"Total number of bytes in active extents mapped by the allocator."</p>                                                                                                                                                                                                                                                                                                                                       | DEPENDENT  | clickhouse.jemalloc.mapped<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "jemalloc.mapped")].value.first()`</p>                                                                                                       |
-| ClickHouse           | ClickHouse: Memory used for queries                            | <p>"Total amount of memory (bytes) allocated in currently executing queries."</p>                                                                                                                                                                                                                                                                                                                               | DEPENDENT  | clickhouse.memory.tracking<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTracking")].value.first()`</p>                                                                                                        |
-| ClickHouse           | ClickHouse: Memory used for background merges                  | <p>"Total amount of memory (bytes) allocated in background processing pool (that is dedicated for background merges, mutations and fetches).</p><p> Note that this value may include a drift when the memory was allocated in a context of background processing pool and freed in other context or vice-versa. This happens naturally due to caches for tables indexes and doesn't indicate memory leaks."</p> | DEPENDENT  | clickhouse.memory.tracking.background<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTrackingInBackgroundProcessingPool")].value.first()`</p>                                                                   |
-| ClickHouse           | ClickHouse: Memory used for background moves                   | <p>"Total amount of memory (bytes) allocated in background processing pool (that is dedicated for background moves). Note that this value may include a drift when the memory was allocated in a context of background processing pool and freed in other context or vice-versa.</p><p> This happens naturally due to caches for tables indexes and doesn't indicate memory leaks."</p>                         | DEPENDENT  | clickhouse.memory.tracking.background.moves<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTrackingInBackgroundMoveProcessingPool")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p>                    |
-| ClickHouse           | ClickHouse: Memory used for background schedule pool           | <p>"Total amount of memory (bytes) allocated in background schedule pool (that is dedicated for bookkeeping tasks of Replicated tables)."</p>                                                                                                                                                                                                                                                                   | DEPENDENT  | clickhouse.memory.tracking.schedule.pool<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTrackingInBackgroundSchedulePool")].value.first()`</p>                                                                  |
-| ClickHouse           | ClickHouse: Memory used for merges                             | <p>"Total amount of memory (bytes) allocated for background merges. Included in MemoryTrackingInBackgroundProcessingPool. Note that this value may include a drift when the memory was allocated in a context of background processing pool and freed in other context or vice-versa. </p><p>This happens naturally due to caches for tables indexes and doesn't indicate memory leaks."</p>                    | DEPENDENT  | clickhouse.memory.tracking.merges<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTrackingForMerges")].value.first()`</p>                                                                                        |
-| ClickHouse           | ClickHouse: Current distributed files to insert                | <p>Number of pending files to process for asynchronous insertion into Distributed tables. Number of files for every shard is summed.</p>                                                                                                                                                                                                                                                                        | DEPENDENT  | clickhouse.distributed.files<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DistributedFilesToInsert")].value.first()`</p>                                                                                            |
-| ClickHouse           | ClickHouse: Distributed connection fail with retry per second  | <p>Connection retries in replicated DB connection pool</p>                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT  | clickhouse.distributed.files.retry.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DistributedConnectionFailTry")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                  |
-| ClickHouse           | ClickHouse: Distributed connection fail with retry per second  | <p>"Connection failures after all retries in replicated DB connection pool"</p>                                                                                                                                                                                                                                                                                                                                 | DEPENDENT  | clickhouse.distributed.files.fail.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DistributedConnectionFailAtAll")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                 |
-| ClickHouse           | ClickHouse: Replication lag across all tables                  | <p>Maximum replica queue delay relative to current time</p>                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT  | clickhouse.replicas.max.absolute.delay<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ReplicasMaxAbsoluteDelay")].value.first()`</p>                                                                                  |
-| ClickHouse           | ClickHouse: Total replication tasks in queue                   |                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT  | clickhouse.replicas.sum.queue.size<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ReplicasSumQueueSize")].value.first()`</p>                                                                                          |
-| ClickHouse           | ClickHouse: Total number read-only Replicas                    | <p>"Number of Replicated tables that are currently in readonly state </p><p>due to re-initialization after ZooKeeper session loss </p><p>or due to startup without ZooKeeper configured."</p>                                                                                                                                                                                                                   | DEPENDENT  | clickhouse.replicas.readonly.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ReadonlyReplica")].value.first()`</p>                                                                                               |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Bytes                              | <p>Table size in bytes. Database: {#DB}, table: {#TABLE}</p>                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | clickhouse.table.bytes["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].bytes.first()`</p>                                                                        |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Parts                              | <p>Number of parts of the table. Database: {#DB}, table: {#TABLE}</p>                                                                                                                                                                                                                                                                                                                                           | DEPENDENT  | clickhouse.table.parts["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].parts.first()`</p>                                                                        |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Rows                               | <p>Number of rows in the table. Database: {#DB}, table: {#TABLE}</p>                                                                                                                                                                                                                                                                                                                                            | DEPENDENT  | clickhouse.table.rows["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].rows.first()`</p>                                                                          |
-| ClickHouse           | ClickHouse: {#DB}: Bytes                                       | <p>Database size in bytes.</p>                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT  | clickhouse.db.bytes["{#DB}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}")].bytes.sum()`</p>                                                                                                               |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica readonly                   | <p>Whether the replica is in read-only mode.</p><p>This mode is turned on if the config doesn’t have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.</p>                                                                                                                                                     | DEPENDENT  | clickhouse.replica.is_readonly["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].is_readonly.first()`</p>                                                          |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica session expired            | <p>True if the ZooKeeper session expired</p>                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | clickhouse.replica.is_session_expired["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].is_session_expired.first()`</p>                                            |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica future parts               | <p>Number of data parts that will appear as the result of INSERTs or merges that haven’t been done yet.</p>                                                                                                                                                                                                                                                                                                     | DEPENDENT  | clickhouse.replica.future_parts["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].future_parts.first()`</p>                                                        |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica parts to check             | <p>Number of data parts in the queue for verification. A part is put in the verification queue if there is suspicion that it might be damaged.</p>                                                                                                                                                                                                                                                              | DEPENDENT  | clickhouse.replica.parts_to_check["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].parts_to_check.first()`</p>                                                    |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica queue size                 | <p>Size of the queue for operations waiting to be performed.</p>                                                                                                                                                                                                                                                                                                                                                | DEPENDENT  | clickhouse.replica.queue_size["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].queue_size.first()`</p>                                                            |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica queue inserts size         | <p>Number of inserts of blocks of data that need to be made.</p>                                                                                                                                                                                                                                                                                                                                                | DEPENDENT  | clickhouse.replica.inserts_in_queue["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].inserts_in_queue.first()`</p>                                                |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica queue merges size          | <p>Number of merges waiting to be made. </p>                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT  | clickhouse.replica.merges_in_queue["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].merges_in_queue.first()`</p>                                                  |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica log max index              | <p>Maximum entry number in the log of general activity. (Have a non-zero value only where there is an active session with ZooKeeper).</p>                                                                                                                                                                                                                                                                       | DEPENDENT  | clickhouse.replica.log_max_index["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].log_max_index.first()`</p>                                                      |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica log pointer                | <p> Maximum entry number in the log of general activity that the replica copied to its execution queue, plus one. (Have a non-zero value only where there is an active session with ZooKeeper).</p>                                                                                                                                                                                                             | DEPENDENT  | clickhouse.replica.log_pointer["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].log_pointer.first()`</p>                                                          |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Total replicas                     | <p>Total number of known replicas of this table. (Have a non-zero value only where there is an active session with ZooKeeper).</p>                                                                                                                                                                                                                                                                              | DEPENDENT  | clickhouse.replica.total_replicas["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].total_replicas.first()`</p>                                                    |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Active replicas                    | <p>Number of replicas of this table that have a session in ZooKeeper (i.e., the number of functioning replicas). (Have a non-zero value only where there is an active session with ZooKeeper).</p>                                                                                                                                                                                                              | DEPENDENT  | clickhouse.replica.active_replicas["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].active_replicas.first()`</p>                                                  |
-| ClickHouse           | ClickHouse: {#DB}.{#TABLE}: Replica lag                        | <p>Difference between log_max_index and log_pointer</p>                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT  | clickhouse.replica.lag["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].replica_lag.first()`</p>                                                                  |
-| ClickHouse           | ClickHouse: Dictionary {#NAME}: Bytes allocated                | <p>The amount of RAM the dictionary uses.</p>                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT  | clickhouse.dictionary.bytes_allocated["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#NAME}")].bytes_allocated.first()`</p>                                                                                 |
-| ClickHouse           | ClickHouse: Dictionary {#NAME}: Element count                  | <p>Number of items stored in the dictionary.</p>                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT  | clickhouse.dictionary.element_count["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#NAME}")].element_count.first()`</p>                                                                                     |
-| ClickHouse           | ClickHouse: Dictionary {#NAME}: Load factor                    | <p>The percentage filled in the dictionary (for a hashed dictionary, the percentage filled in the hash table).</p>                                                                                                                                                                                                                                                                                              | DEPENDENT  | clickhouse.dictionary.load_factor["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#NAME}")].bytes_allocated.first()`</p><p>- MULTIPLIER: `100`</p>                                                           |
-| ClickHouse_ZooKeeper | ClickHouse: ZooKeeper sessions                                 | <p>Number of sessions (connections) to ZooKeeper. Should be no more than one.</p>                                                                                                                                                                                                                                                                                                                               | DEPENDENT  | clickhouse.zookeper.session<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ZooKeeperSession")].value.first()`</p>                                                                                                     |
-| ClickHouse_ZooKeeper | ClickHouse: ZooKeeper watches                                  | <p>Number of watches (e.g., event subscriptions) in ZooKeeperr.</p>                                                                                                                                                                                                                                                                                                                                             | DEPENDENT  | clickhouse.zookeper.watch<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ZooKeeperWatch")].value.first()`</p>                                                                                                         |
-| ClickHouse_ZooKeeper | ClickHouse: ZooKeeper requests                                 | <p>Number of requests to ZooKeeper in progress.</p>                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT  | clickhouse.zookeper.request<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ZooKeeperRequest")].value.first()`</p>                                                                                                     |
-| ClickHouse_ZooKeeper | ClickHouse: ZooKeeper wait time                                | <p>Time spent in waiting for ZooKeeper operations.</p>                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT  | clickhouse.zookeper.wait.time<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ZooKeeperWaitMicroseconds")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- MULTIPLIER: `0.000001`</p><p>- CHANGE_PER_SECOND |
-| ClickHouse_ZooKeeper | ClickHouse: ZooKeeper exceptions per second                    | <p>Count of ZooKeeper exceptions that does not belong to user/hardware exceptions.</p>                                                                                                                                                                                                                                                                                                                          | DEPENDENT  | clickhouse.zookeper.exceptions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ZooKeeperOtherExceptions")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                           |
-| ClickHouse_ZooKeeper | ClickHouse: ZooKeeper hardware exceptions per second           | <p>Count of ZooKeeper exceptions caused by session moved/expired, connection loss, marshalling error, operation timed out and invalid zhandle state.</p>                                                                                                                                                                                                                                                        | DEPENDENT  | clickhouse.zookeper.hw_exeptions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ZooKeeperHardwareExceptions")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                      |
-| ClickHouse_ZooKeeper | ClickHouse: ZooKeeper user exceptions per second               | <p>Count of ZooKeeper exceptions caused by no znodes, bad version, node exists, node empty and no children for ephemeral.</p>                                                                                                                                                                                                                                                                                   | DEPENDENT  | clickhouse.zookeper.user_exeptions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ZooKeeperUserExceptions")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND                        |
-| Zabbix_raw_items     | ClickHouse: Get system.events                                  | <p>Get information about the number of events that have occurred in the system.</p>                                                                                                                                                                                                                                                                                                                             | HTTP_AGENT | clickhouse.system.events<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p>                                                                                                                                                    |
-| Zabbix_raw_items     | ClickHouse: Get system.metrics                                 | <p>Get metrics which can be calculated instantly, or have a current value format JSONEachRow</p>                                                                                                                                                                                                                                                                                                                | HTTP_AGENT | clickhouse.system.metrics<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p>                                                                                                                                                   |
-| Zabbix_raw_items     | ClickHouse: Get system.asynchronous_metrics                    | <p>Get metrics that are calculated periodically in the background</p>                                                                                                                                                                                                                                                                                                                                           | HTTP_AGENT | clickhouse.system.asynchronous_metrics<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p>                                                                                                                                      |
-| Zabbix_raw_items     | ClickHouse: Get system.settings                                | <p>Get information about settings that are currently in use.</p>                                                                                                                                                                                                                                                                                                                                                | HTTP_AGENT | clickhouse.system.settings<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                                                        |
-| Zabbix_raw_items     | ClickHouse: Get replicas info                                  | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                        | HTTP_AGENT | clickhouse.replicas<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p>                                                                                                                                                         |
-| Zabbix_raw_items     | ClickHouse: Get tables info                                    | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                        | HTTP_AGENT | clickhouse.tables<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p>                                                                                                                                                           |
-| Zabbix_raw_items     | ClickHouse: Get dictionaries info                              | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                        | HTTP_AGENT | clickhouse.dictionaries<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p>                                                                                                                                                     |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|ClickHouse |ClickHouse: Longest currently running query time |<p>Get longest running query.</p> |HTTP_AGENT |clickhouse.process.elapsed |
+|ClickHouse |ClickHouse: Check port availability |<p>-</p> |SIMPLE |net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|ClickHouse |ClickHouse: Ping | |HTTP_AGENT |clickhouse.ping<p>**Preprocessing**:</p><p>- REGEX: `Ok\. 1`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|ClickHouse |ClickHouse: Version |<p>Version of the server</p> |HTTP_AGENT |clickhouse.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|ClickHouse |ClickHouse: Revision |<p>Revision of the server.</p> |DEPENDENT |clickhouse.revision<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Revision")].value.first()`</p> |
+|ClickHouse |ClickHouse: Uptime |<p>Number of seconds since ClickHouse server start</p> |DEPENDENT |clickhouse.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Uptime")].value.first()`</p> |
+|ClickHouse |ClickHouse: New queries per second |<p>Number of queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.</p> |DEPENDENT |clickhouse.query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.data.event == "Query")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: New SELECT queries per second |<p>Number of SELECT queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.</p> |DEPENDENT |clickhouse.select_query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "SelectQuery")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: New INSERT queries per second |<p>Number of INSERT queries to be interpreted and potentially executed. Does not include queries that failed to parse or were rejected due to AST size limits, quota limits or limits on the number of simultaneously running queries. May include internal queries initiated by ClickHouse itself. Does not count subqueries.</p> |DEPENDENT |clickhouse.insert_query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "InsertQuery")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Delayed insert queries |<p>"Number of INSERT queries that are throttled due to high number of active data parts for partition in a MergeTree table."</p> |DEPENDENT |clickhouse.insert.delay<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DelayedInserts")].value.first()`</p> |
+|ClickHouse |ClickHouse: Current running queries |<p>Number of executing queries</p> |DEPENDENT |clickhouse.query.current<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Query")].value.first()`</p> |
+|ClickHouse |ClickHouse: Current running merges |<p>Number of executing background merges</p> |DEPENDENT |clickhouse.merge.current<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Merge")].value.first()`</p> |
+|ClickHouse |ClickHouse: Inserted bytes per second |<p>The number of uncompressed bytes inserted in all tables.</p> |DEPENDENT |clickhouse.inserted_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "InsertedBytes")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Read bytes per second |<p>"Number of bytes (the number of bytes before decompression) read from compressed sources (files, network)."</p> |DEPENDENT |clickhouse.read_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ReadCompressedBytes")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Inserted rows per second |<p>The number of rows inserted in all tables.</p> |DEPENDENT |clickhouse.inserted_rows.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "InsertedRows")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Merged rows per second |<p>Rows read for background merges.</p> |DEPENDENT |clickhouse.merge_rows.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "MergedRows")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Uncompressed bytes merged per second |<p>Uncompressed bytes that were read for background merges</p> |DEPENDENT |clickhouse.merge_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "MergedUncompressedBytes")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Max count of parts per partition across all tables |<p>Clickhouse MergeTree table engine split each INSERT query to partitions (PARTITION BY expression) and add one or more PARTS per INSERT inside each partition,</p><p>after that background merge process run.</p> |DEPENDENT |clickhouse.max.part.count.for.partition<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MaxPartCountForPartition")].value.first()`</p> |
+|ClickHouse |ClickHouse: Current TCP connections |<p>Number of connections to TCP server (clients with native interface).</p> |DEPENDENT |clickhouse.connections.tcp<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "TCPConnection")].value.first()`</p> |
+|ClickHouse |ClickHouse: Current HTTP connections |<p>Number of connections to HTTP server.</p> |DEPENDENT |clickhouse.connections.http<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "HTTPConnection")].value.first()`</p> |
+|ClickHouse |ClickHouse: Current distribute connections |<p>Number of connections to remote servers sending data that was INSERTed into Distributed tables.</p> |DEPENDENT |clickhouse.connections.distribute<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DistributedSend")].value.first()`</p> |
+|ClickHouse |ClickHouse: Current MySQL connections |<p>Number of connections to MySQL server.</p> |DEPENDENT |clickhouse.connections.mysql<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MySQLConnection")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|ClickHouse |ClickHouse: Current Interserver connections |<p>Number of connections from other replicas to fetch parts.</p> |DEPENDENT |clickhouse.connections.interserver<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "InterserverConnection")].value.first()`</p> |
+|ClickHouse |ClickHouse: Network errors per second |<p>Network errors (timeouts and connection failures) during query execution, background pool tasks and DNS cache update.</p> |DEPENDENT |clickhouse.network.error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "NetworkErrors")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Read syscalls in fly |<p>Number of read (read, pread, io_getevents, etc.) syscalls in fly</p> |DEPENDENT |clickhouse.read<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Read")].value.first()`</p> |
+|ClickHouse |ClickHouse: Write syscalls in fly |<p>Number of write (write, pwrite, io_getevents, etc.) syscalls in fly</p> |DEPENDENT |clickhouse.write<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "Write")].value.first()`</p> |
+|ClickHouse |ClickHouse: Allocated bytes |<p>"Total number of bytes allocated by the application."</p> |DEPENDENT |clickhouse.jemalloc.allocated<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "jemalloc.allocated")].value.first()`</p> |
+|ClickHouse |ClickHouse: Resident memory |<p>Maximum number of bytes in physically resident data pages mapped by the allocator,</p><p>comprising all pages dedicated to allocator metadata, pages backing active allocations,</p><p>and unused dirty pages.</p> |DEPENDENT |clickhouse.jemalloc.resident<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "jemalloc.resident")].value.first()`</p> |
+|ClickHouse |ClickHouse: Mapped memory |<p>"Total number of bytes in active extents mapped by the allocator."</p> |DEPENDENT |clickhouse.jemalloc.mapped<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "jemalloc.mapped")].value.first()`</p> |
+|ClickHouse |ClickHouse: Memory used for queries |<p>"Total amount of memory (bytes) allocated in currently executing queries."</p> |DEPENDENT |clickhouse.memory.tracking<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTracking")].value.first()`</p> |
+|ClickHouse |ClickHouse: Memory used for background merges |<p>"Total amount of memory (bytes) allocated in background processing pool (that is dedicated for background merges, mutations and fetches).</p><p> Note that this value may include a drift when the memory was allocated in a context of background processing pool and freed in other context or vice-versa. This happens naturally due to caches for tables indexes and doesn't indicate memory leaks."</p> |DEPENDENT |clickhouse.memory.tracking.background<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTrackingInBackgroundProcessingPool")].value.first()`</p> |
+|ClickHouse |ClickHouse: Memory used for background moves |<p>"Total amount of memory (bytes) allocated in background processing pool (that is dedicated for background moves). Note that this value may include a drift when the memory was allocated in a context of background processing pool and freed in other context or vice-versa.</p><p> This happens naturally due to caches for tables indexes and doesn't indicate memory leaks."</p> |DEPENDENT |clickhouse.memory.tracking.background.moves<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTrackingInBackgroundMoveProcessingPool")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|ClickHouse |ClickHouse: Memory used for background schedule pool |<p>"Total amount of memory (bytes) allocated in background schedule pool (that is dedicated for bookkeeping tasks of Replicated tables)."</p> |DEPENDENT |clickhouse.memory.tracking.schedule.pool<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTrackingInBackgroundSchedulePool")].value.first()`</p> |
+|ClickHouse |ClickHouse: Memory used for merges |<p>Total amount of memory (bytes) allocated for background merges. Included in MemoryTrackingInBackgroundProcessingPool. Note that this value may include a drift when the memory was allocated in a context of background processing pool and freed in other context or vice-versa.</p><p>This happens naturally due to caches for tables indexes and doesn't indicate memory leaks.</p> |DEPENDENT |clickhouse.memory.tracking.merges<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "MemoryTrackingForMerges")].value.first()`</p> |
+|ClickHouse |ClickHouse: Current distributed files to insert |<p>Number of pending files to process for asynchronous insertion into Distributed tables. Number of files for every shard is summed.</p> |DEPENDENT |clickhouse.distributed.files<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DistributedFilesToInsert")].value.first()`</p> |
+|ClickHouse |ClickHouse: Distributed connection fail with retry per second |<p>Connection retries in replicated DB connection pool</p> |DEPENDENT |clickhouse.distributed.files.retry.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DistributedConnectionFailTry")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Distributed connection fail with retry per second |<p>"Connection failures after all retries in replicated DB connection pool"</p> |DEPENDENT |clickhouse.distributed.files.fail.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "DistributedConnectionFailAtAll")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse |ClickHouse: Replication lag across all tables |<p>Maximum replica queue delay relative to current time</p> |DEPENDENT |clickhouse.replicas.max.absolute.delay<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ReplicasMaxAbsoluteDelay")].value.first()`</p> |
+|ClickHouse |ClickHouse: Total replication tasks in queue | |DEPENDENT |clickhouse.replicas.sum.queue.size<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ReplicasSumQueueSize")].value.first()`</p> |
+|ClickHouse |ClickHouse: Total number read-only Replicas |<p>Number of Replicated tables that are currently in readonly state</p><p>due to re-initialization after ZooKeeper session loss</p><p>or due to startup without ZooKeeper configured.</p> |DEPENDENT |clickhouse.replicas.readonly.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ReadonlyReplica")].value.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Bytes |<p>Table size in bytes. Database: {#DB}, table: {#TABLE}</p> |DEPENDENT |clickhouse.table.bytes["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].bytes.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Parts |<p>Number of parts of the table. Database: {#DB}, table: {#TABLE}</p> |DEPENDENT |clickhouse.table.parts["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].parts.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Rows |<p>Number of rows in the table. Database: {#DB}, table: {#TABLE}</p> |DEPENDENT |clickhouse.table.rows["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].rows.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}: Bytes |<p>Database size in bytes.</p> |DEPENDENT |clickhouse.db.bytes["{#DB}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}")].bytes.sum()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica readonly |<p>Whether the replica is in read-only mode.</p><p>This mode is turned on if the config doesn't have sections with ZooKeeper, if an unknown error occurred when re-initializing sessions in ZooKeeper, and during session re-initialization in ZooKeeper.</p> |DEPENDENT |clickhouse.replica.is_readonly["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].is_readonly.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica session expired |<p>True if the ZooKeeper session expired</p> |DEPENDENT |clickhouse.replica.is_session_expired["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].is_session_expired.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica future parts |<p>Number of data parts that will appear as the result of INSERTs or merges that haven't been done yet.</p> |DEPENDENT |clickhouse.replica.future_parts["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].future_parts.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica parts to check |<p>Number of data parts in the queue for verification. A part is put in the verification queue if there is suspicion that it might be damaged.</p> |DEPENDENT |clickhouse.replica.parts_to_check["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].parts_to_check.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica queue size |<p>Size of the queue for operations waiting to be performed.</p> |DEPENDENT |clickhouse.replica.queue_size["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].queue_size.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica queue inserts size |<p>Number of inserts of blocks of data that need to be made.</p> |DEPENDENT |clickhouse.replica.inserts_in_queue["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].inserts_in_queue.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica queue merges size |<p>Number of merges waiting to be made. </p> |DEPENDENT |clickhouse.replica.merges_in_queue["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].merges_in_queue.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica log max index |<p>Maximum entry number in the log of general activity. (Have a non-zero value only where there is an active session with ZooKeeper).</p> |DEPENDENT |clickhouse.replica.log_max_index["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].log_max_index.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica log pointer |<p> Maximum entry number in the log of general activity that the replica copied to its execution queue, plus one. (Have a non-zero value only where there is an active session with ZooKeeper).</p> |DEPENDENT |clickhouse.replica.log_pointer["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].log_pointer.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Total replicas |<p>Total number of known replicas of this table. (Have a non-zero value only where there is an active session with ZooKeeper).</p> |DEPENDENT |clickhouse.replica.total_replicas["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].total_replicas.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Active replicas |<p>Number of replicas of this table that have a session in ZooKeeper (i.e., the number of functioning replicas). (Have a non-zero value only where there is an active session with ZooKeeper).</p> |DEPENDENT |clickhouse.replica.active_replicas["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].active_replicas.first()`</p> |
+|ClickHouse |ClickHouse: {#DB}.{#TABLE}: Replica lag |<p>Difference between log_max_index and log_pointer</p> |DEPENDENT |clickhouse.replica.lag["{#DB}.{#TABLE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.database == "{#DB}" && @.table == "{#TABLE}")].replica_lag.first()`</p> |
+|ClickHouse |ClickHouse: Dictionary {#NAME}: Bytes allocated |<p>The amount of RAM the dictionary uses.</p> |DEPENDENT |clickhouse.dictionary.bytes_allocated["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#NAME}")].bytes_allocated.first()`</p> |
+|ClickHouse |ClickHouse: Dictionary {#NAME}: Element count |<p>Number of items stored in the dictionary.</p> |DEPENDENT |clickhouse.dictionary.element_count["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#NAME}")].element_count.first()`</p> |
+|ClickHouse |ClickHouse: Dictionary {#NAME}: Load factor |<p>The percentage filled in the dictionary (for a hashed dictionary, the percentage filled in the hash table).</p> |DEPENDENT |clickhouse.dictionary.load_factor["{#NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "{#NAME}")].bytes_allocated.first()`</p><p>- MULTIPLIER: `100`</p> |
+|ClickHouse_ZooKeeper |ClickHouse: ZooKeeper sessions |<p>Number of sessions (connections) to ZooKeeper. Should be no more than one.</p> |DEPENDENT |clickhouse.zookeper.session<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ZooKeeperSession")].value.first()`</p> |
+|ClickHouse_ZooKeeper |ClickHouse: ZooKeeper watches |<p>Number of watches (e.g., event subscriptions) in ZooKeeperr.</p> |DEPENDENT |clickhouse.zookeper.watch<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ZooKeeperWatch")].value.first()`</p> |
+|ClickHouse_ZooKeeper |ClickHouse: ZooKeeper requests |<p>Number of requests to ZooKeeper in progress.</p> |DEPENDENT |clickhouse.zookeper.request<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.metric == "ZooKeeperRequest")].value.first()`</p> |
+|ClickHouse_ZooKeeper |ClickHouse: ZooKeeper wait time |<p>Time spent in waiting for ZooKeeper operations.</p> |DEPENDENT |clickhouse.zookeper.wait.time<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ZooKeeperWaitMicroseconds")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- MULTIPLIER: `0.000001`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse_ZooKeeper |ClickHouse: ZooKeeper exceptions per second |<p>Count of ZooKeeper exceptions that does not belong to user/hardware exceptions.</p> |DEPENDENT |clickhouse.zookeper.exceptions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ZooKeeperOtherExceptions")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse_ZooKeeper |ClickHouse: ZooKeeper hardware exceptions per second |<p>Count of ZooKeeper exceptions caused by session moved/expired, connection loss, marshalling error, operation timed out and invalid zhandle state.</p> |DEPENDENT |clickhouse.zookeper.hw_exceptions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ZooKeeperHardwareExceptions")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|ClickHouse_ZooKeeper |ClickHouse: ZooKeeper user exceptions per second |<p>Count of ZooKeeper exceptions caused by no znodes, bad version, node exists, node empty and no children for ephemeral.</p> |DEPENDENT |clickhouse.zookeper.user_exceptions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.event == "ZooKeeperUserExceptions")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_raw_items |ClickHouse: Get system.events |<p>Get information about the number of events that have occurred in the system.</p> |HTTP_AGENT |clickhouse.system.events<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p> |
+|Zabbix_raw_items |ClickHouse: Get system.metrics |<p>Get metrics which can be calculated instantly, or have a current value format JSONEachRow</p> |HTTP_AGENT |clickhouse.system.metrics<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p> |
+|Zabbix_raw_items |ClickHouse: Get system.asynchronous_metrics |<p>Get metrics that are calculated periodically in the background</p> |HTTP_AGENT |clickhouse.system.asynchronous_metrics<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p> |
+|Zabbix_raw_items |ClickHouse: Get system.settings |<p>Get information about settings that are currently in use.</p> |HTTP_AGENT |clickhouse.system.settings<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |ClickHouse: Get replicas info |<p>-</p> |HTTP_AGENT |clickhouse.replicas<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p> |
+|Zabbix_raw_items |ClickHouse: Get tables info |<p>-</p> |HTTP_AGENT |clickhouse.tables<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p> |
+|Zabbix_raw_items |ClickHouse: Get dictionaries info |<p>-</p> |HTTP_AGENT |clickhouse.dictionaries<p>**Preprocessing**:</p><p>- JSONPATH: `$.data`</p> |
 
 ## Triggers
 
-| Name                                                                                                                                                 | Description                                                                                                                                                                                                                                                                                                                                                                                                                               | Expression                                                                                                                                                       | Severity | Dependencies and additional info                                                                          |
-|------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------|
-| ClickHouse: There are queries running more than {$CLICKHOUSE.QUERY_TIME.MAX.WARN} seconds                                                            | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:clickhouse.process.elapsed.last()}>{$CLICKHOUSE.QUERY_TIME.MAX.WARN}`                                                                            | AVERAGE  | <p>Manual close: YES</p>                                                                                  |
-| ClickHouse: Port {$CLICKHOUSE.PORT} is unavailable                                                                                                   | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"].last()}=0`                                                              | AVERAGE  | <p>Manual close: YES</p>                                                                                  |
-| ClickHouse: Service is down                                                                                                                          | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:clickhouse.ping.last()}=0 or {ClickHouse by HTTP:net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"].last()} = 0`           | AVERAGE  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- ClickHouse: Port {$CLICKHOUSE.PORT} is unavailable</p> |
-| ClickHouse: Version has changed (new version: {ITEM.VALUE})                                                                                          | <p>ClickHouse version has changed. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                      | `{TEMPLATE_NAME:clickhouse.version.diff()}=1 and {TEMPLATE_NAME:clickhouse.version.strlen()}>0`                                                                  | INFO     | <p>Manual close: YES</p>                                                                                  |
-| ClickHouse: has been restarted (uptime < 10m)                                                                                                        | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:clickhouse.uptime.last()}<10m`                                                                                                                   | INFO     | <p>Manual close: YES</p>                                                                                  |
-| ClickHouse: Failed to fetch info data (or no data for 30m)                                                                                           | <p>Zabbix has not received data for items for the last 30 minutes</p>                                                                                                                                                                                                                                                                                                                                                                     | `{TEMPLATE_NAME:clickhouse.uptime.nodata(30m)}=1`                                                                                                                | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- ClickHouse: Service is down</p>                        |
-| ClickHouse: Too many throttled insert queries (over {$CLICKHOUSE.DELAYED.INSERTS.MAX.WARN) for 5 min)                                                | <p>Clickhouse have INSERT queries that are throttled due to high number of active data parts for partition in a MergeTree, please decrease INSERT frequency</p>                                                                                                                                                                                                                                                                           | `{TEMPLATE_NAME:clickhouse.insert.delay.min(5m)}>{$CLICKHOUSE.DELAYED.INSERTS.MAX.WARN}`                                                                         | WARNING  | <p>Manual close: YES</p>                                                                                  |
-| ClickHouse: Too many MergeTree parts (over 90% of {$CLICKHOUSE.PARTS.PER.PARTITION.WARN})                                                            | <p>"Descease INSERT queries frequency.</p><p>Clickhouse MergeTree table engine split each INSERT query to partitions (PARTITION BY expression) </p><p>and add one or more PARTS per INSERT inside each partition, </p><p>after that background merge process run, and when you have too much unmerged parts inside partition, </p><p>SELECT queries performance can significate degrade, so clickhouse try delay insert, or abort it"</p> | `{TEMPLATE_NAME:clickhouse.max.part.count.for.partition.min(5m)}>{$CLICKHOUSE.PARTS.PER.PARTITION.WARN} * 0.9`                                                   | WARNING  | <p>Manual close: YES</p>                                                                                  |
-| ClickHouse: Too many network errors (over {$CLICKHOUSE.NETWORK.ERRORS.MAX.WARN} in 5m)                                                               | <p>Number of errors (timeouts and connection failures) during query execution, background pool tasks and DNS cache update is too high.</p>                                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:clickhouse.network.error.rate.min(5m)}>{$CLICKHOUSE.NETWORK.ERRORS.MAX.WARN}`                                                                    | WARNING  |                                                                                                           |
-| ClickHouse: Too many distributed files to insert (over {$CLICKHOUSE.DELAYED.FILES.DISTRIBUTED.COUNT.MAX.WARN} for 5 min)                             | <p>"Clickhouse servers and <remote_servers> in config.xml</p><p>https://clickhouse.tech/docs/en/operations/table_engines/distributed/"</p>                                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:clickhouse.distributed.files.min(5m)}>{$CLICKHOUSE.DELAYED.FILES.DISTRIBUTED.COUNT.MAX.WARN}`                                                    | WARNING  | <p>Manual close: YES</p>                                                                                  |
-| ClickHouse: Replication lag is too high (over {$CLICKHOUSE.REPLICA.MAX.WARN} sec for 5min)                                                           | <p>"When replica have too much lag, it can be skipped from Distributed SELECT Queries without errors </p><p>and you will have wrong query results."</p>                                                                                                                                                                                                                                                                                   | `{TEMPLATE_NAME:clickhouse.replicas.max.absolute.delay.min(5m)}>{$CLICKHOUSE.REPLICA.MAX.WARN}`                                                                  | WARNING  | <p>Manual close: YES</p>                                                                                  |
-| ClickHouse: {#DB}.{#TABLE} Replica is readonly                                                                                                       | <p>This mode is turned on if the config doesn’t have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.</p>                                                                                                                                                                                                                               | `{TEMPLATE_NAME:clickhouse.replica.is_readonly["{#DB}.{#TABLE}"].min(5m)}=1`                                                                                     | WARNING  |                                                                                                           |
-| ClickHouse: {#DB}.{#TABLE} Replica session is expired                                                                                                | <p>This mode is turned on if the config doesn’t have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.</p>                                                                                                                                                                                                                               | `{TEMPLATE_NAME:clickhouse.replica.is_session_expired["{#DB}.{#TABLE}"].min(5m)}=1`                                                                              | WARNING  |                                                                                                           |
-| ClickHouse: {#DB}.{#TABLE}: Too many operations in queue (over {$CLICKHOUSE.QUEUE.SIZE.MAX.WARN} for 5m)                                             | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:clickhouse.replica.queue_size["{#DB}.{#TABLE}"].min(5m)}>{$CLICKHOUSE.QUEUE.SIZE.MAX.WARN:"{#TABLE}"}`                                           | WARNING  |                                                                                                           |
-| ClickHouse: {#DB}.{#TABLE}: Number of active replicas less than number of total replicas                                                             | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:clickhouse.replica.active_replicas["{#DB}.{#TABLE}"].max(5m)} < {ClickHouse by HTTP:clickhouse.replica.total_replicas["{#DB}.{#TABLE}"].last()}` | WARNING  |                                                                                                           |
-| ClickHouse: {#DB}.{#TABLE}: Difference between log_max_index and log_pointer is too high (More than {$CLICKHOUSE.LOG_POSITION.DIFF.MAX.WARN} for 5m) | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:clickhouse.replica.lag["{#DB}.{#TABLE}"].min(5m)} > {$CLICKHOUSE.LOG_POSITION.DIFF.MAX.WARN}`                                                    | WARNING  |                                                                                                           |
-| ClickHouse: Too many ZooKeeper sessions opened                                                                                                       | <p>"Number of sessions (connections) to ZooKeeper. </p><p>Should be no more than one, because using more than one connection to ZooKeeper may lead to bugs due to lack of linearizability (stale reads) that ZooKeeper consistency model allows."</p>                                                                                                                                                                                     | `{TEMPLATE_NAME:clickhouse.zookeper.session.min(5m)}>1`                                                                                                          | WARNING  |                                                                                                           |
-| ClickHouse: Configuration has been changed                                                                                                           | <p>ClickHouse configuration has been changed. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                           | `{TEMPLATE_NAME:clickhouse.system.settings.diff()}=1 and {TEMPLATE_NAME:clickhouse.system.settings.strlen()}>0`                                                  | INFO     | <p>Manual close: YES</p>                                                                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|ClickHouse: There are queries running more than {$CLICKHOUSE.QUERY_TIME.MAX.WARN} seconds |<p>-</p> |`last(/ClickHouse by HTTP/clickhouse.process.elapsed)>{$CLICKHOUSE.QUERY_TIME.MAX.WARN}` |AVERAGE |<p>Manual close: YES</p> |
+|ClickHouse: Port {$CLICKHOUSE.PORT} is unavailable |<p>-</p> |`last(/ClickHouse by HTTP/net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|ClickHouse: Service is down |<p>-</p> |`last(/ClickHouse by HTTP/clickhouse.ping)=0 or last(/ClickHouse by HTTP/net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"]) = 0` |AVERAGE |<p>Manual close: YES</p><p>**Depends on**:</p><p>- ClickHouse: Port {$CLICKHOUSE.PORT} is unavailable</p> |
+|ClickHouse: Version has changed (new version: {ITEM.VALUE}) |<p>ClickHouse version has changed. Ack to close.</p> |`last(/ClickHouse by HTTP/clickhouse.version,#1)<>last(/ClickHouse by HTTP/clickhouse.version,#2) and length(last(/ClickHouse by HTTP/clickhouse.version))>0` |INFO |<p>Manual close: YES</p> |
+|ClickHouse: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ClickHouse by HTTP/clickhouse.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ClickHouse: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/ClickHouse by HTTP/clickhouse.uptime,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- ClickHouse: Service is down</p> |
+|ClickHouse: Too many throttled insert queries (over {$CLICKHOUSE.DELAYED.INSERTS.MAX.WARN) for 5 min) |<p>Clickhouse have INSERT queries that are throttled due to high number of active data parts for partition in a MergeTree, please decrease INSERT frequency</p> |`min(/ClickHouse by HTTP/clickhouse.insert.delay,5m)>{$CLICKHOUSE.DELAYED.INSERTS.MAX.WARN}` |WARNING |<p>Manual close: YES</p> |
+|ClickHouse: Too many MergeTree parts (over 90% of {$CLICKHOUSE.PARTS.PER.PARTITION.WARN}) |<p>Descease INSERT queries frequency.</p><p>Clickhouse MergeTree table engine split each INSERT query to partitions (PARTITION BY expression)</p><p>and add one or more PARTS per INSERT inside each partition,</p><p>after that background merge process run, and when you have too much unmerged parts inside partition,</p><p>SELECT queries performance can significate degrade, so clickhouse try delay insert, or abort it.</p> |`min(/ClickHouse by HTTP/clickhouse.max.part.count.for.partition,5m)>{$CLICKHOUSE.PARTS.PER.PARTITION.WARN} * 0.9` |WARNING |<p>Manual close: YES</p> |
+|ClickHouse: Too many network errors (over {$CLICKHOUSE.NETWORK.ERRORS.MAX.WARN} in 5m) |<p>Number of errors (timeouts and connection failures) during query execution, background pool tasks and DNS cache update is too high.</p> |`min(/ClickHouse by HTTP/clickhouse.network.error.rate,5m)>{$CLICKHOUSE.NETWORK.ERRORS.MAX.WARN}` |WARNING | |
+|ClickHouse: Too many distributed files to insert (over {$CLICKHOUSE.DELAYED.FILES.DISTRIBUTED.COUNT.MAX.WARN} for 5 min) |<p>"Clickhouse servers and <remote_servers> in config.xml</p><p>https://clickhouse.tech/docs/en/operations/table_engines/distributed/"</p> |`min(/ClickHouse by HTTP/clickhouse.distributed.files,5m)>{$CLICKHOUSE.DELAYED.FILES.DISTRIBUTED.COUNT.MAX.WARN}` |WARNING |<p>Manual close: YES</p> |
+|ClickHouse: Replication lag is too high (over {$CLICKHOUSE.REPLICA.MAX.WARN} sec for 5min) |<p>When replica have too much lag, it can be skipped from Distributed SELECT Queries without errors</p><p>and you will have wrong query results.</p> |`min(/ClickHouse by HTTP/clickhouse.replicas.max.absolute.delay,5m)>{$CLICKHOUSE.REPLICA.MAX.WARN}` |WARNING |<p>Manual close: YES</p> |
+|ClickHouse: {#DB}.{#TABLE} Replica is readonly |<p>This mode is turned on if the config doesn't have sections with ZooKeeper, if an unknown error occurred when re-initializing sessions in ZooKeeper, and during session re-initialization in ZooKeeper.</p> |`min(/ClickHouse by HTTP/clickhouse.replica.is_readonly["{#DB}.{#TABLE}"],5m)=1` |WARNING | |
+|ClickHouse: {#DB}.{#TABLE} Replica session is expired |<p>This mode is turned on if the config doesn't have sections with ZooKeeper, if an unknown error occurred when re-initializing sessions in ZooKeeper, and during session re-initialization in ZooKeeper.</p> |`min(/ClickHouse by HTTP/clickhouse.replica.is_session_expired["{#DB}.{#TABLE}"],5m)=1` |WARNING | |
+|ClickHouse: {#DB}.{#TABLE}: Too many operations in queue (over {$CLICKHOUSE.QUEUE.SIZE.MAX.WARN} for 5m) |<p>-</p> |`min(/ClickHouse by HTTP/clickhouse.replica.queue_size["{#DB}.{#TABLE}"],5m)>{$CLICKHOUSE.QUEUE.SIZE.MAX.WARN:"{#TABLE}"}` |WARNING | |
+|ClickHouse: {#DB}.{#TABLE}: Number of active replicas less than number of total replicas |<p>-</p> |`max(/ClickHouse by HTTP/clickhouse.replica.active_replicas["{#DB}.{#TABLE}"],5m) < last(/ClickHouse by HTTP/clickhouse.replica.total_replicas["{#DB}.{#TABLE}"])` |WARNING | |
+|ClickHouse: {#DB}.{#TABLE}: Difference between log_max_index and log_pointer is too high (More than {$CLICKHOUSE.LOG_POSITION.DIFF.MAX.WARN} for 5m) |<p>-</p> |`min(/ClickHouse by HTTP/clickhouse.replica.lag["{#DB}.{#TABLE}"],5m) > {$CLICKHOUSE.LOG_POSITION.DIFF.MAX.WARN}` |WARNING | |
+|ClickHouse: Too many ZooKeeper sessions opened |<p>Number of sessions (connections) to ZooKeeper.</p><p>Should be no more than one, because using more than one connection to ZooKeeper may lead to bugs due to lack of linearizability (stale reads) that ZooKeeper consistency model allows.</p> |`min(/ClickHouse by HTTP/clickhouse.zookeper.session,5m)>1` |WARNING | |
+|ClickHouse: Configuration has been changed |<p>ClickHouse configuration has been changed. Ack to close.</p> |`last(/ClickHouse by HTTP/clickhouse.system.settings,#1)<>last(/ClickHouse by HTTP/clickhouse.system.settings,#2) and length(last(/ClickHouse by HTTP/clickhouse.system.settings))>0` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/db/clickhouse_http/template_db_clickhouse_http.yaml b/templates/db/clickhouse_http/template_db_clickhouse_http.yaml
index ef4a36d30bf..86b7dcbdcf1 100644
--- a/templates/db/clickhouse_http/template_db_clickhouse_http.yaml
+++ b/templates/db/clickhouse_http/template_db_clickhouse_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:39Z'
+  version: '6.0'
+  date: '2022-01-10T07:41:26Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Get node metrics from ClickHouse HTTP interface using HTTP agent.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -381,9 +381,9 @@ zabbix_export:
           history: 7d
           units: B
           description: |
-            "Maximum number of bytes in physically resident data pages mapped by the allocator, 
-            comprising all pages dedicated to allocator metadata, pages backing active allocations, 
-            and unused dirty pages."
+            Maximum number of bytes in physically resident data pages mapped by the allocator,
+            comprising all pages dedicated to allocator metadata, pages backing active allocations,
+            and unused dirty pages.
           preprocessing:
             -
               type: JSONPATH
@@ -403,8 +403,8 @@ zabbix_export:
           delay: '0'
           history: 7d
           description: |
-            "Clickhouse MergeTree table engine split each INSERT query to partitions (PARTITION BY expression) and add one or more PARTS per INSERT inside each partition, 
-            after that background merge process run."
+            Clickhouse MergeTree table engine split each INSERT query to partitions (PARTITION BY expression) and add one or more PARTS per INSERT inside each partition,
+            after that background merge process run.
           preprocessing:
             -
               type: JSONPATH
@@ -423,11 +423,11 @@ zabbix_export:
               name: 'ClickHouse: Too many MergeTree parts (over 90% of {$CLICKHOUSE.PARTS.PER.PARTITION.WARN})'
               priority: WARNING
               description: |
-                "Descease INSERT queries frequency.
-                Clickhouse MergeTree table engine split each INSERT query to partitions (PARTITION BY expression) 
-                and add one or more PARTS per INSERT inside each partition, 
-                after that background merge process run, and when you have too much unmerged parts inside partition, 
-                SELECT queries performance can significate degrade, so clickhouse try delay insert, or abort it"
+                Descease INSERT queries frequency.
+                Clickhouse MergeTree table engine split each INSERT query to partitions (PARTITION BY expression)
+                and add one or more PARTS per INSERT inside each partition,
+                after that background merge process run, and when you have too much unmerged parts inside partition,
+                SELECT queries performance can significate degrade, so clickhouse try delay insert, or abort it.
               manual_close: 'YES'
         -
           uuid: a4344162643142c9be3b09439b466a5d
@@ -508,8 +508,8 @@ zabbix_export:
           value_type: FLOAT
           units: B
           description: |
-            "Total amount of memory (bytes) allocated for background merges. Included in MemoryTrackingInBackgroundProcessingPool. Note that this value may include a drift when the memory was allocated in a context of background processing pool and freed in other context or vice-versa. 
-            This happens naturally due to caches for tables indexes and doesn't indicate memory leaks."
+            Total amount of memory (bytes) allocated for background merges. Included in MemoryTrackingInBackgroundProcessingPool. Note that this value may include a drift when the memory was allocated in a context of background processing pool and freed in other context or vice-versa.
+            This happens naturally due to caches for tables indexes and doesn't indicate memory leaks.
           preprocessing:
             -
               type: JSONPATH
@@ -668,7 +668,6 @@ zabbix_export:
               parameters:
                 - 10m
           url: '{$CLICKHOUSE.SCHEME}://{HOST.CONN}:{$CLICKHOUSE.PORT}/ping'
-          status_codes: ''
           tags:
             -
               tag: Application
@@ -852,8 +851,8 @@ zabbix_export:
               name: 'ClickHouse: Replication lag is too high (over {$CLICKHOUSE.REPLICA.MAX.WARN} sec for 5min)'
               priority: WARNING
               description: |
-                "When replica have too much lag, it can be skipped from Distributed SELECT Queries without errors 
-                and you will have wrong query results."
+                When replica have too much lag, it can be skipped from Distributed SELECT Queries without errors
+                and you will have wrong query results.
               manual_close: 'YES'
         -
           uuid: dd61675348374d2ea06cdde144fe4e26
@@ -863,9 +862,9 @@ zabbix_export:
           delay: '0'
           history: 7d
           description: |
-            "Number of Replicated tables that are currently in readonly state 
-            due to re-initialization after ZooKeeper session loss 
-            or due to startup without ZooKeeper configured."
+            Number of Replicated tables that are currently in readonly state
+            due to re-initialization after ZooKeeper session loss
+            or due to startup without ZooKeeper configured.
           preprocessing:
             -
               type: JSONPATH
@@ -1227,7 +1226,7 @@ zabbix_export:
           uuid: f8e6a866d8c745d39ed124f19afe8041
           name: 'ClickHouse: ZooKeeper hardware exceptions per second'
           type: DEPENDENT
-          key: clickhouse.zookeper.hw_exeptions.rate
+          key: clickhouse.zookeper.hw_exceptions.rate
           delay: '0'
           history: 7d
           value_type: FLOAT
@@ -1294,13 +1293,13 @@ zabbix_export:
               name: 'ClickHouse: Too many ZooKeeper sessions opened'
               priority: WARNING
               description: |
-                "Number of sessions (connections) to ZooKeeper. 
-                Should be no more than one, because using more than one connection to ZooKeeper may lead to bugs due to lack of linearizability (stale reads) that ZooKeeper consistency model allows."
+                Number of sessions (connections) to ZooKeeper.
+                Should be no more than one, because using more than one connection to ZooKeeper may lead to bugs due to lack of linearizability (stale reads) that ZooKeeper consistency model allows.
         -
           uuid: 4931797c1034488fb9a2fc01e22b599c
           name: 'ClickHouse: ZooKeeper user exceptions per second'
           type: DEPENDENT
-          key: clickhouse.zookeper.user_exeptions.rate
+          key: clickhouse.zookeper.user_exceptions.rate
           delay: '0'
           history: 7d
           value_type: FLOAT
@@ -1393,7 +1392,7 @@ zabbix_export:
             -
               uuid: 1d4b9842b66b4da9ab3750944b2fa050
               expression: 'last(/ClickHouse by HTTP/net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"])=0'
-              name: 'ClickHouse: Port {$CLICKHOUSE.PORT} is unavaliable'
+              name: 'ClickHouse: Port {$CLICKHOUSE.PORT} is unavailable'
               priority: AVERAGE
               manual_close: 'YES'
       discovery_rules:
@@ -1532,7 +1531,7 @@ zabbix_export:
               key: 'clickhouse.replica.future_parts["{#DB}.{#TABLE}"]'
               delay: '0'
               history: 7d
-              description: 'Number of data parts that will appear as the result of INSERTs or merges that haven’t been done yet.'
+              description: 'Number of data parts that will appear as the result of INSERTs or merges that haven''t been done yet.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1572,7 +1571,7 @@ zabbix_export:
               history: 7d
               description: |
                 Whether the replica is in read-only mode.
-                This mode is turned on if the config doesn’t have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.
+                This mode is turned on if the config doesn't have sections with ZooKeeper, if an unknown error occurred when re-initializing sessions in ZooKeeper, and during session re-initialization in ZooKeeper.
               valuemap:
                 name: 'Replicas state'
               preprocessing:
@@ -1592,7 +1591,7 @@ zabbix_export:
                   expression: 'min(/ClickHouse by HTTP/clickhouse.replica.is_readonly["{#DB}.{#TABLE}"],5m)=1'
                   name: 'ClickHouse: {#DB}.{#TABLE} Replica is readonly'
                   priority: WARNING
-                  description: 'This mode is turned on if the config doesn’t have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.'
+                  description: 'This mode is turned on if the config doesn''t have sections with ZooKeeper, if an unknown error occurred when re-initializing sessions in ZooKeeper, and during session re-initialization in ZooKeeper.'
             -
               uuid: a889475b8ddf48109af3dd2b7ed58627
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica session expired'
@@ -1620,7 +1619,7 @@ zabbix_export:
                   expression: 'min(/ClickHouse by HTTP/clickhouse.replica.is_session_expired["{#DB}.{#TABLE}"],5m)=1'
                   name: 'ClickHouse: {#DB}.{#TABLE} Replica session is expired'
                   priority: WARNING
-                  description: 'This mode is turned on if the config doesn’t have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.'
+                  description: 'This mode is turned on if the config doesn''t have sections with ZooKeeper, if an unknown error occurred when re-initializing sessions in ZooKeeper, and during session re-initialization in ZooKeeper.'
             -
               uuid: 8acd6e2195064708886d9944af264c32
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica lag'
@@ -2031,7 +2030,7 @@ zabbix_export:
       manual_close: 'YES'
       dependencies:
         -
-          name: 'ClickHouse: Port {$CLICKHOUSE.PORT} is unavaliable'
+          name: 'ClickHouse: Port {$CLICKHOUSE.PORT} is unavailable'
           expression: 'last(/ClickHouse by HTTP/net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"])=0'
   graphs:
     -
@@ -2267,13 +2266,13 @@ zabbix_export:
           color: 2774A4
           item:
             host: 'ClickHouse by HTTP'
-            key: clickhouse.zookeper.hw_exeptions.rate
+            key: clickhouse.zookeper.hw_exceptions.rate
         -
           sortorder: '2'
           color: F63100
           item:
             host: 'ClickHouse by HTTP'
-            key: clickhouse.zookeper.user_exeptions.rate
+            key: clickhouse.zookeper.user_exceptions.rate
         -
           sortorder: '3'
           drawtype: BOLD_LINE
diff --git a/templates/db/gridgain_jmx/README.md b/templates/db/gridgain_jmx/README.md
index e106b854197..777f1b93c51 100644
--- a/templates/db/gridgain_jmx/README.md
+++ b/templates/db/gridgain_jmx/README.md
@@ -55,16 +55,16 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|GridGain kernal metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=IgniteKernal,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Cluster metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Local node metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterLocalNodeMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|TCP discovery SPI |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpDiscoverySpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|TCP Ccmmunication SPI metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpCommunicationSpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Transaction metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=TransactionMetrics,name=TransactionMetricsMxBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Cache metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:name=\"org.apache.gridgain.internal.processors.cache.CacheLocalMetricsMXBeanImpl\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- A: {#JMXGROUP} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.MATCHES}`</p><p>- B: {#JMXGROUP} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
-|Data region metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=DataRegionMetrics,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- A: {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.DATA.REGION.MATCHES}`</p><p>- B: {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.DATA.REGION.NOT_MATCHES}`</p> |
-|Cache groups |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Cache groups\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- A: {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.MATCHES}`</p><p>- B: {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
-|Thread pool metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Thread Pools\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- A: {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.THREAD.POOL.MATCHES}`</p><p>- B: {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.THREAD.POOL.NOT_MATCHES}`</p> |
+|GridGain kernal metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=IgniteKernal,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Cluster metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Local node metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterLocalNodeMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|TCP discovery SPI |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpDiscoverySpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|TCP Communication SPI metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpCommunicationSpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Transaction metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=TransactionMetrics,name=TransactionMetricsMxBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Cache metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:name=\"org.apache.gridgain.internal.processors.cache.CacheLocalMetricsMXBeanImpl\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXGROUP} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.MATCHES}`</p><p>- {#JMXGROUP} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
+|Data region metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=DataRegionMetrics,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.DATA.REGION.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.DATA.REGION.NOT_MATCHES}`</p> |
+|Cache groups |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Cache groups\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
+|Thread pool metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Thread Pools\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.THREAD.POOL.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.THREAD.POOL.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -82,9 +82,9 @@ There are no template links in this template.
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs rejected, current |<p>Number of jobs rejected after more recent collision resolution operation.</p> |JMX |jmx["{#JMXOBJ}",CurrentRejectedJobs] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs waiting, current |<p>Number of queued jobs currently waiting to be executed.</p> |JMX |jmx["{#JMXOBJ}",CurrentWaitingJobs] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs active, current |<p>Number of currently active jobs concurrently executing on the node.</p> |JMX |jmx["{#JMXOBJ}",CurrentActiveJobs] |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs executed, rate |<p>Total number of jobs handled by the node per second.</p> |JMX |jmx["{#JMXOBJ}",TotalExecutedJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs cancelled, rate |<p>Total number of jobs cancelled by the node per second.</p> |JMX |jmx["{#JMXOBJ}",TotalCancelledJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs rejects, rate |<p>Total number of jobs this node rejects during collision resolution operations since node startup per second.</p> |JMX |jmx["{#JMXOBJ}",TotalRejectedJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs executed, rate |<p>Total number of jobs handled by the node per second.</p> |JMX |jmx["{#JMXOBJ}",TotalExecutedJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs cancelled, rate |<p>Total number of jobs cancelled by the node per second.</p> |JMX |jmx["{#JMXOBJ}",TotalCancelledJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs rejects, rate |<p>Total number of jobs this node rejects during collision resolution operations since node startup per second.</p> |JMX |jmx["{#JMXOBJ}",TotalRejectedJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration, current |<p>Current PME duration in milliseconds.</p> |JMX |jmx["{#JMXOBJ}",CurrentPmeDuration] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Threads count, current |<p>Current number of live threads.</p> |JMX |jmx["{#JMXOBJ}",CurrentThreadCount] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Heap memory used |<p>Current heap size that is used for object allocation.</p> |JMX |jmx["{#JMXOBJ}",HeapMemoryUsed] |
@@ -93,27 +93,27 @@ There are no template links in this template.
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes joined |<p>Nodes join count.</p> |JMX |jmx["{#JMXOBJ}",NodesJoined] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes failed |<p>Nodes failed count.</p> |JMX |jmx["{#JMXOBJ}",NodesFailed] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Discovery message worker queue |<p>Message worker queue current size.</p> |JMX |jmx["{#JMXOBJ}",MessageWorkerQueueSize] |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Discovery reconnect, rate |<p>Number of times node tries to (re)establish connection to another node per second.</p> |JMX |jmx["{#JMXOBJ}",ReconnectCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: TotalProcessedMessages |<p>The number of messages received per second.</p> |JMX |jmx["{#JMXOBJ}",TotalProcessedMessages]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Discovery messages received, rate |<p>The number of messages processed per second.</p> |JMX |jmx["{#JMXOBJ}",TotalReceivedMessages]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Discovery reconnect, rate |<p>Number of times node tries to (re)establish connection to another node per second.</p> |JMX |jmx["{#JMXOBJ}",ReconnectCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: TotalProcessedMessages |<p>The number of messages received per second.</p> |JMX |jmx["{#JMXOBJ}",TotalProcessedMessages]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Discovery messages received, rate |<p>The number of messages processed per second.</p> |JMX |jmx["{#JMXOBJ}",TotalReceivedMessages]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Communication outbound messages queue |<p>Outbound messages queue size.</p> |JMX |jmx["{#JMXOBJ}",OutboundMessagesQueueSize] |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Communication messages received, rate |<p>The number of  messages received per second.</p> |JMX |jmx["{#JMXOBJ}",ReceivedMessagesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Communication messages sent, rate |<p>The number of  messages sent per second.</p> |JMX |jmx["{#JMXOBJ}",SentMessagesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Communication reconnect rate |<p>Gets maximum number of reconnect attempts used when establishing connection with remote nodes per second.</p> |JMX |jmx["{#JMXOBJ}",ReconnectCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Communication messages received, rate |<p>The number of  messages received per second.</p> |JMX |jmx["{#JMXOBJ}",ReceivedMessagesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Communication messages sent, rate |<p>The number of  messages sent per second.</p> |JMX |jmx["{#JMXOBJ}",SentMessagesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Communication reconnect rate |<p>Gets maximum number of reconnect attempts used when establishing connection with remote nodes per second.</p> |JMX |jmx["{#JMXOBJ}",ReconnectCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Locked keys |<p>The number of keys locked on the node.</p> |JMX |jmx["{#JMXOBJ}",LockedKeysNumber] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Transactions owner, current |<p>The number of active transactions for which this node is the initiator.</p> |JMX |jmx["{#JMXOBJ}",OwnerTransactionsNumber] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Transactions holding lock, current |<p>The number of active transactions holding at least one key lock.</p> |JMX |jmx["{#JMXOBJ}",TransactionsHoldingLockNumber] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Transactions rolledback, rate |<p>The number of transactions which were rollback per second.</p> |JMX |jmx["{#JMXOBJ}",TransactionsRolledBackNumber] |
 |GridGain |GridGain [{#JMXIGNITEINSTANCENAME}]: Transactions committed, rate |<p>The number of transactions which were committed per second.</p> |JMX |jmx["{#JMXOBJ}",TransactionsCommittedNumber] |
-|GridGain |Cache group [{#JMXGROUP}]: Cache gets, rate |<p>The number of gets to the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CacheGets]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |Cache group [{#JMXGROUP}]: Cache puts, rate |<p>The number of puts to the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CachePuts]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |Cache group [{#JMXGROUP}]: Cache removals, rate |<p>The number of removals from the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CacheRemovals]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|GridGain |Cache group [{#JMXGROUP}]: Cache gets, rate |<p>The number of gets to the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CacheGets]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |Cache group [{#JMXGROUP}]: Cache puts, rate |<p>The number of puts to the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CachePuts]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |Cache group [{#JMXGROUP}]: Cache removals, rate |<p>The number of removals from the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CacheRemovals]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |GridGain |Cache group [{#JMXGROUP}]: Cache hits, pct |<p>Percentage of successful hits.</p> |JMX |jmx["{#JMXOBJ}",CacheHitPercentage] |
 |GridGain |Cache group [{#JMXGROUP}]: Cache misses, pct |<p>Percentage of accesses that failed to find anything.</p> |JMX |jmx["{#JMXOBJ}",CacheMissPercentage] |
-|GridGain |Cache group [{#JMXGROUP}]: Cache transaction commits, rate |<p>The number of transaction commits per second.</p> |JMX |jmx["{#JMXOBJ}",CacheTxCommits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|GridGain |Cache group [{#JMXGROUP}]: Cache transaction rollbacks, rate |<p>The number of transaction rollback per second.</p> |JMX |jmx["{#JMXOBJ}",CacheTxRollbacks]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|GridGain |Cache group [{#JMXGROUP}]: Cache transaction commits, rate |<p>The number of transaction commits per second.</p> |JMX |jmx["{#JMXOBJ}",CacheTxCommits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|GridGain |Cache group [{#JMXGROUP}]: Cache transaction rollbacks, rate |<p>The number of transaction rollback per second.</p> |JMX |jmx["{#JMXOBJ}",CacheTxRollbacks]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |GridGain |Cache group [{#JMXGROUP}]: Cache size |<p>The number of non-null values in the cache as a long value.</p> |JMX |jmx["{#JMXOBJ}",CacheSize] |
-|GridGain |Cache group [{#JMXGROUP}]: Cache heap entries |<p>The number of entries in heap memory.</p> |JMX |jmx["{#JMXOBJ}",HeapEntriesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|GridGain |Cache group [{#JMXGROUP}]: Cache heap entries |<p>The number of entries in heap memory.</p> |JMX |jmx["{#JMXOBJ}",HeapEntriesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |GridGain |Data region {#JMXNAME}: Allocation, rate |<p>Allocation rate (pages per second) averaged across rateTimeInternal.</p> |JMX |jmx["{#JMXOBJ}",AllocationRate] |
 |GridGain |Data region {#JMXNAME}: Allocated, bytes |<p>Total size of memory allocated in bytes.</p> |JMX |jmx["{#JMXOBJ}",TotalAllocatedSize] |
 |GridGain |Data region {#JMXNAME}: Dirty pages |<p>Number of pages in memory not yet synchronized with persistent storage.</p> |JMX |jmx["{#JMXOBJ}",DirtyPages] |
@@ -143,31 +143,31 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|GridGain [{#JMXIGNITEINSTANCENAME}]: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",UpTime].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",UpTime].nodata(10m)}=1` |WARNING |<p>Manual close: YES</p> |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: Version has changed (new version: {ITEM.VALUE}) |<p>GridGain [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",FullVersion].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",FullVersion].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: Server node left the topology |<p>One or more server node left the topology. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",TotalServerNodes].change()}<0` |WARNING |<p>Manual close: YES</p> |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: Server node added to the topology |<p>One or more server node added to the topology. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",TotalServerNodes].change()}>0` |INFO |<p>Manual close: YES</p> |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: There are nodes is not in topology |<p>One or more server node left the topology. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",TotalServerNodes].last()}>{GridGain by JMX:jmx["{#JMXOBJ}",TotalBaselineNodes].last()}` |INFO |<p>Manual close: YES</p> |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: Number of queued jobs is too high (over {$GRIDGAIN.JOBS.QUEUE.MAX.WARN} for 15 min) |<p>Number of queued jobs is over {$GRIDGAIN.JOBS.QUEUE.MAX.WARN}.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CurrentWaitingJobs].min(15m)} > {$GRIDGAIN.JOBS.QUEUE.MAX.WARN}` |WARNING | |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.WARN} for 5 min) |<p>PME duration is over {$GRIDGAIN.PME.DURATION.MAX.WARN}ms.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CurrentPmeDuration].min(5m)} > {$GRIDGAIN.PME.DURATION.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min)</p> |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min) |<p>PME duration is over {$GRIDGAIN.PME.DURATION.MAX.HIGH}ms. Looks like PME is hung.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CurrentPmeDuration].min(5m)} > {$GRIDGAIN.PME.DURATION.MAX.HIGH}` |HIGH | |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: Number of running threads is too high (over {$GRIDGAIN.THREADS.COUNT.MAX.WARN} for 15 min) |<p>Number of running threads is over {$GRIDGAIN.THREADS.COUNT.MAX.WARN}.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CurrentThreadCount].min(15m)} > {$GRIDGAIN.THREADS.COUNT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min)</p> |
-|GridGain [{#JMXIGNITEINSTANCENAME}]: Coordinator has changed |<p>GridGain [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",Coordinator].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",Coordinator].strlen()}>0` |WARNING |<p>Manual close: YES</p> |
-|Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CacheTxRollbacks].min(5m)}>0 and {GridGain by JMX:jmx["{#JMXOBJ}",CacheTxCommits].max(5m)}=0` |AVERAGE | |
-|Cache group [{#JMXGROUP}]: Success transactions less than rollbacks for 5m |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CacheTxRollbacks].min(5m)} > {GridGain by JMX:jmx["{#JMXOBJ}",CacheTxCommits].max(5m)}` |WARNING |<p>**Depends on**:</p><p>- Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m</p> |
-|Cache group [{#JMXGROUP}]: All entries are in heap |<p>All entries are in heap. Possibly you use eager queries it may cause out of memory exceptions for big caches. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CacheSize].last()}={GridGain by JMX:jmx["{#JMXOBJ}",HeapEntriesCount].last()}` |INFO |<p>Manual close: YES</p> |
-|Data region {#JMXNAME}: Node started to evict pages |<p>You store more data then region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",EvictionRate].min(5m)}>0` |INFO |<p>Manual close: YES</p> |
-|Data region {#JMXNAME}: Data region utilisation is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.WARN} in 5m) |<p>Data region utilization is high. Increase data region size or delete any data.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",OffheapUsedSize].min(5m)}/{GridGain by JMX:jmx["{#JMXOBJ}",OffHeapSize].last()}*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Data region {#JMXNAME}: Data region utilisation is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m)</p> |
-|Data region {#JMXNAME}: Data region utilisation is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m) |<p>Data region utilization is high. Increase data region size or delete any data.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",OffheapUsedSize].min(5m)}/{GridGain by JMX:jmx["{#JMXOBJ}",OffHeapSize].last()}*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH}` |HIGH | |
-|Data region {#JMXNAME}: Pages replace rate more than 0 |<p>There is more data than DataRegionMaxSize. Cluster started to replace pages in memory. Page replacement can slow down operations.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",PagesReplaceRate].min(5m)}>0` |WARNING | |
-|Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$GRIDGAIN.CHECKPOINT.PUSED.MAX.WARN} in 5m) |<p>Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",UsedCheckpointBufferSize].min(5m)}/{GridGain by JMX:jmx["{#JMXOBJ}",CheckpointBufferSize].last()}*100>{$GRIDGAIN.CHECKPOINT.PUSED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH} in 5m)</p> |
-|Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH} in 5m) |<p>Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",UsedCheckpointBufferSize].min(5m)}/{GridGain by JMX:jmx["{#JMXOBJ}",CheckpointBufferSize].last()}*100>{$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH}` |HIGH | |
-|Cache group [{#JMXNAME}]: One or more backups are unavailable |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",Backups].min(5m)}>={GridGain by JMX:jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies].max(5m)}` |WARNING | |
-|Cache group [{#JMXNAME}]: List of caches has changed |<p>List of caches has changed. Significant changes have occurred in the cluster. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",Caches].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",Caches].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Cache group [{#JMXNAME}]: Rebalance in progress |<p>Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",LocalNodeMovingPartitionsCount].max(30m)}>0` |INFO |<p>Manual close: YES</p> |
-|Cache group [{#JMXNAME}]: There is no copy for partitions |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies].max(30m)}=0` |WARNING | |
-|Thread pool [{#JMXNAME}]: Too many messages in queue (over {$GRIDGAIN.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"} for 5 min) |<p>Number of messages in queue more than {$GRIDGAIN.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",QueueSize].min(5m)} > {$GRIDGAIN.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}` |AVERAGE | |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/GridGain by JMX/jmx["{#JMXOBJ}",UpTime])<10m` |INFO |<p>Manual close: YES</p> |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes.</p> |`nodata(/GridGain by JMX/jmx["{#JMXOBJ}",UpTime],10m)=1` |WARNING |<p>Manual close: YES</p> |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: Version has changed (new version: {ITEM.VALUE}) |<p>GridGain [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.</p> |`last(/GridGain by JMX/jmx["{#JMXOBJ}",FullVersion],#1)<>last(/GridGain by JMX/jmx["{#JMXOBJ}",FullVersion],#2) and length(last(/GridGain by JMX/jmx["{#JMXOBJ}",FullVersion]))>0` |INFO |<p>Manual close: YES</p> |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: Server node left the topology |<p>One or more server node left the topology. Ack to close.</p> |`change(/GridGain by JMX/jmx["{#JMXOBJ}",TotalServerNodes])<0` |WARNING |<p>Manual close: YES</p> |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: Server node added to the topology |<p>One or more server node added to the topology. Ack to close.</p> |`change(/GridGain by JMX/jmx["{#JMXOBJ}",TotalServerNodes])>0` |INFO |<p>Manual close: YES</p> |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: There are nodes is not in topology |<p>One or more server node left the topology. Ack to close.</p> |`last(/GridGain by JMX/jmx["{#JMXOBJ}",TotalServerNodes])>last(/GridGain by JMX/jmx["{#JMXOBJ}",TotalBaselineNodes])` |INFO |<p>Manual close: YES</p> |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: Number of queued jobs is too high (over {$GRIDGAIN.JOBS.QUEUE.MAX.WARN} for 15 min) |<p>Number of queued jobs is over {$GRIDGAIN.JOBS.QUEUE.MAX.WARN}.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",CurrentWaitingJobs],15m) > {$GRIDGAIN.JOBS.QUEUE.MAX.WARN}` |WARNING | |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.WARN} for 5 min) |<p>PME duration is over {$GRIDGAIN.PME.DURATION.MAX.WARN}ms.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$GRIDGAIN.PME.DURATION.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min)</p> |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min) |<p>PME duration is over {$GRIDGAIN.PME.DURATION.MAX.HIGH}ms. Looks like PME is hung.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$GRIDGAIN.PME.DURATION.MAX.HIGH}` |HIGH | |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: Number of running threads is too high (over {$GRIDGAIN.THREADS.COUNT.MAX.WARN} for 15 min) |<p>Number of running threads is over {$GRIDGAIN.THREADS.COUNT.MAX.WARN}.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",CurrentThreadCount],15m) > {$GRIDGAIN.THREADS.COUNT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min)</p> |
+|GridGain [{#JMXIGNITEINSTANCENAME}]: Coordinator has changed |<p>GridGain [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.</p> |`last(/GridGain by JMX/jmx["{#JMXOBJ}",Coordinator],#1)<>last(/GridGain by JMX/jmx["{#JMXOBJ}",Coordinator],#2) and length(last(/GridGain by JMX/jmx["{#JMXOBJ}",Coordinator]))>0` |WARNING |<p>Manual close: YES</p> |
+|Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m |<p>-</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m)>0 and max(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)=0` |AVERAGE | |
+|Cache group [{#JMXGROUP}]: Success transactions less than rollbacks for 5m |<p>-</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m) > max(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)` |WARNING |<p>**Depends on**:</p><p>- Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m</p> |
+|Cache group [{#JMXGROUP}]: All entries are in heap |<p>All entries are in heap. Possibly you use eager queries it may cause out of memory exceptions for big caches. Ack to close.</p> |`last(/GridGain by JMX/jmx["{#JMXOBJ}",CacheSize])=last(/GridGain by JMX/jmx["{#JMXOBJ}",HeapEntriesCount])` |INFO |<p>Manual close: YES</p> |
+|Data region {#JMXNAME}: Node started to evict pages |<p>You store more data than region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",EvictionRate],5m)>0` |INFO |<p>Manual close: YES</p> |
+|Data region {#JMXNAME}: Data region utilization is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.WARN} in 5m) |<p>Data region utilization is high. Increase data region size or delete any data.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Data region {#JMXNAME}: Data region utilization is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m)</p> |
+|Data region {#JMXNAME}: Data region utilization is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m) |<p>Data region utilization is high. Increase data region size or delete any data.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH}` |HIGH | |
+|Data region {#JMXNAME}: Pages replace rate more than 0 |<p>There is more data than DataRegionMaxSize. Cluster started to replace pages in memory. Page replacement can slow down operations.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",PagesReplaceRate],5m)>0` |WARNING | |
+|Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$GRIDGAIN.CHECKPOINT.PUSED.MAX.WARN} in 5m) |<p>Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",UsedCheckpointBufferSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",CheckpointBufferSize])*100>{$GRIDGAIN.CHECKPOINT.PUSED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH} in 5m)</p> |
+|Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH} in 5m) |<p>Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",UsedCheckpointBufferSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",CheckpointBufferSize])*100>{$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH}` |HIGH | |
+|Cache group [{#JMXNAME}]: One or more backups are unavailable |<p>-</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",Backups],5m)>=max(/GridGain by JMX/jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies],5m)` |WARNING | |
+|Cache group [{#JMXNAME}]: List of caches has changed |<p>List of caches has changed. Significant changes have occurred in the cluster. Ack to close.</p> |`last(/GridGain by JMX/jmx["{#JMXOBJ}",Caches],#1)<>last(/GridGain by JMX/jmx["{#JMXOBJ}",Caches],#2) and length(last(/GridGain by JMX/jmx["{#JMXOBJ}",Caches]))>0` |INFO |<p>Manual close: YES</p> |
+|Cache group [{#JMXNAME}]: Rebalance in progress |<p>Ack to close.</p> |`max(/GridGain by JMX/jmx["{#JMXOBJ}",LocalNodeMovingPartitionsCount],30m)>0` |INFO |<p>Manual close: YES</p> |
+|Cache group [{#JMXNAME}]: There is no copy for partitions |<p>-</p> |`max(/GridGain by JMX/jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies],30m)=0` |WARNING | |
+|Thread pool [{#JMXNAME}]: Too many messages in queue (over {$GRIDGAIN.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"} for 5 min) |<p>Number of messages in queue more than {$GRIDGAIN.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}.</p> |`min(/GridGain by JMX/jmx["{#JMXOBJ}",QueueSize],5m) > {$GRIDGAIN.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/db/gridgain_jmx/template_db_gridgain_jmx.yaml b/templates/db/gridgain_jmx/template_db_gridgain_jmx.yaml
index 2ca54321fde..95007c5b32b 100644
--- a/templates/db/gridgain_jmx/template_db_gridgain_jmx.yaml
+++ b/templates/db/gridgain_jmx/template_db_gridgain_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-17T15:25:51Z'
+  version: '6.0'
+  date: '2022-01-10T07:41:30Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,13 +13,13 @@ zabbix_export:
       description: |
         The template to monitor GridGain In-Memory Computing Platform by Zabbix that work without any external scripts.
           It works with both standalone and cluster instances.
-          The metrics are discoverable and collected by JMX.  
+          The metrics are discoverable and collected by JMX.
           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.
           You can set {$GRIDGAIN.USER} and {$GRIDGAIN.PASSWORD} macros in the template for using on the host level.
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -114,7 +114,7 @@ zabbix_export:
                   expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",EvictionRate],5m)>0'
                   name: 'Data region {#JMXNAME}: Node started to evict pages'
                   priority: INFO
-                  description: 'You store more data then region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.'
+                  description: 'You store more data than region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.'
                   manual_close: 'YES'
             -
               uuid: 9f7d683cf3ca47c681eef43e4dd9a471
@@ -255,18 +255,18 @@ zabbix_export:
             -
               uuid: 92c2772aa8d7425e8bee5d760ba5b607
               expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH}'
-              name: 'Data region {#JMXNAME}: Data region utilisation is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
+              name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
               priority: HIGH
               description: 'Data region utilization is high. Increase data region size or delete any data.'
             -
               uuid: 3694e6d813b04b51a77c842de617503c
               expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.WARN}'
-              name: 'Data region {#JMXNAME}: Data region utilisation is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.WARN} in 5m)'
+              name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.WARN} in 5m)'
               priority: WARNING
               description: 'Data region utilization is high. Increase data region size or delete any data.'
               dependencies:
                 -
-                  name: 'Data region {#JMXNAME}: Data region utilisation is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
+                  name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
                   expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH}'
           graph_prototypes:
             -
@@ -287,7 +287,7 @@ zabbix_export:
                     key: 'jmx["{#JMXOBJ}",UsedCheckpointBufferSize]'
             -
               uuid: 6f2ffd3ba45c4803864d049e7bfbbf18
-              name: 'Data region {#JMXNAME}: DataRegion utilisation'
+              name: 'Data region {#JMXNAME}: DataRegion utilization'
               graph_items:
                 -
                   drawtype: BOLD_LINE
@@ -318,7 +318,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -593,7 +592,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
         -
           uuid: 5b7b9e010a274bb5a52784143dd57628
           name: 'Cluster metrics'
@@ -738,7 +736,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
         -
           uuid: 3b81fbcbef204717be1918d3df919174
           name: 'GridGain kernal metrics'
@@ -855,11 +852,9 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
-                  
         -
           uuid: 6265d30cd7494809bc94f929968d3c6f
-          name: 'TCP Ccmmunication SPI metrics'
+          name: 'TCP Communication SPI metrics'
           type: JMX
           key: 'jmx.discovery[beans,"org.apache:group=SPIs,name=TcpCommunicationSpi,*"]'
           delay: 30m
@@ -975,9 +970,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
-                  
-                  
         -
           uuid: 5fb38d8148d746d6ae19d4f8c5a33ce8
           name: 'TCP discovery SPI'
@@ -1167,9 +1159,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
-                  
-                  
         -
           uuid: b0b570121f1646e5baf0b0ff5cc5de2b
           name: 'Transaction metrics'
@@ -1299,9 +1288,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
-                  
-                  
         -
           uuid: 7e3825aba1ad47c194162122eb050612
           name: 'Cache groups'
@@ -1529,7 +1515,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1661,7 +1646,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1950,7 +1934,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(data)
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
diff --git a/templates/db/ignite_jmx/README.md b/templates/db/ignite_jmx/README.md
index cfc611f2fdb..37ad9d4f741 100644
--- a/templates/db/ignite_jmx/README.md
+++ b/templates/db/ignite_jmx/README.md
@@ -3,14 +3,13 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Official JMX Template for Apache Ignite computing platform.
 This template is based on the original template developed by Igor Akkuratov, Senior Engineer at GridGain Systems and Apache Ignite Contributor.
 
 
 This template was tested on:
 
-- Zabbix, version 5.4
 - Ignite, version 2.9.0
 
 ## Setup
@@ -56,16 +55,16 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Ignite kernal metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=IgniteKernal,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Cluster metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Local node metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterLocalNodeMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|TCP discovery SPI |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpDiscoverySpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|TCP Ccmmunication SPI metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpCommunicationSpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Transaction metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=TransactionMetrics,name=TransactionMetricsMxBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|Cache metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:name=\"org.apache.ignite.internal.processors.cache.CacheLocalMetricsMXBeanImpl\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- A: {#JMXGROUP} MATCHES_REGEX `{$IGNITE.LLD.FILTER.CACHE.MATCHES}`</p><p>- B: {#JMXGROUP} NOT_MATCHES_REGEX `{$IGNITE.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
-|Data region metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=DataRegionMetrics,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- A: {#JMXNAME} MATCHES_REGEX `{$IGNITE.LLD.FILTER.DATA.REGION.MATCHES}`</p><p>- B: {#JMXNAME} NOT_MATCHES_REGEX `{$IGNITE.LLD.FILTER.DATA.REGION.NOT_MATCHES}`</p> |
-|Cache groups |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Cache groups\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- A: {#JMXNAME} MATCHES_REGEX `{$IGNITE.LLD.FILTER.CACHE.MATCHES}`</p><p>- B: {#JMXNAME} NOT_MATCHES_REGEX `{$IGNITE.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
-|Thread pool metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Thread Pools\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- A: {#JMXNAME} MATCHES_REGEX `{$IGNITE.LLD.FILTER.THREAD.POOL.MATCHES}`</p><p>- B: {#JMXNAME} NOT_MATCHES_REGEX `{$IGNITE.LLD.FILTER.THREAD.POOL.NOT_MATCHES}`</p> |
+|Ignite kernal metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=IgniteKernal,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Cluster metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Local node metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterLocalNodeMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|TCP discovery SPI |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpDiscoverySpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|TCP Communication SPI metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpCommunicationSpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Transaction metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=TransactionMetrics,name=TransactionMetricsMxBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Cache metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:name=\"org.apache.ignite.internal.processors.cache.CacheLocalMetricsMXBeanImpl\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXGROUP} MATCHES_REGEX `{$IGNITE.LLD.FILTER.CACHE.MATCHES}`</p><p>- {#JMXGROUP} NOT_MATCHES_REGEX `{$IGNITE.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
+|Data region metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=DataRegionMetrics,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$IGNITE.LLD.FILTER.DATA.REGION.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$IGNITE.LLD.FILTER.DATA.REGION.NOT_MATCHES}`</p> |
+|Cache groups |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Cache groups\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$IGNITE.LLD.FILTER.CACHE.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$IGNITE.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
+|Thread pool metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Thread Pools\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$IGNITE.LLD.FILTER.THREAD.POOL.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$IGNITE.LLD.FILTER.THREAD.POOL.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -83,9 +82,9 @@ There are no template links in this template.
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs rejected, current |<p>Number of jobs rejected after more recent collision resolution operation.</p> |JMX |jmx["{#JMXOBJ}",CurrentRejectedJobs] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs waiting, current |<p>Number of queued jobs currently waiting to be executed.</p> |JMX |jmx["{#JMXOBJ}",CurrentWaitingJobs] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs active, current |<p>Number of currently active jobs concurrently executing on the node.</p> |JMX |jmx["{#JMXOBJ}",CurrentActiveJobs] |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs executed, rate |<p>Total number of jobs handled by the node per second.</p> |JMX |jmx["{#JMXOBJ}",TotalExecutedJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs cancelled, rate |<p>Total number of jobs cancelled by the node per second.</p> |JMX |jmx["{#JMXOBJ}",TotalCancelledJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs rejects, rate |<p>Total number of jobs this node rejects during collision resolution operations since node startup per second.</p> |JMX |jmx["{#JMXOBJ}",TotalRejectedJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs executed, rate |<p>Total number of jobs handled by the node per second.</p> |JMX |jmx["{#JMXOBJ}",TotalExecutedJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs cancelled, rate |<p>Total number of jobs cancelled by the node per second.</p> |JMX |jmx["{#JMXOBJ}",TotalCancelledJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs rejects, rate |<p>Total number of jobs this node rejects during collision resolution operations since node startup per second.</p> |JMX |jmx["{#JMXOBJ}",TotalRejectedJobs]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration, current |<p>Current PME duration in milliseconds.</p> |JMX |jmx["{#JMXOBJ}",CurrentPmeDuration] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Threads count, current |<p>Current number of live threads.</p> |JMX |jmx["{#JMXOBJ}",CurrentThreadCount] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Heap memory used |<p>Current heap size that is used for object allocation.</p> |JMX |jmx["{#JMXOBJ}",HeapMemoryUsed] |
@@ -94,27 +93,26 @@ There are no template links in this template.
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes joined |<p>Nodes join count.</p> |JMX |jmx["{#JMXOBJ}",NodesJoined] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes failed |<p>Nodes failed count.</p> |JMX |jmx["{#JMXOBJ}",NodesFailed] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Discovery message worker queue |<p>Message worker queue current size.</p> |JMX |jmx["{#JMXOBJ}",MessageWorkerQueueSize] |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Discovery reconnect, rate |<p>Number of times node tries to (re)establish connection to another node per second.</p> |JMX |jmx["{#JMXOBJ}",ReconnectCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: TotalProcessedMessages |<p>The number of messages received per second.</p> |JMX |jmx["{#JMXOBJ}",TotalProcessedMessages]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Discovery messages received, rate |<p>The number of messages processed per second.</p> |JMX |jmx["{#JMXOBJ}",TotalReceivedMessages]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Discovery reconnect, rate |<p>Number of times node tries to (re)establish connection to another node per second.</p> |JMX |jmx["{#JMXOBJ}",ReconnectCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: TotalProcessedMessages |<p>The number of messages received per second.</p> |JMX |jmx["{#JMXOBJ}",TotalProcessedMessages]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Discovery messages received, rate |<p>The number of messages processed per second.</p> |JMX |jmx["{#JMXOBJ}",TotalReceivedMessages]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Communication outbound messages queue |<p>Outbound messages queue size.</p> |JMX |jmx["{#JMXOBJ}",OutboundMessagesQueueSize] |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Communication messages received, rate |<p>The number of  messages received per second.</p> |JMX |jmx["{#JMXOBJ}",ReceivedMessagesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Communication messages sent, rate |<p>The number of  messages sent per second.</p> |JMX |jmx["{#JMXOBJ}",SentMessagesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Communication reconnect rate |<p>Gets maximum number of reconnect attempts used when establishing connection with remote nodes per second.</p> |JMX |jmx["{#JMXOBJ}",ReconnectCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Communication messages received, rate |<p>The number of  messages received per second.</p> |JMX |jmx["{#JMXOBJ}",ReceivedMessagesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Communication messages sent, rate |<p>The number of  messages sent per second.</p> |JMX |jmx["{#JMXOBJ}",SentMessagesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Locked keys |<p>The number of keys locked on the node.</p> |JMX |jmx["{#JMXOBJ}",LockedKeysNumber] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Transactions owner, current |<p>The number of active transactions for which this node is the initiator.</p> |JMX |jmx["{#JMXOBJ}",OwnerTransactionsNumber] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Transactions holding lock, current |<p>The number of active transactions holding at least one key lock.</p> |JMX |jmx["{#JMXOBJ}",TransactionsHoldingLockNumber] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Transactions rolledback, rate |<p>The number of transactions which were rollback per second.</p> |JMX |jmx["{#JMXOBJ}",TransactionsRolledBackNumber] |
 |Ignite |Ignite [{#JMXIGNITEINSTANCENAME}]: Transactions committed, rate |<p>The number of transactions which were committed per second.</p> |JMX |jmx["{#JMXOBJ}",TransactionsCommittedNumber] |
-|Ignite |Cache group [{#JMXGROUP}]: Cache gets, rate |<p>The number of gets to the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CacheGets]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Cache group [{#JMXGROUP}]: Cache puts, rate |<p>The number of puts to the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CachePuts]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Cache group [{#JMXGROUP}]: Cache removals, rate |<p>The number of removals from the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CacheRemovals]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Ignite |Cache group [{#JMXGROUP}]: Cache gets, rate |<p>The number of gets to the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CacheGets]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Ignite |Cache group [{#JMXGROUP}]: Cache puts, rate |<p>The number of puts to the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CachePuts]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Ignite |Cache group [{#JMXGROUP}]: Cache removals, rate |<p>The number of removals from the cache per second.</p> |JMX |jmx["{#JMXOBJ}",CacheRemovals]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Ignite |Cache group [{#JMXGROUP}]: Cache hits, pct |<p>Percentage of successful hits.</p> |JMX |jmx["{#JMXOBJ}",CacheHitPercentage] |
 |Ignite |Cache group [{#JMXGROUP}]: Cache misses, pct |<p>Percentage of accesses that failed to find anything.</p> |JMX |jmx["{#JMXOBJ}",CacheMissPercentage] |
-|Ignite |Cache group [{#JMXGROUP}]: Cache transaction commits, rate |<p>The number of transaction commits per second.</p> |JMX |jmx["{#JMXOBJ}",CacheTxCommits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Ignite |Cache group [{#JMXGROUP}]: Cache transaction rollbacks, rate |<p>The number of transaction rollback per second.</p> |JMX |jmx["{#JMXOBJ}",CacheTxRollbacks]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Ignite |Cache group [{#JMXGROUP}]: Cache transaction commits, rate |<p>The number of transaction commits per second.</p> |JMX |jmx["{#JMXOBJ}",CacheTxCommits]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Ignite |Cache group [{#JMXGROUP}]: Cache transaction rollbacks, rate |<p>The number of transaction rollback per second.</p> |JMX |jmx["{#JMXOBJ}",CacheTxRollbacks]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Ignite |Cache group [{#JMXGROUP}]: Cache size |<p>The number of non-null values in the cache as a long value.</p> |JMX |jmx["{#JMXOBJ}",CacheSize] |
-|Ignite |Cache group [{#JMXGROUP}]: Cache heap entries |<p>The number of entries in heap memory.</p> |JMX |jmx["{#JMXOBJ}",HeapEntriesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Ignite |Cache group [{#JMXGROUP}]: Cache heap entries |<p>The number of entries in heap memory.</p> |JMX |jmx["{#JMXOBJ}",HeapEntriesCount]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Ignite |Data region {#JMXNAME}: Allocation, rate |<p>Allocation rate (pages per second) averaged across rateTimeInternal.</p> |JMX |jmx["{#JMXOBJ}",AllocationRate] |
 |Ignite |Data region {#JMXNAME}: Allocated, bytes |<p>Total size of memory allocated in bytes.</p> |JMX |jmx["{#JMXOBJ}",TotalAllocatedSize] |
 |Ignite |Data region {#JMXNAME}: Dirty pages |<p>Number of pages in memory not yet synchronized with persistent storage.</p> |JMX |jmx["{#JMXOBJ}",DirtyPages] |
@@ -144,31 +142,31 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Ignite [{#JMXIGNITEINSTANCENAME}]: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",UpTime].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",UpTime].nodata(10m)}=1` |WARNING |<p>Manual close: YES</p> |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: Version has changed (new version: {ITEM.VALUE}) |<p>Ignite [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",FullVersion].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",FullVersion].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: Server node left the topology |<p>One or more server node left the topology. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",TotalServerNodes].change()}<0` |WARNING |<p>Manual close: YES</p> |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: Server node added to the topology |<p>One or more server node added to the topology. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",TotalServerNodes].change()}>0` |INFO |<p>Manual close: YES</p> |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: There are nodes is not in topology |<p>One or more server node left the topology. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",TotalServerNodes].last()}>{Ignite by JMX:jmx["{#JMXOBJ}",TotalBaselineNodes].last()}` |INFO |<p>Manual close: YES</p> |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: Number of queued jobs is too high (over {$IGNITE.JOBS.QUEUE.MAX.WARN} for 15 min) |<p>Number of queued jobs is over {$IGNITE.JOBS.QUEUE.MAX.WARN}.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CurrentWaitingJobs].min(15m)} > {$IGNITE.JOBS.QUEUE.MAX.WARN}` |WARNING | |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.WARN} for 5 min) |<p>PME duration is over {$IGNITE.PME.DURATION.MAX.WARN}ms.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CurrentPmeDuration].min(5m)} > {$IGNITE.PME.DURATION.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min)</p> |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min) |<p>PME duration is over {$IGNITE.PME.DURATION.MAX.HIGH}ms. Looks like PME is hung.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CurrentPmeDuration].min(5m)} > {$IGNITE.PME.DURATION.MAX.HIGH}` |HIGH | |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: Number of running threads is too high (over {$IGNITE.THREADS.COUNT.MAX.WARN} for 15 min) |<p>Number of running threads is over {$IGNITE.THREADS.COUNT.MAX.WARN}.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CurrentThreadCount].min(15m)} > {$IGNITE.THREADS.COUNT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min)</p> |
-|Ignite [{#JMXIGNITEINSTANCENAME}]: Coordinator has changed |<p>Ignite [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",Coordinator].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",Coordinator].strlen()}>0` |WARNING |<p>Manual close: YES</p> |
-|Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CacheTxRollbacks].min(5m)}>0 and {Ignite by JMX:jmx["{#JMXOBJ}",CacheTxCommits].max(5m)}=0` |AVERAGE | |
-|Cache group [{#JMXGROUP}]: Success transactions less than rollbacks for 5m |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CacheTxRollbacks].min(5m)} > {Ignite by JMX:jmx["{#JMXOBJ}",CacheTxCommits].max(5m)}` |WARNING |<p>**Depends on**:</p><p>- Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m</p> |
-|Cache group [{#JMXGROUP}]: All entries are in heap |<p>All entries are in heap. Possibly you use eager queries it may cause out of memory exceptions for big caches. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",CacheSize].last()}={Ignite by JMX:jmx["{#JMXOBJ}",HeapEntriesCount].last()}` |INFO |<p>Manual close: YES</p> |
-|Data region {#JMXNAME}: Node started to evict pages |<p>You store more data then region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",EvictionRate].min(5m)}>0` |INFO |<p>Manual close: YES</p> |
-|Data region {#JMXNAME}: Data region utilisation is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.WARN} in 5m) |<p>Data region utilization is high. Increase data region size or delete any data.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",OffheapUsedSize].min(5m)}/{Ignite by JMX:jmx["{#JMXOBJ}",OffHeapSize].last()}*100>{$IGNITE.DATA.REGION.PUSED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Data region {#JMXNAME}: Data region utilisation is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m)</p> |
-|Data region {#JMXNAME}: Data region utilisation is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m) |<p>Data region utilization is high. Increase data region size or delete any data.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",OffheapUsedSize].min(5m)}/{Ignite by JMX:jmx["{#JMXOBJ}",OffHeapSize].last()}*100>{$IGNITE.DATA.REGION.PUSED.MAX.HIGH}` |HIGH | |
-|Data region {#JMXNAME}: Pages replace rate more than 0 |<p>There is more data than DataRegionMaxSize. Cluster started to replace pages in memory. Page replacement can slow down operations.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",PagesReplaceRate].min(5m)}>0` |WARNING | |
-|Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$IGNITE.CHECKPOINT.PUSED.MAX.WARN} in 5m) |<p>Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",UsedCheckpointBufferSize].min(5m)}/{Ignite by JMX:jmx["{#JMXOBJ}",CheckpointBufferSize].last()}*100>{$IGNITE.CHECKPOINT.PUSED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$IGNITE.CHECKPOINT.PUSED.MAX.HIGH} in 5m)</p> |
-|Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$IGNITE.CHECKPOINT.PUSED.MAX.HIGH} in 5m) |<p>Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",UsedCheckpointBufferSize].min(5m)}/{Ignite by JMX:jmx["{#JMXOBJ}",CheckpointBufferSize].last()}*100>{$IGNITE.CHECKPOINT.PUSED.MAX.HIGH}` |HIGH | |
-|Cache group [{#JMXNAME}]: One or more backups are unavailable |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",Backups].min(5m)}>={Ignite by JMX:jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies].max(5m)}` |WARNING | |
-|Cache group [{#JMXNAME}]: List of caches has changed |<p>List of caches has changed. Significant changes have occurred in the cluster. Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",Caches].diff()}=1 and {TEMPLATE_NAME:jmx["{#JMXOBJ}",Caches].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Cache group [{#JMXNAME}]: Rebalance in progress |<p>Ack to close.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",LocalNodeMovingPartitionsCount].max(30m)}>0` |INFO |<p>Manual close: YES</p> |
-|Cache group [{#JMXNAME}]: There is no copy for partitions |<p>-</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies].max(30m)}=0` |WARNING | |
-|Thread pool [{#JMXNAME}]: Too many messages in queue (over {$IGNITE.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"} for 5 min) |<p>Number of messages in queue more than {$IGNITE.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}.</p> |`{TEMPLATE_NAME:jmx["{#JMXOBJ}",QueueSize].min(5m)} > {$IGNITE.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}` |AVERAGE | |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Ignite by JMX/jmx["{#JMXOBJ}",UpTime])<10m` |INFO |<p>Manual close: YES</p> |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes.</p> |`nodata(/Ignite by JMX/jmx["{#JMXOBJ}",UpTime],10m)=1` |WARNING |<p>Manual close: YES</p> |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: Version has changed (new version: {ITEM.VALUE}) |<p>Ignite [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.</p> |`last(/Ignite by JMX/jmx["{#JMXOBJ}",FullVersion],#1)<>last(/Ignite by JMX/jmx["{#JMXOBJ}",FullVersion],#2) and length(last(/Ignite by JMX/jmx["{#JMXOBJ}",FullVersion]))>0` |INFO |<p>Manual close: YES</p> |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: Server node left the topology |<p>One or more server node left the topology. Ack to close.</p> |`change(/Ignite by JMX/jmx["{#JMXOBJ}",TotalServerNodes])<0` |WARNING |<p>Manual close: YES</p> |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: Server node added to the topology |<p>One or more server node added to the topology. Ack to close.</p> |`change(/Ignite by JMX/jmx["{#JMXOBJ}",TotalServerNodes])>0` |INFO |<p>Manual close: YES</p> |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: There are nodes is not in topology |<p>One or more server node left the topology. Ack to close.</p> |`last(/Ignite by JMX/jmx["{#JMXOBJ}",TotalServerNodes])>last(/Ignite by JMX/jmx["{#JMXOBJ}",TotalBaselineNodes])` |INFO |<p>Manual close: YES</p> |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: Number of queued jobs is too high (over {$IGNITE.JOBS.QUEUE.MAX.WARN} for 15 min) |<p>Number of queued jobs is over {$IGNITE.JOBS.QUEUE.MAX.WARN}.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",CurrentWaitingJobs],15m) > {$IGNITE.JOBS.QUEUE.MAX.WARN}` |WARNING | |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.WARN} for 5 min) |<p>PME duration is over {$IGNITE.PME.DURATION.MAX.WARN}ms.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$IGNITE.PME.DURATION.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min)</p> |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min) |<p>PME duration is over {$IGNITE.PME.DURATION.MAX.HIGH}ms. Looks like PME is hung.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$IGNITE.PME.DURATION.MAX.HIGH}` |HIGH | |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: Number of running threads is too high (over {$IGNITE.THREADS.COUNT.MAX.WARN} for 15 min) |<p>Number of running threads is over {$IGNITE.THREADS.COUNT.MAX.WARN}.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",CurrentThreadCount],15m) > {$IGNITE.THREADS.COUNT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min)</p> |
+|Ignite [{#JMXIGNITEINSTANCENAME}]: Coordinator has changed |<p>Ignite [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.</p> |`last(/Ignite by JMX/jmx["{#JMXOBJ}",Coordinator],#1)<>last(/Ignite by JMX/jmx["{#JMXOBJ}",Coordinator],#2) and length(last(/Ignite by JMX/jmx["{#JMXOBJ}",Coordinator]))>0` |WARNING |<p>Manual close: YES</p> |
+|Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m |<p>-</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m)>0 and max(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)=0` |AVERAGE | |
+|Cache group [{#JMXGROUP}]: Success transactions less than rollbacks for 5m |<p>-</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m) > max(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)` |WARNING |<p>**Depends on**:</p><p>- Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m</p> |
+|Cache group [{#JMXGROUP}]: All entries are in heap |<p>All entries are in heap. Possibly you use eager queries it may cause out of memory exceptions for big caches. Ack to close.</p> |`last(/Ignite by JMX/jmx["{#JMXOBJ}",CacheSize])=last(/Ignite by JMX/jmx["{#JMXOBJ}",HeapEntriesCount])` |INFO |<p>Manual close: YES</p> |
+|Data region {#JMXNAME}: Node started to evict pages |<p>You store more data than region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",EvictionRate],5m)>0` |INFO |<p>Manual close: YES</p> |
+|Data region {#JMXNAME}: Data region utilization is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.WARN} in 5m) |<p>Data region utilization is high. Increase data region size or delete any data.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$IGNITE.DATA.REGION.PUSED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Data region {#JMXNAME}: Data region utilization is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m)</p> |
+|Data region {#JMXNAME}: Data region utilization is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m) |<p>Data region utilization is high. Increase data region size or delete any data.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$IGNITE.DATA.REGION.PUSED.MAX.HIGH}` |HIGH | |
+|Data region {#JMXNAME}: Pages replace rate more than 0 |<p>There is more data than DataRegionMaxSize. Cluster started to replace pages in memory. Page replacement can slow down operations.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",PagesReplaceRate],5m)>0` |WARNING | |
+|Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$IGNITE.CHECKPOINT.PUSED.MAX.WARN} in 5m) |<p>Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",UsedCheckpointBufferSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",CheckpointBufferSize])*100>{$IGNITE.CHECKPOINT.PUSED.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$IGNITE.CHECKPOINT.PUSED.MAX.HIGH} in 5m)</p> |
+|Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$IGNITE.CHECKPOINT.PUSED.MAX.HIGH} in 5m) |<p>Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",UsedCheckpointBufferSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",CheckpointBufferSize])*100>{$IGNITE.CHECKPOINT.PUSED.MAX.HIGH}` |HIGH | |
+|Cache group [{#JMXNAME}]: One or more backups are unavailable |<p>-</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",Backups],5m)>=max(/Ignite by JMX/jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies],5m)` |WARNING | |
+|Cache group [{#JMXNAME}]: List of caches has changed |<p>List of caches has changed. Significant changes have occurred in the cluster. Ack to close.</p> |`last(/Ignite by JMX/jmx["{#JMXOBJ}",Caches],#1)<>last(/Ignite by JMX/jmx["{#JMXOBJ}",Caches],#2) and length(last(/Ignite by JMX/jmx["{#JMXOBJ}",Caches]))>0` |INFO |<p>Manual close: YES</p> |
+|Cache group [{#JMXNAME}]: Rebalance in progress |<p>Ack to close.</p> |`max(/Ignite by JMX/jmx["{#JMXOBJ}",LocalNodeMovingPartitionsCount],30m)>0` |INFO |<p>Manual close: YES</p> |
+|Cache group [{#JMXNAME}]: There is no copy for partitions |<p>-</p> |`max(/Ignite by JMX/jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies],30m)=0` |WARNING | |
+|Thread pool [{#JMXNAME}]: Too many messages in queue (over {$IGNITE.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"} for 5 min) |<p>Number of messages in queue more than {$IGNITE.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}.</p> |`min(/Ignite by JMX/jmx["{#JMXOBJ}",QueueSize],5m) > {$IGNITE.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/db/ignite_jmx/template_db_ignite_jmx.yaml b/templates/db/ignite_jmx/template_db_ignite_jmx.yaml
index c060acf7dc0..5f7b40ec93b 100644
--- a/templates/db/ignite_jmx/template_db_ignite_jmx.yaml
+++ b/templates/db/ignite_jmx/template_db_ignite_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:45Z'
+  version: '6.0'
+  date: '2022-01-10T07:41:32Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,13 +13,13 @@ zabbix_export:
       description: |
         The template to monitor Apache Ignite by Zabbix that work without any external scripts.
           It works with both standalone and cluster instances.
-          The metrics are discoverable and collected by JMX.  
+          The metrics are discoverable and collected by JMX.
           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.
           You can set {$IGNITE.USER} and {$IGNITE.PASSWORD} macros in the template for using on the host level.
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -114,7 +114,7 @@ zabbix_export:
                   expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",EvictionRate],5m)>0'
                   name: 'Data region {#JMXNAME}: Node started to evict pages'
                   priority: INFO
-                  description: 'You store more data then region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.'
+                  description: 'You store more data than region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.'
                   manual_close: 'YES'
             -
               uuid: 7fa689749cd64474af294976e4bc7762
@@ -255,18 +255,18 @@ zabbix_export:
             -
               uuid: 736fbc965aa448309d022de34354decf
               expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$IGNITE.DATA.REGION.PUSED.MAX.HIGH}'
-              name: 'Data region {#JMXNAME}: Data region utilisation is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
+              name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
               priority: HIGH
               description: 'Data region utilization is high. Increase data region size or delete any data.'
             -
               uuid: 6ded19e7616b45f08e37e716d8256c5e
               expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$IGNITE.DATA.REGION.PUSED.MAX.WARN}'
-              name: 'Data region {#JMXNAME}: Data region utilisation is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.WARN} in 5m)'
+              name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.WARN} in 5m)'
               priority: WARNING
               description: 'Data region utilization is high. Increase data region size or delete any data.'
               dependencies:
                 -
-                  name: 'Data region {#JMXNAME}: Data region utilisation is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
+                  name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
                   expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$IGNITE.DATA.REGION.PUSED.MAX.HIGH}'
           graph_prototypes:
             -
@@ -287,7 +287,7 @@ zabbix_export:
                     key: 'jmx["{#JMXOBJ}",UsedCheckpointBufferSize]'
             -
               uuid: 330be15755ca4b5dbee88e21b2e58df2
-              name: 'Data region {#JMXNAME}: DataRegion utilisation'
+              name: 'Data region {#JMXNAME}: DataRegion utilization'
               graph_items:
                 -
                   drawtype: BOLD_LINE
@@ -309,11 +309,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
@@ -583,11 +583,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
@@ -727,11 +727,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
@@ -843,18 +843,18 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
                   return JSON.stringify(data)
         -
           uuid: afd0c3182f8d4a299a180848eb096b95
-          name: 'TCP Ccmmunication SPI metrics'
+          name: 'TCP Communication SPI metrics'
           type: JMX
           key: 'jmx.discovery[beans,"org.apache:group=SPIs,name=TcpCommunicationSpi,*"]'
           delay: 30m
@@ -941,11 +941,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
@@ -1130,11 +1130,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
@@ -1259,11 +1259,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
@@ -1486,11 +1486,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
@@ -1617,11 +1617,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
@@ -1905,11 +1905,11 @@ zabbix_export:
                 - |
                   var data = JSON.parse(value);
                   for (var item, i = 0; item = data.data[i++];) {
-                  if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
-                  Object.assign(item, {
-                  '{#JMXIGNITEINSTANCENAME}': 'null'
-                  });
-                  }
+                      if (!('{#JMXIGNITEINSTANCENAME}' in item)) {
+                          Object.assign(item, {
+                              '{#JMXIGNITEINSTANCENAME}': 'null'
+                          });
+                      }
                   
                   }
                   
diff --git a/templates/db/influxdb_http/README.md b/templates/db/influxdb_http/README.md
index e7a52075fe1..61b3bf78999 100644
--- a/templates/db/influxdb_http/README.md
+++ b/templates/db/influxdb_http/README.md
@@ -51,15 +51,15 @@ There are no template links in this template.
 
 |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> |
+|Organizations discovery |<p>Discovery of organizations metrics.</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>- {#ORG_NAME} NOT_MATCHES_REGEX `{$INFLUXDB.ORG_NAME.NOT_MATCHES}`</p><p>- {#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: Instance status |<p>Get the health of an instance.</p> |HTTP_AGENT |influx.healthcheck<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"status":"fail"}]}`</p><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</p> |
+|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</p> |
 |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> |
@@ -72,15 +72,15 @@ There are no template links in this template.
 |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 |
+|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</p> |
+|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</p> |
+|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</p> |
+|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</p> |
+|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</p> |
+|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</p> |
+|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</p> |
+|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</p> |
+|Zabbix_raw_items |InfluxDB: Get instance metrics |<p>-</p> |HTTP_AGENT |influx.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- PROMETHEUS_TO_JSON</p> |
 
 ## Triggers
 
diff --git a/templates/db/influxdb_http/template_db_influxdb_http.yaml b/templates/db/influxdb_http/template_db_influxdb_http.yaml
index e6cd3f506c3..0348de3c2fd 100644
--- a/templates/db/influxdb_http/template_db_influxdb_http.yaml
+++ b/templates/db/influxdb_http/template_db_influxdb_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-01T08:33:52Z'
+  date: '2021-12-14T17:43:46Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -19,7 +19,7 @@ zabbix_export:
         
         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
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Applications
@@ -657,7 +657,7 @@ zabbix_export:
                 macro: '{#ORG_NAME}'
                 value: '{$INFLUXDB.ORG_NAME.MATCHES}'
                 formulaid: B
-          description: 'Discovery of organizations merics.'
+          description: 'Discovery of organizations metrics.'
           item_prototypes:
             -
               uuid: c84ae278bd7c4387873bc8bbf6d8ba8f
diff --git a/templates/db/mongodb/README.md b/templates/db/mongodb/README.md
index c27694f03f7..785cb141bfe 100644
--- a/templates/db/mongodb/README.md
+++ b/templates/db/mongodb/README.md
@@ -1,9 +1,9 @@
 
-# MongoDB node by Zabbix Agent 2
+# MongoDB node by Zabbix agent 2
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor single MongoDB server by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
@@ -57,9 +57,9 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Collect database metrics.</p><p>Note, depending on the number of DBs this discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}.</p> |ZABBIX_PASSIVE |mongodb.db.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.NOT_MATCHES}`</p> |
-|Collection discovery |<p>Collect collections metrics.</p><p>Note, depending on the number of DBs and collections this discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}.</p> |ZABBIX_PASSIVE |mongodb.collections.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.NOT_MATCHES}`</p><p>- C: {#COLLECTION} MATCHES_REGEX `{$MONGODB.LLD.FILTER.COLLECTION.MATCHES}`</p><p>- D: {#COLLECTION} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}`</p> |
-|Replication discovery |<p>Collect metrics by Zabbix agent if it exists</p> |DEPENDENT |mongodb.rs.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Overrides:**</p><p>Primary metrics<br> - {#NODE_STATE} MATCHES_REGEX `1`<br>  - ITEM_PROTOTYPE LIKE `Number of replicas` - DISCOVER</p><br>  - ITEM_PROTOTYPE LIKE `Unhealthy replicas` - DISCOVER</p><br>  - ITEM_PROTOTYPE LIKE `Number of unhealthy replicas` - DISCOVER</p><br>  - ITEM_PROTOTYPE LIKE `Replication lag` - NO_DISCOVER</p><p>Arbiter metrics<br> - {#NODE_STATE} MATCHES_REGEX `7`<br>  - ITEM_PROTOTYPE LIKE `Replication lag` - NO_DISCOVER</p> |
+|Database discovery |<p>Collect database metrics.</p><p>Note, depending on the number of DBs this discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}.</p> |ZABBIX_PASSIVE |mongodb.db.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.NOT_MATCHES}`</p> |
+|Collection discovery |<p>Collect collections metrics.</p><p>Note, depending on the number of DBs and collections this discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}.</p> |ZABBIX_PASSIVE |mongodb.collections.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.NOT_MATCHES}`</p><p>- {#COLLECTION} MATCHES_REGEX `{$MONGODB.LLD.FILTER.COLLECTION.MATCHES}`</p><p>- {#COLLECTION} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}`</p> |
+|Replication discovery |<p>Collect metrics by Zabbix agent if it exists</p> |DEPENDENT |mongodb.rs.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Overrides:**</p><p>Primary metrics<br> - {#NODE_STATE} MATCHES_REGEX `1`<br>  - ITEM_PROTOTYPE LIKE `Number of replicas` - DISCOVER</p><br>  - ITEM_PROTOTYPE LIKE `Unhealthy replicas` - DISCOVER</p><br>  - ITEM_PROTOTYPE LIKE `Number of unhealthy replicas` - DISCOVER</p><br>  - ITEM_PROTOTYPE LIKE `Replication lag` - NO_DISCOVER</p><p>Arbiter metrics<br> - {#NODE_STATE} MATCHES_REGEX `7`<br>  - ITEM_PROTOTYPE LIKE `Replication lag` - NO_DISCOVER</p> |
 |WiredTiger metrics |<p>Collect metrics of WiredTiger Storage Engine if it exists</p> |DEPENDENT |mongodb.wired_tiger.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(JSON.parse(value).wiredTiger   ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 
 ## Items collected
@@ -69,38 +69,38 @@ There are no template links in this template.
 |MongoDB |MongoDB: Ping |<p>Test if a connection is alive or not.</p> |ZABBIX_PASSIVE |mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
 |MongoDB |MongoDB: MongoDB version |<p>Version of the MongoDB server.</p> |DEPENDENT |mongodb.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |MongoDB |MongoDB: Uptime |<p>Number of seconds that the mongod process has been active.</p> |DEPENDENT |mongodb.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p> |
-|MongoDB |MongoDB: Asserts: message, rate |<p>The number of message assertions raised per second.</p><p>Check the log file for more information about these messages.</p> |DEPENDENT |mongodb.asserts.msg.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.msg`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Asserts: user, rate |<p>The number of “user asserts” that have occurred per second.</p><p>These are errors that user may generate, such as out of disk space or duplicate key.</p> |DEPENDENT |mongodb.asserts.user.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.user`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Asserts: warning, rate |<p>The number of warnings raised per second.</p> |DEPENDENT |mongodb.asserts.warning.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.warning`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Asserts: regular, rate |<p>The number of regular assertions raised per second.</p><p>Check the log file for more information about these messages.</p> |DEPENDENT |mongodb.asserts.regular.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.regular`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Asserts: rollovers, rate |<p>Number of times that the rollover counters roll over per second.</p><p>The counters rollover to zero every 2^30 assertions.</p> |DEPENDENT |mongodb.asserts.rollovers.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.rollovers`</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB: Asserts: message, rate |<p>The number of message assertions raised per second.</p><p>Check the log file for more information about these messages.</p> |DEPENDENT |mongodb.asserts.msg.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.msg`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Asserts: user, rate |<p>The number of “user asserts” that have occurred per second.</p><p>These are errors that user may generate, such as out of disk space or duplicate key.</p> |DEPENDENT |mongodb.asserts.user.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.user`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Asserts: warning, rate |<p>The number of warnings raised per second.</p> |DEPENDENT |mongodb.asserts.warning.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.warning`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Asserts: regular, rate |<p>The number of regular assertions raised per second.</p><p>Check the log file for more information about these messages.</p> |DEPENDENT |mongodb.asserts.regular.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.regular`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Asserts: rollovers, rate |<p>Number of times that the rollover counters roll over per second.</p><p>The counters rollover to zero every 2^30 assertions.</p> |DEPENDENT |mongodb.asserts.rollovers.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.asserts.rollovers`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB: Active clients: writers |<p>The number of active client connections performing write operations.</p> |DEPENDENT |mongodb.active_clients.writers<p>**Preprocessing**:</p><p>- JSONPATH: `$.globalLock.activeClients.writers`</p> |
 |MongoDB |MongoDB: Active clients: readers |<p>The number of the active client connections performing read operations.</p> |DEPENDENT |mongodb.active_clients.readers<p>**Preprocessing**:</p><p>- JSONPATH: `$.globalLock.activeClients.readers`</p> |
 |MongoDB |MongoDB: Active clients: total |<p>The total number of internal client connections to the database including system threads as well as queued readers and writers.</p> |DEPENDENT |mongodb.active_clients.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.globalLock.activeClients.total`</p> |
-|MongoDB |MongoDB: Current queue: writers |<p>The number of operations that are currently queued and waiting for the write lock. </p><p> A consistently small write-queue, particularly of shorter operations, is no cause for concern.</p> |DEPENDENT |mongodb.current_queue.writers<p>**Preprocessing**:</p><p>- JSONPATH: `$.globalLock.currentQueue.writers`</p> |
+|MongoDB |MongoDB: Current queue: writers |<p>The number of operations that are currently queued and waiting for the write lock.</p><p> A consistently small write-queue, particularly of shorter operations, is no cause for concern.</p> |DEPENDENT |mongodb.current_queue.writers<p>**Preprocessing**:</p><p>- JSONPATH: `$.globalLock.currentQueue.writers`</p> |
 |MongoDB |MongoDB: Current queue: readers |<p>The number of operations that are currently queued and waiting for the read lock.</p><p>A consistently small read-queue, particularly of shorter operations, should cause no concern.</p> |DEPENDENT |mongodb.current_queue.readers<p>**Preprocessing**:</p><p>- JSONPATH: `$.globalLock.currentQueue.readers`</p> |
 |MongoDB |MongoDB: Current queue: total |<p>The total number of operations queued waiting for the lock.</p> |DEPENDENT |mongodb.current_queue.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.globalLock.currentQueue.total`</p> |
-|MongoDB |MongoDB: Operations: command, rate |<p>The number of commands issued to the database the mongod instance per second.</p><p>Counts all commands except the write commands: insert, update, and delete.</p> |DEPENDENT |mongodb.opcounters.command.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.command`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Operations: delete, rate |<p>The number of delete operations the mongod instance per second.</p> |DEPENDENT |mongodb.opcounters.delete.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.delete`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Operations: update, rate |<p>The number of update operations the mongod instance per second.</p> |DEPENDENT |mongodb.opcounters.update.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.update`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Operations: query, rate |<p>The number of queries received the mongod instance per second.</p> |DEPENDENT |mongodb.opcounters.query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.query`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Operations: insert, rate |<p>The number of insert operations received since the mongod instance per second.</p> |DEPENDENT |mongodb.opcounters.insert.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.insert`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Operations: getmore, rate |<p>The number of “getmore” operations since the mongod instance per second. This counter can be high even if the query count is low. </p><p>Secondary nodes send getMore operations as part of the replication process.</p> |DEPENDENT |mongodb.opcounters.getmore.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.getmore`</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB: Operations: command, rate |<p>The number of commands issued to the database the mongod instance per second.</p><p>Counts all commands except the write commands: insert, update, and delete.</p> |DEPENDENT |mongodb.opcounters.command.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.command`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Operations: delete, rate |<p>The number of delete operations the mongod instance per second.</p> |DEPENDENT |mongodb.opcounters.delete.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.delete`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Operations: update, rate |<p>The number of update operations the mongod instance per second.</p> |DEPENDENT |mongodb.opcounters.update.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.update`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Operations: query, rate |<p>The number of queries received the mongod instance per second.</p> |DEPENDENT |mongodb.opcounters.query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.query`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Operations: insert, rate |<p>The number of insert operations received since the mongod instance per second.</p> |DEPENDENT |mongodb.opcounters.insert.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.insert`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Operations: getmore, rate |<p>The number of “getmore” operations since the mongod instance per second. This counter can be high even if the query count is low.</p><p>Secondary nodes send getMore operations as part of the replication process.</p> |DEPENDENT |mongodb.opcounters.getmore.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.getmore`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB: Connections, current |<p>The number of incoming connections from clients to the database server.</p><p>This number includes the current shell session</p> |DEPENDENT |mongodb.connections.current<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.current`</p> |
-|MongoDB |MongoDB: New connections, rate |<p>Rate of all incoming connections created to the server.</p> |DEPENDENT |mongodb.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.totalCreated`</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB: New connections, rate |<p>Rate of all incoming connections created to the server.</p> |DEPENDENT |mongodb.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.totalCreated`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB: Connections, available |<p>The number of unused incoming connections available.</p> |DEPENDENT |mongodb.connections.available<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.available`</p> |
 |MongoDB |MongoDB: Connections, active |<p>The number of active client connections to the server.</p><p>Active client connections refers to client connections that currently have operations in progress.</p><p>Available starting in  4.0.7, 0 for older versions.</p> |DEPENDENT |mongodb.connections.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.active`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|MongoDB |MongoDB: Bytes in, rate |<p>The total number of bytes that the server has received over network connections initiated by clients or other mongod/mongos instances per second.</p> |DEPENDENT |mongodb.network.bytes_in.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.bytesIn`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Bytes out, rate |<p>The total number of bytes that the server has sent over network connections initiated by clients or other mongod/mongos instances per second.</p> |DEPENDENT |mongodb.network.bytes_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.bytesOut`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Requests, rate |<p>Number of distinct requests that the server has received per second</p> |DEPENDENT |mongodb.network.numRequests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.numRequests`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Document: deleted, rate |<p>Number of documents deleted per second.</p> |DEPENDENT |mongod.document.deleted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.document.deleted`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Document: inserted, rate |<p>Number of documents inserted per second.</p> |DEPENDENT |mongod.document.inserted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.document.inserted`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Document: returned, rate |<p>Number of documents returned by queries per second.</p> |DEPENDENT |mongod.document.returned.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.document.returned`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Document: updated, rate |<p>Number of documents updated per second.</p> |DEPENDENT |mongod.document.updated.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.document.updated`</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB: Bytes in, rate |<p>The total number of bytes that the server has received over network connections initiated by clients or other mongod/mongos instances per second.</p> |DEPENDENT |mongodb.network.bytes_in.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.bytesIn`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Bytes out, rate |<p>The total number of bytes that the server has sent over network connections initiated by clients or other mongod/mongos instances per second.</p> |DEPENDENT |mongodb.network.bytes_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.bytesOut`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Requests, rate |<p>Number of distinct requests that the server has received per second</p> |DEPENDENT |mongodb.network.numRequests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.numRequests`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Document: deleted, rate |<p>Number of documents deleted per second.</p> |DEPENDENT |mongod.document.deleted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.document.deleted`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Document: inserted, rate |<p>Number of documents inserted per second.</p> |DEPENDENT |mongod.document.inserted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.document.inserted`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Document: returned, rate |<p>Number of documents returned by queries per second.</p> |DEPENDENT |mongod.document.returned.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.document.returned`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Document: updated, rate |<p>Number of documents updated per second.</p> |DEPENDENT |mongod.document.updated.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.document.updated`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB: Cursor: open no timeout |<p>Number of open cursors with the option DBQuery.Option.noTimeout set to prevent timeout after a period of inactivity.</p> |DEPENDENT |mongodb.metrics.cursor.open.no_timeout<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.open.noTimeout`</p> |
 |MongoDB |MongoDB: Cursor: open pinned |<p>Number of pinned open cursors.</p> |DEPENDENT |mongodb.cursor.open.pinned<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.open.pinned`</p> |
 |MongoDB |MongoDB: Cursor: open total |<p>Number of cursors that MongoDB is maintaining for clients.</p> |DEPENDENT |mongodb.cursor.open.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.open.total`</p> |
-|MongoDB |MongoDB: Cursor: timed out, rate |<p>Number of cursors that time out, per second.</p> |DEPENDENT |mongodb.cursor.timed_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.timedOut`</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB: Cursor: timed out, rate |<p>Number of cursors that time out, per second.</p> |DEPENDENT |mongodb.cursor.timed_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.timedOut`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB: Architecture |<p>A number, either 64 or 32, that indicates whether the MongoDB instance is compiled for 64-bit or 32-bit architecture.</p> |DEPENDENT |mongodb.mem.bits<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem.bits`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |MongoDB |MongoDB: Memory: mapped |<p>Amount of mapped memory by the database.</p> |DEPENDENT |mongodb.mem.mapped<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem.mapped`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `1048576`</p> |
 |MongoDB |MongoDB: Memory: mapped with journal |<p>The amount of mapped memory, including the memory used for journaling.</p> |DEPENDENT |mongodb.mem.mapped_with_journal<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem.mappedWithJournal`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- MULTIPLIER: `1048576`</p> |
@@ -121,53 +121,53 @@ There are no template links in this template.
 |MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Capped: max size |<p>Maximum size of a capped collection in bytes.</p> |DEPENDENT |mongodb.collection.max_size["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxSize`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Storage size |<p>Total storage space allocated to this collection for document storage.</p> |DEPENDENT |mongodb.collection.storage_size["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.storageSize`</p> |
 |MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Indexes |<p>Total number of indices on the collection.</p> |DEPENDENT |mongodb.collection.nindexes["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.nindexes`</p> |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Capped |<p>Whether or not the collection is capped.</p> |DEPENDENT |mongodb.collection.capped["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.capped`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: total, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.total.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].total.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Read lock, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.read_lock.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].readLock.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Write lock, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.write_lock.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].writeLock.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: queries, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.queries.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].queries.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: getmore, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.getmore.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].getmore.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: insert, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.insert.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].insert.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: update, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.update.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].update.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: remove, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.remove.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].remove.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: commands, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.commands.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].commands.count`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: total, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.total.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].total.time`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Read lock, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.read_lock.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].readLock.time`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Write lock, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.write_lock.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].writeLock.time`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: queries, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.queries.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].queries.time`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: getmore, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.getmore.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].getmore.time`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: insert, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.insert.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].insert.time`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: update, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.update.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].update.time`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: remove, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.remove.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].remove.time`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: commands, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.commands.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].commands.time`</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Capped |<p>Whether or not the collection is capped.</p> |DEPENDENT |mongodb.collection.capped["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.capped`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: total, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.total.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].total.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Read lock, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.read_lock.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].readLock.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Write lock, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.write_lock.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].writeLock.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: queries, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.queries.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].queries.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: getmore, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.getmore.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].getmore.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: insert, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.insert.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].insert.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: update, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.update.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].update.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: remove, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.remove.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].remove.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: commands, rate |<p>The number of operations per second.</p> |DEPENDENT |mongodb.collection.ops.commands.rate["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].commands.count`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: total, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.total.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].total.time`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Read lock, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.read_lock.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].readLock.time`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Write lock, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.write_lock.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].writeLock.time`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: queries, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.queries.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].queries.time`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: getmore, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.getmore.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].getmore.time`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: insert, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.insert.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].insert.time`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: update, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.update.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].update.time`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: remove, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.remove.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].remove.time`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB {#DBNAME}.{#COLLECTION}: Operations: commands, ms/s |<p>Fraction of time (ms/s) the mongod has spent to operations.</p> |DEPENDENT |mongodb.collection.ops.commands.ms["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.totals["{#DBNAME}.{#COLLECTION}"].commands.time`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB: Node state |<p>An integer between 0 and 10 that represents the replica state of the current member.</p> |DEPENDENT |mongodb.rs.state[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.myState`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MongoDB |MongoDB: Replication lag |<p>Delay between a write operation on the primary and its copy to a secondary.</p> |DEPENDENT |mongodb.rs.lag[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.members[?(@.self == "true")].lag.first()`</p> |
-|MongoDB |MongoDB: Number of replicas |<p>The number of replucated nodes in current ReplicaSet.</p> |DEPENDENT |mongodb.rs.total_nodes[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.members[?(@.self == "true")].totalNodes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|MongoDB |MongoDB: Number of replicas |<p>The number of replicated nodes in current ReplicaSet.</p> |DEPENDENT |mongodb.rs.total_nodes[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.members[?(@.self == "true")].totalNodes.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MongoDB |MongoDB: Number of unhealthy replicas |<p>The number of replicated nodes with member health value  = 0.</p> |DEPENDENT |mongodb.rs.unhealthy_count[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.members[?(@.self == "true")].unhealthyCount.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MongoDB |MongoDB: Unhealthy replicas |<p>The replicated nodes in current ReplicaSet with member health value  = 0.</p> |DEPENDENT |mongodb.rs.unhealthy[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.members[?(@.self == "true")].unhealthyNodes.first()`</p><p>- JAVASCRIPT: `var value = JSON.parse(value); return value.length ? JSON.stringify(value) : ''; `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MongoDB |MongoDB: Apply batches, rate |<p>Number of batches applied across all databases per second.</p> |DEPENDENT |mongodb.rs.apply.batches.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.apply.batches.num`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Apply batches, ms/s |<p>Fraction of time (ms/s) the mongod has spent applying operations from the oplog.</p> |DEPENDENT |mongodb.rs.apply.batches.ms.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.apply.batches.totalMillis`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Apply ops, rate |<p>Number of oplog operations applied per second.</p> |DEPENDENT |mongodb.rs.apply.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.apply.ops`</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB: Apply batches, rate |<p>Number of batches applied across all databases per second.</p> |DEPENDENT |mongodb.rs.apply.batches.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.apply.batches.num`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Apply batches, ms/s |<p>Fraction of time (ms/s) the mongod has spent applying operations from the oplog.</p> |DEPENDENT |mongodb.rs.apply.batches.ms.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.apply.batches.totalMillis`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Apply ops, rate |<p>Number of oplog operations applied per second.</p> |DEPENDENT |mongodb.rs.apply.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.apply.ops`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB: Buffer |<p>Number of operations in the oplog buffer.</p> |DEPENDENT |mongodb.rs.buffer.count[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.buffer.count`</p> |
 |MongoDB |MongoDB: Buffer, max size |<p>Maximum size of the buffer.</p> |DEPENDENT |mongodb.rs.buffer.max_size[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.buffer.maxSizeBytes`</p> |
 |MongoDB |MongoDB: Buffer, size |<p>Current size of the contents of the oplog buffer.</p> |DEPENDENT |mongodb.rs.buffer.size[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.buffer.sizeBytes`</p> |
-|MongoDB |MongoDB: Network bytes, rate |<p>Amount of data read from the replication sync source per second.</p> |DEPENDENT |mongodb.rs.network.bytes.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.bytes`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Network getmores, rate |<p>Number of getmore operations per second.</p> |DEPENDENT |mongodb.rs.network.getmores.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.getmores.num`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Network getmores, ms/s |<p>Fraction of time (ms/s) required to collect data from getmore operations.</p> |DEPENDENT |mongodb.rs.network.getmores.ms.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.getmores.totalMillis`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Network ops, rate |<p>Number of operations read from the replication source per second.</p> |DEPENDENT |mongodb.rs.network.ops.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.ops`</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Network readers created, rate |<p>Number of oplog query processes created per second.</p> |DEPENDENT |mongodb.rs.network.readers.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.readersCreated`</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB: Network bytes, rate |<p>Amount of data read from the replication sync source per second.</p> |DEPENDENT |mongodb.rs.network.bytes.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.bytes`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Network getmores, rate |<p>Number of getmore operations per second.</p> |DEPENDENT |mongodb.rs.network.getmores.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.getmores.num`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Network getmores, ms/s |<p>Fraction of time (ms/s) required to collect data from getmore operations.</p> |DEPENDENT |mongodb.rs.network.getmores.ms.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.getmores.totalMillis`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Network ops, rate |<p>Number of operations read from the replication source per second.</p> |DEPENDENT |mongodb.rs.network.ops.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.ops`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Network readers created, rate |<p>Number of oplog query processes created per second.</p> |DEPENDENT |mongodb.rs.network.readers.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.network.readersCreated`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB {#RS_NAME}: Oplog time diff |<p>Oplog window: difference between the first and last operation in the oplog. Only present if there are entries in the oplog.</p> |DEPENDENT |mongodb.rs.oplog.timediff[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.timediff`</p> |
-|MongoDB |MongoDB: Preload docs, rate |<p>Number of documents loaded per second during the pre-fetch stage of replication.</p> |DEPENDENT |mongodb.rs.preload.docs.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.preload.docs.num`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Preload docs, ms/s |<p>Fraction of time (ms/s) spent loading documents as part of the pre-fetch stage of replication.</p> |DEPENDENT |mongodb.rs.preload.docs.ms.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.preload.docs.totalMillis`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Preload indexes, rate |<p>Number of index entries loaded by members before updating documents as part of the pre-fetch stage of replication.</p> |DEPENDENT |mongodb.rs.preload.indexes.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.preload.indexes.num`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|MongoDB |MongoDB: Preload indexes, ms/s |<p>Fraction of time (ms/s) spent loading documents as part of the pre-fetch stage of replication.</p> |DEPENDENT |mongodb.rs.preload.indexes.ms.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.preload.indexes.totalMillis`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|MongoDB |MongoDB: Preload docs, rate |<p>Number of documents loaded per second during the pre-fetch stage of replication.</p> |DEPENDENT |mongodb.rs.preload.docs.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.preload.docs.num`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Preload docs, ms/s |<p>Fraction of time (ms/s) spent loading documents as part of the pre-fetch stage of replication.</p> |DEPENDENT |mongodb.rs.preload.docs.ms.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.preload.docs.totalMillis`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Preload indexes, rate |<p>Number of index entries loaded by members before updating documents as part of the pre-fetch stage of replication.</p> |DEPENDENT |mongodb.rs.preload.indexes.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.preload.indexes.num`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB |MongoDB: Preload indexes, ms/s |<p>Fraction of time (ms/s) spent loading documents as part of the pre-fetch stage of replication.</p> |DEPENDENT |mongodb.rs.preload.indexes.ms.rate[{#RS_NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.repl.preload.indexes.totalMillis`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB |MongoDB: WiredTiger cache: bytes |<p>Size of the data currently in cache.</p> |DEPENDENT |mongodb.wired_tiger.cache.bytes_in_cache[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['bytes currently in the cache']`</p> |
 |MongoDB |MongoDB: WiredTiger cache: in-memory page splits |<p>In-memory page splits.</p> |DEPENDENT |mongodb.wired_tiger.cache.splits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['in-memory page splits']`</p> |
 |MongoDB |MongoDB: WiredTiger cache: bytes, max |<p>Maximum cache size.</p> |DEPENDENT |mongodb.wired_tiger.cache.maximum_bytes_configured[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['maximum bytes configured']`</p> |
 |MongoDB |MongoDB: WiredTiger cache: max page size at eviction |<p>Maximum page size at eviction.</p> |DEPENDENT |mongodb.wired_tiger.cache.max_page_size_eviction[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['maximum page size at eviction']`</p> |
 |MongoDB |MongoDB: WiredTiger cache: modified pages evicted |<p>Number of pages, that have been modified, evicted from the cache.</p> |DEPENDENT |mongodb.wired_tiger.cache.modified_pages_evicted[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['modified pages evicted']`</p> |
 |MongoDB |MongoDB: WiredTiger cache: pages read into cache |<p>Number of pages read into the cache.</p> |DEPENDENT |mongodb.wired_tiger.cache.pages_read[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['pages read into cache']`</p> |
-|MongoDB |MongoDB: WiredTiger cache: pages written from cache |<p>Number of pages writtent from the cache.</p> |DEPENDENT |mongodb.wired_tiger.cache.pages_written[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['pages written from cache']`</p> |
+|MongoDB |MongoDB: WiredTiger cache: pages written from cache |<p>Number of pages written from the cache.</p> |DEPENDENT |mongodb.wired_tiger.cache.pages_written[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['pages written from cache']`</p> |
 |MongoDB |MongoDB: WiredTiger cache: pages held in cache |<p>Number of pages currently held in the cache.</p> |DEPENDENT |mongodb.wired_tiger.cache.pages_in_cache[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache['pages currently held in the cache']`</p> |
 |MongoDB |MongoDB: WiredTiger cache: pages evicted by application threads, rate |<p>Number of page evicted by application threads per second.</p> |DEPENDENT |mongodb.wired_tiger.cache.pages_evicted_threads.rate[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache.['pages evicted by application threads']`</p> |
 |MongoDB |MongoDB: WiredTiger cache: tracked dirty bytes in the cache |<p>Size of the dirty data in the cache.</p> |DEPENDENT |mongodb.wired_tiger.cache.tracked_dirty_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.cache.['tracked dirty bytes in the cache']`</p> |
@@ -178,29 +178,29 @@ There are no template links in this template.
 |MongoDB |MongoDB: WiredTiger concurrent transactions: write, available |<p>Number of available write tickets (concurrent transactions) remaining.</p> |DEPENDENT |mongodb.wired_tiger.concurrent_transactions.write.available[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.concurrentTransactions.write.available`</p> |
 |MongoDB |MongoDB: WiredTiger concurrent transactions: write, out |<p>Number of write tickets (concurrent transactions) in use.</p> |DEPENDENT |mongodb.wired_tiger.concurrent_transactions.write.out[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.concurrentTransactions.write.out`</p> |
 |MongoDB |MongoDB: WiredTiger concurrent transactions: write, total tickets |<p>Total number of write tickets (concurrent transactions) available.</p> |DEPENDENT |mongodb.wired_tiger.concurrent_transactions.write.totalTickets[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.wiredTiger.concurrentTransactions.write.totalTickets`</p> |
-|Zabbix_raw_items |MongoDB: Get server status |<p>Returns a database’s state.</p> |ZABBIX_PASSIVE |mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
+|Zabbix_raw_items |MongoDB: Get server status |<p>Returns a database's state.</p> |ZABBIX_PASSIVE |mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
 |Zabbix_raw_items |MongoDB: Get Replica Set status |<p>Returns the replica set status from the point of view of the member where the method is run.</p> |ZABBIX_PASSIVE |mongodb.rs.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
 |Zabbix_raw_items |MongoDB: Get oplog stats |<p>Returns status of the replica set, using data polled from the oplog.</p> |ZABBIX_PASSIVE |mongodb.oplog.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
 |Zabbix_raw_items |MongoDB: Get collections usage stats |<p>Returns usage statistics for each collection.</p> |ZABBIX_PASSIVE |mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
-|Zabbix_raw_items |MongoDB {#DBNAME}: Get db stats {#DBNAME} |<p>Returns statistics reflecting the database system’s state.</p> |ZABBIX_PASSIVE |mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"] |
+|Zabbix_raw_items |MongoDB {#DBNAME}: Get db stats {#DBNAME} |<p>Returns statistics reflecting the database system's state.</p> |ZABBIX_PASSIVE |mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"] |
 |Zabbix_raw_items |MongoDB {#DBNAME}.{#COLLECTION}: Get collection stats {#DBNAME}.{#COLLECTION} |<p>Returns a variety of storage statistics for a given collection.</p> |ZABBIX_PASSIVE |mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"] |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|MongoDB: Connection to MongoDB is unavailable |<p>Connection to MongoDB instance is currently unavailable.</p> |`{TEMPLATE_NAME:mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"].last()}=0` |HIGH | |
-|MongoDB: Version has changed (new version: {ITEM.VALUE}) |<p>MongoDB version has changed. Ack to close.</p> |`{TEMPLATE_NAME:mongodb.version.diff()}=1 and {TEMPLATE_NAME:mongodb.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|MongoDB: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:mongodb.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|MongoDB: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes</p> |`{TEMPLATE_NAME:mongodb.uptime.nodata(10m)}=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MongoDB: Connection to MongoDB is unavailable</p> |
-|MongoDB: Total number of open connections is too high (over {$MONGODB.CONNS.PCT.USED.MAX.WARN%} in 5m) |<p>Too few available connections. If MongoDB runs low on connections, in may not be able to handle incoming requests in a timely manner.</p> |`{TEMPLATE_NAME:mongodb.connections.current.min(5m)}/({MongoDB node by Zabbix Agent 2:mongodb.connections.available.last()}+{TEMPLATE_NAME:mongodb.connections.current.last()})*100>{$MONGODB.CONNS.PCT.USED.MAX.WARN}` |WARNING | |
-|MongoDB: Too many cursors opened by MongoDB for clients (over {$MONGODB.CURSOR.OPEN.MAX.WARN} in 5m) |<p>-</p> |`{TEMPLATE_NAME:mongodb.cursor.open.total.min(5m)}>{$MONGODB.CURSOR.OPEN.MAX.WARN}` |WARNING | |
-|MongoDB: Too many cursors are timing out (over {$MONGODB.CURSOR.TIMEOUT.MAX.WARN} per second in 5m) |<p>-</p> |`{TEMPLATE_NAME:mongodb.cursor.timed_out.rate.min(5m)}>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}` |WARNING | |
-|MongoDB: Node in ReplicaSet changed the state (new state: {ITEM.VALUE}) |<p>Node in ReplicaSet  changed the state. Ack to close.</p> |`{TEMPLATE_NAME:mongodb.rs.state[{#RS_NAME}].diff()}=1` |WARNING |<p>Manual close: YES</p> |
-|MongoDB: Replication lag with primary is too high (over {$MONGODB.REPL.LAG.MAX.WARN} in 5m) |<p>-</p> |`{TEMPLATE_NAME:mongodb.rs.lag[{#RS_NAME}].min(5m)}>{$MONGODB.REPL.LAG.MAX.WARN}` |WARNING | |
-|MongoDB: There are unhealthy replicas in ReplicaSet | |`{TEMPLATE_NAME:mongodb.rs.unhealthy_count[{#RS_NAME}].last()}>0  and {MongoDB node by Zabbix Agent 2:mongodb.rs.unhealthy[{#RS_NAME}].strlen()}>0 ` |AVERAGE | |
-|MongoDB: Available WiredTiger read tickets less then {$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN} |<p>"Too few available read tickets.</p><p>When the number of available read tickets remaining reaches zero, new read requests will be queued until a new read ticket is available."</p> |`{TEMPLATE_NAME:mongodb.wired_tiger.concurrent_transactions.read.available[{#SINGLETON}].max(5m)}<{$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}` |WARNING | |
-|MongoDB: Available WiredTiger write tickets less then {$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN} |<p>"Too few available write tickets.</p><p>When the number of available write tickets remaining reaches zero, new write requests will be queued until a new write ticket is available."</p> |`{TEMPLATE_NAME:mongodb.wired_tiger.concurrent_transactions.write.available[{#SINGLETON}].max(5m)}<{$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}` |WARNING | |
+|MongoDB: Connection to MongoDB is unavailable |<p>Connection to MongoDB instance is currently unavailable.</p> |`last(/MongoDB node by Zabbix agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0` |HIGH | |
+|MongoDB: Version has changed (new version: {ITEM.VALUE}) |<p>MongoDB version has changed. Ack to close.</p> |`last(/MongoDB node by Zabbix agent 2/mongodb.version,#1)<>last(/MongoDB node by Zabbix agent 2/mongodb.version,#2) and length(last(/MongoDB node by Zabbix agent 2/mongodb.version))>0` |INFO |<p>Manual close: YES</p> |
+|MongoDB: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MongoDB node by Zabbix agent 2/mongodb.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|MongoDB: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes</p> |`nodata(/MongoDB node by Zabbix agent 2/mongodb.uptime,10m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MongoDB: Connection to MongoDB is unavailable</p> |
+|MongoDB: Total number of open connections is too high (over {$MONGODB.CONNS.PCT.USED.MAX.WARN%} in 5m) |<p>Too few available connections. If MongoDB runs low on connections, in may not be able to handle incoming requests in a timely manner.</p> |`min(/MongoDB node by Zabbix agent 2/mongodb.connections.current,5m)/(last(/MongoDB node by Zabbix agent 2/mongodb.connections.available)+last(/MongoDB node by Zabbix agent 2/mongodb.connections.current))*100>{$MONGODB.CONNS.PCT.USED.MAX.WARN}` |WARNING | |
+|MongoDB: Too many cursors opened by MongoDB for clients (over {$MONGODB.CURSOR.OPEN.MAX.WARN} in 5m) |<p>-</p> |`min(/MongoDB node by Zabbix agent 2/mongodb.cursor.open.total,5m)>{$MONGODB.CURSOR.OPEN.MAX.WARN}` |WARNING | |
+|MongoDB: Too many cursors are timing out (over {$MONGODB.CURSOR.TIMEOUT.MAX.WARN} per second in 5m) |<p>-</p> |`min(/MongoDB node by Zabbix agent 2/mongodb.cursor.timed_out.rate,5m)>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}` |WARNING | |
+|MongoDB: Node in ReplicaSet changed the state (new state: {ITEM.VALUE}) |<p>Node in ReplicaSet  changed the state. Ack to close.</p> |`last(/MongoDB node by Zabbix agent 2/mongodb.rs.state[{#RS_NAME}],#1)<>last(/MongoDB node by Zabbix agent 2/mongodb.rs.state[{#RS_NAME}],#2)` |WARNING |<p>Manual close: YES</p> |
+|MongoDB: Replication lag with primary is too high (over {$MONGODB.REPL.LAG.MAX.WARN} in 5m) |<p>-</p> |`min(/MongoDB node by Zabbix agent 2/mongodb.rs.lag[{#RS_NAME}],5m)>{$MONGODB.REPL.LAG.MAX.WARN}` |WARNING | |
+|MongoDB: There are unhealthy replicas in ReplicaSet |<p>-</p> |`last(/MongoDB node by Zabbix agent 2/mongodb.rs.unhealthy_count[{#RS_NAME}])>0 and length(last(/MongoDB node by Zabbix agent 2/mongodb.rs.unhealthy[{#RS_NAME}]))>0` |AVERAGE | |
+|MongoDB: Available WiredTiger read tickets less than {$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN} |<p>"Too few available read tickets.</p><p>When the number of available read tickets remaining reaches zero, new read requests will be queued until a new read ticket is available."</p> |`max(/MongoDB node by Zabbix agent 2/mongodb.wired_tiger.concurrent_transactions.read.available[{#SINGLETON}],5m)<{$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}` |WARNING | |
+|MongoDB: Available WiredTiger write tickets less than {$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN} |<p>"Too few available write tickets.</p><p>When the number of available write tickets remaining reaches zero, new write requests will be queued until a new write ticket is available."</p> |`max(/MongoDB node by Zabbix agent 2/mongodb.wired_tiger.concurrent_transactions.write.available[{#SINGLETON}],5m)<{$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/db/mongodb/template_db_mongodb.yaml b/templates/db/mongodb/template_db_mongodb.yaml
index 5c7d1c78ba4..cf960710a4f 100644
--- a/templates/db/mongodb/template_db_mongodb.yaml
+++ b/templates/db/mongodb/template_db_mongodb.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T14:36:37Z'
+  version: '6.0'
+  date: '2022-01-10T07:41:44Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -8,8 +8,8 @@ zabbix_export:
   templates:
     -
       uuid: 81aa8c5ab5594f77a2b26fb7f5094048
-      template: 'MongoDB node by Zabbix Agent 2'
-      name: 'MongoDB node by Zabbix Agent 2'
+      template: 'MongoDB node by Zabbix agent 2'
+      name: 'MongoDB node by Zabbix agent 2'
       description: |
         Get MongoDB metrics from plugin for the zabbix-agent2.
           1. Setup and configure zabbix-agent2 compiled with the MongoDB monitoring plugin.
@@ -18,7 +18,7 @@ zabbix_export:
         
         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
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -452,7 +452,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           description: |
-            The number of operations that are currently queued and waiting for the write lock. 
+            The number of operations that are currently queued and waiting for the write lock.
              A consistently small write-queue, particularly of shorter operations, is no cause for concern.
           preprocessing:
             -
@@ -506,7 +506,7 @@ zabbix_export:
           triggers:
             -
               uuid: ed4a0c66c76d4ca699d0f2188cc8e71f
-              expression: 'min(/MongoDB node by Zabbix Agent 2/mongodb.cursor.open.total,5m)>{$MONGODB.CURSOR.OPEN.MAX.WARN}'
+              expression: 'min(/MongoDB node by Zabbix agent 2/mongodb.cursor.open.total,5m)>{$MONGODB.CURSOR.OPEN.MAX.WARN}'
               name: 'MongoDB: Too many cursors opened by MongoDB for clients (over {$MONGODB.CURSOR.OPEN.MAX.WARN} in 5m)'
               priority: WARNING
         -
@@ -536,7 +536,7 @@ zabbix_export:
           triggers:
             -
               uuid: 41d37791111b461d94da779e4b2c7e46
-              expression: 'min(/MongoDB node by Zabbix Agent 2/mongodb.cursor.timed_out.rate,5m)>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}'
+              expression: 'min(/MongoDB node by Zabbix agent 2/mongodb.cursor.timed_out.rate,5m)>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}'
               name: 'MongoDB: Too many cursors are timing out (over {$MONGODB.CURSOR.TIMEOUT.MAX.WARN} per second in 5m)'
               priority: WARNING
         -
@@ -814,7 +814,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            The number of “getmore” operations since the mongod instance per second. This counter can be high even if the query count is low. 
+            The number of “getmore” operations since the mongod instance per second. This counter can be high even if the query count is low.
             Secondary nodes send getMore operations as part of the replication process.
           preprocessing:
             -
@@ -936,7 +936,7 @@ zabbix_export:
           triggers:
             -
               uuid: c4ab9bfdd6d14634870f8ebb44081655
-              expression: 'last(/MongoDB node by Zabbix Agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
+              expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
               name: 'MongoDB: Connection to MongoDB is unavailable'
               priority: HIGH
               description: 'Connection to MongoDB instance is currently unavailable.'
@@ -959,7 +959,7 @@ zabbix_export:
           history: '0'
           trends: '0'
           value_type: TEXT
-          description: 'Returns a database’s state.'
+          description: 'Returns a database''s state.'
           tags:
             -
               tag: Application
@@ -988,7 +988,7 @@ zabbix_export:
           triggers:
             -
               uuid: 166444342def4adc954aa35f3dc22dba
-              expression: 'nodata(/MongoDB node by Zabbix Agent 2/mongodb.uptime,10m)=1'
+              expression: 'nodata(/MongoDB node by Zabbix agent 2/mongodb.uptime,10m)=1'
               name: 'MongoDB: Failed to fetch info data (or no data for 10m)'
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 10 minutes'
@@ -996,10 +996,10 @@ zabbix_export:
               dependencies:
                 -
                   name: 'MongoDB: Connection to MongoDB is unavailable'
-                  expression: 'last(/MongoDB node by Zabbix Agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
+                  expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
             -
               uuid: 992590e47a7f42dda0e074c2f7a3e5ba
-              expression: 'last(/MongoDB node by Zabbix Agent 2/mongodb.uptime)<10m'
+              expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.uptime)<10m'
               name: 'MongoDB: has been restarted (uptime < 10m)'
               priority: INFO
               description: 'Uptime is less than 10 minutes'
@@ -1032,7 +1032,7 @@ zabbix_export:
           triggers:
             -
               uuid: 0856e13b7e7644c5b353fcfa577acb51
-              expression: 'last(/MongoDB node by Zabbix Agent 2/mongodb.version,#1)<>last(/MongoDB node by Zabbix Agent 2/mongodb.version,#2) and length(last(/MongoDB node by Zabbix Agent 2/mongodb.version))>0'
+              expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.version,#1)<>last(/MongoDB node by Zabbix agent 2/mongodb.version,#2) and length(last(/MongoDB node by Zabbix agent 2/mongodb.version))>0'
               name: 'MongoDB: Version has changed (new version: {ITEM.VALUE})'
               priority: INFO
               description: 'MongoDB version has changed. Ack to close.'
@@ -1700,13 +1700,13 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.read_lock.rate["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.write_lock.rate["{#DBNAME}","{#COLLECTION}"]'
             -
               uuid: ab97504abcc844d5a408d4b7cf85e5a5
@@ -1715,13 +1715,13 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.read_lock.ms["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.write_lock.ms["{#DBNAME}","{#COLLECTION}"]'
             -
               uuid: dcfc8fcc0b484c8baea14525aa212dc2
@@ -1730,44 +1730,44 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.queries.rate["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.getmore.rate["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '2'
                   color: F63100
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.insert.rate["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '3'
                   color: A54F10
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.update.rate["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '4'
                   color: FC6EA3
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.remove.rate["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '5'
                   color: 6C59DC
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.commands.rate["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '6'
                   drawtype: BOLD_LINE
                   color: AC8C14
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.total.rate["{#DBNAME}","{#COLLECTION}"]'
             -
               uuid: 554ac3ac477c47cfbaaba3d6419109f0
@@ -1776,44 +1776,44 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.queries.ms["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.getmore.ms["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '2'
                   color: F63100
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.insert.ms["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '3'
                   color: A54F10
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.update.ms["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '4'
                   color: FC6EA3
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.remove.ms["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '5'
                   color: 6C59DC
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.commands.ms["{#DBNAME}","{#COLLECTION}"]'
                 -
                   sortorder: '6'
                   drawtype: BOLD_LINE
                   color: AC8C14
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.collection.ops.total.ms["{#DBNAME}","{#COLLECTION}"]'
         -
           uuid: a2a57b40d12944ae8ee21c166706b132
@@ -1983,7 +1983,7 @@ zabbix_export:
               history: '0'
               trends: '0'
               value_type: TEXT
-              description: 'Returns statistics reflecting the database system’s state.'
+              description: 'Returns statistics reflecting the database system''s state.'
               tags:
                 -
                   tag: Application
@@ -2016,13 +2016,13 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.db.collections["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.db.objects["{#DBNAME}"]'
             -
               uuid: 5dc13b4aebf24a1b8448c26d93b42d7a
@@ -2031,25 +2031,25 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.db.index_size["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.db.storage_size["{#DBNAME}"]'
                 -
                   sortorder: '2'
                   color: F63100
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.db.file_size["{#DBNAME}"]'
                 -
                   sortorder: '3'
                   color: A54F10
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.db.data_size["{#DBNAME}"]'
         -
           uuid: eaa4b8fc535143f887673834987ce7be
@@ -2215,7 +2215,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 778d0b15affe4867b3e7f3e396c2a700
-                  expression: 'min(/MongoDB node by Zabbix Agent 2/mongodb.rs.lag[{#RS_NAME}],5m)>{$MONGODB.REPL.LAG.MAX.WARN}'
+                  expression: 'min(/MongoDB node by Zabbix agent 2/mongodb.rs.lag[{#RS_NAME}],5m)>{$MONGODB.REPL.LAG.MAX.WARN}'
                   name: 'MongoDB: Replication lag with primary is too high (over {$MONGODB.REPL.LAG.MAX.WARN} in 5m)'
                   priority: WARNING
             -
@@ -2490,7 +2490,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: f9f29647a3db426c9c303fc47cfc48eb
-                  expression: 'last(/MongoDB node by Zabbix Agent 2/mongodb.rs.state[{#RS_NAME}],#1)<>last(/MongoDB node by Zabbix Agent 2/mongodb.rs.state[{#RS_NAME}],#2)'
+                  expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.rs.state[{#RS_NAME}],#1)<>last(/MongoDB node by Zabbix agent 2/mongodb.rs.state[{#RS_NAME}],#2)'
                   recovery_mode: NONE
                   name: 'MongoDB: Node in ReplicaSet changed the state (new state: {ITEM.VALUE})'
                   priority: WARNING
@@ -2504,7 +2504,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               discover: NO_DISCOVER
-              description: 'The number of replucated nodes in current ReplicaSet.'
+              description: 'The number of replicated nodes in current ReplicaSet.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -2579,7 +2579,7 @@ zabbix_export:
           trigger_prototypes:
             -
               uuid: 975c5e5817b148ba8a8d551ac42053d0
-              expression: 'last(/MongoDB node by Zabbix Agent 2/mongodb.rs.unhealthy_count[{#RS_NAME}])>0  and length(last(/MongoDB node by Zabbix Agent 2/mongodb.rs.unhealthy[{#RS_NAME}]))>0'
+              expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.rs.unhealthy_count[{#RS_NAME}])>0 and length(last(/MongoDB node by Zabbix agent 2/mongodb.rs.unhealthy[{#RS_NAME}]))>0'
               name: 'MongoDB: There are unhealthy replicas in ReplicaSet'
               priority: AVERAGE
           graph_prototypes:
@@ -2591,7 +2591,7 @@ zabbix_export:
                   drawtype: BOLD_LINE
                   color: 1A7C11
                   item:
-                    host: 'MongoDB node by Zabbix Agent 2'
+                    host: 'MongoDB node by Zabbix agent 2'
                     key: 'mongodb.rs.lag[{#RS_NAME}]'
           master_item:
             key: 'mongodb.rs.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
@@ -2610,6 +2610,22 @@ zabbix_export:
                 - 1h
           overrides:
             -
+              name: 'Arbiter metrics'
+              step: '2'
+              filter:
+                conditions:
+                  -
+                    macro: '{#NODE_STATE}'
+                    value: '7'
+                    formulaid: A
+              operations:
+                -
+                  operationobject: ITEM_PROTOTYPE
+                  operator: LIKE
+                  value: 'Replication lag'
+                  status: ENABLED
+                  discover: NO_DISCOVER
+            -
               name: 'Primary metrics'
               step: '1'
               filter:
@@ -2643,22 +2659,6 @@ zabbix_export:
                   value: 'Replication lag'
                   status: ENABLED
                   discover: NO_DISCOVER
-            -
-              name: 'Arbiter metrics'
-              step: '2'
-              filter:
-                conditions:
-                  -
-                    macro: '{#NODE_STATE}'
-                    value: '7'
-                    formulaid: A
-              operations:
-                -
-                  operationobject: ITEM_PROTOTYPE
-                  operator: LIKE
-                  value: 'Replication lag'
-                  status: ENABLED
-                  discover: NO_DISCOVER
         -
           uuid: 9b37bb1d3e244a95ac5702bcf3ab19a9
           name: 'WiredTiger metrics'
@@ -2811,7 +2811,7 @@ zabbix_export:
               key: 'mongodb.wired_tiger.cache.pages_written[{#SINGLETON}]'
               delay: '0'
               history: 7d
-              description: 'Number of pages writtent from the cache.'
+              description: 'Number of pages written from the cache.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -2903,8 +2903,8 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 967928b915f64623b4416ed0dbf6ba98
-                  expression: 'max(/MongoDB node by Zabbix Agent 2/mongodb.wired_tiger.concurrent_transactions.read.available[{#SINGLETON}],5m)<{$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}'
-                  name: 'MongoDB: Available WiredTiger read tickets less then {$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}'
+                  expression: 'max(/MongoDB node by Zabbix agent 2/mongodb.wired_tiger.concurrent_transactions.read.available[{#SINGLETON}],5m)<{$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}'
+                  name: 'MongoDB: Available WiredTiger read tickets less than {$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}'
                   priority: WARNING
                   description: |
                     "Too few available read tickets.
@@ -2969,8 +2969,8 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 485e6e846f274b528902b3ffd08f2fc4
-                  expression: 'max(/MongoDB node by Zabbix Agent 2/mongodb.wired_tiger.concurrent_transactions.write.available[{#SINGLETON}],5m)<{$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}'
-                  name: 'MongoDB: Available WiredTiger write tickets less then {$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}'
+                  expression: 'max(/MongoDB node by Zabbix agent 2/mongodb.wired_tiger.concurrent_transactions.write.available[{#SINGLETON}],5m)<{$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}'
+                  name: 'MongoDB: Available WiredTiger write tickets less than {$MONGODB.WIRED_TIGER.TICKETS.AVAILABLE.MIN.WARN}'
                   priority: WARNING
                   description: |
                     "Too few available write tickets.
@@ -3021,7 +3021,7 @@ zabbix_export:
               parameters:
                 - |
                   return JSON.stringify(JSON.parse(value).wiredTiger
-                  ? [{'{#SINGLETON}': ''}] : []);
+                    ? [{'{#SINGLETON}': ''}] : []);
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -3131,7 +3131,7 @@ zabbix_export:
   triggers:
     -
       uuid: 58142b2a76114e69af259ea1b5c19bbc
-      expression: 'min(/MongoDB node by Zabbix Agent 2/mongodb.connections.current,5m)/(last(/MongoDB node by Zabbix Agent 2/mongodb.connections.available)+last(/MongoDB node by Zabbix Agent 2/mongodb.connections.current))*100>{$MONGODB.CONNS.PCT.USED.MAX.WARN}'
+      expression: 'min(/MongoDB node by Zabbix agent 2/mongodb.connections.current,5m)/(last(/MongoDB node by Zabbix agent 2/mongodb.connections.available)+last(/MongoDB node by Zabbix agent 2/mongodb.connections.current))*100>{$MONGODB.CONNS.PCT.USED.MAX.WARN}'
       name: 'MongoDB: Total number of open connections is too high (over {$MONGODB.CONNS.PCT.USED.MAX.WARN%} in 5m)'
       priority: WARNING
       description: 'Too few available connections. If MongoDB runs low on connections, in may not be able to handle incoming requests in a timely manner.'
@@ -3144,19 +3144,19 @@ zabbix_export:
           drawtype: BOLD_LINE
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.active_clients.total
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.active_clients.readers
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.active_clients.writers
     -
       uuid: 815c7f2a6dd941df9bc10bc9153e0e97
@@ -3165,13 +3165,13 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.connections.rate
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.network.numRequests.rate
     -
       uuid: d7787063a8614cb4afdf41811a8ade59
@@ -3180,19 +3180,19 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.connections.available
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.connections.active
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.connections.current
     -
       uuid: 230bda1ddd4a45b6a2f11dbea252276e
@@ -3201,19 +3201,19 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.cursor.open.total
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.cursor.open.pinned
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.metrics.cursor.open.no_timeout
     -
       uuid: 509211f5f33d4c57a49c5416b2f33937
@@ -3222,25 +3222,25 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongod.document.deleted.rate
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongod.document.inserted.rate
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongod.document.returned.rate
         -
           sortorder: '3'
           color: A54F10
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongod.document.updated.rate
     -
       uuid: f47175a50c6f488b993d3b04ecb28af4
@@ -3249,25 +3249,25 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.mem.mapped
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.mem.resident
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.mem.virtual
         -
           sortorder: '3'
           color: A54F10
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.mem.mapped_with_journal
     -
       uuid: f1311a6b0d5f4564898d6679a45c438d
@@ -3276,13 +3276,13 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.network.bytes_out.rate
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.network.bytes_in.rate
     -
       uuid: 27c36a56bdca436d8a0fe43c9ee8233b
@@ -3291,37 +3291,37 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.opcounters.query.rate
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.opcounters.insert.rate
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.opcounters.getmore.rate
         -
           sortorder: '3'
           color: A54F10
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.opcounters.update.rate
         -
           sortorder: '4'
           color: FC6EA3
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.opcounters.delete.rate
         -
           sortorder: '5'
           color: 6C59DC
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.opcounters.command.rate
     -
       uuid: e228af86d0a34bd4b494cb6b8cda2ad8
@@ -3331,19 +3331,19 @@ zabbix_export:
           drawtype: BOLD_LINE
           color: 1A7C11
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.current_queue.total
         -
           sortorder: '1'
           drawtype: BOLD_LINE
           color: 2774A4
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.current_queue.readers
         -
           sortorder: '2'
           drawtype: BOLD_LINE
           color: F63100
           item:
-            host: 'MongoDB node by Zabbix Agent 2'
+            host: 'MongoDB node by Zabbix agent 2'
             key: mongodb.current_queue.writers
diff --git a/templates/db/mongodb_cluster/README.md b/templates/db/mongodb_cluster/README.md
index 8a061e99faf..5e8cafb5853 100644
--- a/templates/db/mongodb_cluster/README.md
+++ b/templates/db/mongodb_cluster/README.md
@@ -1,13 +1,13 @@
 
-# MongoDB cluster by Zabbix Agent 2
+# MongoDB cluster by Zabbix agent 2
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor MongoDB sharded cluster by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-`MongoDB cluster by Zabbix Agent 2` — collects metrics from mongos proxy(router) by polling zabbix-agent2.
+`MongoDB cluster by Zabbix agent 2` — collects metrics from mongos proxy(router) by polling zabbix-agent2.
 
 
 This template was tested on:
@@ -25,7 +25,7 @@ This template was tested on:
 
 **Note**, depending on the number of DBs and collections discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}.
 
-All sharded Mongodb nodes (mongod) will be discovered with attached template "MongoDB node by Zabbix Agent 2".
+All sharded Mongodb nodes (mongod) will be discovered with attached template "MongoDB node by Zabbix agent 2".
 
 
 Test availability: `zabbix_get -s mongos.node -k 'mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]"`
@@ -58,8 +58,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Collect database metrics.</p><p>Note, depending on the number of DBs this discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}.</p> |ZABBIX_PASSIVE |mongodb.db.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.NOT_MATCHES}`</p> |
-|Collection discovery |<p>Collect collections metrics.</p><p>Note, depending on the number of DBs and collections this discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}.</p> |ZABBIX_PASSIVE |mongodb.collections.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.NOT_MATCHES}`</p><p>- C: {#COLLECTION} MATCHES_REGEX `{$MONGODB.LLD.FILTER.COLLECTION.MATCHES}`</p><p>- D: {#COLLECTION} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}`</p> |
+|Database discovery |<p>Collect database metrics.</p><p>Note, depending on the number of DBs this discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}.</p> |ZABBIX_PASSIVE |mongodb.db.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.NOT_MATCHES}`</p> |
+|Collection discovery |<p>Collect collections metrics.</p><p>Note, depending on the number of DBs and collections this discovery operation may be expensive. Use filters with macros {$MONGODB.LLD.FILTER.DB.MATCHES}, {$MONGODB.LLD.FILTER.DB.NOT_MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.MATCHES}, {$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}.</p> |ZABBIX_PASSIVE |mongodb.collections.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.DB.NOT_MATCHES}`</p><p>- {#COLLECTION} MATCHES_REGEX `{$MONGODB.LLD.FILTER.COLLECTION.MATCHES}`</p><p>- {#COLLECTION} NOT_MATCHES_REGEX `{$MONGODB.LLD.FILTER.COLLECTION.NOT_MATCHES}`</p> |
 |Shards discovery |<p>Discovery shared cluster hosts.</p> |ZABBIX_PASSIVE |mongodb.sh.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
 |Config servers discovery |<p>Discovery shared cluster config servers.</p> |ZABBIX_PASSIVE |mongodb.cfg.discovery["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
 
@@ -71,31 +71,31 @@ There are no template links in this template.
 |MongoDB sharded cluster |MongoDB cluster: Jumbo chunks |<p>Total number of 'jumbo' chunks in the mongo cluster.</p> |ZABBIX_PASSIVE |mongodb.jumbo_chunks.count["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
 |MongoDB sharded cluster |MongoDB cluster: Mongos version |<p>Version of the Mongos server</p> |DEPENDENT |mongodb.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Uptime |<p>Number of seconds since Mongos server start</p> |DEPENDENT |mongodb.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p> |
-|MongoDB sharded cluster |MongoDB cluster: Operations: command |<p>"The number of commands issued to the database per second.</p><p>Counts all commands except the write commands: insert, update, and delete."</p> |DEPENDENT |mongodb.opcounters.command.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.command`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Operations: delete |<p>"The number of delete operations the mongos instance per second."</p> |DEPENDENT |mongodb.opcounters.delete.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.delete`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Operations: update, rate |<p>"The number of update operations the mongos instance per second."</p> |DEPENDENT |mongodb.opcounters.update.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.update`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Operations: query, rate |<p>"The number of queries received the mongos instance per second."</p> |DEPENDENT |mongodb.opcounters.query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.query`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Operations: insert, rate |<p>"The number of insert operations received the mongos instance per second."</p> |DEPENDENT |mongodb.opcounters.insert.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.insert`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Operations: getmore, rate |<p>"The number of “getmore” operations the mongos per second. This counter can be high even if the query count is low.</p><p>Secondary nodes send getMore operations as part of the replication process."</p> |DEPENDENT |mongodb.opcounters.getmore.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.getmore`</p><p>- CHANGE_PER_SECOND |
+|MongoDB sharded cluster |MongoDB cluster: Operations: command |<p>"The number of commands issued to the database per second.</p><p>Counts all commands except the write commands: insert, update, and delete."</p> |DEPENDENT |mongodb.opcounters.command.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.command`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Operations: delete |<p>"The number of delete operations the mongos instance per second."</p> |DEPENDENT |mongodb.opcounters.delete.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.delete`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Operations: update, rate |<p>"The number of update operations the mongos instance per second."</p> |DEPENDENT |mongodb.opcounters.update.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.update`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Operations: query, rate |<p>"The number of queries received the mongos instance per second."</p> |DEPENDENT |mongodb.opcounters.query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.query`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Operations: insert, rate |<p>"The number of insert operations received the mongos instance per second."</p> |DEPENDENT |mongodb.opcounters.insert.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.insert`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Operations: getmore, rate |<p>"The number of “getmore” operations the mongos per second. This counter can be high even if the query count is low.</p><p>Secondary nodes send getMore operations as part of the replication process."</p> |DEPENDENT |mongodb.opcounters.getmore.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.opcounters.getmore`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB sharded cluster |MongoDB cluster: Last seen configserver |<p>The latest optime of the CSRS primary that the mongos has seen.</p> |DEPENDENT |mongodb.last_seen_config_server<p>**Preprocessing**:</p><p>- JAVASCRIPT: `data = JSON.parse(value) return data.sharding.lastSeenConfigServerOpTime.ts/Math.pow(2,32) `</p> |
-|MongoDB sharded cluster |MongoDB cluster: Configserver heartbeat |<p>Difference between the latest optime of the CSRS primary that the mongos has seen and cluster time.</p> |DEPENDENT |mongodb.config_server_heartbeat<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-|MongoDB sharded cluster |MongoDB cluster: Bytes in, rate |<p>The total number of bytes that the server has received over network connections initiated by clients or other mongod/mongos instances per second.</p> |DEPENDENT |mongodb.network.bytes_in.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.bytesIn`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Bytes out, rate |<p>The total number of bytes that the server has sent over network connections initiated by clients or other mongod/mongos instances per second.</p> |DEPENDENT |mongodb.network.bytes_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.bytesOut`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Requests, rate |<p>Number of distinct requests that the server has received per second</p> |DEPENDENT |mongodb.network.numRequests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.numRequests`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Connections, current |<p>"The number of incoming connections from clients to the database server. </p><p>This number includes the current shell session"</p> |DEPENDENT |mongodb.connections.current<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.current`</p> |
-|MongoDB sharded cluster |MongoDB cluster: New connections, rate |<p>"Rate of all incoming connections created to the server."</p> |DEPENDENT |mongodb.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.totalCreated`</p><p>- CHANGE_PER_SECOND |
-|MongoDB sharded cluster |MongoDB cluster: Connections, active |<p>"The number of active client connections to the server. </p><p>Active client connections refers to client connections that currently have operations in progress.</p><p>Available starting in  4.0.7, 0 for older versions."</p> |DEPENDENT |mongodb.connections.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.active`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
+|MongoDB sharded cluster |MongoDB cluster: Configserver heartbeat |<p>Difference between the latest optime of the CSRS primary that the mongos has seen and cluster time.</p> |DEPENDENT |mongodb.config_server_heartbeat<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|MongoDB sharded cluster |MongoDB cluster: Bytes in, rate |<p>The total number of bytes that the server has received over network connections initiated by clients or other mongod/mongos instances per second.</p> |DEPENDENT |mongodb.network.bytes_in.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.bytesIn`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Bytes out, rate |<p>The total number of bytes that the server has sent over network connections initiated by clients or other mongod/mongos instances per second.</p> |DEPENDENT |mongodb.network.bytes_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.bytesOut`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Requests, rate |<p>Number of distinct requests that the server has received per second</p> |DEPENDENT |mongodb.network.numRequests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.network.numRequests`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Connections, current |<p>"The number of incoming connections from clients to the database server.</p><p>This number includes the current shell session"</p> |DEPENDENT |mongodb.connections.current<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.current`</p> |
+|MongoDB sharded cluster |MongoDB cluster: New connections, rate |<p>"Rate of all incoming connections created to the server."</p> |DEPENDENT |mongodb.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.totalCreated`</p><p>- CHANGE_PER_SECOND</p> |
+|MongoDB sharded cluster |MongoDB cluster: Connections, active |<p>"The number of active client connections to the server.</p><p>Active client connections refers to client connections that currently have operations in progress.</p><p>Available starting in  4.0.7, 0 for older versions."</p> |DEPENDENT |mongodb.connections.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.active`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Connections, available |<p>"The number of unused incoming connections available."</p> |DEPENDENT |mongodb.connections.available<p>**Preprocessing**:</p><p>- JSONPATH: `$.connections.available`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Connection pool: client connections |<p>The number of active and stored outgoing synchronous connections from the current mongos instance to other members of the sharded cluster.</p> |DEPENDENT |mongodb.connection_pool.client<p>**Preprocessing**:</p><p>- JSONPATH: `$.numClientConnections`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Connection pool: scoped |<p>Number of active and stored outgoing scoped synchronous connections from the current mongos instance to other members of the sharded cluster.</p> |DEPENDENT |mongodb.connection_pool.scoped<p>**Preprocessing**:</p><p>- JSONPATH: `$.numAScopedConnections`</p> |
-|MongoDB sharded cluster |MongoDB cluster: Connection pool: created, rate |<p>The total number of outgoing connections created per second by the current mongos instance to other members of the sharded cluster.</p> |DEPENDENT |mongodb.connection_pool.created.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.totalCreated`</p><p>- CHANGE_PER_SECOND |
+|MongoDB sharded cluster |MongoDB cluster: Connection pool: created, rate |<p>The total number of outgoing connections created per second by the current mongos instance to other members of the sharded cluster.</p> |DEPENDENT |mongodb.connection_pool.created.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.totalCreated`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB sharded cluster |MongoDB cluster: Connection pool: available |<p>The total number of available outgoing connections from the current mongos instance to other members of the sharded cluster.</p> |DEPENDENT |mongodb.connection_pool.available<p>**Preprocessing**:</p><p>- JSONPATH: `$.totalAvailable`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Connection pool: in use |<p>Reports the total number of outgoing connections from the current mongos instance to other members of the sharded cluster set that are currently in use.</p> |DEPENDENT |mongodb.connection_pool.in_use<p>**Preprocessing**:</p><p>- JSONPATH: `$.totalInUse`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Connection pool: refreshing |<p>Reports the total number of outgoing connections from the current mongos instance to other members of the sharded cluster that are currently being refreshed.</p> |DEPENDENT |mongodb.connection_pool.refreshing<p>**Preprocessing**:</p><p>- JSONPATH: `$.totalRefreshing`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Cursor: open no timeout |<p>Number of open cursors with the option DBQuery.Option.noTimeout set to prevent timeout after a period of inactivity.</p> |DEPENDENT |mongodb.metrics.cursor.open.no_timeout<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.open.noTimeout`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Cursor: open pinned |<p>Number of pinned open cursors.</p> |DEPENDENT |mongodb.cursor.open.pinned<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.open.pinned`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Cursor: open total |<p>Number of cursors that MongoDB is maintaining for clients.</p> |DEPENDENT |mongodb.cursor.open.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.open.total`</p> |
-|MongoDB sharded cluster |MongoDB cluster: Cursor: timed out, rate |<p>Number of cursors that time out, per second.</p> |DEPENDENT |mongodb.cursor.timed_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.timedOut`</p><p>- CHANGE_PER_SECOND |
+|MongoDB sharded cluster |MongoDB cluster: Cursor: timed out, rate |<p>Number of cursors that time out, per second.</p> |DEPENDENT |mongodb.cursor.timed_out.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.metrics.cursor.timedOut`</p><p>- CHANGE_PER_SECOND</p> |
 |MongoDB sharded cluster |MongoDB cluster: Architecture |<p>A number, either 64 or 32, that indicates whether the MongoDB instance is compiled for 64-bit or 32-bit architecture.</p> |DEPENDENT |mongodb.mem.bits<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem.bits`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Memory: resident |<p>Amount of memory currently used by the database process.</p> |DEPENDENT |mongodb.mem.resident<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem.resident`</p><p>- MULTIPLIER: `1048576`</p> |
 |MongoDB sharded cluster |MongoDB cluster: Memory: virtual |<p>Amount of virtual memory used by the mongos process.</p> |DEPENDENT |mongodb.mem.virtual<p>**Preprocessing**:</p><p>- JSONPATH: `$.mem.virtual`</p><p>- MULTIPLIER: `1048576`</p> |
@@ -113,23 +113,23 @@ There are no template links in this template.
 |MongoDB sharded cluster |MongoDB {#DBNAME}.{#COLLECTION}: Capped, max size |<p>Maximum size of a capped collection in bytes.</p> |DEPENDENT |mongodb.collection.max_size["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxSize`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |MongoDB sharded cluster |MongoDB {#DBNAME}.{#COLLECTION}: Storage size |<p>Total storage space allocated to this collection for document storage.</p> |DEPENDENT |mongodb.collection.storage_size["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.storageSize`</p> |
 |MongoDB sharded cluster |MongoDB {#DBNAME}.{#COLLECTION}: Indexes |<p>Total number of indices on the collection.</p> |DEPENDENT |mongodb.collection.nindexes["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.nindexes`</p> |
-|MongoDB sharded cluster |MongoDB {#DBNAME}.{#COLLECTION}: Capped |<p>Whether or not the collection is capped.</p> |DEPENDENT |mongodb.collection.capped["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.capped`</p><p>- BOOL_TO_DECIMAL<p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|MongoDB sharded cluster |MongoDB {#DBNAME}.{#COLLECTION}: Capped |<p>Whether or not the collection is capped.</p> |DEPENDENT |mongodb.collection.capped["{#DBNAME}","{#COLLECTION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.capped`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Zabbix_raw_items |MongoDB cluster: Get server status |<p>The mongos statistic</p> |ZABBIX_PASSIVE |mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
 |Zabbix_raw_items |MongoDB cluster: Get mongodb.connpool.stats |<p>Returns current info about connpool.stats.</p> |ZABBIX_PASSIVE |mongodb.connpool.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"] |
-|Zabbix_raw_items |MongoDB {#DBNAME}: Get db stats {#DBNAME} |<p>Returns statistics reflecting the database system’s state.</p> |ZABBIX_PASSIVE |mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"] |
+|Zabbix_raw_items |MongoDB {#DBNAME}: Get db stats {#DBNAME} |<p>Returns statistics reflecting the database system's state.</p> |ZABBIX_PASSIVE |mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"] |
 |Zabbix_raw_items |MongoDB {#DBNAME}.{#COLLECTION}: Get collection stats {#DBNAME}.{#COLLECTION} |<p>Returns a variety of storage statistics for a given collection.</p> |ZABBIX_PASSIVE |mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"] |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|MongoDB cluster: Connection to mongos proxy is unavailable |<p>Connection to mongos proxy instance is currently unavailable.</p> |`{TEMPLATE_NAME:mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"].last()}=0` |HIGH | |
-|MongoDB cluster: Version has changed (new version: {ITEM.VALUE}) |<p>MongoDB cluster version has changed. Ack to close.</p> |`{TEMPLATE_NAME:mongodb.version.diff()}=1 and {TEMPLATE_NAME:mongodb.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|MongoDB cluster: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:mongodb.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|MongoDB cluster: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes</p> |`{TEMPLATE_NAME:mongodb.uptime.nodata(10m)}=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MongoDB cluster: Connection to mongos proxy is unavailable</p> |
-|MongoDB cluster: Available connections less then {$MONGODB.CONNS.AVAILABLE.MIN.WARN} |<p>"Too few available connections.</p><p>Consider this value in combination with the value of connections current to understand the connection load on the database"</p> |`{TEMPLATE_NAME:mongodb.connections.available.max(5m)}<{$MONGODB.CONNS.AVAILABLE.MIN.WARN}` |WARNING | |
-|MongoDB cluster: Too many cursors opened by MongoDB for clients (over {$MONGODB.CURSOR.OPEN.MAX.WARN} in 5m) |<p>-</p> |`{TEMPLATE_NAME:mongodb.cursor.open.total.min(5m)}>{$MONGODB.CURSOR.OPEN.MAX.WARN}` |WARNING | |
-|MongoDB cluster: Too many cursors are timing out (over {$MONGODB.CURSOR.TIMEOUT.MAX.WARN} per second in 5m) |<p>-</p> |`{TEMPLATE_NAME:mongodb.cursor.timed_out.rate.min(5m)}>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}` |WARNING | |
+|MongoDB cluster: Connection to mongos proxy is unavailable |<p>Connection to mongos proxy instance is currently unavailable.</p> |`last(/MongoDB cluster by Zabbix agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0` |HIGH | |
+|MongoDB cluster: Version has changed (new version: {ITEM.VALUE}) |<p>MongoDB cluster version has changed. Ack to close.</p> |`last(/MongoDB cluster by Zabbix agent 2/mongodb.version,#1)<>last(/MongoDB cluster by Zabbix agent 2/mongodb.version,#2) and length(last(/MongoDB cluster by Zabbix agent 2/mongodb.version))>0` |INFO |<p>Manual close: YES</p> |
+|MongoDB cluster: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MongoDB cluster by Zabbix agent 2/mongodb.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|MongoDB cluster: Failed to fetch info data (or no data for 10m) |<p>Zabbix has not received data for items for the last 10 minutes</p> |`nodata(/MongoDB cluster by Zabbix agent 2/mongodb.uptime,10m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- MongoDB cluster: Connection to mongos proxy is unavailable</p> |
+|MongoDB cluster: Available connections less then {$MONGODB.CONNS.AVAILABLE.MIN.WARN} |<p>"Too few available connections.</p><p>Consider this value in combination with the value of connections current to understand the connection load on the database"</p> |`max(/MongoDB cluster by Zabbix agent 2/mongodb.connections.available,5m)<{$MONGODB.CONNS.AVAILABLE.MIN.WARN}` |WARNING | |
+|MongoDB cluster: Too many cursors opened by MongoDB for clients (over {$MONGODB.CURSOR.OPEN.MAX.WARN} in 5m) |<p>-</p> |`min(/MongoDB cluster by Zabbix agent 2/mongodb.cursor.open.total,5m)>{$MONGODB.CURSOR.OPEN.MAX.WARN}` |WARNING | |
+|MongoDB cluster: Too many cursors are timing out (over {$MONGODB.CURSOR.TIMEOUT.MAX.WARN} per second in 5m) |<p>-</p> |`min(/MongoDB cluster by Zabbix agent 2/mongodb.cursor.timed_out.rate,5m)>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml b/templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml
index 5c5b6d683ef..13e1c09aae8 100644
--- a/templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml
+++ b/templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T14:37:54Z'
+  version: '6.0'
+  date: '2021-12-16T07:08:28Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -8,8 +8,8 @@ zabbix_export:
   templates:
     -
       uuid: d38b271797bd41f2ad8c79d83b9d8d9c
-      template: 'MongoDB cluster by Zabbix Agent 2'
-      name: 'MongoDB cluster by Zabbix Agent 2'
+      template: 'MongoDB cluster by Zabbix agent 2'
+      name: 'MongoDB cluster by Zabbix agent 2'
       description: |
         Get MongoDB metrics from plugin for the zabbix-agent2.
           1. Setup and configure zabbix-agent2 compiled with the MongoDB monitoring plugin.
@@ -20,7 +20,7 @@ zabbix_export:
         
         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
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -41,7 +41,6 @@ zabbix_export:
                 - |
                   data = JSON.parse(value)
                   return (data["$clusterTime"].clusterTime-data.sharding.lastSeenConfigServerOpTime.ts)/Math.pow(2,32);
-                  
           master_item:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
@@ -56,7 +55,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           description: |
-            "The number of active client connections to the server. 
+            "The number of active client connections to the server.
             Active client connections refers to client connections that currently have operations in progress.
             Available starting in  4.0.7, 0 for older versions."
           preprocessing:
@@ -94,7 +93,7 @@ zabbix_export:
           triggers:
             -
               uuid: eae86b6f98db49099259a466b78d1c59
-              expression: 'max(/MongoDB cluster by Zabbix Agent 2/mongodb.connections.available,5m)<{$MONGODB.CONNS.AVAILABLE.MIN.WARN}'
+              expression: 'max(/MongoDB cluster by Zabbix agent 2/mongodb.connections.available,5m)<{$MONGODB.CONNS.AVAILABLE.MIN.WARN}'
               name: 'MongoDB cluster: Available connections less then {$MONGODB.CONNS.AVAILABLE.MIN.WARN}'
               priority: WARNING
               description: |
@@ -108,7 +107,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           description: |
-            "The number of incoming connections from clients to the database server. 
+            "The number of incoming connections from clients to the database server.
             This number includes the current shell session"
           preprocessing:
             -
@@ -317,7 +316,7 @@ zabbix_export:
           triggers:
             -
               uuid: 67db1f543818476ca0b07e2cc1709452
-              expression: 'min(/MongoDB cluster by Zabbix Agent 2/mongodb.cursor.open.total,5m)>{$MONGODB.CURSOR.OPEN.MAX.WARN}'
+              expression: 'min(/MongoDB cluster by Zabbix agent 2/mongodb.cursor.open.total,5m)>{$MONGODB.CURSOR.OPEN.MAX.WARN}'
               name: 'MongoDB cluster: Too many cursors opened by MongoDB for clients (over {$MONGODB.CURSOR.OPEN.MAX.WARN} in 5m)'
               priority: WARNING
         -
@@ -347,7 +346,7 @@ zabbix_export:
           triggers:
             -
               uuid: 5ea8cf9c955940a6a580cd6f4bb2cc78
-              expression: 'min(/MongoDB cluster by Zabbix Agent 2/mongodb.cursor.timed_out.rate,5m)>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}'
+              expression: 'min(/MongoDB cluster by Zabbix agent 2/mongodb.cursor.timed_out.rate,5m)>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}'
               name: 'MongoDB cluster: Too many cursors are timing out (over {$MONGODB.CURSOR.TIMEOUT.MAX.WARN} per second in 5m)'
               priority: WARNING
         -
@@ -376,7 +375,6 @@ zabbix_export:
                 - |
                   data = JSON.parse(value)
                   return data.sharding.lastSeenConfigServerOpTime.ts/Math.pow(2,32)
-                  
           master_item:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
@@ -717,7 +715,7 @@ zabbix_export:
           triggers:
             -
               uuid: cd74289970204ca281c5bc7d5c695e95
-              expression: 'last(/MongoDB cluster by Zabbix Agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
+              expression: 'last(/MongoDB cluster by Zabbix agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
               name: 'MongoDB cluster: Connection to mongos proxy is unavailable'
               priority: HIGH
               description: 'Connection to mongos proxy instance is currently unavailable.'
@@ -756,7 +754,7 @@ zabbix_export:
           triggers:
             -
               uuid: ee70d6da232a4068b574c9c147c622c9
-              expression: 'nodata(/MongoDB cluster by Zabbix Agent 2/mongodb.uptime,10m)=1'
+              expression: 'nodata(/MongoDB cluster by Zabbix agent 2/mongodb.uptime,10m)=1'
               name: 'MongoDB cluster: Failed to fetch info data (or no data for 10m)'
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 10 minutes'
@@ -764,10 +762,10 @@ zabbix_export:
               dependencies:
                 -
                   name: 'MongoDB cluster: Connection to mongos proxy is unavailable'
-                  expression: 'last(/MongoDB cluster by Zabbix Agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
+                  expression: 'last(/MongoDB cluster by Zabbix agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
             -
               uuid: 99ff438a7e3e4b0a8190b2ab9f41f076
-              expression: 'last(/MongoDB cluster by Zabbix Agent 2/mongodb.uptime)<10m'
+              expression: 'last(/MongoDB cluster by Zabbix agent 2/mongodb.uptime)<10m'
               name: 'MongoDB cluster: has been restarted (uptime < 10m)'
               priority: INFO
               description: 'Uptime is less than 10 minutes'
@@ -800,7 +798,7 @@ zabbix_export:
           triggers:
             -
               uuid: 921ee489887943838d69558f103ad646
-              expression: 'last(/MongoDB cluster by Zabbix Agent 2/mongodb.version,#1)<>last(/MongoDB cluster by Zabbix Agent 2/mongodb.version,#2) and length(last(/MongoDB cluster by Zabbix Agent 2/mongodb.version))>0'
+              expression: 'last(/MongoDB cluster by Zabbix agent 2/mongodb.version,#1)<>last(/MongoDB cluster by Zabbix agent 2/mongodb.version,#2) and length(last(/MongoDB cluster by Zabbix agent 2/mongodb.version))>0'
               name: 'MongoDB cluster: Version has changed (new version: {ITEM.VALUE})'
               priority: INFO
               description: 'MongoDB cluster version has changed. Ack to close.'
@@ -826,7 +824,7 @@ zabbix_export:
                   name: 'MongoDB sharded cluster/{#REPLICASET}'
               templates:
                 -
-                  name: 'MongoDB node by Zabbix Agent 2'
+                  name: 'MongoDB node by Zabbix agent 2'
               macros:
                 -
                   macro: '{$MONGODB.CONNSTRING}'
@@ -1196,7 +1194,7 @@ zabbix_export:
               history: '0'
               trends: '0'
               value_type: TEXT
-              description: 'Returns statistics reflecting the database system’s state.'
+              description: 'Returns statistics reflecting the database system''s state.'
               tags:
                 -
                   tag: Application
@@ -1229,25 +1227,25 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'MongoDB cluster by Zabbix Agent 2'
+                    host: 'MongoDB cluster by Zabbix agent 2'
                     key: 'mongodb.db.index_size["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'MongoDB cluster by Zabbix Agent 2'
+                    host: 'MongoDB cluster by Zabbix agent 2'
                     key: 'mongodb.db.storage_size["{#DBNAME}"]'
                 -
                   sortorder: '2'
                   color: F63100
                   item:
-                    host: 'MongoDB cluster by Zabbix Agent 2'
+                    host: 'MongoDB cluster by Zabbix agent 2'
                     key: 'mongodb.db.file_size["{#DBNAME}"]'
                 -
                   sortorder: '3'
                   color: A54F10
                   item:
-                    host: 'MongoDB cluster by Zabbix Agent 2'
+                    host: 'MongoDB cluster by Zabbix agent 2'
                     key: 'mongodb.db.data_size["{#DBNAME}"]'
         -
           uuid: a8bcea1509974c0f9d0051591e92cd5a
@@ -1269,7 +1267,7 @@ zabbix_export:
                   name: 'MongoDB sharded cluster/{#ID}'
               templates:
                 -
-                  name: 'MongoDB node by Zabbix Agent 2'
+                  name: 'MongoDB node by Zabbix agent 2'
               macros:
                 -
                   macro: '{$MONGODB.CONNSTRING}'
@@ -1343,31 +1341,31 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connection_pool.available
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connection_pool.refreshing
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connection_pool.in_use
         -
           sortorder: '3'
           color: A54F10
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connection_pool.scoped
         -
           sortorder: '4'
           color: FC6EA3
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connection_pool.client
     -
       uuid: 71a5a2d563d64bceacd564fe25b4d49e
@@ -1376,19 +1374,19 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connections.available
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connections.active
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connections.current
         -
           sortorder: '3'
@@ -1396,7 +1394,7 @@ zabbix_export:
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.connections.rate
     -
       uuid: b4277ddaf3c5486cacba0f9b7208c5b2
@@ -1405,19 +1403,19 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.cursor.open.total
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.cursor.open.pinned
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.metrics.cursor.open.no_timeout
     -
       uuid: d612246739784b9b9403dee6024493ce
@@ -1426,13 +1424,13 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.network.bytes_out.rate
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.network.bytes_in.rate
     -
       uuid: 4228deefccae4cd2959b183ba3e36295
@@ -1442,40 +1440,40 @@ zabbix_export:
           drawtype: BOLD_LINE
           color: 1A7C11
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.opcounters.query.rate
         -
           sortorder: '1'
           drawtype: BOLD_LINE
           color: 2774A4
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.opcounters.insert.rate
         -
           sortorder: '2'
           drawtype: BOLD_LINE
           color: F63100
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.opcounters.getmore.rate
         -
           sortorder: '3'
           drawtype: BOLD_LINE
           color: A54F10
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.opcounters.update.rate
         -
           sortorder: '4'
           drawtype: BOLD_LINE
           color: FC6EA3
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.opcounters.delete.rate
         -
           sortorder: '5'
           drawtype: BOLD_LINE
           color: 6C59DC
           item:
-            host: 'MongoDB cluster by Zabbix Agent 2'
+            host: 'MongoDB cluster by Zabbix agent 2'
             key: mongodb.opcounters.command.rate
diff --git a/templates/db/mssql_odbc/README.md b/templates/db/mssql_odbc/README.md
index 702eea9139e..2e87a2df62a 100644
--- a/templates/db/mssql_odbc/README.md
+++ b/templates/db/mssql_odbc/README.md
@@ -14,22 +14,22 @@ This template was tested on:
 
 > See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/odbc_checks) for basic instructions.
 
-1. Create an MSSQL user for monitoring. For example, zbx_monitor.  
-  **View Server State** and **View Any Definition** permissions should be granted to the user.  
-  Grant this user read permissions to the sysjobschedules, sysjobhistory, sysjobs tables.  
-  For example, using T-SQL commands:  
-  `GRANT SELECT ON OBJECT::msdb.dbo.sysjobs TO zbx_monitor`  
-  `GRANT SELECT ON OBJECT::msdb.dbo.sysjobservers TO zbx_monitor`  
-  `GRANT SELECT ON OBJECT::msdb.dbo.sysjobactivity TO zbx_monitor`  
-  `GRANT EXECUTE ON OBJECT::msdb.dbo.agent_datetime TO zbx_monitor`  
-  For more information, see MSSQL documentation:  
-    [Create a database user](https://docs.microsoft.com/en-us/sql/relational-databases/security/authentication-access/create-a-database-user?view=sql-server-ver15)  
-    [GRANT Server Permissions](https://docs.microsoft.com/en-us/sql/t-sql/statements/grant-server-permissions-transact-sql?view=sql-server-ver15)  
-    [Configure a User to Create and Manage SQL Server Agent Jobs](https://docs.microsoft.com/ru-ru/sql/ssms/agent/configure-a-user-to-create-and-manage-sql-server-agent-jobs?view=sql-server-ver15)  
-2. Set the username and password in host macros ({$MSSQL.USER} and {$MSSQL.PASSWORD}).  
-  Do not forget to install Microsoft ODBC driver on Zabbix server or Zabbix proxy.  
-  See Microsoft documentation for instructions: https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15.  
-  **Note! Credentials in the odbc.ini do not work for MSSQL.**  
+1. Create an MSSQL user for monitoring. For example, zbx_monitor.
+  **View Server State** and **View Any Definition** permissions should be granted to the user.
+  Grant this user read permissions to the sysjobschedules, sysjobhistory, sysjobs tables.
+  For example, using T-SQL commands:
+  `GRANT SELECT ON OBJECT::msdb.dbo.sysjobs TO zbx_monitor`
+  `GRANT SELECT ON OBJECT::msdb.dbo.sysjobservers TO zbx_monitor`
+  `GRANT SELECT ON OBJECT::msdb.dbo.sysjobactivity TO zbx_monitor`
+  `GRANT EXECUTE ON OBJECT::msdb.dbo.agent_datetime TO zbx_monitor`
+  For more information, see MSSQL documentation:
+    [Create a database user](https://docs.microsoft.com/en-us/sql/relational-databases/security/authentication-access/create-a-database-user?view=sql-server-ver15)
+    [GRANT Server Permissions](https://docs.microsoft.com/en-us/sql/t-sql/statements/grant-server-permissions-transact-sql?view=sql-server-ver15)
+    [Configure a User to Create and Manage SQL Server Agent Jobs](https://docs.microsoft.com/ru-ru/sql/ssms/agent/configure-a-user-to-create-and-manage-sql-server-agent-jobs?view=sql-server-ver15)
+2. Set the username and password in host macros ({$MSSQL.USER} and {$MSSQL.PASSWORD}).
+  Do not forget to install Microsoft ODBC driver on Zabbix server or Zabbix proxy.
+  See Microsoft documentation for instructions: https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver15.
+  **Note! Credentials in the odbc.ini do not work for MSSQL.**
 
 For named instance set the value of {$MSSQL.INSTANCE} macro as MSSQL$instance name.
 In case if MSSQL was installed using default configuration do not change {$MSSQL.INSTANCE} macro value.
@@ -91,13 +91,13 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[dbname,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$MSSQL.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$MSSQL.DBNAME.NOT_MATCHES}`</p> |
+|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[dbname,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$MSSQL.DBNAME.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$MSSQL.DBNAME.NOT_MATCHES}`</p> |
 |Availability groups discovery |<p>Discovery of the existing availability groups.</p> |ODBC |db.odbc.discovery[availability_groups,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Local database discovery |<p>Discovery of the local availability databases.</p> |ODBC |db.odbc.discovery[local_db,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Non-local database discovery |<p>Discovery of the non-local (not local to the SQL Server instance) availability databases.</p> |ODBC |db.odbc.discovery[non-local_db,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Replication discovery |<p>Discovery of the database replicas.</p> |ODBC |db.odbc.discovery[replicas,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Mirroring discovery |<p>To see the row for a database other than master or tempdb, you must</p><p>either be the database owner or have at least ALTER ANY DATABASE or VIEW ANY</p><p>DATABASE server-level permission or CREATE DATABASE permission in the master</p><p>database. To see non-NULL values on a mirror database, you must be a member</p><p>of the sysadmin fixed server role.</p> |ODBC |db.odbc.discovery[mirrors,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Job discovery |<p>Scanning jobs in DBMS.</p> |ODBC |db.odbc.discovery[jobname,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- A: {#JOBNAME} MATCHES_REGEX `{$MSSQL.JOB.MATCHES}`</p><p>- B: {#JOBNAME} NOT_MATCHES_REGEX `{$MSSQL.JOB.NOT_MATCHES}`</p> |
+|Job discovery |<p>Scanning jobs in DBMS.</p> |ODBC |db.odbc.discovery[jobname,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- {#JOBNAME} MATCHES_REGEX `{$MSSQL.JOB.MATCHES}`</p><p>- {#JOBNAME} NOT_MATCHES_REGEX `{$MSSQL.JOB.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -106,42 +106,42 @@ There are no template links in this template.
 |MSSQL |MSSQL: Service's TCP port state |<p>Test the availability of MS SQL Server on a TCP port.</p> |SIMPLE |net.tcp.service[tcp,{HOST.CONN},{$MSSQL.PORT}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |MSSQL |MSSQL: Version |<p>MS SQL Server version.</p> |DEPENDENT |mssql.version<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}' && @.counter_name=='Version')].instance_name.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |MSSQL |MSSQL: Uptime |<p>MS SQL Server uptime in 'N days, hh:mm:ss' format.</p> |DEPENDENT |mssql.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}' && @.counter_name=='Uptime')].cntr_value.first()`</p> |
-|MSSQL |MSSQL: Forwarded records per second |<p>Number of records per second fetched through forwarded record pointers.</p> |DEPENDENT |mssql.forwarded_records_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Forwarded Records/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Full scans per second |<p>Number of unrestricted full scans per second. These can be either base-table or full-index scans. Values greater than 1 or 2 indicate that there are table / Index page scans. If that is combined with high CPU, this counter requires further investigation, otherwise, if the full scans are on small tables, it can be ignored.</p> |DEPENDENT |mssql.full_scans_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Full Scans/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Index searches per second |<p>Number of index searches per second. These are used to start a range scan, reposition a range scan, revalidate a scan point, fetch a single index record, and search down the index to locate where to insert a new row.</p> |DEPENDENT |mssql.index_searches_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Index Searches/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Page splits per second |<p>Number of page splits per second that occur as the result of overflowing index pages.</p> |DEPENDENT |mssql.page_splits_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Page Splits/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Work files created per second |<p>Number of work files created per second. For example, work files can be used to store temporary results for hash joins and hash aggregates.</p> |DEPENDENT |mssql.workfiles_created_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Workfiles Created/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Work tables created per second |<p>Number of work tables created per second. For example, work tables can be used to store temporary results for query spool, lob variables, XML variables, and cursors.</p> |DEPENDENT |mssql.worktables_created_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Worktables Created/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Table lock escalations per second |<p>Number of times locks on a table were escalated to the TABLE or HoBT granularity.</p> |DEPENDENT |mssql.table_lock_escalations.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Table Lock Escalations/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL: Forwarded records per second |<p>Number of records per second fetched through forwarded record pointers.</p> |DEPENDENT |mssql.forwarded_records_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Forwarded Records/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Full scans per second |<p>Number of unrestricted full scans per second. These can be either base-table or full-index scans. Values greater than 1 or 2 indicate that there are table / Index page scans. If that is combined with high CPU, this counter requires further investigation, otherwise, if the full scans are on small tables, it can be ignored.</p> |DEPENDENT |mssql.full_scans_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Full Scans/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Index searches per second |<p>Number of index searches per second. These are used to start a range scan, reposition a range scan, revalidate a scan point, fetch a single index record, and search down the index to locate where to insert a new row.</p> |DEPENDENT |mssql.index_searches_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Index Searches/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Page splits per second |<p>Number of page splits per second that occur as the result of overflowing index pages.</p> |DEPENDENT |mssql.page_splits_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Page Splits/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Work files created per second |<p>Number of work files created per second. For example, work files can be used to store temporary results for hash joins and hash aggregates.</p> |DEPENDENT |mssql.workfiles_created_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Workfiles Created/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Work tables created per second |<p>Number of work tables created per second. For example, work tables can be used to store temporary results for query spool, lob variables, XML variables, and cursors.</p> |DEPENDENT |mssql.worktables_created_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Worktables Created/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Table lock escalations per second |<p>Number of times locks on a table were escalated to the TABLE or HoBT granularity.</p> |DEPENDENT |mssql.table_lock_escalations.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='Table Lock Escalations/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL: Worktables from cache ratio |<p>Percentage of work tables created where the initial two pages of the work table were not allocated but were immediately available from the work table cache.</p> |DEPENDENT |mssql.worktables_from_cache_ratio<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Access Methods' && @.counter_name=='WorktablesFromCacheRatio')].cntr_value.first()`</p> |
 |MSSQL |MSSQL: Buffer cache hit ratio |<p>Indicates the percentage of pages found in the buffer cache without having to read from disk. The ratio is the total number of cache hits divided by the total number of cache lookups over the last few thousand page accesses. After a long period of time, the ratio changes very little. Since reading from the cache is much less expensive than reading from the disk, a higher value is preferred for this item. To increase the buffer cache hit ratio, consider increasing the amount of memory available to SQL Server or using the buffer pool extension feature.</p> |DEPENDENT |mssql.buffer_cache_hit_ratio<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='BufferCacheHitRatio')].cntr_value.first()`</p> |
-|MSSQL |MSSQL: Checkpoint pages per second |<p>Indicates the number of pages flushed to disk per second by a checkpoint or other operation which required all dirty pages to be flushed.</p> |DEPENDENT |mssql.checkpoint_pages_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Checkpoint pages/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL: Checkpoint pages per second |<p>Indicates the number of pages flushed to disk per second by a checkpoint or other operation which required all dirty pages to be flushed.</p> |DEPENDENT |mssql.checkpoint_pages_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Checkpoint pages/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL: Database pages |<p>Indicates the number of pages in the buffer pool with database content.</p> |DEPENDENT |mssql.database_pages<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Database pages')].cntr_value.first()`</p> |
-|MSSQL |MSSQL: Free list stalls per second |<p>Indicates the number of requests per second that had to wait for a free page.</p> |DEPENDENT |mssql.free_list_stalls_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Free list stalls/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Lazy writes per second |<p>Indicates the number of buffers written per second by the buffer manager's lazy writer. The lazy writer is a system process that flushes out batches of dirty, aged buffers (buffers that contain changes that must be written back to disk before the buffer can be reused for a different page) and makes them available to user processes. The lazy writer eliminates the need to perform frequent checkpoints in order to create available buffers.</p> |DEPENDENT |mssql.lazy_writes_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Lazy writes/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL: Free list stalls per second |<p>Indicates the number of requests per second that had to wait for a free page.</p> |DEPENDENT |mssql.free_list_stalls_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Free list stalls/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Lazy writes per second |<p>Indicates the number of buffers written per second by the buffer manager's lazy writer. The lazy writer is a system process that flushes out batches of dirty, aged buffers (buffers that contain changes that must be written back to disk before the buffer can be reused for a different page) and makes them available to user processes. The lazy writer eliminates the need to perform frequent checkpoints in order to create available buffers.</p> |DEPENDENT |mssql.lazy_writes_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Lazy writes/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL: Page life expectancy |<p>Indicates the number of seconds a page will stay in the buffer pool without references.</p> |DEPENDENT |mssql.page_life_expectancy<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Page life expectancy')].cntr_value.first()`</p> |
-|MSSQL |MSSQL: Page lookups per second |<p>Indicates the number of requests per second to find a page in the buffer pool.</p> |DEPENDENT |mssql.page_lookups_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Page lookups/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Page reads per second |<p>Indicates the number of physical database page reads that are issued per second. This statistic displays the total number of physical page reads across all databases. Because physical I/O is expensive, you may be able to minimize the cost, either by using a larger data cache, intelligent indexes, and more efficient queries, or by changing the database design.</p> |DEPENDENT |mssql.page_reads_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Page reads/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Page writes per second |<p>Indicates the number of physical database page writes that are issued per second.</p> |DEPENDENT |mssql.page_writes_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Page writes/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Read-ahead pages per second |<p>Indicates the number of pages read per second in anticipation of use.</p> |DEPENDENT |mssql.readahead_pages_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Readahead pages/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL: Page lookups per second |<p>Indicates the number of requests per second to find a page in the buffer pool.</p> |DEPENDENT |mssql.page_lookups_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Page lookups/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Page reads per second |<p>Indicates the number of physical database page reads that are issued per second. This statistic displays the total number of physical page reads across all databases. Because physical I/O is expensive, you may be able to minimize the cost, either by using a larger data cache, intelligent indexes, and more efficient queries, or by changing the database design.</p> |DEPENDENT |mssql.page_reads_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Page reads/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Page writes per second |<p>Indicates the number of physical database page writes that are issued per second.</p> |DEPENDENT |mssql.page_writes_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Page writes/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Read-ahead pages per second |<p>Indicates the number of pages read per second in anticipation of use.</p> |DEPENDENT |mssql.readahead_pages_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Readahead pages/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL: Target pages |<p>The optimal number of pages in the buffer pool.</p> |DEPENDENT |mssql.target_pages<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Buffer Manager' && @.counter_name=='Target pages')].cntr_value.first()`</p> |
 |MSSQL |MSSQL: Total data file size |<p>Total size of all data files.</p> |DEPENDENT |mssql.data_files_size<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Data File(s) Size (KB)' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- MULTIPLIER: `1024`</p> |
 |MSSQL |MSSQL: Total log file size |<p>Total size of all the transaction log files.</p> |DEPENDENT |mssql.log_files_size<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log File(s) Size (KB)' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- MULTIPLIER: `1024`</p> |
 |MSSQL |MSSQL: Total log file used size |<p>The cumulative used size of all the log files in the database.</p> |DEPENDENT |mssql.log_files_used_size<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log File(s) Used Size (KB)' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- MULTIPLIER: `1024`</p> |
-|MSSQL |MSSQL: Total transactions per second |<p>Total number of transactions started for all databases per second.</p> |DEPENDENT |mssql.transactions_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Transactions/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Logins per second |<p>Total number of logins started per second. This does not include pooled connections. Any value over 2 may indicate insufcient connection pooling.</p> |DEPENDENT |mssql.logins_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='Logins/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Logouts per second |<p>Total number of logout operations started per second. Any value over 2 may indicate insufcient connection pooling.</p> |DEPENDENT |mssql.logouts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='Logouts/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL: Total transactions per second |<p>Total number of transactions started for all databases per second.</p> |DEPENDENT |mssql.transactions_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Transactions/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Logins per second |<p>Total number of logins started per second. This does not include pooled connections. Any value over 2 may indicate insufficient connection pooling.</p> |DEPENDENT |mssql.logins_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='Logins/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Logouts per second |<p>Total number of logout operations started per second. Any value over 2 may indicate insufficient connection pooling.</p> |DEPENDENT |mssql.logouts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='Logouts/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL: Number of blocked processes |<p>Number of currently blocked processes.</p> |DEPENDENT |mssql.processes_blocked<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='Processes blocked')].cntr_value.first()`</p> |
 |MSSQL |MSSQL: Number users connected |<p>Number of users connected to MS SQL Server.</p> |DEPENDENT |mssql.user_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:General Statistics' && @.counter_name=='User Connections')].cntr_value.first()`</p> |
-|MSSQL |MSSQL: Average latch wait time |<p>Average latch wait time (in milliseconds) for latch requests that had to wait.</p> |CALCULATED |mssql.average_latch_wait_time<p>**Expression**:</p>`(last(//mssql.average_latch_wait_time_raw) - last(//mssql.average_latch_wait_time_raw,#2)) / (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2) +  (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2)=0)) ` |
-|MSSQL |MSSQL: Latch waits per second |<p>The number of latch requests that could not be granted immediately. Latches are lightweight means of holding a very transient server resource, such as an address in memory.</p> |DEPENDENT |mssql.latch_waits_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Latch Waits/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Total latch wait Time |<p>Total latch wait time (in milliseconds) for latch requests in the last second. This value should stay stable compared to the number of latch waits per second.</p> |DEPENDENT |mssql.total_latch_wait_time<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Total Latch Wait Time (ms)')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Total average wait time |<p>The average wait time, in milliseconds, for each lock request that had to wait.</p> |CALCULATED |mssql.average_wait_time<p>**Expression**:</p>`(last(//mssql.average_wait_time_raw) - last(//mssql.average_wait_time_raw,#2)) / (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2) +  (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2)=0)) ` |
-|MSSQL |MSSQL: Total lock requests per second |<p>Number of new locks and lock conversions per second requested from the lock manager.</p> |DEPENDENT |mssql.lock_requests_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Requests/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Total lock requests per second that timed out |<p>Number of timed out lock requests per second, including requests for NOWAIT locks.</p> |DEPENDENT |mssql.lock_timeouts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Timeouts/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Total lock requests per second that required waiting |<p>Number of lock requests per second that required the caller to wait.</p> |DEPENDENT |mssql.lock_waits_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Waits/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Lock wait time |<p>Average of total wait time (in milliseconds) for locks in the last second. </p> |DEPENDENT |mssql.lock_wait_time<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Wait Time (ms)' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Total lock requests per second that have deadlocks |<p>Number of lock requests per second that resulted in a deadlock.</p> |DEPENDENT |mssql.number_deadlocks_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Number of Deadlocks/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL: Average latch wait time |<p>Average latch wait time (in milliseconds) for latch requests that had to wait.</p> |CALCULATED |mssql.average_latch_wait_time<p>**Expression**:</p>`(last(//mssql.average_latch_wait_time_raw) - last(//mssql.average_latch_wait_time_raw,#2)) / (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2) + (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2)=0)) ` |
+|MSSQL |MSSQL: Latch waits per second |<p>The number of latch requests that could not be granted immediately. Latches are lightweight means of holding a very transient server resource, such as an address in memory.</p> |DEPENDENT |mssql.latch_waits_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Latch Waits/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Total latch wait Time |<p>Total latch wait time (in milliseconds) for latch requests in the last second. This value should stay stable compared to the number of latch waits per second.</p> |DEPENDENT |mssql.total_latch_wait_time<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Total Latch Wait Time (ms)')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Total average wait time |<p>The average wait time, in milliseconds, for each lock request that had to wait.</p> |CALCULATED |mssql.average_wait_time<p>**Expression**:</p>`(last(//mssql.average_wait_time_raw) - last(//mssql.average_wait_time_raw,#2)) / (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2) + (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2)=0)) ` |
+|MSSQL |MSSQL: Total lock requests per second |<p>Number of new locks and lock conversions per second requested from the lock manager.</p> |DEPENDENT |mssql.lock_requests_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Requests/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Total lock requests per second that timed out |<p>Number of timed out lock requests per second, including requests for NOWAIT locks.</p> |DEPENDENT |mssql.lock_timeouts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Timeouts/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Total lock requests per second that required waiting |<p>Number of lock requests per second that required the caller to wait.</p> |DEPENDENT |mssql.lock_waits_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Waits/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Lock wait time |<p>Average of total wait time (in milliseconds) for locks in the last second. </p> |DEPENDENT |mssql.lock_wait_time<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Lock Wait Time (ms)' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Total lock requests per second that have deadlocks |<p>Number of lock requests per second that resulted in a deadlock.</p> |DEPENDENT |mssql.number_deadlocks_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Number of Deadlocks/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL: Granted Workspace Memory |<p>Specifies the total amount of memory currently granted to executing processes, such as hash, sort, bulk copy, and index creation operations.</p> |DEPENDENT |mssql.granted_workspace_memory<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Memory Manager' && @.counter_name=='Granted Workspace Memory (KB)')].cntr_value.first()`</p><p>- MULTIPLIER: `1024`</p> |
 |MSSQL |MSSQL: Maximum workspace memory |<p>Indicates the maximum amount of memory available for executing processes, such as hash, sort, bulk copy, and index creation operations.</p> |DEPENDENT |mssql.maximum_workspace_memory<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Memory Manager' && @.counter_name=='Maximum Workspace Memory (KB)')].cntr_value.first()`</p><p>- MULTIPLIER: `1024`</p> |
 |MSSQL |MSSQL: Memory grants outstanding |<p>Specifies the total number of processes that have successfully acquired a workspace memory grant.</p> |DEPENDENT |mssql.memory_grants_outstanding<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Memory Manager' && @.counter_name=='Memory Grants Outstanding')].cntr_value.first()`</p> |
@@ -152,36 +152,36 @@ There are no template links in this template.
 |MSSQL |MSSQL: Cache object counts |<p>Number of cache objects in the cache.</p> |DEPENDENT |mssql.cache_object_counts<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Plan Cache' && @.counter_name=='Cache Object Counts' && @.instance_name=='_Total')].cntr_value.first()`</p> |
 |MSSQL |MSSQL: Cache objects in use |<p>Number of cache objects in use.</p> |DEPENDENT |mssql.cache_objects_in_use<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Plan Cache' && @.counter_name=='Cache Objects in use' && @.instance_name=='_Total')].cntr_value.first()`</p> |
 |MSSQL |MSSQL: Cache pages |<p>Number of 8-kilobyte (KB) pages used by cache objects.</p> |DEPENDENT |mssql.cache_pages<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Plan Cache' && @.counter_name=='Cache Pages' && @.instance_name=='_Total')].cntr_value.first()`</p> |
-|MSSQL |MSSQL: Errors per second (DB offline errors) |<p>Number of errors per second.</p> |DEPENDENT |mssql.offline_errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='DB Offline Errors')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Errors per second (Info errors) |<p>Number of errors per second.</p> |DEPENDENT |mssql.info_errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='Info Errors')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Errors per second (Kill connection errors) |<p>Number of errors per second.</p> |DEPENDENT |mssql.kill_connection_errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='Kill Connection Errors')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Errors per second (User errors) |<p>Number of errors per second.</p> |DEPENDENT |mssql.user_errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='User Errors')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Total errors per second |<p>Number of errors per second.</p> |DEPENDENT |mssql.errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Auto-param attempts per second |<p>Number of auto-parameterization attempts per second. The total should be the sum of the failed, safe, and unsafe auto-parameterizations. Auto-parameterization occurs when an instance of SQL Server tries to parameterize a Transact-SQL request by replacing some literals with parameters to me reuse of the resulting cached execution plan across multiple similar-looking requests possible. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server. This counter does not include forced parameterizations.</p> |DEPENDENT |mssql.autoparam_attempts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Auto-Param Attempts/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Batch requests per second |<p>Number of Transact-SQL command batches received per second. This statistic is affected by all constraints (such as I/O, number of users, cache size, complexity of requests, and so on). High batch requests mean good throughput.</p> |DEPENDENT |mssql.batch_requests_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Batch Requests/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Percent of Adhoc queries running |<p>The ratio of SQL compilations per second to Batch requests per second in percentage.</p> |CALCULATED |mssql.percent_of_adhoc_queries<p>**Expression**:</p>`last(//mssql.sql_compilations_sec.rate) * 100 / (last(//mssql.batch_requests_sec.rate) + (last(//mssql.batch_requests_sec.rate)=0)) ` |
-|MSSQL |MSSQL: Percent of Recompiled Transact-SQL Objects |<p>The ratio of SQL re-compilations per second to SQL compilations per second in percentage.</p> |CALCULATED |mssql.percent_recompilations_to_compilations<p>**Expression**:</p>`last(//mssql.sql_recompilations_sec.rate) * 100 / (last(//mssql.sql_compilations_sec.rate) + (last(//mssql.sql_compilations_sec.rate)=0)) ` |
+|MSSQL |MSSQL: Errors per second (DB offline errors) |<p>Number of errors per second.</p> |DEPENDENT |mssql.offline_errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='DB Offline Errors')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Errors per second (Info errors) |<p>Number of errors per second.</p> |DEPENDENT |mssql.info_errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='Info Errors')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Errors per second (Kill connection errors) |<p>Number of errors per second.</p> |DEPENDENT |mssql.kill_connection_errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='Kill Connection Errors')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Errors per second (User errors) |<p>Number of errors per second.</p> |DEPENDENT |mssql.user_errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='User Errors')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Total errors per second |<p>Number of errors per second.</p> |DEPENDENT |mssql.errors_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Errors' && @.counter_name=='Errors/sec' && @.instance_name=='_Total')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Auto-param attempts per second |<p>Number of auto-parameterization attempts per second. The total should be the sum of the failed, safe, and unsafe auto-parameterizations. Auto-parameterization occurs when an instance of SQL Server tries to parameterize a Transact-SQL request by replacing some literals with parameters to me reuse of the resulting cached execution plan across multiple similar-looking requests possible. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server. This counter does not include forced parameterizations.</p> |DEPENDENT |mssql.autoparam_attempts_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Auto-Param Attempts/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Batch requests per second |<p>Number of Transact-SQL command batches received per second. This statistic is affected by all constraints (such as I/O, number of users, cache size, complexity of requests, and so on). High batch requests mean good throughput.</p> |DEPENDENT |mssql.batch_requests_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Batch Requests/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Percent of Adhoc queries running |<p>The ratio of SQL compilations per second to Batch requests per second in percentage.</p> |CALCULATED |mssql.percent_of_adhoc_queries<p>**Expression**:</p>`last(//mssql.sql_compilations_sec.rate) * 100 / (last(//mssql.batch_requests_sec.rate) + (last(//mssql.batch_requests_sec.rate)=0))` |
+|MSSQL |MSSQL: Percent of Recompiled Transact-SQL Objects |<p>The ratio of SQL re-compilations per second to SQL compilations per second in percentage.</p> |CALCULATED |mssql.percent_recompilations_to_compilations<p>**Expression**:</p>`last(//mssql.sql_recompilations_sec.rate) * 100 / (last(//mssql.sql_compilations_sec.rate) + (last(//mssql.sql_compilations_sec.rate)=0))` |
 |MSSQL |MSSQL: Full scans to Index searches ratio |<p>The ratio of Full scans per second to Index searches per second. The threshold recommendation is strictly for OLTP workloads.</p> |CALCULATED |mssql.scan_to_search<p>**Expression**:</p>`last(//mssql.full_scans_sec.rate) / (last(//mssql.index_searches_sec.rate) + (last(//mssql.index_searches_sec.rate)=0))` |
-|MSSQL |MSSQL: Failed auto-params per second |<p>Number of failed auto-parameterization attempts per second. This number should be small. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server.</p> |DEPENDENT |mssql.failed_autoparams_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Failed Auto-Params/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Safe auto-params per second |<p>Number of safe auto-parameterization attempts per second. Safe refers to a determination that a cached execution plan can be shared between different similar-looking Transact-SQL statements. SQL Server makes many auto-parameterization attempts some of which turn out to be safe and others fail. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server. This does not include forced parameterizations.</p> |DEPENDENT |mssql.safe_autoparams_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Safe Auto-Params/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: SQL compilations per second |<p>Number of SQL compilations per second. Indicates the number of times the compile code path is entered. Includes compiles caused by statement-level recompilations in SQL Server. After SQL Server user activity is stable, this value reaches a steady state.</p> |DEPENDENT |mssql.sql_compilations_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='SQL Compilations/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: SQL re-compilations per second |<p>Number of statement recompiles per second. Counts the number of times statement recompiles are triggered. Generally, you want the recompiles to be low.</p> |DEPENDENT |mssql.sql_recompilations_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='SQL Re-Compilations/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL: Unsafe auto-params per second |<p>Number of unsafe auto-parameterization attempts per second. For example, the query has some characteristics that prevent the cached plan from being shared. These are designated as unsafe. This does not count the number of forced parameterizations.</p> |DEPENDENT |mssql.unsafe_autoparams_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Unsafe Auto-Params/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL: Failed auto-params per second |<p>Number of failed auto-parameterization attempts per second. This number should be small. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server.</p> |DEPENDENT |mssql.failed_autoparams_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Failed Auto-Params/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Safe auto-params per second |<p>Number of safe auto-parameterization attempts per second. Safe refers to a determination that a cached execution plan can be shared between different similar-looking Transact-SQL statements. SQL Server makes many auto-parameterization attempts some of which turn out to be safe and others fail. Note that auto-parameterizations are also known as simple parameterizations in the newer versions of SQL Server. This does not include forced parameterizations.</p> |DEPENDENT |mssql.safe_autoparams_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Safe Auto-Params/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: SQL compilations per second |<p>Number of SQL compilations per second. Indicates the number of times the compile code path is entered. Includes compiles caused by statement-level recompilations in SQL Server. After SQL Server user activity is stable, this value reaches a steady state.</p> |DEPENDENT |mssql.sql_compilations_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='SQL Compilations/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: SQL re-compilations per second |<p>Number of statement recompiles per second. Counts the number of times statement recompiles are triggered. Generally, you want the recompiles to be low.</p> |DEPENDENT |mssql.sql_recompilations_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='SQL Re-Compilations/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL: Unsafe auto-params per second |<p>Number of unsafe auto-parameterization attempts per second. For example, the query has some characteristics that prevent the cached plan from being shared. These are designated as unsafe. This does not count the number of forced parameterizations.</p> |DEPENDENT |mssql.unsafe_autoparams_sec.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:SQL Statistics' && @.counter_name=='Unsafe Auto-Params/sec')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL: Total transactions number |<p>The number of currently active transactions of all types.</p> |DEPENDENT |mssql.transactions<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Transactions' && @.counter_name=='Transactions')].cntr_value.first()`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': State |<p>0 = ONLINE</p><p>1 = RESTORING</p><p>2 = RECOVERING | SQL Server 2008 and later</p><p>3 = RECOVERY_PENDING | SQL Server 2008 and later</p><p>4 = SUSPECT</p><p>5 = EMERGENCY | SQL Server 2008 and later</p><p>6 = OFFLINE | SQL Server 2008 and later</p><p>7 = COPYING | Azure SQL Database Active Geo-Replication</p><p>10 = OFFLINE_SECONDARY | Azure SQL Database Active Geo-Replication</p> |DEPENDENT |mssql.db.state["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='State' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Active transactions |<p>Number of active transactions for the database.</p> |DEPENDENT |mssql.db.active_transactions["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Active Transactions' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Data file size |<p>Cumulative size of all the data files in the database including any automatic growth. Monitoring this counter is useful, for example, for determining the correct size of tempdb.</p> |DEPENDENT |mssql.db.data_files_size["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Data File(s) Size (KB)' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- MULTIPLIER: `1024`</p> |
-|MSSQL |MSSQL DB '{#DBNAME}': Log bytes flushed per second |<p>Total number of log bytes flushed per second. Useful for determining trends and utilization of the transaction log.</p> |DEPENDENT |mssql.db.log_bytes_flushed_sec.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Bytes Flushed/sec' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL DB '{#DBNAME}': Log bytes flushed per second |<p>Total number of log bytes flushed per second. Useful for determining trends and utilization of the transaction log.</p> |DEPENDENT |mssql.db.log_bytes_flushed_sec.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Bytes Flushed/sec' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Log file size |<p>Cumulative size of all the transaction log files in the database.</p> |DEPENDENT |mssql.db.log_files_size["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log File(s) Size (KB)' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- MULTIPLIER: `1024`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Log file used size |<p>Cumulative used size of all the log files in the database.</p> |DEPENDENT |mssql.db.log_files_used_size["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log File(s) Used Size (KB)' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- MULTIPLIER: `1024`</p> |
-|MSSQL |MSSQL DB '{#DBNAME}': Log flushes per second |<p>Number of log flushes per second.</p> |DEPENDENT |mssql.db.log_flushes_sec.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Flushes/sec' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL DB '{#DBNAME}': Log flush waits per second |<p>Number of commits per second waiting for the log flush.</p> |DEPENDENT |mssql.db.log_flush_waits_sec.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Flush Waits/sec' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
-|MSSQL |MSSQL DB '{#DBNAME}': Log flush wait time |<p>Total wait time (in milliseconds) to flush the log. On an AlwaysOn secondary database, this value indicates the wait time for log records to be hardened to disk.</p> |DEPENDENT |mssql.db.log_flush_wait_time["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Flush Wait Time' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL DB '{#DBNAME}': Log flushes per second |<p>Number of log flushes per second.</p> |DEPENDENT |mssql.db.log_flushes_sec.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Flushes/sec' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL DB '{#DBNAME}': Log flush waits per second |<p>Number of commits per second waiting for the log flush.</p> |DEPENDENT |mssql.db.log_flush_waits_sec.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Flush Waits/sec' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MSSQL |MSSQL DB '{#DBNAME}': Log flush wait time |<p>Total wait time (in milliseconds) to flush the log. On an AlwaysOn secondary database, this value indicates the wait time for log records to be hardened to disk.</p> |DEPENDENT |mssql.db.log_flush_wait_time["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Flush Wait Time' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Log growths |<p>Total number of times the transaction log for the database has been expanded.</p> |DEPENDENT |mssql.db.log_growths["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Growths' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Log shrinks |<p>Total number of times the transaction log for the database has been shrunk.</p> |DEPENDENT |mssql.db.log_shrinks["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Shrinks' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Log truncations |<p>Number of times the transaction log has been shrunk.</p> |DEPENDENT |mssql.db.log_truncations["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Log Truncations' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Percent log used |<p>Percentage of space in the log that is in use.</p> |DEPENDENT |mssql.db.percent_log_used["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Percent Log Used' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p> |
-|MSSQL |MSSQL DB '{#DBNAME}': Transactions per second |<p>Number of transactions started for the database per second.</p> |DEPENDENT |mssql.db.transactions_sec.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Transactions/sec' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND |
+|MSSQL |MSSQL DB '{#DBNAME}': Transactions per second |<p>Number of transactions started for the database per second.</p> |DEPENDENT |mssql.db.transactions_sec.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Databases' && @.counter_name=='Transactions/sec' && @.instance_name=='{#DBNAME}')].cntr_value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Last diff backup duration |<p>Duration of the last differential backup.</p> |DEPENDENT |mssql.backup.diff.duration["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}' && @.type=='I')].duration.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Last diff backup (time ago) |<p>The amount of time since the last differential backup.</p> |DEPENDENT |mssql.backup.diff["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}' && @.type=='I')].timesincelastbackup.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |MSSQL |MSSQL DB '{#DBNAME}': Last full backup duration |<p>Duration of the last full backup.</p> |DEPENDENT |mssql.backup.full.duration["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}' && @.type=='D')].duration.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
@@ -205,7 +205,7 @@ There are no template links in this template.
 |MSSQL |MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': Role |<p>Current Always On availability groups role of a local replica or a connected remote replica:</p><p>0 = Resolving</p><p>1 = Primary</p><p>2 = Secondary</p> |DEPENDENT |mssql.replica.role["{#GROUP_NAME}_{#REPLICA_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.group_name=='{#GROUP_NAME}' && @.replica_name=='{#REPLICA_NAME}')].role.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MSSQL |MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': Sync health |<p>Reflects a rollup of the database synchronization state (synchronization_state)of all joined availability databases (also known as replicas) and the availability mode of the replica (synchronous-commit or asynchronous-commit mode). The rollup will reflect the least healthy accumulated state of the databases on the replica:</p><p>0 : Not healthy. At least one joined database is in the NOT SYNCHRONIZING state.</p><p>1 : Partially healthy. Some replicas are not in the target synchronization state: synchronous-commit replicas should be synchronized, and asynchronous-commit replicas should be synchronizing.</p><p>2 : Healthy. All replicas are in the target synchronization state: synchronous-commit replicas are synchronized, and asynchronous-commit replicas are synchronizing.</p> |DEPENDENT |mssql.replica.synchronization_health["{#GROUP_NAME}_{#REPLICA_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.group_name=='{#GROUP_NAME}' && @.replica_name=='{#REPLICA_NAME}')].synchronization_health.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MSSQL |MSSQL Mirroring '{#DBNAME}': Role |<p>Current role of the local database plays in the database mirroring session.</p><p>1 = Principal</p><p>2 = Mirror</p> |DEPENDENT |mssql.mirroring.role["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}')].mirroring_role.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MSSQL |MSSQL Mirroring '{#DBNAME}': Role sequence |<p>The number of times that mirroring partners have switched the principal and mirror roles due to a failover or forced service.</p> |DEPENDENT |mssql.mirroring.role_sequence["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}')].mirroring_role_sequence.first()`</p><p>- SIMPLE_CHANGE |
+|MSSQL |MSSQL Mirroring '{#DBNAME}': Role sequence |<p>The number of times that mirroring partners have switched the principal and mirror roles due to a failover or forced service.</p> |DEPENDENT |mssql.mirroring.role_sequence["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}')].mirroring_role_sequence.first()`</p><p>- SIMPLE_CHANGE</p> |
 |MSSQL |MSSQL Mirroring '{#DBNAME}': State |<p>State of the mirror database and of the database mirroring session.</p><p>0 = Suspended</p><p>1 = Disconnected from the other partner</p><p>2 = Synchronizing</p><p>3 = Pending Failover</p><p>4 = Synchronized</p><p>5 = The partners are not synchronized. Failover is not possible now.</p><p>6 = The partners are synchronized. Failover is potentially possible. For information about the requirements for the failover, see Database Mirroring Operating Modes.</p> |DEPENDENT |mssql.mirroring.state["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}')].mirroring_state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MSSQL |MSSQL Mirroring '{#DBNAME}': Witness state |<p>State of the witness in the database mirroring session of the database:</p><p>0 = Unknown</p><p>1 = Connected</p><p>2 = Disconnected</p> |DEPENDENT |mssql.mirroring.witness_state["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}')].mirroring_witness_state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MSSQL |MSSQL Mirroring '{#DBNAME}': Safety level |<p>Safety setting for updates on the mirror database:</p><p>0 = Unknown state</p><p>1 = Off [asynchronous]</p><p>2 = Full [synchronous]</p> |DEPENDENT |mssql.mirroring.safety_level["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.dbname=='{#DBNAME}')].mirroring_safety_level.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -238,7 +238,7 @@ There are no template links in this template.
 |MSSQL: Too frequently pointers using |<p>Rows with varchar columns can experience expansion when varchar values are updated with a longer string.  In the case where the row cannot fit in the existing page, the row migrates and access to the row will traverse a pointer.  This only happens on heaps (tables without clustered indexes). Evaluate clustered index for heap tables.  In cases where clustered indexes cannot be used, drop non-clustered indexes, build a clustered index to reorg pages and rows, drop the clustered index, then recreate non-clustered indexes.</p> |`last(/MSSQL by ODBC/mssql.forwarded_records_sec.rate) * 100 > 10 * last(/MSSQL by ODBC/mssql.batch_requests_sec.rate)` |WARNING | |
 |MSSQL: Number of work files created per second is high (over {$MSSQL.WORK_FILES.MAX} for 5m) |<p>Too many work files created per second to store temporary results for hash joins and hash aggregates.</p> |`min(/MSSQL by ODBC/mssql.workfiles_created_sec.rate,5m)>{$MSSQL.WORK_FILES.MAX}` |AVERAGE | |
 |MSSQL: Number of work tables created per second is high (over {$MSSQL.WORK_TABLES.MAX} for 5m) |<p>Too many work tables created per second to store temporary results for query spool, lob variables, XML variables, and cursors.</p> |`min(/MSSQL by ODBC/mssql.worktables_created_sec.rate,5m)>{$MSSQL.WORK_TABLES.MAX}` |AVERAGE | |
-|MSSQL: Percentage of work tables available from the work table cache is low (below {$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}% for 5m) |<p>A value less than 90% may indicate insufcient memory, since execution plans are being dropped, or on 32-bit systems, may indicate the need for an upgrade to a 64-bit system</p> |`max(/MSSQL by ODBC/mssql.worktables_from_cache_ratio,5m)<{$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}` |HIGH | |
+|MSSQL: Percentage of work tables available from the work table cache is low (below {$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}% for 5m) |<p>A value less than 90% may indicate insufficient memory, since execution plans are being dropped, or on 32-bit systems, may indicate the need for an upgrade to a 64-bit system</p> |`max(/MSSQL by ODBC/mssql.worktables_from_cache_ratio,5m)<{$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}` |HIGH | |
 |MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}% for 5m) |<p>Too low buffer cache hit ratio.</p> |`max(/MSSQL by ODBC/mssql.buffer_cache_hit_ratio,5m)<{$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}` |HIGH | |
 |MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.WARN}% for 5m) |<p>Low buffer cache hit ratio.</p> |`max(/MSSQL by ODBC/mssql.buffer_cache_hit_ratio,5m)<{$MSSQL.BUFFER_CACHE_RATIO.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}% for 5m)</p> |
 |MSSQL: Number of rps waiting for a free page is high (over {$MSSQL.FREE_LIST_STALLS.MAX} for 5m) |<p>Some requests have to wait for a free page.</p> |`min(/MSSQL by ODBC/mssql.free_list_stalls_sec.rate,5m)>{$MSSQL.FREE_LIST_STALLS.MAX}` |WARNING | |
@@ -252,8 +252,8 @@ There are no template links in this template.
 |MSSQL: Total lock requests per second that timed out is high (over {$MSSQL.LOCK_TIMEOUTS.MAX} for 5m) |<p>The total number of timed out lock requests per second, including requests for NOWAIT locks, is high.</p> |`min(/MSSQL by ODBC/mssql.lock_timeouts_sec.rate,5m)>{$MSSQL.LOCK_TIMEOUTS.MAX}` |WARNING | |
 |MSSQL: Some blocking is occurring for 5m |<p>Values greater than zero indicate at least some blocking is occurring, while a value of zero can quickly eliminate blocking as a potential root-cause problem.</p> |`min(/MSSQL by ODBC/mssql.lock_waits_sec.rate,5m)>0` |AVERAGE | |
 |MSSQL: Number of deadlock is high (over {$MSSQL.DEADLOCKS.MAX} for 5m) |<p>Too many deadlocks are occurring currently.</p> |`min(/MSSQL by ODBC/mssql.number_deadlocks_sec.rate,5m)>{$MSSQL.DEADLOCKS.MAX}` |AVERAGE | |
-|MSSQL: Percent of adhoc queries running is over {$MSSQL.PERCENT_COMPILATIONS.MAX}% for 15m |<p>The lower this value is the better. High values often indicate excessive adhoc querying and should be as low as possible. If excessive adhoc querying is happening, try rewriting the queries as procedures or invoke the queries using sp_executeSQL. When rewriting isn’t possible, consider using a plan guide or setting the database to parameterization forced mode.</p> |`min(/MSSQL by ODBC/mssql.percent_of_adhoc_queries,15m) > {$MSSQL.PERCENT_COMPILATIONS.MAX}` |WARNING | |
-|MSSQL: Percent of times statement recompiles is over {$MSSQL.PERCENT_RECOMPILATIONS.MAX}% for 15m |<p>This number should be at or near zero, since recompiles can cause deadlocks and exclusive compile locks. This counter’s value should follow in proportion to “Batch Requests/sec” and “SQL Compilations/sec”.</p> |`min(/MSSQL by ODBC/mssql.percent_recompilations_to_compilations,15m) > {$MSSQL.PERCENT_RECOMPILATIONS.MAX}` |WARNING | |
+|MSSQL: Percent of adhoc queries running is over {$MSSQL.PERCENT_COMPILATIONS.MAX}% for 15m |<p>The lower this value is the better. High values often indicate excessive adhoc querying and should be as low as possible. If excessive adhoc querying is happening, try rewriting the queries as procedures or invoke the queries using sp_executeSQL. When rewriting isn't possible, consider using a plan guide or setting the database to parameterization forced mode.</p> |`min(/MSSQL by ODBC/mssql.percent_of_adhoc_queries,15m) > {$MSSQL.PERCENT_COMPILATIONS.MAX}` |WARNING | |
+|MSSQL: Percent of times statement recompiles is over {$MSSQL.PERCENT_RECOMPILATIONS.MAX}% for 15m |<p>This number should be at or near zero, since recompiles can cause deadlocks and exclusive compile locks. This counter's value should follow in proportion to “Batch Requests/sec” and “SQL Compilations/sec”.</p> |`min(/MSSQL by ODBC/mssql.percent_recompilations_to_compilations,15m) > {$MSSQL.PERCENT_RECOMPILATIONS.MAX}` |WARNING | |
 |MSSQL: Number of index and table scans exceeds index searches in the last 15m |<p>Index searches are preferable to index and table scans. For OLTP applications, optimize for more index searches and less scans (preferably, 1 full scan for every 1000 index searches). Index and table scans are expensive I/O operations.</p> |`min(/MSSQL by ODBC/mssql.scan_to_search,15m) > 0.001` |WARNING | |
 |MSSQL DB '{#DBNAME}': State is {ITEM.VALUE} |<p>The DB has a non-working state.</p> |`last(/MSSQL by ODBC/mssql.db.state["{#DBNAME}"])>1` |HIGH | |
 |MSSQL DB '{#DBNAME}': Number of commits waiting for the log flush is high (over {$MSSQL.LOG_FLUSH_WAITS.MAX:"{#DBNAME}"}/sec for 5m) |<p>Too many commits are waiting for the log flush.</p> |`min(/MSSQL by ODBC/mssql.db.log_flush_waits_sec.rate["{#DBNAME}"],5m)>{$MSSQL.LOG_FLUSH_WAITS.MAX:"{#DBNAME}"}` |WARNING | |
@@ -274,7 +274,7 @@ There are no template links in this template.
 |MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': "{#DBNAME}" is Partially healthy |<p>A database on a synchronous-commit availability replica is considered partially healthy if synchronization state is SYNCHRONIZING.</p> |`last(/MSSQL by ODBC/mssql.local_db.synchronization_health["{#DBNAME}"])=1` |AVERAGE | |
 |MSSQL AG '{#GROUP_NAME}' Non-Local DB '*{#REPLICA_NAME}*{#DBNAME}': Log queue size is growing |<p>The log records of the primary database are not sent to the secondary databases.</p> |`last(/MSSQL by ODBC/mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#1)>last(/MSSQL by ODBC/mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#2) and last(/MSSQL by ODBC/mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#2)>last(/MSSQL by ODBC/mssql.non-local_db.log_send_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#3)` |HIGH | |
 |MSSQL AG '{#GROUP_NAME}' Non-Local DB '*{#REPLICA_NAME}*{#DBNAME}': Redo log queue size is growing |<p>The log records in the log files of the secondary replica have not yet been redone.</p> |`last(/MSSQL by ODBC/mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#1)>last(/MSSQL by ODBC/mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#2) and last(/MSSQL by ODBC/mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#2)>last(/MSSQL by ODBC/mssql.non-local_db.redo_queue_size["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}"],#3)` |HIGH | |
-|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is disconnected |<p>The response of an availability replica to the DISCONNECTED state depends on its role: </p><p>On the primary replica, if a secondary replica is disconnected, its secondary databases are marked as NOT SYNCHRONIZED on the primary replica, which waits for the secondary to reconnect; On a secondary replica, upon detecting that it is disconnected, the secondary replica attempts to reconnect to the primary replica.</p> |`last(/MSSQL by ODBC/mssql.replica.connected_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=0 and last(/MSSQL by ODBC/mssql.replica.role["{#GROUP_NAME}_{#REPLICA_NAME}"])=2` |WARNING | |
+|MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is disconnected |<p>The response of an availability replica to the DISCONNECTED state depends on its role:</p><p>On the primary replica, if a secondary replica is disconnected, its secondary databases are marked as NOT SYNCHRONIZED on the primary replica, which waits for the secondary to reconnect; On a secondary replica, upon detecting that it is disconnected, the secondary replica attempts to reconnect to the primary replica.</p> |`last(/MSSQL by ODBC/mssql.replica.connected_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=0 and last(/MSSQL by ODBC/mssql.replica.role["{#GROUP_NAME}_{#REPLICA_NAME}"])=2` |WARNING | |
 |MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Pending" or "Offline".</p> |`last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=0 or last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=1 or last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=3` |WARNING | |
 |MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Failed".</p> |`last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=4` |AVERAGE | |
 |MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': {#REPLICA_NAME} is {ITEM.VALUE} |<p>The operational state of the replica in a given availability group is "Failed, no quorum".</p> |`last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=5` |HIGH | |
@@ -297,6 +297,6 @@ You can also provide a feedback, discuss the template or ask for help with it at
 
 ## References
 
-http://www.grumpyolddba.co.uk/monitoring/Performance%20Counter%20Guidance%20-%20SQL%20Server.htm  
+http://www.grumpyolddba.co.uk/monitoring/Performance%20Counter%20Guidance%20-%20SQL%20Server.htm
 https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/sql-server-access-methods-object?view=sql-server-ver15
 
diff --git a/templates/db/mssql_odbc/template_db_mssql_odbc.yaml b/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
index ca02376f6bc..b5e142f33db 100644
--- a/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
+++ b/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-09-03T05:58:49Z'
+  date: '2021-12-16T07:08:32Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         1. Create an MSSQL user for monitoring.
           View Server State and View Any Definition permissions should be granted to the user.
-          Grant this user read permissions to the sysjobschedules, sysjobhistory, sysjobs tables.  
+          Grant this user read permissions to the sysjobschedules, sysjobhistory, sysjobs tables.
           For more information, see MSSQL documentation.
         2. Set the user name and password in host macros ({$MSSQL.USER} and {$MSSQL.PASSWORD}).
           Do not forget to install Microsoft ODBC driver on Zabbix server or Zabbix proxy.
@@ -25,7 +25,7 @@ zabbix_export:
         
         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
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -181,7 +181,7 @@ zabbix_export:
           units: ms
           params: |
             (last(//mssql.average_latch_wait_time_raw) - last(//mssql.average_latch_wait_time_raw,#2)) /
-            (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2) + 
+            (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2) +
             (last(//mssql.average_latch_wait_time_base) - last(//mssql.average_latch_wait_time_base,#2)=0))
           description: 'Average latch wait time (in milliseconds) for latch requests that had to wait.'
           tags:
@@ -238,7 +238,7 @@ zabbix_export:
           units: ms
           params: |
             (last(//mssql.average_wait_time_raw) - last(//mssql.average_wait_time_raw,#2)) /
-            (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2) + 
+            (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2) +
             (last(//mssql.average_wait_time_base) - last(//mssql.average_wait_time_base,#2)=0))
           description: 'The average wait time, in milliseconds, for each lock request that had to wait.'
           tags:
@@ -908,7 +908,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: 'Total number of logins started per second. This does not include pooled connections. Any value over 2 may indicate insufcient connection pooling.'
+          description: 'Total number of logins started per second. This does not include pooled connections. Any value over 2 may indicate insufficient connection pooling.'
           preprocessing:
             -
               type: JSONPATH
@@ -932,7 +932,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: 'Total number of logout operations started per second. Any value over 2 may indicate insufcient connection pooling.'
+          description: 'Total number of logout operations started per second. Any value over 2 may indicate insufficient connection pooling.'
           preprocessing:
             -
               type: JSONPATH
@@ -1276,7 +1276,7 @@ zabbix_export:
               expression: 'min(/MSSQL by ODBC/mssql.percent_of_adhoc_queries,15m) > {$MSSQL.PERCENT_COMPILATIONS.MAX}'
               name: 'MSSQL: Percent of adhoc queries running is over {$MSSQL.PERCENT_COMPILATIONS.MAX}% for 15m'
               priority: WARNING
-              description: 'The lower this value is the better. High values often indicate excessive adhoc querying and should be as low as possible. If excessive adhoc querying is happening, try rewriting the queries as procedures or invoke the queries using sp_executeSQL. When rewriting isn’t possible, consider using a plan guide or setting the database to parameterization forced mode.'
+              description: 'The lower this value is the better. High values often indicate excessive adhoc querying and should be as low as possible. If excessive adhoc querying is happening, try rewriting the queries as procedures or invoke the queries using sp_executeSQL. When rewriting isn''t possible, consider using a plan guide or setting the database to parameterization forced mode.'
         -
           uuid: ceab0472883f47b0a18b04fc6f7438ab
           name: 'MSSQL: Percent of Recompiled Transact-SQL Objects'
@@ -1300,7 +1300,7 @@ zabbix_export:
               expression: 'min(/MSSQL by ODBC/mssql.percent_recompilations_to_compilations,15m) > {$MSSQL.PERCENT_RECOMPILATIONS.MAX}'
               name: 'MSSQL: Percent of times statement recompiles is over {$MSSQL.PERCENT_RECOMPILATIONS.MAX}% for 15m'
               priority: WARNING
-              description: 'This number should be at or near zero, since recompiles can cause deadlocks and exclusive compile locks. This counter’s value should follow in proportion to “Batch Requests/sec” and “SQL Compilations/sec”.'
+              description: 'This number should be at or near zero, since recompiles can cause deadlocks and exclusive compile locks. This counter''s value should follow in proportion to “Batch Requests/sec” and “SQL Compilations/sec”.'
         -
           uuid: 5c0bee24f9494bb49860171ff875caf7
           name: 'MSSQL: Number of blocked processes'
@@ -1824,7 +1824,7 @@ zabbix_export:
               expression: 'max(/MSSQL by ODBC/mssql.worktables_from_cache_ratio,5m)<{$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}'
               name: 'MSSQL: Percentage of work tables available from the work table cache is low (below {$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}% for 5m)'
               priority: HIGH
-              description: 'A value less than 90% may indicate insufcient memory, since execution plans are being dropped, or on 32-bit systems, may indicate the need for an upgrade to a 64-bit system'
+              description: 'A value less than 90% may indicate insufficient memory, since execution plans are being dropped, or on 32-bit systems, may indicate the need for an upgrade to a 64-bit system'
         -
           uuid: c0302965c2574b43955a1d37a8fce9eb
           name: 'MSSQL: Service''s TCP port state'
@@ -1859,7 +1859,7 @@ zabbix_export:
           key: 'db.odbc.discovery[availability_groups,"{$MSSQL.DSN}"]'
           delay: 1h
           params: |
-            SELECT name as group_name 
+            SELECT name as group_name
             FROM sys.availability_groups
           username: '{$MSSQL.USER}'
           password: '{$MSSQL.PASSWORD}'
@@ -2038,7 +2038,7 @@ zabbix_export:
           key: 'db.odbc.discovery[dbname,"{$MSSQL.DSN}"]'
           delay: 1h
           params: |
-            SELECT name as dbname 
+            SELECT name as dbname
             FROM sys.databases
           username: '{$MSSQL.USER}'
           password: '{$MSSQL.PASSWORD}'
@@ -3232,8 +3232,8 @@ zabbix_export:
           params: |
             SELECT ag.name AS group_name, arcs.replica_server_name AS replica_name,
             db_name(drs.database_id) AS dbname, drs.is_local
-            FROM sys.dm_hadr_database_replica_states drs JOIN sys.dm_hadr_availability_replica_cluster_states arcs 
-            ON arcs.replica_id = drs.replica_id 
+            FROM sys.dm_hadr_database_replica_states drs JOIN sys.dm_hadr_availability_replica_cluster_states arcs
+            ON arcs.replica_id = drs.replica_id
             JOIN sys.availability_groups ag ON ag.group_id = arcs.group_id
             JOIN sys.dm_hadr_availability_replica_states ars ON ars.replica_id = arcs.replica_id
             WHERE drs.is_local = 0
@@ -3348,9 +3348,9 @@ zabbix_export:
           key: 'db.odbc.discovery[replicas,"{$MSSQL.DSN}"]'
           delay: 1h
           params: |
-            SELECT ag.name as group_name, 
+            SELECT ag.name as group_name,
             arcs.replica_server_name as replica_name
-            FROM sys.dm_hadr_availability_replica_cluster_states as arcs 
+            FROM sys.dm_hadr_availability_replica_cluster_states as arcs
             JOIN sys.availability_groups ag ON ag.group_id = arcs.group_id
             JOIN sys.dm_hadr_availability_replica_states ars ON ars.replica_id = arcs.replica_id
           username: '{$MSSQL.USER}'
@@ -3638,7 +3638,7 @@ zabbix_export:
               name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': {#REPLICA_NAME} is disconnected'
               priority: WARNING
               description: |
-                The response of an availability replica to the DISCONNECTED state depends on its role: 
+                The response of an availability replica to the DISCONNECTED state depends on its role:
                 On the primary replica, if a secondary replica is disconnected, its secondary databases are marked as NOT SYNCHRONIZED on the primary replica, which waits for the secondary to reconnect; On a secondary replica, upon detecting that it is disconnected, the secondary replica attempts to reconnect to the primary replica.
           preprocessing:
             -
diff --git a/templates/db/mysql_agent/README.md b/templates/db/mysql_agent/README.md
index f18366eaacf..5659cd63a25 100644
--- a/templates/db/mysql_agent/README.md
+++ b/templates/db/mysql_agent/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template is developed for monitoring DBMS MySQL and its forks.
 
 This template was tested on:
@@ -34,8 +34,8 @@ For more information, please see MySQL documentation https://dev.mysql.com/doc/r
 user='zbx_monitor'
 password='<password>'
 ```
-NOTE: Use systemd to start Zabbix agent on Linux OS. 
-For example, in Centos use "systemctl edit zabbix-agent.service" to set the required user to start the Zabbix agent. 
+NOTE: Use systemd to start Zabbix agent on Linux OS.
+For example, in Centos use "systemctl edit zabbix-agent.service" to set the required user to start the Zabbix agent.
 
 Add the rule to the SELinux policy (example for Centos):
 
@@ -95,7 +95,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Scanning databases in DBMS.</p> |ZABBIX_PASSIVE |mysql.db.discovery["{$MYSQL.HOST}","{$MYSQL.PORT}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value.split("\n").map(function (name) {     return ({"{#DBNAME}": name}); }));`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- A: {#DBNAME} NOT_MATCHES_REGEX `information_schema`</p> |
+|Database discovery |<p>Scanning databases in DBMS.</p> |ZABBIX_PASSIVE |mysql.db.discovery["{$MYSQL.HOST}","{$MYSQL.PORT}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value.split("\n").map(function (name) {     return ({"{#DBNAME}": name}); }));`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- {#DBNAME} NOT_MATCHES_REGEX `information_schema`</p> |
 |Replication discovery |<p>If "show slave status" returns Master_Host, "Replication: *" items are created.</p> |ZABBIX_PASSIVE |mysql.replication.discovery["{$MYSQL.HOST}","{$MYSQL.PORT}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |MariaDB discovery |<p>Additional metrics if MariaDB is used.</p> |DEPENDENT |mysql.extra_metric.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value.search('MariaDB')>-1 ? [{'{#SINGLETON}': ''}] : []);`</p> |
 
@@ -106,53 +106,53 @@ There are no template links in this template.
 |MySQL |MySQL: Status | |ZABBIX_PASSIVE |mysql.ping["{$MYSQL.HOST}","{$MYSQL.PORT}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return value.indexOf('is alive') !== -1 ? 1 : 0;`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |MySQL |MySQL: Version | |ZABBIX_PASSIVE |mysql.version["{$MYSQL.HOST}","{$MYSQL.PORT}"]<p>**Preprocessing**:</p><p>- REGEX: `(Server version)\s+(.+) \2`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |MySQL |MySQL: Uptime |<p>The amount of seconds that the server has been up.</p> |DEPENDENT |mysql.uptime<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Uptime']/field[@name='Value']/text()`</p> |
-|MySQL |MySQL: Aborted clients per second |<p>Number of connections that were aborted because the client died without closing the connection properly.</p> |DEPENDENT |mysql.aborted_clients.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Aborted_clients']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Aborted connections per second |<p>Number of failed attempts to connect to the MySQL server.</p> |DEPENDENT |mysql.aborted_connects.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Aborted_connects']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors accept per second |<p>Number of errors that occurred during calls to accept() on the listening port.</p> |DEPENDENT |mysql.connection_errors_accept.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_accept']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors internal per second |<p>Number of refused connections due to internal server errors, for example, out of memory errors, or failed thread starts.</p> |DEPENDENT |mysql.connection_errors_internal.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_internal']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors max connections per second |<p>Number of refused connections due to the max_connections limit being reached.</p> |DEPENDENT |mysql.connection_errors_max_connections.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_max_connections']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors peer address per second |<p>Number of errors while searching for the connecting client IP address.</p> |DEPENDENT |mysql.connection_errors_peer_address.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_peer_address']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors select per second |<p>Number of errors during calls to select() or poll() on the listening port. The client would not necessarily have been rejected in these cases.</p> |DEPENDENT |mysql.connection_errors_select.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_select']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors tcpwrap per second |<p>Number of connections the libwrap library has refused.</p> |DEPENDENT |mysql.connection_errors_tcpwrap.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_tcpwrap']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connections per second |<p>Number of connection attempts (successful or not) to the MySQL server.</p> |DEPENDENT |mysql.connections.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connections']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Aborted clients per second |<p>Number of connections that were aborted because the client died without closing the connection properly.</p> |DEPENDENT |mysql.aborted_clients.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Aborted_clients']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Aborted connections per second |<p>Number of failed attempts to connect to the MySQL server.</p> |DEPENDENT |mysql.aborted_connects.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Aborted_connects']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors accept per second |<p>Number of errors that occurred during calls to accept() on the listening port.</p> |DEPENDENT |mysql.connection_errors_accept.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_accept']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors internal per second |<p>Number of refused connections due to internal server errors, for example, out of memory errors, or failed thread starts.</p> |DEPENDENT |mysql.connection_errors_internal.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_internal']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors max connections per second |<p>Number of refused connections due to the max_connections limit being reached.</p> |DEPENDENT |mysql.connection_errors_max_connections.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_max_connections']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors peer address per second |<p>Number of errors while searching for the connecting client IP address.</p> |DEPENDENT |mysql.connection_errors_peer_address.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_peer_address']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors select per second |<p>Number of errors during calls to select() or poll() on the listening port. The client would not necessarily have been rejected in these cases.</p> |DEPENDENT |mysql.connection_errors_select.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_select']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors tcpwrap per second |<p>Number of connections the libwrap library has refused.</p> |DEPENDENT |mysql.connection_errors_tcpwrap.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connection_errors_tcpwrap']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connections per second |<p>Number of connection attempts (successful or not) to the MySQL server.</p> |DEPENDENT |mysql.connections.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Connections']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Max used connections |<p>The maximum number of connections that have been in use simultaneously since the server start.</p> |DEPENDENT |mysql.max_used_connections<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Max_used_connections']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: Threads cached |<p>Number of threads in the thread cache.</p> |DEPENDENT |mysql.threads_cached<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Threads_cached']/field[@name='Value']/text()`</p> |
 |MySQL |MySQL: Threads connected |<p>Number of currently open connections.</p> |DEPENDENT |mysql.threads_connected<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Threads_connected']/field[@name='Value']/text()`</p> |
-|MySQL |MySQL: Threads created per second |<p>Number of threads created to handle connections. If Threads_created is big, you may want to increase the thread_cache_size value. The cache miss rate can be calculated as Threads_created/Connections.</p> |DEPENDENT |mysql.threads_created.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Threads_created']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Threads created per second |<p>Number of threads created to handle connections. If Threads_created is big, you may want to increase the thread_cache_size value. The cache miss rate can be calculated as Threads_created/Connections.</p> |DEPENDENT |mysql.threads_created.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Threads_created']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Threads running |<p>Number of threads which are not sleeping.</p> |DEPENDENT |mysql.threads_running<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Threads_running']/field[@name='Value']/text()`</p> |
-|MySQL |MySQL: Buffer pool efficiency |<p>The item shows how effectively the buffer pool is serving reads.</p> |CALCULATED |mysql.buffer_pool_efficiency<p>**Expression**:</p>`last(mysql.innodb_buffer_pool_reads) /  ( last(mysql.innodb_buffer_pool_read_requests) +  ( last(mysql.innodb_buffer_pool_read_requests) = 0 ) ) * 100 *  ( last(mysql.innodb_buffer_pool_read_requests) > 0 )` |
-|MySQL |MySQL: Buffer pool utilization |<p>Ratio of used to total pages in the buffer pool.</p> |CALCULATED |mysql.buffer_pool_utilization<p>**Expression**:</p>`( last(mysql.innodb_buffer_pool_pages_total) -  last(mysql.innodb_buffer_pool_pages_free) ) /  ( last(mysql.innodb_buffer_pool_pages_total) +  ( last(mysql.innodb_buffer_pool_pages_total) = 0 ) ) * 100 *  ( last(mysql.innodb_buffer_pool_pages_total) > 0 )` |
-|MySQL |MySQL: Created tmp files on disk per second |<p>How many temporary files mysqld has created.</p> |DEPENDENT |mysql.created_tmp_files.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Created_tmp_files']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Created tmp tables on disk per second |<p>Number of internal on-disk temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_disk_tables.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Created_tmp_disk_tables']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Created tmp tables on memory per second |<p>Number of internal temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_tables.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Created_tmp_tables']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Buffer pool efficiency |<p>The item shows how effectively the buffer pool is serving reads.</p> |CALCULATED |mysql.buffer_pool_efficiency<p>**Expression**:</p>`last(//mysql.innodb_buffer_pool_reads) /  ( last(//mysql.innodb_buffer_pool_read_requests) +  ( last(//mysql.innodb_buffer_pool_read_requests) = 0 ) ) * 100 *  ( last(//mysql.innodb_buffer_pool_read_requests) > 0 ) ` |
+|MySQL |MySQL: Buffer pool utilization |<p>Ratio of used to total pages in the buffer pool.</p> |CALCULATED |mysql.buffer_pool_utilization<p>**Expression**:</p>`( last(//mysql.innodb_buffer_pool_pages_total) -  last(//mysql.innodb_buffer_pool_pages_free) ) /  ( last(//mysql.innodb_buffer_pool_pages_total) +  ( last(//mysql.innodb_buffer_pool_pages_total) = 0 ) ) * 100 *  ( last(//mysql.innodb_buffer_pool_pages_total) > 0 ) ` |
+|MySQL |MySQL: Created tmp files on disk per second |<p>How many temporary files mysqld has created.</p> |DEPENDENT |mysql.created_tmp_files.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Created_tmp_files']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Created tmp tables on disk per second |<p>Number of internal on-disk temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_disk_tables.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Created_tmp_disk_tables']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Created tmp tables on memory per second |<p>Number of internal temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_tables.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Created_tmp_tables']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: InnoDB buffer pool pages free |<p>The total size of the InnoDB buffer pool, in pages.</p> |DEPENDENT |mysql.innodb_buffer_pool_pages_free<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_buffer_pool_pages_free']/field[@name='Value']/text()`</p> |
 |MySQL |MySQL: InnoDB buffer pool pages total |<p>The total size of the InnoDB buffer pool, in pages.</p> |DEPENDENT |mysql.innodb_buffer_pool_pages_total<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_buffer_pool_pages_total']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MySQL |MySQL: InnoDB buffer pool read requests per second |<p>Number of logical read requests per second.</p> |DEPENDENT |mysql.innodb_buffer_pool_read_requests.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_buffer_pool_read_requests']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: InnoDB buffer pool reads per second |<p>Number of logical reads per second that InnoDB could not satisfy from the buffer pool, and had to read directly from the disk.</p> |DEPENDENT |mysql.innodb_buffer_pool_reads.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_buffer_pool_reads']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: InnoDB buffer pool read requests per second |<p>Number of logical read requests per second.</p> |DEPENDENT |mysql.innodb_buffer_pool_read_requests.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_buffer_pool_read_requests']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: InnoDB buffer pool reads per second |<p>Number of logical reads per second that InnoDB could not satisfy from the buffer pool, and had to read directly from the disk.</p> |DEPENDENT |mysql.innodb_buffer_pool_reads.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_buffer_pool_reads']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: InnoDB row lock time |<p>The total time spent in acquiring row locks for InnoDB tables, in milliseconds.</p> |DEPENDENT |mysql.innodb_row_lock_time<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_row_lock_time']/field[@name='Value']/text()`</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: InnoDB row lock time max |<p>The maximum time to acquire a row lock for InnoDB tables, in milliseconds.</p> |DEPENDENT |mysql.innodb_row_lock_time_max<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_row_lock_time_max']/field[@name='Value']/text()`</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: InnoDB row lock waits |<p>Number of times operations on InnoDB tables had to wait for a row lock.</p> |DEPENDENT |mysql.innodb_row_lock_waits<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_row_lock_waits']/field[@name='Value']/text()`</p> |
-|MySQL |MySQL: Slow queries per second |<p>Number of queries that have taken more than long_query_time seconds.</p> |DEPENDENT |mysql.slow_queries.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Slow_queries']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Bytes received |<p>Number of bytes received from all clients.</p> |DEPENDENT |mysql.bytes_received.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Bytes_received']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Bytes sent |<p>Number of bytes sent to all clients.</p> |DEPENDENT |mysql.bytes_sent.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Bytes_sent']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Delete per second |<p>The Com_delete counter variable indicates the number of times the delete statement has been executed.</p> |DEPENDENT |mysql.com_delete.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Com_delete']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Insert per second |<p>The Com_insert counter variable indicates the number of times the insert statement has been executed.</p> |DEPENDENT |mysql.com_insert.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Com_insert']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Select per second |<p>The Com_select counter variable indicates the number of times the select statement has been executed.</p> |DEPENDENT |mysql.com_select.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Com_select']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Update per second |<p>The Com_update counter variable indicates the number of times the update statement has been executed.</p> |DEPENDENT |mysql.com_update.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Com_update']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Queries per second |<p>Number of statements executed by the server. This variable includes statements executed within stored programs, unlike the Questions variable.</p> |DEPENDENT |mysql.queries.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Queries']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Questions per second |<p>Number of statements executed by the server. This includes only statements sent to the server by clients and not statements executed within stored programs, unlike the Queries variable.</p> |DEPENDENT |mysql.questions.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Questions']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Slow queries per second |<p>Number of queries that have taken more than long_query_time seconds.</p> |DEPENDENT |mysql.slow_queries.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Slow_queries']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Bytes received |<p>Number of bytes received from all clients.</p> |DEPENDENT |mysql.bytes_received.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Bytes_received']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Bytes sent |<p>Number of bytes sent to all clients.</p> |DEPENDENT |mysql.bytes_sent.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Bytes_sent']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Delete per second |<p>The Com_delete counter variable indicates the number of times the delete statement has been executed.</p> |DEPENDENT |mysql.com_delete.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Com_delete']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Insert per second |<p>The Com_insert counter variable indicates the number of times the insert statement has been executed.</p> |DEPENDENT |mysql.com_insert.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Com_insert']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Select per second |<p>The Com_select counter variable indicates the number of times the select statement has been executed.</p> |DEPENDENT |mysql.com_select.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Com_select']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Update per second |<p>The Com_update counter variable indicates the number of times the update statement has been executed.</p> |DEPENDENT |mysql.com_update.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Com_update']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Queries per second |<p>Number of statements executed by the server. This variable includes statements executed within stored programs, unlike the Questions variable.</p> |DEPENDENT |mysql.queries.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Queries']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Questions per second |<p>Number of statements executed by the server. This includes only statements sent to the server by clients and not statements executed within stored programs, unlike the Queries variable.</p> |DEPENDENT |mysql.questions.rate<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Questions']/field[@name='Value']/text()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Binlog cache disk use |<p>Number of transactions that used a temporary disk cache because they could not fit in the regular binary log cache, being larger than binlog_cache_size.</p> |DEPENDENT |mysql.binlog_cache_disk_use<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Binlog_cache_disk_use']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb buffer pool wait free |<p>Number of times InnoDB waited for a free page before reading or creating a page. Normally, writes to the InnoDB buffer pool happen in the background. When no clean pages are available, dirty pages are flushed first in order to free some up. This counts the numbers of wait for this operation to finish. If this value is not small, look at the increasing innodb_buffer_pool_size.</p> |DEPENDENT |mysql.innodb_buffer_pool_wait_free<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_buffer_pool_wait_free']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb number open files |<p>Number of open files held by InnoDB. InnoDB only.</p> |DEPENDENT |mysql.innodb_num_open_files<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_num_open_files']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Open table definitions |<p>Number of cached table definitions.</p> |DEPENDENT |mysql.open_table_definitions<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Open_table_definitions']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Open tables |<p>Number of tables that are open.</p> |DEPENDENT |mysql.open_tables<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Open_tables']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb log written |<p>Number of bytes written to the InnoDB log.</p> |DEPENDENT |mysql.innodb_os_log_written<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Innodb_os_log_written']/field[@name='Value']/text()`</p> |
-|MySQL |MySQL: Calculated value of innodb_log_file_size |<p>Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.</p> |CALCULATED |mysql.innodb_log_file_size<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Expression**:</p>`(last(mysql.innodb_os_log_written) - last(mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}` |
+|MySQL |MySQL: Calculated value of innodb_log_file_size |<p>Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.</p> |CALCULATED |mysql.innodb_log_file_size<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Expression**:</p>`(last(//mysql.innodb_os_log_written) - first(//mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}` |
 |MySQL |MySQL: Size of database {#DBNAME} |<p>-</p> |ZABBIX_PASSIVE |mysql.dbsize["{$MYSQL.HOST}","{$MYSQL.PORT}","{#DBNAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: Replication Slave SQL Running State {#MASTER_HOST} |<p>This shows the state of the SQL driver threads.</p> |DEPENDENT |mysql.slave_sql_running_state["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Slave_SQL_Running_State']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Replication Seconds Behind Master {#MASTERHOST} |<p>The number of seconds that the slave SQL thread is behind processing the master binary log.</p><p>A high number (or an increasing one) can indicate that the slave is unable to handle events</p><p>from the master in a timely fashion.</p> |DEPENDENT |mysql.seconds_behind_master["{#MASTERHOST}"]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row/field[@name='Seconds_Behind_Master']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- NOT_MATCHES_REGEX: `null`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Replication is not performed.`</p> |
-|MySQL |MySQL: Replication Slave IO Running {#MASTERHOST} |<p>Whether the I/O thread for reading the master's binary log is running. </p><p>Normally, you want this to be Yes unless you have not yet started replication or have </p><p>explicitly stopped it with STOP SLAVE.</p> |DEPENDENT |mysql.slave_io_running["{#MASTERHOST}"]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row/field[@name='Slave_IO_Running']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MySQL |MySQL: Replication Slave SQL Running {#MASTERHOST} |<p>Whether the SQL thread for executing events in the relay log is running. </p><p>As with the I/O thread, this should normally be Yes.</p> |DEPENDENT |mysql.slave_sql_running["{#MASTERHOST}"]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row/field[@name='Slave_SQL_Running']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|MySQL |MySQL: Replication Slave IO Running {#MASTERHOST} |<p>Whether the I/O thread for reading the master's binary log is running.</p><p>Normally, you want this to be Yes unless you have not yet started replication or have</p><p>explicitly stopped it with STOP SLAVE.</p> |DEPENDENT |mysql.slave_io_running["{#MASTERHOST}"]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row/field[@name='Slave_IO_Running']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|MySQL |MySQL: Replication Slave SQL Running {#MASTERHOST} |<p>Whether the SQL thread for executing events in the relay log is running.</p><p>As with the I/O thread, this should normally be Yes.</p> |DEPENDENT |mysql.slave_sql_running["{#MASTERHOST}"]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row/field[@name='Slave_SQL_Running']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: Binlog commits |<p>Total number of transactions committed to the binary log.</p> |DEPENDENT |mysql.binlog_commits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Binlog_commits']/field[@name='Value']/text()`</p> |
 |MySQL |MySQL: Binlog group commits |<p>Total number of group commits done to the binary log.</p> |DEPENDENT |mysql.binlog_group_commits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Binlog_group_commits']/field[@name='Value']/text()`</p> |
 |MySQL |MySQL: Master GTID wait count |<p>The number of times MASTER_GTID_WAIT called.</p> |DEPENDENT |mysql.master_gtid_wait_count[{#SINGLETON}]<p>**Preprocessing**:</p><p>- XMLPATH: `/resultset/row[field/text()='Master_gtid_wait_count']/field[@name='Value']/text()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -167,21 +167,21 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|MySQL: Service is down | |`{TEMPLATE_NAME:mysql.ping["{$MYSQL.HOST}","{$MYSQL.PORT}"].last()}=0` |HIGH | |
-|MySQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>MySQL version has changed. Ack to close.</p> |`{TEMPLATE_NAME:mysql.version["{$MYSQL.HOST}","{$MYSQL.PORT}"].diff()}=1 and {TEMPLATE_NAME:mysql.version["{$MYSQL.HOST}","{$MYSQL.PORT}"].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|MySQL: Service has been restarted (uptime < 10m) |<p>MySQL uptime is less than 10 minutes.</p> |`{TEMPLATE_NAME:mysql.uptime.last()}<10m` |INFO | |
-|MySQL: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`{TEMPLATE_NAME:mysql.uptime.nodata(30m)}=1` |INFO |<p>**Depends on**:</p><p>- MySQL: Service is down</p> |
-|MySQL: Server has aborted connections (over {$MYSQL.ABORTED_CONN.MAX.WARN} for 5m) |<p>The number of failed attempts to connect to the MySQL server is more than {$MYSQL.ABORTED_CONN.MAX.WARN} in the last 5 minutes.</p> |`{TEMPLATE_NAME:mysql.aborted_connects.rate.min(5m)}>{$MYSQL.ABORTED_CONN.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- MySQL: Refused connections (max_connections limit reached)</p> |
-|MySQL: Refused connections (max_connections limit reached) |<p>Number of refused connections due to the max_connections limit being reached.</p> |`{TEMPLATE_NAME:mysql.connection_errors_max_connections.rate.last()}>0` |AVERAGE | |
-|MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m) |<p>The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.</p> |`{TEMPLATE_NAME:mysql.buffer_pool_utilization.max(5m)}<{$MYSQL.BUFF_UTIL.MIN.WARN}` |WARNING | |
-|MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_files.rate.min(5m)}>{$MYSQL.CREATED_TMP_FILES.MAX.WARN}` |WARNING | |
-|MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_disk_tables.rate.min(5m)}>{$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN}` |WARNING | |
-|MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_tables.rate.min(5m)}>{$MYSQL.CREATED_TMP_TABLES.MAX.WARN}` |WARNING | |
-|MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m) |<p>The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.</p> |`{TEMPLATE_NAME:mysql.slow_queries.rate.min(5m)}>{$MYSQL.SLOW_QUERIES.MAX.WARN}` |WARNING | |
-|MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:mysql.seconds_behind_master["{#MASTERHOST}"].min(5m)}>{$MYSQL.REPL_LAG.MAX.WARN}` |WARNING | |
-|MySQL: The slave I/O thread is not running |<p>Whether the I/O thread for reading the master's binary log is running.</p> |`{TEMPLATE_NAME:mysql.slave_io_running["{#MASTERHOST}"].count(#1,"No",eq)}=1` |AVERAGE | |
-|MySQL: The slave I/O thread is not connected to a replication master |<p>-</p> |`{TEMPLATE_NAME:mysql.slave_io_running["{#MASTERHOST}"].count(#1,"Yes",ne)}=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
-|MySQL: The SQL thread is not running |<p>Whether the SQL thread for executing events in the relay log is running.</p> |`{TEMPLATE_NAME:mysql.slave_sql_running["{#MASTERHOST}"].count(#1,"No",eq)}=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
+|MySQL: Service is down |<p>-</p> |`last(/MySQL by Zabbix agent/mysql.ping["{$MYSQL.HOST}","{$MYSQL.PORT}"])=0` |HIGH | |
+|MySQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>MySQL version has changed. Ack to close.</p> |`last(/MySQL by Zabbix agent/mysql.version["{$MYSQL.HOST}","{$MYSQL.PORT}"],#1)<>last(/MySQL by Zabbix agent/mysql.version["{$MYSQL.HOST}","{$MYSQL.PORT}"],#2) and length(last(/MySQL by Zabbix agent/mysql.version["{$MYSQL.HOST}","{$MYSQL.PORT}"]))>0` |INFO |<p>Manual close: YES</p> |
+|MySQL: Service has been restarted (uptime < 10m) |<p>MySQL uptime is less than 10 minutes.</p> |`last(/MySQL by Zabbix agent/mysql.uptime)<10m` |INFO | |
+|MySQL: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/MySQL by Zabbix agent/mysql.uptime,30m)=1` |INFO |<p>**Depends on**:</p><p>- MySQL: Service is down</p> |
+|MySQL: Server has aborted connections (over {$MYSQL.ABORTED_CONN.MAX.WARN} for 5m) |<p>The number of failed attempts to connect to the MySQL server is more than {$MYSQL.ABORTED_CONN.MAX.WARN} in the last 5 minutes.</p> |`min(/MySQL by Zabbix agent/mysql.aborted_connects.rate,5m)>{$MYSQL.ABORTED_CONN.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- MySQL: Refused connections (max_connections limit reached)</p> |
+|MySQL: Refused connections (max_connections limit reached) |<p>Number of refused connections due to the max_connections limit being reached.</p> |`last(/MySQL by Zabbix agent/mysql.connection_errors_max_connections.rate)>0` |AVERAGE | |
+|MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m) |<p>The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.</p> |`max(/MySQL by Zabbix agent/mysql.buffer_pool_utilization,5m)<{$MYSQL.BUFF_UTIL.MIN.WARN}` |WARNING | |
+|MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by Zabbix agent/mysql.created_tmp_files.rate,5m)>{$MYSQL.CREATED_TMP_FILES.MAX.WARN}` |WARNING | |
+|MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by Zabbix agent/mysql.created_tmp_disk_tables.rate,5m)>{$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN}` |WARNING | |
+|MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by Zabbix agent/mysql.created_tmp_tables.rate,5m)>{$MYSQL.CREATED_TMP_TABLES.MAX.WARN}` |WARNING | |
+|MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m) |<p>The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.</p> |`min(/MySQL by Zabbix agent/mysql.slow_queries.rate,5m)>{$MYSQL.SLOW_QUERIES.MAX.WARN}` |WARNING | |
+|MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m) |<p>-</p> |`min(/MySQL by Zabbix agent/mysql.seconds_behind_master["{#MASTERHOST}"],5m)>{$MYSQL.REPL_LAG.MAX.WARN}` |WARNING | |
+|MySQL: The slave I/O thread is not running |<p>Whether the I/O thread for reading the master's binary log is running.</p> |`count(/MySQL by Zabbix agent/mysql.slave_io_running["{#MASTERHOST}"],#1,"eq","No")=1` |AVERAGE | |
+|MySQL: The slave I/O thread is not connected to a replication master |<p>-</p> |`count(/MySQL by Zabbix agent/mysql.slave_io_running["{#MASTERHOST}"],#1,"ne","Yes")=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
+|MySQL: The SQL thread is not running |<p>Whether the SQL thread for executing events in the relay log is running.</p> |`count(/MySQL by Zabbix agent/mysql.slave_sql_running["{#MASTERHOST}"],#1,"eq","No")=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
 
 ## Feedback
 
diff --git a/templates/db/mysql_agent/template_db_mysql_agent.yaml b/templates/db/mysql_agent/template_db_mysql_agent.yaml
index 07faf0aafe8..70e3a6cbf25 100644
--- a/templates/db/mysql_agent/template_db_mysql_agent.yaml
+++ b/templates/db/mysql_agent/template_db_mysql_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:44Z'
+  version: '6.0'
+  date: '2021-12-16T07:08:36Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,11 +13,11 @@ zabbix_export:
       description: |
         Requirements for template operation:
         1.Install Zabbix agent and MySQL client.
-        2.Copy template_db_mysql.conf into folder with Zabbix agent configuration (/etc/zabbix/zabbix_agentd.d/ by default). Don't forget to restart zabbix-agent. 
+        2.Copy template_db_mysql.conf into folder with Zabbix agent configuration (/etc/zabbix/zabbix_agentd.d/ by default). Don't forget to restart zabbix-agent.
         3.Create MySQL user for monitoring. For example:
         CREATE USER 'zbx_monitor'@'%' IDENTIFIED BY '<password>';
         GRANT REPLICATION CLIENT,PROCESS,SHOW DATABASES,SHOW VIEW ON *.* TO 'zbx_monitor'@'%';
-        For more information read the MySQL documentation https://dev.mysql.com/doc/refman/8.0/en/grant.html , please. 
+        For more information read the MySQL documentation https://dev.mysql.com/doc/refman/8.0/en/grant.html , please.
         4.Create .my.cnf in home directory of Zabbix agent for Linux (/var/lib/zabbix by default ) or my.cnf in c:\ for Windows. For example:
         [client]
         user='zbx_monitor'
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384189-discussion-thread-for-official-zabbix-template-db-mysql
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -743,7 +743,7 @@ zabbix_export:
           key: mysql.innodb_log_file_size
           history: 7d
           value_type: FLOAT
-          params: '(last(//mysql.innodb_os_log_written) - last(//mysql.innodb_os_log_written)) / {$MYSQL.INNODB_LOG_FILES}'
+          params: '(last(//mysql.innodb_os_log_written) - first(//mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}'
           description: 'Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.'
           preprocessing:
             -
@@ -1426,8 +1426,8 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: |
-                Whether the I/O thread for reading the master's binary log is running. 
-                Normally, you want this to be Yes unless you have not yet started replication or have 
+                Whether the I/O thread for reading the master's binary log is running.
+                Normally, you want this to be Yes unless you have not yet started replication or have
                 explicitly stopped it with STOP SLAVE.
               preprocessing:
                 -
@@ -1470,7 +1470,7 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: |
-                Whether the SQL thread for executing events in the relay log is running. 
+                Whether the SQL thread for executing events in the relay log is running.
                 As with the I/O thread, this should normally be Yes.
               preprocessing:
                 -
diff --git a/templates/db/mysql_agent2/README.md b/templates/db/mysql_agent2/README.md
index e1e09806961..29635a743a9 100644
--- a/templates/db/mysql_agent2/README.md
+++ b/templates/db/mysql_agent2/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template is developed for monitoring DBMS MySQL and its forks.
 
 This template was tested on:
@@ -25,12 +25,12 @@ GRANT REPLICATION CLIENT,PROCESS,SHOW DATABASES,SHOW VIEW ON *.* TO 'zbx_monitor
 
 For more information, please see MySQL documentation https://dev.mysql.com/doc/refman/8.0/en/grant.html
 
-2. Set in the {$MYSQL.DSN} macro the data source name of the MySQL instance either session name from Zabbix agent 2 configuration file or URI.  
-**Examples:** MySQL1, tcp://localhost:3306, tcp://172.16.0.10, unix:/var/run/mysql.sock  
+2. Set in the {$MYSQL.DSN} macro the data source name of the MySQL instance either session name from Zabbix agent 2 configuration file or URI.
+**Examples:** MySQL1, tcp://localhost:3306, tcp://172.16.0.10, unix:/var/run/mysql.sock
 For more information about MySQL Unix socket file, see the MySQL documentation https://dev.mysql.com/doc/refman/8.0/en/problems-with-mysql-sock.html.
 
-3. If you had set URI in the {$MYSQL.DSN}, define the user name and password in host macros ({$MYSQL.USER} and {$MYSQL.PASSWORD}).  
-Leave macros {$MYSQL.USER} and {$MYSQL.PASSWORD} empty if you use a session name. Set the user name and password in the Plugins.Mysql.<...> section of your Zabbix agent 2 configuration file.  
+3. If you had set URI in the {$MYSQL.DSN}, define the user name and password in host macros ({$MYSQL.USER} and {$MYSQL.PASSWORD}).
+Leave macros {$MYSQL.USER} and {$MYSQL.PASSWORD} empty if you use a session name. Set the user name and password in the Plugins.Mysql.<...> section of your Zabbix agent 2 configuration file.
 For more information about configuring the Zabbix MySQL plugin, see the documentation https://git.zabbix.com/projects/ZBX/repos/zabbix/browse/src/go/plugins/mysql/README.md.
 
 ## Zabbix configuration
@@ -61,7 +61,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Scanning databases in DBMS.</p> |ZABBIX_PASSIVE |mysql.db.discovery["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- A: {#DATABASE} NOT_MATCHES_REGEX `information_schema`</p> |
+|Database discovery |<p>Scanning databases in DBMS.</p> |ZABBIX_PASSIVE |mysql.db.discovery["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- {#DATABASE} NOT_MATCHES_REGEX `information_schema`</p> |
 |Replication discovery |<p>If "show slave status" returns Master_Host, "Replication: *" items are created.</p> |ZABBIX_PASSIVE |mysql.replication.discovery["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |MariaDB discovery |<p>Additional metrics if MariaDB is used.</p> |DEPENDENT |mysql.extra_metric.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value.search('MariaDB')>-1 ? [{'{#SINGLETON}': ''}] : []);`</p> |
 
@@ -72,53 +72,53 @@ There are no template links in this template.
 |MySQL |MySQL: Status | |ZABBIX_PASSIVE |mysql.ping["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |MySQL |MySQL: Version | |ZABBIX_PASSIVE |mysql.version["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Uptime |<p>The amount of seconds that the server has been up.</p> |DEPENDENT |mysql.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.Uptime`</p> |
-|MySQL |MySQL: Aborted clients per second |<p>Number of connections that were aborted because the client died without closing the connection properly.</p> |DEPENDENT |mysql.aborted_clients.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Aborted_clients`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Aborted connections per second |<p>Number of failed attempts to connect to the MySQL server.</p> |DEPENDENT |mysql.aborted_connects.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Aborted_connects`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors accept per second |<p>Number of errors that occurred during calls to accept() on the listening port.</p> |DEPENDENT |mysql.connection_errors_accept.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_accept`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors internal per second |<p>Number of refused connections due to internal server errors, for example, out of memory errors, or failed thread starts.</p> |DEPENDENT |mysql.connection_errors_internal.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_internal`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors max connections per second |<p>Number of refused connections due to the max_connections limit being reached.</p> |DEPENDENT |mysql.connection_errors_max_connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_max_connections`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors peer address per second |<p>Number of errors while searching for the connecting client IP address.</p> |DEPENDENT |mysql.connection_errors_peer_address.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_peer_address`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors select per second |<p>Number of errors during calls to select() or poll() on the listening port. The client would not necessarily have been rejected in these cases.</p> |DEPENDENT |mysql.connection_errors_select.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_select`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors tcpwrap per second |<p>Number of connections the libwrap library has refused.</p> |DEPENDENT |mysql.connection_errors_tcpwrap.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_tcpwrap`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connections per second |<p>Number of connection attempts (successful or not) to the MySQL server.</p> |DEPENDENT |mysql.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connections`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Aborted clients per second |<p>Number of connections that were aborted because the client died without closing the connection properly.</p> |DEPENDENT |mysql.aborted_clients.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Aborted_clients`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Aborted connections per second |<p>Number of failed attempts to connect to the MySQL server.</p> |DEPENDENT |mysql.aborted_connects.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Aborted_connects`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors accept per second |<p>Number of errors that occurred during calls to accept() on the listening port.</p> |DEPENDENT |mysql.connection_errors_accept.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_accept`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors internal per second |<p>Number of refused connections due to internal server errors, for example, out of memory errors, or failed thread starts.</p> |DEPENDENT |mysql.connection_errors_internal.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_internal`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors max connections per second |<p>Number of refused connections due to the max_connections limit being reached.</p> |DEPENDENT |mysql.connection_errors_max_connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_max_connections`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors peer address per second |<p>Number of errors while searching for the connecting client IP address.</p> |DEPENDENT |mysql.connection_errors_peer_address.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_peer_address`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors select per second |<p>Number of errors during calls to select() or poll() on the listening port. The client would not necessarily have been rejected in these cases.</p> |DEPENDENT |mysql.connection_errors_select.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_select`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors tcpwrap per second |<p>Number of connections the libwrap library has refused.</p> |DEPENDENT |mysql.connection_errors_tcpwrap.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connection_errors_tcpwrap`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connections per second |<p>Number of connection attempts (successful or not) to the MySQL server.</p> |DEPENDENT |mysql.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Connections`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Max used connections |<p>The maximum number of connections that have been in use simultaneously since the server start.</p> |DEPENDENT |mysql.max_used_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.Max_used_connections`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: Threads cached |<p>Number of threads in the thread cache.</p> |DEPENDENT |mysql.threads_cached<p>**Preprocessing**:</p><p>- JSONPATH: `$.Threads_cached`</p> |
 |MySQL |MySQL: Threads connected |<p>Number of currently open connections.</p> |DEPENDENT |mysql.threads_connected<p>**Preprocessing**:</p><p>- JSONPATH: `$.Threads_connected`</p> |
-|MySQL |MySQL: Threads created per second |<p>Number of threads created to handle connections. If Threads_created is big, you may want to increase the thread_cache_size value. The cache miss rate can be calculated as Threads_created/Connections.</p> |DEPENDENT |mysql.threads_created.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Threads_created`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Threads created per second |<p>Number of threads created to handle connections. If Threads_created is big, you may want to increase the thread_cache_size value. The cache miss rate can be calculated as Threads_created/Connections.</p> |DEPENDENT |mysql.threads_created.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Threads_created`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Threads running |<p>Number of threads which are not sleeping.</p> |DEPENDENT |mysql.threads_running<p>**Preprocessing**:</p><p>- JSONPATH: `$.Threads_running`</p> |
-|MySQL |MySQL: Buffer pool efficiency |<p>The item shows how effectively the buffer pool is serving reads.</p> |CALCULATED |mysql.buffer_pool_efficiency<p>**Expression**:</p>`last(mysql.innodb_buffer_pool_reads) /  ( last(mysql.innodb_buffer_pool_read_requests) +  ( last(mysql.innodb_buffer_pool_read_requests) = 0 ) ) * 100 *  ( last(mysql.innodb_buffer_pool_read_requests) > 0 )` |
-|MySQL |MySQL: Buffer pool utilization |<p>Ratio of used to total pages in the buffer pool.</p> |CALCULATED |mysql.buffer_pool_utilization<p>**Expression**:</p>`( last(mysql.innodb_buffer_pool_pages_total) -  last(mysql.innodb_buffer_pool_pages_free) ) /  ( last(mysql.innodb_buffer_pool_pages_total) +  ( last(mysql.innodb_buffer_pool_pages_total) = 0 ) ) * 100 *  ( last(mysql.innodb_buffer_pool_pages_total) > 0 )` |
-|MySQL |MySQL: Created tmp files on disk per second |<p>How many temporary files mysqld has created.</p> |DEPENDENT |mysql.created_tmp_files.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Created_tmp_files`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Created tmp tables on disk per second |<p>Number of internal on-disk temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_disk_tables.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Created_tmp_disk_tables`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Created tmp tables on memory per second |<p>Number of internal temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_tables.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Created_tmp_tables`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Buffer pool efficiency |<p>The item shows how effectively the buffer pool is serving reads.</p> |CALCULATED |mysql.buffer_pool_efficiency<p>**Expression**:</p>`last(//mysql.innodb_buffer_pool_reads) /  ( last(//mysql.innodb_buffer_pool_read_requests) +  ( last(//mysql.innodb_buffer_pool_read_requests) = 0 ) ) * 100 *  ( last(//mysql.innodb_buffer_pool_read_requests) > 0 ) ` |
+|MySQL |MySQL: Buffer pool utilization |<p>Ratio of used to total pages in the buffer pool.</p> |CALCULATED |mysql.buffer_pool_utilization<p>**Expression**:</p>`( last(//mysql.innodb_buffer_pool_pages_total) -  last(//mysql.innodb_buffer_pool_pages_free) ) /  ( last(//mysql.innodb_buffer_pool_pages_total) +  ( last(//mysql.innodb_buffer_pool_pages_total) = 0 ) ) * 100 *  ( last(//mysql.innodb_buffer_pool_pages_total) > 0 ) ` |
+|MySQL |MySQL: Created tmp files on disk per second |<p>How many temporary files mysqld has created.</p> |DEPENDENT |mysql.created_tmp_files.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Created_tmp_files`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Created tmp tables on disk per second |<p>Number of internal on-disk temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_disk_tables.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Created_tmp_disk_tables`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Created tmp tables on memory per second |<p>Number of internal temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_tables.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Created_tmp_tables`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: InnoDB buffer pool pages free |<p>The total size of the InnoDB buffer pool, in pages.</p> |DEPENDENT |mysql.innodb_buffer_pool_pages_free<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_buffer_pool_pages_free`</p> |
 |MySQL |MySQL: InnoDB buffer pool pages total |<p>The total size of the InnoDB buffer pool, in pages.</p> |DEPENDENT |mysql.innodb_buffer_pool_pages_total<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_buffer_pool_pages_total`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MySQL |MySQL: InnoDB buffer pool read requests per second |<p>Number of logical read requests per second.</p> |DEPENDENT |mysql.innodb_buffer_pool_read_requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_buffer_pool_read_requests`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: InnoDB buffer pool reads per second |<p>Number of logical reads per second that InnoDB could not satisfy from the buffer pool, and had to read directly from the disk.</p> |DEPENDENT |mysql.innodb_buffer_pool_reads.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_buffer_pool_reads`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: InnoDB buffer pool read requests per second |<p>Number of logical read requests per second.</p> |DEPENDENT |mysql.innodb_buffer_pool_read_requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_buffer_pool_read_requests`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: InnoDB buffer pool reads per second |<p>Number of logical reads per second that InnoDB could not satisfy from the buffer pool, and had to read directly from the disk.</p> |DEPENDENT |mysql.innodb_buffer_pool_reads.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_buffer_pool_reads`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: InnoDB row lock time |<p>The total time spent in acquiring row locks for InnoDB tables, in milliseconds.</p> |DEPENDENT |mysql.innodb_row_lock_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_row_lock_time`</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: InnoDB row lock time max |<p>The maximum time to acquire a row lock for InnoDB tables, in milliseconds.</p> |DEPENDENT |mysql.innodb_row_lock_time_max<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_row_lock_time_max`</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: InnoDB row lock waits |<p>Number of times operations on InnoDB tables had to wait for a row lock.</p> |DEPENDENT |mysql.innodb_row_lock_waits<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_row_lock_waits`</p> |
-|MySQL |MySQL: Slow queries per second |<p>Number of queries that have taken more than long_query_time seconds.</p> |DEPENDENT |mysql.slow_queries.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Slow_queries`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Bytes received |<p>Number of bytes received from all clients.</p> |DEPENDENT |mysql.bytes_received.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Bytes_received`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Bytes sent |<p>Number of bytes sent to all clients.</p> |DEPENDENT |mysql.bytes_sent.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Bytes_sent`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Delete per second |<p>The Com_delete counter variable indicates the number of times the delete statement has been executed.</p> |DEPENDENT |mysql.com_delete.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Com_delete`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Insert per second |<p>The Com_insert counter variable indicates the number of times the insert statement has been executed.</p> |DEPENDENT |mysql.com_insert.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Com_insert`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Select per second |<p>The Com_select counter variable indicates the number of times the select statement has been executed.</p> |DEPENDENT |mysql.com_select.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Com_select`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Update per second |<p>The Com_update counter variable indicates the number of times the update statement has been executed.</p> |DEPENDENT |mysql.com_update.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Com_update`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Queries per second |<p>Number of statements executed by the server. This variable includes statements executed within stored programs, unlike the Questions variable.</p> |DEPENDENT |mysql.queries.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Queries`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Questions per second |<p>Number of statements executed by the server. This includes only statements sent to the server by clients and not statements executed within stored programs, unlike the Queries variable.</p> |DEPENDENT |mysql.questions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Questions`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Slow queries per second |<p>Number of queries that have taken more than long_query_time seconds.</p> |DEPENDENT |mysql.slow_queries.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Slow_queries`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Bytes received |<p>Number of bytes received from all clients.</p> |DEPENDENT |mysql.bytes_received.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Bytes_received`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Bytes sent |<p>Number of bytes sent to all clients.</p> |DEPENDENT |mysql.bytes_sent.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Bytes_sent`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Delete per second |<p>The Com_delete counter variable indicates the number of times the delete statement has been executed.</p> |DEPENDENT |mysql.com_delete.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Com_delete`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Insert per second |<p>The Com_insert counter variable indicates the number of times the insert statement has been executed.</p> |DEPENDENT |mysql.com_insert.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Com_insert`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Select per second |<p>The Com_select counter variable indicates the number of times the select statement has been executed.</p> |DEPENDENT |mysql.com_select.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Com_select`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Update per second |<p>The Com_update counter variable indicates the number of times the update statement has been executed.</p> |DEPENDENT |mysql.com_update.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Com_update`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Queries per second |<p>Number of statements executed by the server. This variable includes statements executed within stored programs, unlike the Questions variable.</p> |DEPENDENT |mysql.queries.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Queries`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Questions per second |<p>Number of statements executed by the server. This includes only statements sent to the server by clients and not statements executed within stored programs, unlike the Queries variable.</p> |DEPENDENT |mysql.questions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Questions`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Binlog cache disk use |<p>Number of transactions that used a temporary disk cache because they could not fit in the regular binary log cache, being larger than binlog_cache_size.</p> |DEPENDENT |mysql.binlog_cache_disk_use<p>**Preprocessing**:</p><p>- JSONPATH: `$.Binlog_cache_disk_use`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb buffer pool wait free |<p>Number of times InnoDB waited for a free page before reading or creating a page. Normally, writes to the InnoDB buffer pool happen in the background. When no clean pages are available, dirty pages are flushed first in order to free some up. This counts the numbers of wait for this operation to finish. If this value is not small, look at the increasing innodb_buffer_pool_size.</p> |DEPENDENT |mysql.innodb_buffer_pool_wait_free<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_buffer_pool_wait_free`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb number open files |<p>Number of open files held by InnoDB. InnoDB only.</p> |DEPENDENT |mysql.innodb_num_open_files<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_num_open_files`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Open table definitions |<p>Number of cached table definitions.</p> |DEPENDENT |mysql.open_table_definitions<p>**Preprocessing**:</p><p>- JSONPATH: `$.Open_table_definitions`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Open tables |<p>Number of tables that are open.</p> |DEPENDENT |mysql.open_tables<p>**Preprocessing**:</p><p>- JSONPATH: `$.Open_tables`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb log written |<p>Number of bytes written to the InnoDB log.</p> |DEPENDENT |mysql.innodb_os_log_written<p>**Preprocessing**:</p><p>- JSONPATH: `$.Innodb_os_log_written`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|MySQL |MySQL: Calculated value of innodb_log_file_size |<p>Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.</p> |CALCULATED |mysql.innodb_log_file_size<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Expression**:</p>`(last(mysql.innodb_os_log_written) - last(mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}` |
+|MySQL |MySQL: Calculated value of innodb_log_file_size |<p>Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.</p> |CALCULATED |mysql.innodb_log_file_size<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Expression**:</p>`(last(//mysql.innodb_os_log_written) - first(//mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}` |
 |MySQL |MySQL: Size of database {#DATABASE} |<p>-</p> |ZABBIX_PASSIVE |mysql.db.size["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}","{#DATABASE}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: Replication Slave SQL Running State {#MASTER_HOST} |<p>This shows the state of the SQL driver threads.</p> |DEPENDENT |mysql.replication.slave_sql_running_state["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Slave_SQL_Running_State`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Replication Seconds Behind Master {#MASTER_HOST} |<p>Number of seconds that the slave SQL thread is behind processing the master binary log.</p><p>A high number (or an increasing one) can indicate that the slave is unable to handle events</p><p>from the master in a timely fashion.</p> |DEPENDENT |mysql.replication.seconds_behind_master["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Seconds_Behind_Master`</p><p>- MATCHES_REGEX: `\d+`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Replication is not performed.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MySQL |MySQL: Replication Slave IO Running {#MASTER_HOST} |<p>Whether the I/O thread for reading the master's binary log is running. </p><p>Normally, you want this to be Yes unless you have not yet started a replication or have </p><p>explicitly stopped it with STOP SLAVE.</p> |DEPENDENT |mysql.replication.slave_io_running["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Slave_IO_Running`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MySQL |MySQL: Replication Slave SQL Running {#MASTER_HOST} |<p>Whether the SQL thread for executing events in the relay log is running. </p><p>As with the I/O thread, this should normally be Yes.</p> |DEPENDENT |mysql.replication.slave_sql_running["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Slave_SQL_Running`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|MySQL |MySQL: Replication Slave IO Running {#MASTER_HOST} |<p>Whether the I/O thread for reading the master's binary log is running.</p><p>Normally, you want this to be Yes unless you have not yet started a replication or have</p><p>explicitly stopped it with STOP SLAVE.</p> |DEPENDENT |mysql.replication.slave_io_running["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Slave_IO_Running`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|MySQL |MySQL: Replication Slave SQL Running {#MASTER_HOST} |<p>Whether the SQL thread for executing events in the relay log is running.</p><p>As with the I/O thread, this should normally be Yes.</p> |DEPENDENT |mysql.replication.slave_sql_running["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Slave_SQL_Running`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: Binlog commits |<p>Total number of transactions committed to the binary log.</p> |DEPENDENT |mysql.binlog_commits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Binlog_commits`</p> |
 |MySQL |MySQL: Binlog group commits |<p>Total number of group commits done to the binary log.</p> |DEPENDENT |mysql.binlog_group_commits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Binlog_group_commits`</p> |
 |MySQL |MySQL: Master GTID wait count |<p>The number of times MASTER_GTID_WAIT called.</p> |DEPENDENT |mysql.master_gtid_wait_count[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Master_gtid_wait_count`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -133,21 +133,21 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|MySQL: Service is down | |`{TEMPLATE_NAME:mysql.ping["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"].last()}=0` |HIGH | |
-|MySQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>MySQL version has changed. Ack to close.</p> |`{TEMPLATE_NAME:mysql.version["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"].diff()}=1 and {TEMPLATE_NAME:mysql.version["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|MySQL: Service has been restarted (uptime < 10m) |<p>MySQL uptime is less than 10 minutes.</p> |`{TEMPLATE_NAME:mysql.uptime.last()}<10m` |INFO | |
-|MySQL: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`{TEMPLATE_NAME:mysql.uptime.nodata(30m)}=1` |INFO |<p>**Depends on**:</p><p>- MySQL: Service is down</p> |
-|MySQL: Server has aborted connections (over {$MYSQL.ABORTED_CONN.MAX.WARN} for 5m) |<p>The number of failed attempts to connect to the MySQL server is more than {$MYSQL.ABORTED_CONN.MAX.WARN} in the last 5 minutes.</p> |`{TEMPLATE_NAME:mysql.aborted_connects.rate.min(5m)}>{$MYSQL.ABORTED_CONN.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- MySQL: Refused connections (max_connections limit reached)</p> |
-|MySQL: Refused connections (max_connections limit reached) |<p>Number of refused connections due to the max_connections limit being reached.</p> |`{TEMPLATE_NAME:mysql.connection_errors_max_connections.rate.last()}>0` |AVERAGE | |
-|MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m) |<p>The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.</p> |`{TEMPLATE_NAME:mysql.buffer_pool_utilization.max(5m)}<{$MYSQL.BUFF_UTIL.MIN.WARN}` |WARNING | |
-|MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_files.rate.min(5m)}>{$MYSQL.CREATED_TMP_FILES.MAX.WARN}` |WARNING | |
-|MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_disk_tables.rate.min(5m)}>{$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN}` |WARNING | |
-|MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_tables.rate.min(5m)}>{$MYSQL.CREATED_TMP_TABLES.MAX.WARN}` |WARNING | |
-|MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m) |<p>The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.</p> |`{TEMPLATE_NAME:mysql.slow_queries.rate.min(5m)}>{$MYSQL.SLOW_QUERIES.MAX.WARN}` |WARNING | |
-|MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:mysql.replication.seconds_behind_master["{#MASTER_HOST}"].min(5m)}>{$MYSQL.REPL_LAG.MAX.WARN}` |WARNING | |
-|MySQL: The slave I/O thread is not running |<p>Whether the I/O thread for reading the master's binary log is running.</p> |`{TEMPLATE_NAME:mysql.replication.slave_io_running["{#MASTER_HOST}"].count(#1,"No",eq)}=1` |AVERAGE | |
-|MySQL: The slave I/O thread is not connected to a replication master |<p>-</p> |`{TEMPLATE_NAME:mysql.replication.slave_io_running["{#MASTER_HOST}"].count(#1,"Yes",ne)}=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
-|MySQL: The SQL thread is not running |<p>Whether the SQL thread for executing events in the relay log is running.</p> |`{TEMPLATE_NAME:mysql.replication.slave_sql_running["{#MASTER_HOST}"].count(#1,"No",eq)}=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
+|MySQL: Service is down |<p>-</p> |`last(/MySQL by Zabbix agent 2/mysql.ping["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"])=0` |HIGH | |
+|MySQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>MySQL version has changed. Ack to close.</p> |`last(/MySQL by Zabbix agent 2/mysql.version["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"],#1)<>last(/MySQL by Zabbix agent 2/mysql.version["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"],#2) and length(last(/MySQL by Zabbix agent 2/mysql.version["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]))>0` |INFO |<p>Manual close: YES</p> |
+|MySQL: Service has been restarted (uptime < 10m) |<p>MySQL uptime is less than 10 minutes.</p> |`last(/MySQL by Zabbix agent 2/mysql.uptime)<10m` |INFO | |
+|MySQL: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/MySQL by Zabbix agent 2/mysql.uptime,30m)=1` |INFO |<p>**Depends on**:</p><p>- MySQL: Service is down</p> |
+|MySQL: Server has aborted connections (over {$MYSQL.ABORTED_CONN.MAX.WARN} for 5m) |<p>The number of failed attempts to connect to the MySQL server is more than {$MYSQL.ABORTED_CONN.MAX.WARN} in the last 5 minutes.</p> |`min(/MySQL by Zabbix agent 2/mysql.aborted_connects.rate,5m)>{$MYSQL.ABORTED_CONN.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- MySQL: Refused connections (max_connections limit reached)</p> |
+|MySQL: Refused connections (max_connections limit reached) |<p>Number of refused connections due to the max_connections limit being reached.</p> |`last(/MySQL by Zabbix agent 2/mysql.connection_errors_max_connections.rate)>0` |AVERAGE | |
+|MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m) |<p>The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.</p> |`max(/MySQL by Zabbix agent 2/mysql.buffer_pool_utilization,5m)<{$MYSQL.BUFF_UTIL.MIN.WARN}` |WARNING | |
+|MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by Zabbix agent 2/mysql.created_tmp_files.rate,5m)>{$MYSQL.CREATED_TMP_FILES.MAX.WARN}` |WARNING | |
+|MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by Zabbix agent 2/mysql.created_tmp_disk_tables.rate,5m)>{$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN}` |WARNING | |
+|MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by Zabbix agent 2/mysql.created_tmp_tables.rate,5m)>{$MYSQL.CREATED_TMP_TABLES.MAX.WARN}` |WARNING | |
+|MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m) |<p>The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.</p> |`min(/MySQL by Zabbix agent 2/mysql.slow_queries.rate,5m)>{$MYSQL.SLOW_QUERIES.MAX.WARN}` |WARNING | |
+|MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m) |<p>-</p> |`min(/MySQL by Zabbix agent 2/mysql.replication.seconds_behind_master["{#MASTER_HOST}"],5m)>{$MYSQL.REPL_LAG.MAX.WARN}` |WARNING | |
+|MySQL: The slave I/O thread is not running |<p>Whether the I/O thread for reading the master's binary log is running.</p> |`count(/MySQL by Zabbix agent 2/mysql.replication.slave_io_running["{#MASTER_HOST}"],#1,"eq","No")=1` |AVERAGE | |
+|MySQL: The slave I/O thread is not connected to a replication master |<p>-</p> |`count(/MySQL by Zabbix agent 2/mysql.replication.slave_io_running["{#MASTER_HOST}"],#1,"ne","Yes")=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
+|MySQL: The SQL thread is not running |<p>Whether the SQL thread for executing events in the relay log is running.</p> |`count(/MySQL by Zabbix agent 2/mysql.replication.slave_sql_running["{#MASTER_HOST}"],#1,"eq","No")=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
 
 ## Feedback
 
diff --git a/templates/db/mysql_agent2/template_db_mysql_agent2.yaml b/templates/db/mysql_agent2/template_db_mysql_agent2.yaml
index 6abc3e50bce..cf42b8b2213 100644
--- a/templates/db/mysql_agent2/template_db_mysql_agent2.yaml
+++ b/templates/db/mysql_agent2/template_db_mysql_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:43Z'
+  version: '6.0'
+  date: '2021-12-16T07:08:41Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384189-discussion-thread-for-official-zabbix-template-db-mysql
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -743,7 +743,7 @@ zabbix_export:
           key: mysql.innodb_log_file_size
           history: 7d
           value_type: FLOAT
-          params: '(last(//mysql.innodb_os_log_written) - last(//mysql.innodb_os_log_written)) / {$MYSQL.INNODB_LOG_FILES}'
+          params: '(last(//mysql.innodb_os_log_written) - first(//mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}'
           description: 'Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.'
           preprocessing:
             -
@@ -1430,8 +1430,8 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: |
-                Whether the I/O thread for reading the master's binary log is running. 
-                Normally, you want this to be Yes unless you have not yet started a replication or have 
+                Whether the I/O thread for reading the master's binary log is running.
+                Normally, you want this to be Yes unless you have not yet started a replication or have
                 explicitly stopped it with STOP SLAVE.
               preprocessing:
                 -
@@ -1474,7 +1474,7 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: |
-                Whether the SQL thread for executing events in the relay log is running. 
+                Whether the SQL thread for executing events in the relay log is running.
                 As with the I/O thread, this should normally be Yes.
               preprocessing:
                 -
diff --git a/templates/db/mysql_odbc/README.md b/templates/db/mysql_odbc/README.md
index d90e484ebb4..8e2bfabb7ab 100644
--- a/templates/db/mysql_odbc/README.md
+++ b/templates/db/mysql_odbc/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template is developed for monitoring DBMS MySQL and its forks.
 
 
@@ -57,7 +57,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[databases,"{$MYSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- A: {#DATABASE} NOT_MATCHES_REGEX `information_schema`</p> |
+|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[databases,"{$MYSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- {#DATABASE} NOT_MATCHES_REGEX `information_schema`</p> |
 |Replication discovery |<p>If "show slave status" returns Master_Host, "Replication: *" items are created.</p> |ODBC |db.odbc.discovery[replication,"{$MYSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |MariaDB discovery |<p>Additional metrics if MariaDB is used.</p> |DEPENDENT |mysql.extra_metric.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value.search('MariaDB')>-1 ? [{'{#SINGLETON}': ''}] : []);`</p> |
 
@@ -68,53 +68,53 @@ There are no template links in this template.
 |MySQL |MySQL: Status | |ODBC |db.odbc.select[ping,"{$MYSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p><p>**Expression**:</p>`select "1"` |
 |MySQL |MySQL: Version | |ODBC |db.odbc.select[version,"{$MYSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Expression**:</p>`select version()` |
 |MySQL |MySQL: Uptime |<p>The amount of seconds that the server has been up.</p> |DEPENDENT |mysql.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Uptime')].Value.first()`</p> |
-|MySQL |MySQL: Aborted clients per second |<p>Number of connections that were aborted because the client died without closing the connection properly.</p> |DEPENDENT |mysql.aborted_clients.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Aborted_clients')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Aborted connections per second |<p>Number of failed attempts to connect to the MySQL server.</p> |DEPENDENT |mysql.aborted_connects.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Aborted_connects')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors accept per second |<p>Number of errors that occurred during calls to accept() on the listening port.</p> |DEPENDENT |mysql.connection_errors_accept.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_accept')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors internal per second |<p>Number of refused connections due to internal server errors, for example, out of memory errors, or failed thread starts.</p> |DEPENDENT |mysql.connection_errors_internal.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_internal')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors max connections per second |<p>Number of refused connections due to the max_connections limit being reached.</p> |DEPENDENT |mysql.connection_errors_max_connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_max_connections')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors peer address per second |<p>Number of errors while searching for the connecting client IP address.</p> |DEPENDENT |mysql.connection_errors_peer_address.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_peer_address')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors select per second |<p>Number of errors during calls to select() or poll() on the listening port. The client would not necessarily have been rejected in these cases.</p> |DEPENDENT |mysql.connection_errors_select.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_select')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connection errors tcpwrap per second |<p>Number of connections the libwrap library has refused.</p> |DEPENDENT |mysql.connection_errors_tcpwrap.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_tcpwrap')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Connections per second |<p>Number of connection attempts (successful or not) to the MySQL server.</p> |DEPENDENT |mysql.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connections')].Value.first()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Aborted clients per second |<p>Number of connections that were aborted because the client died without closing the connection properly.</p> |DEPENDENT |mysql.aborted_clients.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Aborted_clients')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Aborted connections per second |<p>Number of failed attempts to connect to the MySQL server.</p> |DEPENDENT |mysql.aborted_connects.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Aborted_connects')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors accept per second |<p>Number of errors that occurred during calls to accept() on the listening port.</p> |DEPENDENT |mysql.connection_errors_accept.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_accept')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors internal per second |<p>Number of refused connections due to internal server errors, for example, out of memory errors, or failed thread starts.</p> |DEPENDENT |mysql.connection_errors_internal.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_internal')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors max connections per second |<p>Number of refused connections due to the max_connections limit being reached.</p> |DEPENDENT |mysql.connection_errors_max_connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_max_connections')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors peer address per second |<p>Number of errors while searching for the connecting client IP address.</p> |DEPENDENT |mysql.connection_errors_peer_address.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_peer_address')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors select per second |<p>Number of errors during calls to select() or poll() on the listening port. The client would not necessarily have been rejected in these cases.</p> |DEPENDENT |mysql.connection_errors_select.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_select')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connection errors tcpwrap per second |<p>Number of connections the libwrap library has refused.</p> |DEPENDENT |mysql.connection_errors_tcpwrap.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connection_errors_tcpwrap')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Connections per second |<p>Number of connection attempts (successful or not) to the MySQL server.</p> |DEPENDENT |mysql.connections.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Connections')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Max used connections |<p>The maximum number of connections that have been in use simultaneously since the server start.</p> |DEPENDENT |mysql.max_used_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Max_used_connections')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: Threads cached |<p>Number of threads in the thread cache.</p> |DEPENDENT |mysql.threads_cached<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Threads_cached')].Value.first()`</p> |
 |MySQL |MySQL: Threads connected |<p>Number of currently open connections.</p> |DEPENDENT |mysql.threads_connected<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Threads_connected')].Value.first()`</p> |
-|MySQL |MySQL: Threads created per second |<p>Number of threads created to handle connections. If Threads_created is big, you may want to increase the thread_cache_size value. The cache miss rate can be calculated as Threads_created/Connections.</p> |DEPENDENT |mysql.threads_created.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Threads_created')].Value.first()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Threads created per second |<p>Number of threads created to handle connections. If Threads_created is big, you may want to increase the thread_cache_size value. The cache miss rate can be calculated as Threads_created/Connections.</p> |DEPENDENT |mysql.threads_created.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Threads_created')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Threads running |<p>Number of threads which are not sleeping.</p> |DEPENDENT |mysql.threads_running<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Threads_running')].Value.first()`</p> |
-|MySQL |MySQL: Buffer pool efficiency |<p>The item shows how effectively the buffer pool is serving reads.</p> |CALCULATED |mysql.buffer_pool_efficiency<p>**Expression**:</p>`last(mysql.innodb_buffer_pool_reads) /  ( last(mysql.innodb_buffer_pool_read_requests) +  ( last(mysql.innodb_buffer_pool_read_requests) = 0 ) ) * 100 *  ( last(mysql.innodb_buffer_pool_read_requests) > 0 )` |
-|MySQL |MySQL: Buffer pool utilization |<p>Ratio of used to total pages in the buffer pool.</p> |CALCULATED |mysql.buffer_pool_utilization<p>**Expression**:</p>`( last(mysql.innodb_buffer_pool_pages_total) -  last(mysql.innodb_buffer_pool_pages_free) ) /  ( last(mysql.innodb_buffer_pool_pages_total) +  ( last(mysql.innodb_buffer_pool_pages_total) = 0 ) ) * 100 *  ( last(mysql.innodb_buffer_pool_pages_total) > 0 )` |
-|MySQL |MySQL: Created tmp files on disk per second |<p>How many temporary files mysqld has created.</p> |DEPENDENT |mysql.created_tmp_files.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Created_tmp_files')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Created tmp tables on disk per second |<p>Number of internal on-disk temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_disk_tables.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Created_tmp_disk_tables')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Created tmp tables on memory per second |<p>Number of internal temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_tables.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Created_tmp_tables')].Value.first()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Buffer pool efficiency |<p>The item shows how effectively the buffer pool is serving reads.</p> |CALCULATED |mysql.buffer_pool_efficiency<p>**Expression**:</p>`last(//mysql.innodb_buffer_pool_reads) /  ( last(//mysql.innodb_buffer_pool_read_requests) +  ( last(//mysql.innodb_buffer_pool_read_requests) = 0 ) ) * 100 *  ( last(//mysql.innodb_buffer_pool_read_requests) > 0 ) ` |
+|MySQL |MySQL: Buffer pool utilization |<p>Ratio of used to total pages in the buffer pool.</p> |CALCULATED |mysql.buffer_pool_utilization<p>**Expression**:</p>`( last(//mysql.innodb_buffer_pool_pages_total) -  last(//mysql.innodb_buffer_pool_pages_free) ) /  ( last(//mysql.innodb_buffer_pool_pages_total) +  ( last(//mysql.innodb_buffer_pool_pages_total) = 0 ) ) * 100 *  ( last(//mysql.innodb_buffer_pool_pages_total) > 0 ) ` |
+|MySQL |MySQL: Created tmp files on disk per second |<p>How many temporary files mysqld has created.</p> |DEPENDENT |mysql.created_tmp_files.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Created_tmp_files')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Created tmp tables on disk per second |<p>Number of internal on-disk temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_disk_tables.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Created_tmp_disk_tables')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Created tmp tables on memory per second |<p>Number of internal temporary tables created by the server while executing statements.</p> |DEPENDENT |mysql.created_tmp_tables.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Created_tmp_tables')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: InnoDB buffer pool pages free |<p>The total size of the InnoDB buffer pool, in pages.</p> |DEPENDENT |mysql.innodb_buffer_pool_pages_free<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_buffer_pool_pages_free')].Value.first()`</p> |
 |MySQL |MySQL: InnoDB buffer pool pages total |<p>The total size of the InnoDB buffer pool, in pages.</p> |DEPENDENT |mysql.innodb_buffer_pool_pages_total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_buffer_pool_pages_total')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MySQL |MySQL: InnoDB buffer pool read requests per second |<p>Number of logical read requests per second.</p> |DEPENDENT |mysql.innodb_buffer_pool_read_requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_buffer_pool_read_requests')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: InnoDB buffer pool reads per second |<p>Number of logical reads per second that InnoDB could not satisfy from the buffer pool, and had to read directly from the disk.</p> |DEPENDENT |mysql.innodb_buffer_pool_reads.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_buffer_pool_reads')].Value.first()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: InnoDB buffer pool read requests per second |<p>Number of logical read requests per second.</p> |DEPENDENT |mysql.innodb_buffer_pool_read_requests.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_buffer_pool_read_requests')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: InnoDB buffer pool reads per second |<p>Number of logical reads per second that InnoDB could not satisfy from the buffer pool, and had to read directly from the disk.</p> |DEPENDENT |mysql.innodb_buffer_pool_reads.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_buffer_pool_reads')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: InnoDB row lock time |<p>The total time spent in acquiring row locks for InnoDB tables, in milliseconds.</p> |DEPENDENT |mysql.innodb_row_lock_time<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_row_lock_time')].Value.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: InnoDB row lock time max |<p>The maximum time to acquire a row lock for InnoDB tables, in milliseconds.</p> |DEPENDENT |mysql.innodb_row_lock_time_max<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_row_lock_time_max')].Value.first()`</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: InnoDB row lock waits |<p>Number of times operations on InnoDB tables had to wait for a row lock.</p> |DEPENDENT |mysql.innodb_row_lock_waits<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_row_lock_waits')].Value.first()`</p> |
-|MySQL |MySQL: Slow queries per second |<p>Number of queries that have taken more than long_query_time seconds.</p> |DEPENDENT |mysql.slow_queries.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Slow_queries')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Bytes received |<p>Number of bytes received from all clients.</p> |DEPENDENT |mysql.bytes_received.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Bytes_received')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Bytes sent |<p>Number of bytes sent to all clients.</p> |DEPENDENT |mysql.bytes_sent.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Bytes_sent')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Delete per second |<p>The Com_delete counter variable indicates the number of times the delete statement has been executed.</p> |DEPENDENT |mysql.com_delete.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Com_delete')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Insert per second |<p>The Com_insert counter variable indicates the number of times the insert statement has been executed.</p> |DEPENDENT |mysql.com_insert.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Com_insert')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Select per second |<p>The Com_select counter variable indicates the number of times the select statement has been executed.</p> |DEPENDENT |mysql.com_select.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Com_select')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Command Update per second |<p>The Com_update counter variable indicates the number of times the update statement has been executed.</p> |DEPENDENT |mysql.com_update.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Com_update')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Queries per second |<p>Number of statements executed by the server. This variable includes statements executed within stored programs, unlike the Questions variable.</p> |DEPENDENT |mysql.queries.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Queries')].Value.first()`</p><p>- CHANGE_PER_SECOND |
-|MySQL |MySQL: Questions per second |<p>Number of statements executed by the server. This includes only statements sent to the server by clients and not statements executed within stored programs, unlike the Queries variable.</p> |DEPENDENT |mysql.questions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Questions')].Value.first()`</p><p>- CHANGE_PER_SECOND |
+|MySQL |MySQL: Slow queries per second |<p>Number of queries that have taken more than long_query_time seconds.</p> |DEPENDENT |mysql.slow_queries.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Slow_queries')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Bytes received |<p>Number of bytes received from all clients.</p> |DEPENDENT |mysql.bytes_received.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Bytes_received')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Bytes sent |<p>Number of bytes sent to all clients.</p> |DEPENDENT |mysql.bytes_sent.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Bytes_sent')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Delete per second |<p>The Com_delete counter variable indicates the number of times the delete statement has been executed.</p> |DEPENDENT |mysql.com_delete.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Com_delete')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Insert per second |<p>The Com_insert counter variable indicates the number of times the insert statement has been executed.</p> |DEPENDENT |mysql.com_insert.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Com_insert')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Select per second |<p>The Com_select counter variable indicates the number of times the select statement has been executed.</p> |DEPENDENT |mysql.com_select.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Com_select')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Command Update per second |<p>The Com_update counter variable indicates the number of times the update statement has been executed.</p> |DEPENDENT |mysql.com_update.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Com_update')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Queries per second |<p>Number of statements executed by the server. This variable includes statements executed within stored programs, unlike the Questions variable.</p> |DEPENDENT |mysql.queries.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Queries')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|MySQL |MySQL: Questions per second |<p>Number of statements executed by the server. This includes only statements sent to the server by clients and not statements executed within stored programs, unlike the Queries variable.</p> |DEPENDENT |mysql.questions.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Questions')].Value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |MySQL |MySQL: Binlog cache disk use |<p>Number of transactions that used a temporary disk cache because they could not fit in the regular binary log cache, being larger than binlog_cache_size.</p> |DEPENDENT |mysql.binlog_cache_disk_use<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Binlog_cache_disk_use')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb buffer pool wait free |<p>Number of times InnoDB waited for a free page before reading or creating a page. Normally, writes to the InnoDB buffer pool happen in the background. When no clean pages are available, dirty pages are flushed first in order to free some up. This counts the numbers of wait for this operation to finish. If this value is not small, look at the increasing innodb_buffer_pool_size.</p> |DEPENDENT |mysql.innodb_buffer_pool_wait_free<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_buffer_pool_wait_free')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb number open files |<p>Number of open files held by InnoDB. InnoDB only.</p> |DEPENDENT |mysql.innodb_num_open_files<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_num_open_files')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Open table definitions |<p>Number of cached table definitions.</p> |DEPENDENT |mysql.open_table_definitions<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Open_table_definitions')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Open tables |<p>Number of tables that are open.</p> |DEPENDENT |mysql.open_tables<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Open_tables')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Innodb log written |<p>Number of bytes written to the InnoDB log.</p> |DEPENDENT |mysql.innodb_os_log_written<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Innodb_os_log_written')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|MySQL |MySQL: Calculated value of innodb_log_file_size |<p>Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.</p> |CALCULATED |mysql.innodb_log_file_size<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Expression**:</p>`(last(mysql.innodb_os_log_written) - last(mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}` |
+|MySQL |MySQL: Calculated value of innodb_log_file_size |<p>Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.</p> |CALCULATED |mysql.innodb_log_file_size<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Expression**:</p>`(last(//mysql.innodb_os_log_written) - first(//mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}` |
 |MySQL |MySQL: Size of database {#DATABASE} |<p>-</p> |ODBC |db.odbc.select[{#DATABASE}_size,"{$MYSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Expression**:</p>`The text is too long. Please see the template.` |
 |MySQL |MySQL: Replication Slave SQL Running State {#MASTER_HOST} |<p>This shows the state of the SQL driver threads.</p> |DEPENDENT |mysql.slave_sql_running_state["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.Master_Host=='{#MASTER_HOST}')]['Slave_SQL_Running_State'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |MySQL |MySQL: Replication Seconds Behind Master {#MASTER_HOST} |<p>The amount of seconds the slave SQL thread has been behind processing the master binary log.</p><p>A high number (or an increasing one) can indicate that the slave is unable to handle events</p><p>from the master in a timely fashion.</p> |DEPENDENT |mysql.seconds_behind_master["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.Master_Host=='{#MASTER_HOST}')]['Seconds_Behind_Master'].first()`</p><p>- MATCHES_REGEX: `\d+`</p><p>⛔️ON_FAIL: `CUSTOM_ERROR -> Replication is not performed.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MySQL |MySQL: Replication Slave IO Running {#MASTER_HOST} |<p>Whether the I/O thread for reading the master's binary log is running. </p><p>Normally, you want this to be Yes unless you have not yet started a replication or have </p><p>explicitly stopped it with STOP SLAVE.</p> |DEPENDENT |mysql.slave_io_running["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.Master_Host=='{#MASTER_HOST}')]['Slave_IO_Running'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|MySQL |MySQL: Replication Slave SQL Running {#MASTER_HOST} |<p>Whether the SQL thread for executing events in the relay log is running. </p><p>As with the I/O thread, this should normally be Yes.</p> |DEPENDENT |mysql.slave_sql_running["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.Master_Host=='{#MASTER_HOST}')]['Slave_SQL_Running'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|MySQL |MySQL: Replication Slave IO Running {#MASTER_HOST} |<p>Whether the I/O thread for reading the master's binary log is running.</p><p>Normally, you want this to be Yes unless you have not yet started a replication or have</p><p>explicitly stopped it with STOP SLAVE.</p> |DEPENDENT |mysql.slave_io_running["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.Master_Host=='{#MASTER_HOST}')]['Slave_IO_Running'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|MySQL |MySQL: Replication Slave SQL Running {#MASTER_HOST} |<p>Whether the SQL thread for executing events in the relay log is running.</p><p>As with the I/O thread, this should normally be Yes.</p> |DEPENDENT |mysql.slave_sql_running["{#MASTER_HOST}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.Master_Host=='{#MASTER_HOST}')]['Slave_SQL_Running'].first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |MySQL |MySQL: Binlog commits |<p>Total number of transactions committed to the binary log.</p> |DEPENDENT |mysql.binlog_commits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Binlog_commits')].Value.first()`</p> |
 |MySQL |MySQL: Binlog group commits |<p>Total number of group commits done to the binary log.</p> |DEPENDENT |mysql.binlog_group_commits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Binlog_group_commits')].Value.first()`</p> |
 |MySQL |MySQL: Master GTID wait count |<p>The number of times MASTER_GTID_WAIT called.</p> |DEPENDENT |mysql.master_gtid_wait_count[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.Variable_name=='Master_gtid_wait_count')].Value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -129,21 +129,21 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|MySQL: Service is down | |`{TEMPLATE_NAME:db.odbc.select[ping,"{$MYSQL.DSN}"].last()}=0` |HIGH | |
-|MySQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>MySQL version has changed. Ack to close.</p> |`{TEMPLATE_NAME:db.odbc.select[version,"{$MYSQL.DSN}"].diff()}=1 and {TEMPLATE_NAME:db.odbc.select[version,"{$MYSQL.DSN}"].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|MySQL: Service has been restarted (uptime < 10m) |<p>MySQL uptime is less than 10 minutes.</p> |`{TEMPLATE_NAME:mysql.uptime.last()}<10m` |INFO | |
-|MySQL: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`{TEMPLATE_NAME:mysql.uptime.nodata(30m)}=1` |INFO |<p>**Depends on**:</p><p>- MySQL: Service is down</p> |
-|MySQL: Server has aborted connections (over {$MYSQL.ABORTED_CONN.MAX.WARN} for 5m) |<p>The number of failed attempts to connect to the MySQL server is more than {$MYSQL.ABORTED_CONN.MAX.WARN} in the last 5 minutes.</p> |`{TEMPLATE_NAME:mysql.aborted_connects.rate.min(5m)}>{$MYSQL.ABORTED_CONN.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- MySQL: Refused connections (max_connections limit reached)</p> |
-|MySQL: Refused connections (max_connections limit reached) |<p>Number of refused connections due to the max_connections limit being reached.</p> |`{TEMPLATE_NAME:mysql.connection_errors_max_connections.rate.last()}>0` |AVERAGE | |
-|MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m) |<p>The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.</p> |`{TEMPLATE_NAME:mysql.buffer_pool_utilization.max(5m)}<{$MYSQL.BUFF_UTIL.MIN.WARN}` |WARNING | |
-|MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_files.rate.min(5m)}>{$MYSQL.CREATED_TMP_FILES.MAX.WARN}` |WARNING | |
-|MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_disk_tables.rate.min(5m)}>{$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN}` |WARNING | |
-|MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`{TEMPLATE_NAME:mysql.created_tmp_tables.rate.min(5m)}>{$MYSQL.CREATED_TMP_TABLES.MAX.WARN}` |WARNING | |
-|MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m) |<p>The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.</p> |`{TEMPLATE_NAME:mysql.slow_queries.rate.min(5m)}>{$MYSQL.SLOW_QUERIES.MAX.WARN}` |WARNING | |
-|MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:mysql.seconds_behind_master["{#MASTER_HOST}"].min(5m)}>{$MYSQL.REPL_LAG.MAX.WARN}` |WARNING | |
-|MySQL: The slave I/O thread is not running |<p>Whether the I/O thread for reading the master's binary log is running.</p> |`{TEMPLATE_NAME:mysql.slave_io_running["{#MASTER_HOST}"].count(#1,"No",eq)}=1` |AVERAGE | |
-|MySQL: The slave I/O thread is not connected to a replication master |<p>-</p> |`{TEMPLATE_NAME:mysql.slave_io_running["{#MASTER_HOST}"].count(#1,"Yes",ne)}=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
-|MySQL: The SQL thread is not running |<p>Whether the SQL thread for executing events in the relay log is running.</p> |`{TEMPLATE_NAME:mysql.slave_sql_running["{#MASTER_HOST}"].count(#1,"No",eq)}=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
+|MySQL: Service is down |<p>-</p> |`last(/MySQL by ODBC/db.odbc.select[ping,"{$MYSQL.DSN}"])=0` |HIGH | |
+|MySQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>MySQL version has changed. Ack to close.</p> |`last(/MySQL by ODBC/db.odbc.select[version,"{$MYSQL.DSN}"],#1)<>last(/MySQL by ODBC/db.odbc.select[version,"{$MYSQL.DSN}"],#2) and length(last(/MySQL by ODBC/db.odbc.select[version,"{$MYSQL.DSN}"]))>0` |INFO |<p>Manual close: YES</p> |
+|MySQL: Service has been restarted (uptime < 10m) |<p>MySQL uptime is less than 10 minutes.</p> |`last(/MySQL by ODBC/mysql.uptime)<10m` |INFO | |
+|MySQL: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/MySQL by ODBC/mysql.uptime,30m)=1` |INFO |<p>**Depends on**:</p><p>- MySQL: Service is down</p> |
+|MySQL: Server has aborted connections (over {$MYSQL.ABORTED_CONN.MAX.WARN} for 5m) |<p>The number of failed attempts to connect to the MySQL server is more than {$MYSQL.ABORTED_CONN.MAX.WARN} in the last 5 minutes.</p> |`min(/MySQL by ODBC/mysql.aborted_connects.rate,5m)>{$MYSQL.ABORTED_CONN.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- MySQL: Refused connections (max_connections limit reached)</p> |
+|MySQL: Refused connections (max_connections limit reached) |<p>Number of refused connections due to the max_connections limit being reached.</p> |`last(/MySQL by ODBC/mysql.connection_errors_max_connections.rate)>0` |AVERAGE | |
+|MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m) |<p>The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.</p> |`max(/MySQL by ODBC/mysql.buffer_pool_utilization,5m)<{$MYSQL.BUFF_UTIL.MIN.WARN}` |WARNING | |
+|MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by ODBC/mysql.created_tmp_files.rate,5m)>{$MYSQL.CREATED_TMP_FILES.MAX.WARN}` |WARNING | |
+|MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by ODBC/mysql.created_tmp_disk_tables.rate,5m)>{$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN}` |WARNING | |
+|MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m) |<p>Possibly the application using the database is in need of query optimization.</p> |`min(/MySQL by ODBC/mysql.created_tmp_tables.rate,5m)>{$MYSQL.CREATED_TMP_TABLES.MAX.WARN}` |WARNING | |
+|MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m) |<p>The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.</p> |`min(/MySQL by ODBC/mysql.slow_queries.rate,5m)>{$MYSQL.SLOW_QUERIES.MAX.WARN}` |WARNING | |
+|MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m) |<p>-</p> |`min(/MySQL by ODBC/mysql.seconds_behind_master["{#MASTER_HOST}"],5m)>{$MYSQL.REPL_LAG.MAX.WARN}` |WARNING | |
+|MySQL: The slave I/O thread is not running |<p>Whether the I/O thread for reading the master's binary log is running.</p> |`count(/MySQL by ODBC/mysql.slave_io_running["{#MASTER_HOST}"],#1,"eq","No")=1` |AVERAGE | |
+|MySQL: The slave I/O thread is not connected to a replication master |<p>-</p> |`count(/MySQL by ODBC/mysql.slave_io_running["{#MASTER_HOST}"],#1,"ne","Yes")=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
+|MySQL: The SQL thread is not running |<p>Whether the SQL thread for executing events in the relay log is running.</p> |`count(/MySQL by ODBC/mysql.slave_sql_running["{#MASTER_HOST}"],#1,"eq","No")=1` |WARNING |<p>**Depends on**:</p><p>- MySQL: The slave I/O thread is not running</p> |
 
 ## Feedback
 
diff --git a/templates/db/mysql_odbc/template_db_mysql_odbc.yaml b/templates/db/mysql_odbc/template_db_mysql_odbc.yaml
index cd22b2a479c..3de7300b43f 100644
--- a/templates/db/mysql_odbc/template_db_mysql_odbc.yaml
+++ b/templates/db/mysql_odbc/template_db_mysql_odbc.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:39Z'
+  version: '6.0'
+  date: '2021-12-16T07:08:45Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -15,13 +15,13 @@ zabbix_export:
         1. Create MySQL user for monitoring. For example:
         CREATE USER 'zbx_monitor'@'%' IDENTIFIED BY '<password>';
         GRANT REPLICATION CLIENT,PROCESS,SHOW DATABASES,SHOW VIEW ON *.* TO 'zbx_monitor'@'%';
-        For more information read the MYSQL documentation https://dev.mysql.com/doc/refman/8.0/en/grant.html , please. 
+        For more information read the MYSQL documentation https://dev.mysql.com/doc/refman/8.0/en/grant.html , please.
         2. Set the user name and password in host macros ({$MYSQL.USER} and {$MYSQL.PASSWORD}).
         
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384189-discussion-thread-for-official-zabbix-template-db-mysql
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -797,7 +797,7 @@ zabbix_export:
           key: mysql.innodb_log_file_size
           history: 7d
           value_type: FLOAT
-          params: '(last(//mysql.innodb_os_log_written) - last(//mysql.innodb_os_log_written)) / {$MYSQL.INNODB_LOG_FILES}'
+          params: '(last(//mysql.innodb_os_log_written) - first(//mysql.innodb_os_log_written,1h)) / {$MYSQL.INNODB_LOG_FILES}'
           description: 'Calculated by (innodb_os_log_written-innodb_os_log_written(time shift -1h))/{$MYSQL.INNODB_LOG_FILES} value of the innodb_log_file_size. Innodb_log_file_size is the size in bytes of the each InnoDB redo log file in the log group. The combined size can be no more than 512GB. Larger values mean less disk I/O due to less flushing checkpoint activity, but also slower recovery from a crash.'
           preprocessing:
             -
@@ -1322,8 +1322,8 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: |
-                Whether the I/O thread for reading the master's binary log is running. 
-                Normally, you want this to be Yes unless you have not yet started a replication or have 
+                Whether the I/O thread for reading the master's binary log is running.
+                Normally, you want this to be Yes unless you have not yet started a replication or have
                 explicitly stopped it with STOP SLAVE.
               preprocessing:
                 -
@@ -1366,7 +1366,7 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: |
-                Whether the SQL thread for executing events in the relay log is running. 
+                Whether the SQL thread for executing events in the relay log is running.
                 As with the I/O thread, this should normally be Yes.
               preprocessing:
                 -
diff --git a/templates/db/oracle_agent2/README.md b/templates/db/oracle_agent2/README.md
index cad4085cb9b..1c6a1f680d3 100644
--- a/templates/db/oracle_agent2/README.md
+++ b/templates/db/oracle_agent2/README.md
@@ -3,12 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
-The template is developed for monitoring DBMS Oracle Database single instance via Zabbix Agent2.
+For Zabbix version: 6.0 and higher  
+The template is developed for monitoring DBMS Oracle Database single instance via Zabbix agent 2.
 
 This template was tested on:
 
-- Zabbix, version 5.4
 - Oracle Database, version 12c2, 18c, 19c
 
 ## Setup
@@ -34,7 +33,7 @@ No specific Zabbix configuration is required.
 |{$ORACLE.ASM.USED.PCT.MAX.HIGH} |<p>Maximum percentage of used ASM disk group for high trigger expression.</p> |`95` |
 |{$ORACLE.ASM.USED.PCT.MAX.WARN} |<p>Maximum percentage of used ASM disk group for warning trigger expression.</p> |`90` |
 |{$ORACLE.CONCURRENCY.MAX.WARN} |<p>Maximum percentage of sessions concurrency usage for trigger expression.</p> |`80` |
-|{$ORACLE.CONNSTRING} | |`tcp://localhost:1521` |
+|{$ORACLE.CONNSTRING} |<p>-</p> |`tcp://localhost:1521` |
 |{$ORACLE.DB.FILE.MAX.WARN} |<p>Maximum percentage of database files for trigger expression.</p> |`80` |
 |{$ORACLE.DBNAME.MATCHES} |<p>This macro is used in database discovery. It can be overridden on the host or linked template level.</p> |`.*` |
 |{$ORACLE.DBNAME.NOT_MATCHES} |<p>This macro is used in database discovery. It can be overridden on a host or linked template level.</p> |`PDB\$SEED` |
@@ -44,8 +43,8 @@ No specific Zabbix configuration is required.
 |{$ORACLE.PROCESSES.MAX.WARN} |<p>Maximum percentage of active processes alert threshold (for trigger expression).</p> |`80` |
 |{$ORACLE.REDO.MIN.WARN} |<p>Minimum number of REDO logs alert threshold (for trigger expression).</p> |`3` |
 |{$ORACLE.SERVICE} |<p>Oracle Service Name</p> |`ORA` |
-|{$ORACLE.SESSION.LOCK.MAX.TIME} |<p>Maximum session lock duration in seconds for count the session as a prolongely locked query.</p> |`600` |
-|{$ORACLE.SESSION.LONG.LOCK.MAX.WARN} |<p>Maximum number of the prolongely locked sessions alert threshold (for trigger expression).</p> |`3` |
+|{$ORACLE.SESSION.LOCK.MAX.TIME} |<p>Maximum session lock duration in seconds for count the session as a prolongedly locked query.</p> |`600` |
+|{$ORACLE.SESSION.LONG.LOCK.MAX.WARN} |<p>Maximum number of the prolongedly locked sessions alert threshold (for trigger expression).</p> |`3` |
 |{$ORACLE.SESSIONS.LOCK.MAX.WARN} |<p>Maximum percentage of locked sessions alert threshold (for trigger expression).</p> |`20` |
 |{$ORACLE.SESSIONS.MAX.WARN} |<p>Maximum percentage of active sessions alert threshold (for trigger expression).</p> |`80` |
 |{$ORACLE.SHARED.FREE.MIN.WARN} |<p>Minimum percentage of free shared pool alert threshold (for trigger expression).</p> |`5` |
@@ -65,9 +64,9 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Scanning databases in DBMS.</p> |ZABBIX_PASSIVE |oracle.db.discovery["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
-|PDB discovery |<p>Scanning PDB in DBMS.</p> |ZABBIX_PASSIVE |oracle.pdb.discovery["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
-|Tablespace discovery |<p>Scanning tablespaces in DBMS.</p> |ZABBIX_PASSIVE |oracle.ts.discovery["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]<p>**Filter**:</p>AND <p>- A: {#TABLESPACE} MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.MATCHES}`</p><p>- B: {#TABLESPACE} NOT_MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.NOT_MATCHES}`</p> |
+|Database discovery |<p>Scanning databases in DBMS.</p> |ZABBIX_PASSIVE |oracle.db.discovery["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
+|PDB discovery |<p>Scanning PDB in DBMS.</p> |ZABBIX_PASSIVE |oracle.pdb.discovery["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
+|Tablespace discovery |<p>Scanning tablespaces in DBMS.</p> |ZABBIX_PASSIVE |oracle.ts.discovery["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]<p>**Filter**:</p>AND <p>- {#TABLESPACE} MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.MATCHES}`</p><p>- {#TABLESPACE} NOT_MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.NOT_MATCHES}`</p> |
 |Archive log discovery |<p>Log archive destinations.</p> |ZABBIX_PASSIVE |oracle.archive.discovery["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
 |ASM disk groups discovery |<p>ASM disk groups</p> |ZABBIX_PASSIVE |oracle.diskgroups.discovery["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
 
@@ -117,7 +116,7 @@ There are no template links in this template.
 |Oracle |Oracle: Active background sessions |<p>The number of active background sessions.</p> |DEPENDENT |oracle.session_active_background<p>**Preprocessing**:</p><p>- JSONPATH: `$.active_background`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |Oracle |Oracle: Inactive user sessions |<p>The number of inactive user sessions.</p> |DEPENDENT |oracle.session_inactive_user<p>**Preprocessing**:</p><p>- JSONPATH: `$.inactive_user`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |Oracle |Oracle: Sessions lock rate |<p>The percentage of locked sessions. Locks are mechanisms that prevent destructive interaction between transactions accessing the same resource—either user objects such as tables and rows or system objects not visible to users, such as shared data structures in memory and data dictionary rows.</p> |DEPENDENT |oracle.session_lock_rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.lock_rate`</p> |
-|Oracle |Oracle: Sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s |<p>Count of the prolongely locked sessions. (You can change maximum session lock duration in seconds for query by {$ORACLE.SESSION.LOCK.MAX.TIME} macro. Default 600 sec)</p> |DEPENDENT |oracle.session_long_time_locked<p>**Preprocessing**:</p><p>- JSONPATH: `$.long_time_locked`</p> |
+|Oracle |Oracle: Sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s |<p>Count of the prolongedly locked sessions. (You can change maximum session lock duration in seconds for query by {$ORACLE.SESSION.LOCK.MAX.TIME} macro. Default 600 sec)</p> |DEPENDENT |oracle.session_long_time_locked<p>**Preprocessing**:</p><p>- JSONPATH: `$.long_time_locked`</p> |
 |Oracle |Oracle: Sessions concurrency |<p>The percentage of concurrency. Concurrency is a DB behaviour when different transactions request to change the same resource - in case of modifying data transactions sequentially block temporarily the right to change data, the rest of the transactions are waiting for access. In the case when access for resource is locked for a long time, then the concurrency grows (like the transaction queue) and this often has an extremely negative impact on performance. A high contention value does not indicate the root cause of the problem, but is a signal to search for it.</p> |DEPENDENT |oracle.session_concurrency_rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.concurrency_rate`</p> |
 |Oracle |Oracle: PGA, Total inuse |<p>Indicates how much PGA memory is currently consumed by work areas. This number can be used to determine how much memory is consumed by other consumers of the PGA memory (for example, PL/SQL or Java).</p> |DEPENDENT |oracle.total_pga_used<p>**Preprocessing**:</p><p>- JSONPATH: `$.['total PGA inuse']`</p> |
 |Oracle |Oracle: PGA, Aggregate target parameter |<p>Current value of the PGA_AGGREGATE_TARGET initialization parameter. If this parameter is not set, then its value is 0 and automatic management of PGA memory is disabled.</p> |DEPENDENT |oracle.pga_target<p>**Preprocessing**:</p><p>- JSONPATH: `$.['aggregate PGA target parameter']`</p> |
@@ -154,7 +153,7 @@ There are no template links in this template.
 |Oracle |Oracle TBS '{#TABLESPACE}': Open status |<p>Tablespace status. 1 - 'ONLINE' 2 - 'OFFLINE' 3- 'READ ONLY'</p> |DEPENDENT |oracle.tbs_status["{#TABLESPACE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#TABLESPACE}'].status.first()`</p> |
 |Oracle |Archivelog '{#DEST_NAME}': Error |<p>Displays the error text</p> |DEPENDENT |oracle.archivelog_error["{#DEST_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#DEST_NAME}'].error.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Oracle |Archivelog '{#DEST_NAME}': Last sequence |<p>Identifies the sequence number of the last archived redo log to be archived</p> |DEPENDENT |oracle.archivelog_log_sequence["{#DEST_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#DEST_NAME}'].log_sequence.first()`</p> |
-|Oracle |Archivelog '{#DEST_NAME}': Status |<p> Identifies the current status of the destination: 1 - 'Valid', 2 - 'Dederred',3 - 'Error', 0 - 'Unknown'</p> |DEPENDENT |oracle.archivelog_log_status["{#DEST_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#DEST_NAME}'].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Oracle |Archivelog '{#DEST_NAME}': Status |<p> Identifies the current status of the destination: 1 - 'Valid', 2 - 'Deferred',3 - 'Error', 0 - 'Unknown'</p> |DEPENDENT |oracle.archivelog_log_status["{#DEST_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#DEST_NAME}'].status.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Oracle |ASM '{#DG_NAME}': Total size |<p>Total size of ASM disk group.</p> |DEPENDENT |oracle.asm_total_size["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#DG_NAME}'].size_byte.first()`</p> |
 |Oracle |ASM '{#DG_NAME}': Free size |<p>Free size of ASM disk group.</p> |DEPENDENT |oracle.asm_free_size["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#DG_NAME}'].free_size_byte.first()`</p> |
 |Oracle |ASM '{#DG_NAME}': Free size |<p>Usage percent of ASM disk group.</p> |DEPENDENT |oracle.asm_used_pct["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#DG_NAME}'].used_percent.first()`</p> |
@@ -166,8 +165,8 @@ There are no template links in this template.
 |Zabbix_raw_items |Oracle: Get FRA stats |<p>Get FRA statistics.</p> |ZABBIX_PASSIVE |oracle.fra.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
 |Zabbix_raw_items |Oracle: Get SGA stats |<p>Get SGA statistics.</p> |ZABBIX_PASSIVE |oracle.sga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
 |Zabbix_raw_items |Oracle: Get tablespaces stats |<p>Get tablespaces stats.</p> |ZABBIX_PASSIVE |oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
-|Zabbix_raw_items |Oracle: Get CDB and No-CDB info |<p>Get info about CDB and  No-CDB databases on instansce.</p> |ZABBIX_PASSIVE |oracle.cdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
-|Zabbix_raw_items |Oracle: Get PDB info |<p>Get info about PDB databases on instansce.</p> |ZABBIX_PASSIVE |oracle.pdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
+|Zabbix_raw_items |Oracle: Get CDB and No-CDB info |<p>Get info about CDB and  No-CDB databases on instance.</p> |ZABBIX_PASSIVE |oracle.cdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
+|Zabbix_raw_items |Oracle: Get PDB info |<p>Get info about PDB databases on instance.</p> |ZABBIX_PASSIVE |oracle.pdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
 |Zabbix_raw_items |Oracle: Get archive log info | |ZABBIX_PASSIVE |oracle.archive.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
 |Zabbix_raw_items |Oracle: Get ASM stats |<p>Get ASM disk groups stats.</p> |ZABBIX_PASSIVE |oracle.diskgroups.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"] |
 
@@ -175,37 +174,37 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Oracle: Connection to database is unavailable |<p>Connection to Oracle Database is currently unavailable.</p> |`{TEMPLATE_NAME:oracle.ping["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"].last()}=0` |DISASTER | |
-|Oracle: Version has changed (new version value received: {ITEM.VALUE}) |<p>Oracle DB version has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.version.diff()}=1 and {TEMPLATE_NAME:oracle.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Oracle: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 5 minutes. The database might be unavailable for connecting.</p> |`{TEMPLATE_NAME:oracle.uptime.nodata(30m)}=1` |INFO | |
-|Oracle: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:oracle.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Oracle: Instance name has changed (new name received: {ITEM.VALUE}) |<p>Oracle DB Instance name has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.instance_name.diff()}=1 and {TEMPLATE_NAME:oracle.instance_name.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Oracle: Instance hostname has changed (new hostname received: {ITEM.VALUE}) |<p>Oracle DB Instance hostname has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.instance_hostname.diff()}=1 and {TEMPLATE_NAME:oracle.instance_hostname.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Oracle: Shared pool free is too low (less {$ORACLE.SHARED.FREE.MIN.WARN}% for 5m) |<p>The shared pool free memory percent has been less than {$ORACLE.SHARED.FREE.MIN.WARN}% in the last 5 minutes.</p> |`{TEMPLATE_NAME:oracle.shared_pool_free.max(5m)}<{$ORACLE.SHARED.FREE.MIN.WARN}` |WARNING | |
-|Oracle: Too many active sessions (over {$ORACLE.SESSIONS.MAX.WARN}% for 5 min) |<p>Active sessions are using more than {$ORACLE.SESSIONS.MAX.WARN}% of the available sessions.</p> |`{TEMPLATE_NAME:oracle.session_count.min(5m)} * 100 / {Oracle by Zabbix Agent 2:oracle.session_limit.last()} > {$ORACLE.SESSIONS.MAX.WARN}` |WARNING | |
-|Oracle: Too many locked sessions (over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% for 5 min) |<p>Number of locked sessions is over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% of the running sessions.</p> |`{TEMPLATE_NAME:oracle.session_lock_rate.min(5m)} > {$ORACLE.SESSIONS.LOCK.MAX.WARN}` |WARNING | |
-|Oracle: Too many sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s (over {$ORACLE.SESSION.LONG.LOCK.MAX.WARN} for 5 min) |<p>Number of sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME} seconds is too high. Long-term locks can negatively affect database performance, therefore, if they are detected, you should first find the most difficult queries from the database point of view and analyze possible resource leaks.</p> |`{TEMPLATE_NAME:oracle.session_long_time_locked.min(5m)} > {$ORACLE.SESSION.LONG.LOCK.MAX.WARN}` |WARNING | |
-|Oracle: Too high database concurrency (over {$ORACLE.CONCURRENCY.MAX.WARN}% for 5 min) |<p>Concurrency rate is over {$ORACLE.CONCURRENCY.MAX.WARN}%. A high contention value does not indicate the root cause of the problem, but is a signal to search for it. In the case of high competition, an analysis of resource consumption should be carried out, the most "heavy" queries made in the database, possibly - session tracing. All this will help determine the root cause and possible optimization points both in the database configuration and in the logic of building queries of the application itself.</p> |`{TEMPLATE_NAME:oracle.session_concurrency_rate.min(5m)} > {$ORACLE.CONCURRENCY.MAX.WARN}` |WARNING | |
-|Oracle: Total PGA inuse is too high (over {$ORACLE.PGA.USE.MAX.WARN}% for 5 min) |<p>Total PGA in use is more than {$ORACLE.PGA.USE.MAX.WARN}% of PGA_AGGREGATE_TARGET.</p> |`{TEMPLATE_NAME:oracle.total_pga_used.min(5m)} * 100 / {Oracle by Zabbix Agent 2:oracle.pga_target.last()} > {$ORACLE.PGA.USE.MAX.WARN}` |WARNING | |
-|Oracle: Zabbix account will expire soon (under {$ORACLE.EXPIRE.PASSWORD.MIN.WARN} days) |<p>Password for zabbix user in the database will expire soon.</p> |`{TEMPLATE_NAME:oracle.user.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"].last()}  < {$ORACLE.EXPIRE.PASSWORD.MIN.WARN}` |WARNING | |
-|Oracle: Number of REDO logs available for switching is too low (less {$ORACLE.REDO.MIN.WARN} for 5 min) |<p>Number of available for log switching inactive/unused REDOs is low (Database down risk)</p> |`{TEMPLATE_NAME:oracle.redolog.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"].max(5m)} < {$ORACLE.REDO.MIN.WARN}` |WARNING | |
-|Oracle: Too many active processes (over {$ORACLE.PROCESSES.MAX.WARN}% for 5 min) |<p>Active processes are using more than {$ORACLE.PROCESSES.MAX.WARN}% of the available number of processes.</p> |`{TEMPLATE_NAME:oracle.proc.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"].min(5m)} * 100 / {Oracle by Zabbix Agent 2:oracle.processes_limit.last()} > {$ORACLE.PROCESSES.MAX.WARN}` |WARNING | |
-|Oracle: Too many database files (over {$ORACLE.DB.FILE.MAX.WARN}% for 5 min) |<p>Number of datafiles is higher than {$ORACLE.DB.FILE.MAX.WARN}% of the available datafile files limit.</p> |`{TEMPLATE_NAME:oracle.datafiles.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"].min(5m)} * 100 / {Oracle by Zabbix Agent 2:oracle.db_files_limit.last()} > {$ORACLE.DB.FILE.MAX.WARN}` |WARNING | |
-|Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`{TEMPLATE_NAME:oracle.db_open_mode["{#DBNAME}"].last()}=1` |WARNING | |
-|Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.db_open_mode["{#DBNAME}"].diff()}=1` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle Database '{#DBNAME}': Open status in mount mode</p> |
-|Oracle Database '{#DBNAME}': Role has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB role has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.db_role["{#DBNAME}"].diff()}=1` |INFO |<p>Manual close: YES</p> |
-|Oracle Database '{#DBNAME}': Force logging is deactivated for DB with active Archivelog |<p>Force Logging mode  - it is very important metric for Databases in 'ARCHIVELOG'. This feature allows to forcibly write all transactions to the REDO.</p> |`{TEMPLATE_NAME:oracle.db_force_logging["{#DBNAME}"].last()} = 0 and {Oracle by Zabbix Agent 2:oracle.db_log_mode["{#DBNAME}"].last()} = 1` |WARNING | |
-|Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`{TEMPLATE_NAME:oracle.pdb_open_mode["{#DBNAME}"].last()}=1` |WARNING | |
-|Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.pdb_open_mode["{#DBNAME}"].diff()}=1` |INFO |<p>Manual close: YES</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). | |`{TEMPLATE_NAME:oracle.tbs_used_file_pct["{#TABLESPACE}"].min(5m)}>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m). | |`{TEMPLATE_NAME:oracle.tbs_used_file_pct["{#TABLESPACE}"].min(5m)}>{$ORACLE.TBS.USED.PCT.MAX.HIGH}` |HIGH | |
-|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). | |`{TEMPLATE_NAME:oracle.tbs_used_pct["{#TABLESPACE}"].min(5m)}>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m). | |`{TEMPLATE_NAME:oracle.tbs_used_pct["{#TABLESPACE}"].min(5m)}>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}` |HIGH | |
-|Oracle TBS '{#TABLESPACE}': Tablespase is OFFLINE |<p>The tablespase is in the offline state.</p> |`{TEMPLATE_NAME:oracle.tbs_status["{#TABLESPACE}"].last()}=2` |WARNING | |
-|Oracle TBS '{#TABLESPACE}': Tablespace status has changed (new value received: {ITEM.VALUE}) |<p>Oracle tablespace status has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.tbs_status["{#TABLESPACE}"].diff()}=1` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespase is OFFLINE</p> |
-|Archivelog '{#DEST_NAME}': Log Archive is not valid |<p>ARL destination not in 3 - Valid or 2 - Deferred.</p> |`{TEMPLATE_NAME:oracle.archivelog_log_status["{#DEST_NAME}"].last()}<2` |HIGH | |
-|ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.WARN}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`{TEMPLATE_NAME:oracle.asm_used_pct["{#DG_NAME}"].min(5m)}>{$ORACLE.ASM.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)</p> |
-|ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`{TEMPLATE_NAME:oracle.asm_used_pct["{#DG_NAME}"].min(5m)}>{$ORACLE.ASM.USED.PCT.MAX.HIGH}` |HIGH | |
+|Oracle: Connection to database is unavailable |<p>Connection to Oracle Database is currently unavailable.</p> |`last(/Oracle by Zabbix agent 2/oracle.ping["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"])=0` |DISASTER | |
+|Oracle: Version has changed (new version value received: {ITEM.VALUE}) |<p>Oracle DB version has changed. Ack to close.</p> |`last(/Oracle by Zabbix agent 2/oracle.version,#1)<>last(/Oracle by Zabbix agent 2/oracle.version,#2) and length(last(/Oracle by Zabbix agent 2/oracle.version))>0` |INFO |<p>Manual close: YES</p> |
+|Oracle: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 5 minutes. The database might be unavailable for connecting.</p> |`nodata(/Oracle by Zabbix agent 2/oracle.uptime,30m)=1` |INFO | |
+|Oracle: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Oracle by Zabbix agent 2/oracle.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Oracle: Instance name has changed (new name received: {ITEM.VALUE}) |<p>Oracle DB Instance name has changed. Ack to close.</p> |`last(/Oracle by Zabbix agent 2/oracle.instance_name,#1)<>last(/Oracle by Zabbix agent 2/oracle.instance_name,#2) and length(last(/Oracle by Zabbix agent 2/oracle.instance_name))>0` |INFO |<p>Manual close: YES</p> |
+|Oracle: Instance hostname has changed (new hostname received: {ITEM.VALUE}) |<p>Oracle DB Instance hostname has changed. Ack to close.</p> |`last(/Oracle by Zabbix agent 2/oracle.instance_hostname,#1)<>last(/Oracle by Zabbix agent 2/oracle.instance_hostname,#2) and length(last(/Oracle by Zabbix agent 2/oracle.instance_hostname))>0` |INFO |<p>Manual close: YES</p> |
+|Oracle: Shared pool free is too low (less {$ORACLE.SHARED.FREE.MIN.WARN}% for 5m) |<p>The shared pool free memory percent has been less than {$ORACLE.SHARED.FREE.MIN.WARN}% in the last 5 minutes.</p> |`max(/Oracle by Zabbix agent 2/oracle.shared_pool_free,5m)<{$ORACLE.SHARED.FREE.MIN.WARN}` |WARNING | |
+|Oracle: Too many active sessions (over {$ORACLE.SESSIONS.MAX.WARN}% for 5 min) |<p>Active sessions are using more than {$ORACLE.SESSIONS.MAX.WARN}% of the available sessions.</p> |`min(/Oracle by Zabbix agent 2/oracle.session_count,5m) * 100 / last(/Oracle by Zabbix agent 2/oracle.session_limit) > {$ORACLE.SESSIONS.MAX.WARN}` |WARNING | |
+|Oracle: Too many locked sessions (over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% for 5 min) |<p>Number of locked sessions is over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% of the running sessions.</p> |`min(/Oracle by Zabbix agent 2/oracle.session_lock_rate,5m) > {$ORACLE.SESSIONS.LOCK.MAX.WARN}` |WARNING | |
+|Oracle: Too many sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s (over {$ORACLE.SESSION.LONG.LOCK.MAX.WARN} for 5 min) |<p>Number of sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME} seconds is too high. Long-term locks can negatively affect database performance, therefore, if they are detected, you should first find the most difficult queries from the database point of view and analyze possible resource leaks.</p> |`min(/Oracle by Zabbix agent 2/oracle.session_long_time_locked,5m) > {$ORACLE.SESSION.LONG.LOCK.MAX.WARN}` |WARNING | |
+|Oracle: Too high database concurrency (over {$ORACLE.CONCURRENCY.MAX.WARN}% for 5 min) |<p>Concurrency rate is over {$ORACLE.CONCURRENCY.MAX.WARN}%. A high contention value does not indicate the root cause of the problem, but is a signal to search for it. In the case of high competition, an analysis of resource consumption should be carried out, the most "heavy" queries made in the database, possibly - session tracing. All this will help determine the root cause and possible optimization points both in the database configuration and in the logic of building queries of the application itself.</p> |`min(/Oracle by Zabbix agent 2/oracle.session_concurrency_rate,5m) > {$ORACLE.CONCURRENCY.MAX.WARN}` |WARNING | |
+|Oracle: Total PGA inuse is too high (over {$ORACLE.PGA.USE.MAX.WARN}% for 5 min) |<p>Total PGA in use is more than {$ORACLE.PGA.USE.MAX.WARN}% of PGA_AGGREGATE_TARGET.</p> |`min(/Oracle by Zabbix agent 2/oracle.total_pga_used,5m) * 100 / last(/Oracle by Zabbix agent 2/oracle.pga_target) > {$ORACLE.PGA.USE.MAX.WARN}` |WARNING | |
+|Oracle: Zabbix account will expire soon (under {$ORACLE.EXPIRE.PASSWORD.MIN.WARN} days) |<p>Password for zabbix user in the database will expire soon.</p> |`last(/Oracle by Zabbix agent 2/oracle.user.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"])  < {$ORACLE.EXPIRE.PASSWORD.MIN.WARN}` |WARNING | |
+|Oracle: Number of REDO logs available for switching is too low (less {$ORACLE.REDO.MIN.WARN} for 5 min) |<p>Number of available for log switching inactive/unused REDOs is low (Database down risk)</p> |`max(/Oracle by Zabbix agent 2/oracle.redolog.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"],5m) < {$ORACLE.REDO.MIN.WARN}` |WARNING | |
+|Oracle: Too many active processes (over {$ORACLE.PROCESSES.MAX.WARN}% for 5 min) |<p>Active processes are using more than {$ORACLE.PROCESSES.MAX.WARN}% of the available number of processes.</p> |`min(/Oracle by Zabbix agent 2/oracle.proc.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"],5m) * 100 / last(/Oracle by Zabbix agent 2/oracle.processes_limit) > {$ORACLE.PROCESSES.MAX.WARN}` |WARNING | |
+|Oracle: Too many database files (over {$ORACLE.DB.FILE.MAX.WARN}% for 5 min) |<p>Number of datafiles is higher than {$ORACLE.DB.FILE.MAX.WARN}% of the available datafile files limit.</p> |`min(/Oracle by Zabbix agent 2/oracle.datafiles.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"],5m) * 100 / last(/Oracle by Zabbix agent 2/oracle.db_files_limit) > {$ORACLE.DB.FILE.MAX.WARN}` |WARNING | |
+|Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`last(/Oracle by Zabbix agent 2/oracle.db_open_mode["{#DBNAME}"])=1` |WARNING | |
+|Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`last(/Oracle by Zabbix agent 2/oracle.db_open_mode["{#DBNAME}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.db_open_mode["{#DBNAME}"],#2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle Database '{#DBNAME}': Open status in mount mode</p> |
+|Oracle Database '{#DBNAME}': Role has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB role has changed. Ack to close.</p> |`last(/Oracle by Zabbix agent 2/oracle.db_role["{#DBNAME}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.db_role["{#DBNAME}"],#2)` |INFO |<p>Manual close: YES</p> |
+|Oracle Database '{#DBNAME}': Force logging is deactivated for DB with active Archivelog |<p>Force Logging mode  - it is very important metric for Databases in 'ARCHIVELOG'. This feature allows to forcibly write all transactions to the REDO.</p> |`last(/Oracle by Zabbix agent 2/oracle.db_force_logging["{#DBNAME}"]) = 0 and last(/Oracle by Zabbix agent 2/oracle.db_log_mode["{#DBNAME}"]) = 1` |WARNING | |
+|Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#DBNAME}"])=1` |WARNING | |
+|Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#DBNAME}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#DBNAME}"],#2)` |INFO |<p>Manual close: YES</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). |<p>-</p> |`min(/Oracle by Zabbix agent 2/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m). |<p>-</p> |`min(/Oracle by Zabbix agent 2/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}` |HIGH | |
+|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). |<p>-</p> |`min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m). |<p>-</p> |`min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}` |HIGH | |
+|Oracle TBS '{#TABLESPACE}': Tablespace is OFFLINE |<p>The tablespace is in the offline state.</p> |`last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"])=2` |WARNING | |
+|Oracle TBS '{#TABLESPACE}': Tablespace status has changed (new value received: {ITEM.VALUE}) |<p>Oracle tablespace status has changed. Ack to close.</p> |`last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"],#2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace is OFFLINE</p> |
+|Archivelog '{#DEST_NAME}': Log Archive is not valid |<p>ARL destination not in 3 - Valid or 2 - Deferred.</p> |`last(/Oracle by Zabbix agent 2/oracle.archivelog_log_status["{#DEST_NAME}"])<2` |HIGH | |
+|ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.WARN}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`min(/Oracle by Zabbix agent 2/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)</p> |
+|ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`min(/Oracle by Zabbix agent 2/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.HIGH}` |HIGH | |
 
 ## Feedback
 
diff --git a/templates/db/oracle_agent2/template_db_oracle_agent2.yaml b/templates/db/oracle_agent2/template_db_oracle_agent2.yaml
index 138d96d3657..aeb4235776c 100644
--- a/templates/db/oracle_agent2/template_db_oracle_agent2.yaml
+++ b/templates/db/oracle_agent2/template_db_oracle_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:44Z'
+  version: '6.0'
+  date: '2021-12-16T07:08:49Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: d670c32f007d438c9dcd32db57d2b691
       template: 'Oracle by Zabbix agent 2'
       name: 'Oracle by Zabbix agent 2'
-      description: 'Template tooling version used: 0.38'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Databases
@@ -174,7 +174,7 @@ zabbix_export:
           history: '0'
           trends: '0'
           value_type: TEXT
-          description: 'Get info about CDB and  No-CDB databases on instansce.'
+          description: 'Get info about CDB and  No-CDB databases on instance.'
           tags:
             -
               tag: Application
@@ -684,7 +684,7 @@ zabbix_export:
           history: '0'
           trends: '0'
           value_type: TEXT
-          description: 'Get info about PDB databases on instansce.'
+          description: 'Get info about PDB databases on instance.'
           tags:
             -
               tag: Application
@@ -1131,7 +1131,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: 'Count of the prolongely locked sessions. (You can change maximum session lock duration in seconds for query by {$ORACLE.SESSION.LOCK.MAX.TIME} macro. Default 600 sec)'
+          description: 'Count of the prolongedly locked sessions. (You can change maximum session lock duration in seconds for query by {$ORACLE.SESSION.LOCK.MAX.TIME} macro. Default 600 sec)'
           preprocessing:
             -
               type: JSONPATH
@@ -1606,11 +1606,7 @@ zabbix_export:
                 -
                   type: JSONPATH
                   parameters:
-                    - '$..[''{#DEST_NAME}''].status.first()'
-                -
-                  type: DISCARD_UNCHANGED_HEARTBEAT
-                  parameters:
-                    - 1h
+                    - '$..[''{#DEST_NAME}''].log_sequence.first()'
               master_item:
                 key: 'oracle.archive.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
@@ -1624,14 +1620,18 @@ zabbix_export:
               key: 'oracle.archivelog_log_status["{#DEST_NAME}"]'
               delay: '0'
               history: 7d
-              description: 'Identifies the current status of the destination: 1 - ''Valid'', 2 - ''Dederred'',3 - ''Error'', 0 - ''Unknown'''
+              description: 'Identifies the current status of the destination: 1 - ''Valid'', 2 - ''Deferred'',3 - ''Error'', 0 - ''Unknown'''
               valuemap:
                 name: 'Oracle Archivelog status'
               preprocessing:
                 -
                   type: JSONPATH
                   parameters:
-                    - '$..[''{#DEST_NAME}''].log_sequence.first()'
+                    - '$..[''{#DEST_NAME}''].status.first()'
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
               master_item:
                 key: 'oracle.archive.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
@@ -2058,6 +2058,12 @@ zabbix_export:
                   value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
               trigger_prototypes:
                 -
+                  uuid: 832f908ca3b84a3c9a030b5d33b96016
+                  expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"])=2'
+                  name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
+                  priority: WARNING
+                  description: 'The tablespace is in the offline state.'
+                -
                   uuid: 2e84836974b340b5b916eed08e1fcdf4
                   expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"],#2)'
                   name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace status has changed (new value received: {ITEM.VALUE})'
@@ -2066,14 +2072,8 @@ zabbix_export:
                   manual_close: 'YES'
                   dependencies:
                     -
-                      name: 'Oracle TBS ''{#TABLESPACE}'': Tablespase is OFFLINE'
+                      name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
                       expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"])=2'
-                -
-                  uuid: 832f908ca3b84a3c9a030b5d33b96016
-                  expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"])=2'
-                  name: 'Oracle TBS ''{#TABLESPACE}'': Tablespase is OFFLINE'
-                  priority: WARNING
-                  description: 'The tablespase is in the offline state.'
             -
               uuid: ab56fee407e143db912dffcf24fb0106
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace used, bytes'
@@ -2243,11 +2243,11 @@ zabbix_export:
         -
           macro: '{$ORACLE.SESSION.LOCK.MAX.TIME}'
           value: '600'
-          description: 'Maximum session lock duration in seconds for count the session as a prolongely locked query.'
+          description: 'Maximum session lock duration in seconds for count the session as a prolongedly locked query.'
         -
           macro: '{$ORACLE.SESSION.LONG.LOCK.MAX.WARN}'
           value: '3'
-          description: 'Maximum number of the prolongely locked sessions alert threshold (for trigger expression).'
+          description: 'Maximum number of the prolongedly locked sessions alert threshold (for trigger expression).'
         -
           macro: '{$ORACLE.SESSIONS.LOCK.MAX.WARN}'
           value: '20'
diff --git a/templates/db/oracle_odbc/README.md b/templates/db/oracle_odbc/README.md
index 4a95b8bc474..168e90b33bf 100644
--- a/templates/db/oracle_odbc/README.md
+++ b/templates/db/oracle_odbc/README.md
@@ -3,12 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template is developed for monitoring DBMS Oracle Database single instance via ODBC.
 
 This template was tested on:
 
-- Zabbix, version 5.4
 - Oracle Database, version 12c2, 18c, 19c
 
 ## Setup
@@ -93,8 +92,8 @@ No specific Zabbix configuration is required.
 |{$ORACLE.PROCESSES.MAX.WARN} |<p>Maximum percentage of active processes alert threshold (for trigger expression).</p> |`80` |
 |{$ORACLE.REDO.MIN.WARN} |<p>Minimum number of REDO logs alert threshold (for trigger expression).</p> |`3` |
 |{$ORACLE.SERVICE} |<p>Oracle service name</p> |`<Put oracle service name here>` |
-|{$ORACLE.SESSION.LOCK.MAX.TIME} |<p>Maximum session lock duration in seconds for count the session as a prolongely locked query.</p> |`600` |
-|{$ORACLE.SESSION.LONG.LOCK.MAX.WARN} |<p>Maximum number of the prolongely locked sessions alert threshold (for trigger expression).</p> |`3` |
+|{$ORACLE.SESSION.LOCK.MAX.TIME} |<p>Maximum session lock duration in seconds for count the session as a prolongedly locked query.</p> |`600` |
+|{$ORACLE.SESSION.LONG.LOCK.MAX.WARN} |<p>Maximum number of the prolongedly locked sessions alert threshold (for trigger expression).</p> |`3` |
 |{$ORACLE.SESSIONS.LOCK.MAX.WARN} |<p>Maximum percentage of locked sessions alert threshold (for trigger expression).</p> |`20` |
 |{$ORACLE.SESSIONS.MAX.WARN} |<p>Maximum percentage of active sessions alert threshold (for trigger expression).</p> |`80` |
 |{$ORACLE.SHARED.FREE.MIN.WARN} |<p>Minimum percentage of free shared pool alert threshold (for trigger expression).</p> |`5` |
@@ -114,9 +113,9 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[db_list,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
-|PDB discovery |<p>Scanning PDB in DBMS.</p> |ODBC |db.odbc.discovery[pdb_list,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
-|Tablespace discovery |<p>Scanning tablespaces in DBMS.</p> |ODBC |db.odbc.discovery[tbsname,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- A: {#TABLESPACE} MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.MATCHES}`</p><p>- B: {#TABLESPACE} NOT_MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.NOT_MATCHES}`</p> |
+|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[db_list,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
+|PDB discovery |<p>Scanning PDB in DBMS.</p> |ODBC |db.odbc.discovery[pdb_list,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
+|Tablespace discovery |<p>Scanning tablespaces in DBMS.</p> |ODBC |db.odbc.discovery[tbsname,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- {#TABLESPACE} MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.MATCHES}`</p><p>- {#TABLESPACE} NOT_MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.NOT_MATCHES}`</p> |
 |Archive log discovery |<p>Log archive destinations.</p> |ODBC |db.odbc.discovery[archivelog,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"] |
 |ASM disk groups discovery |<p>ASM disk groups</p> |ODBC |db.odbc.discovery[asm,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"] |
 
@@ -157,7 +156,7 @@ There are no template links in this template.
 |Oracle |Oracle: Active background sessions |<p>The number of active background sessions.</p> |DEPENDENT |oracle.session_active_background<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.METRIC=='SESSION::Active Background')].VALUE.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |Oracle |Oracle: Inactive user sessions |<p>The number of inactive user sessions.</p> |DEPENDENT |oracle.session_inactive_user<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.METRIC=='SESSION::Inactive User')].VALUE.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
 |Oracle |Oracle: Sessions lock rate |<p>The percentage of locked sessions. Locks are mechanisms that prevent destructive interaction between transactions accessing the same resource—either user objects such as tables and rows or system objects not visible to users, such as shared data structures in memory and data dictionary rows.</p> |DEPENDENT |oracle.session_lock_rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.METRIC=='SESSION::Lock rate')].VALUE.first()`</p> |
-|Oracle |Oracle: Sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s |<p>Count of the prolongely locked sessions. (You can change maximum session lock duration in seconds for query by {$ORACLE.SESSION.LOCK.MAX.TIME} macro. Default 600 sec)</p> |DEPENDENT |oracle.session_long_time_locked<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.METRIC=='SESSION::Long time locked')].VALUE.first()`</p> |
+|Oracle |Oracle: Sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s |<p>Count of the prolongedly locked sessions. (You can change maximum session lock duration in seconds for query by {$ORACLE.SESSION.LOCK.MAX.TIME} macro. Default 600 sec)</p> |DEPENDENT |oracle.session_long_time_locked<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.METRIC=='SESSION::Long time locked')].VALUE.first()`</p> |
 |Oracle |Oracle: Sessions concurrency |<p>The percentage of concurrency. Concurrency is a DB behaviour when different transactions request to change the same resource - in case of modifying data transactions sequentially block temporarily the right to change data, the rest of the transactions are waiting for access. In the case when access for resource is locked for a long time, then the concurrency grows (like the transaction queue) and this often has an extremely negative impact on performance. A high contention value does not indicate the root cause of the problem, but is a signal to search for it.</p> |DEPENDENT |oracle.session_concurrency_rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.METRIC=='SESSION::Concurrency rate')].VALUE.first()`</p> |
 |Oracle |Oracle: User '{$ORACLE.USER}' expire password |<p>The number of days before zabbix account password expired.</p> |DEPENDENT |oracle.user_expire_password<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.METRIC=='USER::Expire password')].VALUE.first()`</p> |
 |Oracle |Oracle: Active serial sessions |<p>The number of active serial sessions.</p> |DEPENDENT |oracle.active_serial_sessions<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.METRIC=='SYS::Active Serial Sessions')].VALUE.first()`</p> |
@@ -204,15 +203,15 @@ There are no template links in this template.
 |Oracle |Oracle TBS '{#TABLESPACE}': Open status |<p>Tablespace status. 1 - 'ONLINE' 2 - 'OFFLINE' 3- 'READ ONLY'</p> |DEPENDENT |oracle.tbs_status["{#TABLESPACE}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.TABLESPACE=='{#TABLESPACE}')].STATUS.first()`</p> |
 |Oracle |Archivelog '{#DEST_NAME}': Error |<p>Displays the error text</p> |DEPENDENT |oracle.archivelog_error["{#DEST_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DEST_NAME=='{#DEST_NAME}')].ERROR.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Oracle |Archivelog '{#DEST_NAME}': Last sequence |<p>Identifies the sequence number of the last archived redo log to be archived</p> |DEPENDENT |oracle.archivelog_log_sequence["{#DEST_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DEST_NAME=='{#DEST_NAME}')].LOG_SEQUENCE.first()`</p> |
-|Oracle |Archivelog '{#DEST_NAME}': Status |<p> Identifies the current status of the destination: 1 - 'Valid', 2 - 'Dederred',3 - 'Error', 0 - 'Unknown'</p> |DEPENDENT |oracle.archivelog_log_status["{#DEST_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DEST_NAME=='{#DEST_NAME}')].STATUS.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Oracle |Archivelog '{#DEST_NAME}': Status |<p> Identifies the current status of the destination: 1 - 'Valid', 2 - 'Deferred',3 - 'Error', 0 - 'Unknown'</p> |DEPENDENT |oracle.archivelog_log_status["{#DEST_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DEST_NAME=='{#DEST_NAME}')].STATUS.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Oracle |ASM '{#DG_NAME}': Total size |<p>Total size of ASM disk group.</p> |DEPENDENT |oracle.asm_total_size["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DG_NAME=='{#DG_NAME}')].SIZE_BYTE.first()`</p> |
 |Oracle |ASM '{#DG_NAME}': Free size |<p>Free size of ASM disk group.</p> |DEPENDENT |oracle.asm_free_size["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DG_NAME=='{#DG_NAME}')].FREE_SIZE_BYTE.first()`</p> |
 |Oracle |ASM '{#DG_NAME}': Free size |<p>Usage percent of ASM disk group.</p> |DEPENDENT |oracle.asm_used_pct["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DG_NAME=='{#DG_NAME}')].USED_PERCENT.first()`</p> |
 |Zabbix_raw_items |Oracle: Get instance state |<p>The item gets state of the current instance.</p> |ODBC |db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
 |Zabbix_raw_items |Oracle: Get system metrics |<p>The item gets system metric values.</p> |ODBC |db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
 |Zabbix_raw_items |Oracle: Get tablespaces stats |<p>Get tablespaces stats.</p> |ODBC |db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |Oracle: Get CDB and No-CDB info |<p>Get info about CDB and  No-CDB databases on instansce.</p> |ODBC |db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |Oracle: Get PDB info |<p>Get info about PDB databases on instansce.</p> |ODBC |db.odbc.get[get_pdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get CDB and No-CDB info |<p>Get info about CDB and  No-CDB databases on instance.</p> |ODBC |db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get PDB info |<p>Get info about PDB databases on instance.</p> |ODBC |db.odbc.get[get_pdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
 |Zabbix_raw_items |Oracle: Get archive log info | |ODBC |db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
 |Zabbix_raw_items |Oracle: Get ASM stats |<p>Get ASM disk groups stats.</p> |ODBC |db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
 
@@ -221,7 +220,7 @@ There are no template links in this template.
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
 |Oracle: Port {$ORACLE.PORT} is unavailable |<p>The TCP port of the Oracle Server service is currently unavailable.</p> |`max(/Oracle by ODBC/net.tcp.service[tcp,{HOST.CONN},{$ORACLE.PORT}],#3)=0  and max(/Oracle by ODBC/proc.num[,,,"tnslsnr LISTENER"],#3)>0` |DISASTER | |
-|Oracle: LISTENER process is not running | |`max(/Oracle by ODBC/proc.num[,,,"tnslsnr LISTENER"],#3)=0` |DISASTER | |
+|Oracle: LISTENER process is not running |<p>-</p> |`max(/Oracle by ODBC/proc.num[,,,"tnslsnr LISTENER"],#3)=0` |DISASTER | |
 |Oracle: Version has changed (new version value received: {ITEM.VALUE}) |<p>Oracle DB version has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.version,#1)<>last(/Oracle by ODBC/oracle.version,#2) and length(last(/Oracle by ODBC/oracle.version))>0` |INFO |<p>Manual close: YES</p> |
 |Oracle: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Oracle by ODBC/oracle.uptime)<10m` |INFO |<p>Manual close: YES</p> |
 |Oracle: Failed to fetch info data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes. The database might be unavailable for connecting.</p> |`nodata(/Oracle by ODBC/oracle.uptime,5m)=1` |WARNING |<p>**Depends on**:</p><p>- Oracle: Port {$ORACLE.PORT} is unavailable</p> |
@@ -243,12 +242,12 @@ There are no template links in this template.
 |Oracle Database '{#DBNAME}': Force logging is deactivated for DB with active Archivelog |<p>Force Logging mode  - it is very important metric for Databases in 'ARCHIVELOG'. This feature allows to forcibly write all transactions to the REDO.</p> |`last(/Oracle by ODBC/oracle.db_force_logging["{#DBNAME}"]) = 0 and last(/Oracle by ODBC/oracle.db_log_mode["{#DBNAME}"]) = 1` |WARNING | |
 |Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`last(/Oracle by ODBC/oracle.pdb_open_mode["{#DBNAME}"])=1` |WARNING | |
 |Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.pdb_open_mode["{#DBNAME}"],#1)<>last(/Oracle by ODBC/oracle.pdb_open_mode["{#DBNAME}"],#2)` |INFO |<p>Manual close: YES</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). | |`min(/Oracle by ODBC/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m). | |`min(/Oracle by ODBC/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}` |HIGH | |
-|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). | |`min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m). | |`min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}` |HIGH | |
-|Oracle TBS '{#TABLESPACE}': Tablespase is OFFLINE |<p>The tablespase is in the offline state.</p> |`last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"])=2` |WARNING | |
-|Oracle TBS '{#TABLESPACE}': Tablespace status has changed (new value received: {ITEM.VALUE}) |<p>Oracle tablespace status has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#1)<>last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespase is OFFLINE</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). |<p>-</p> |`min(/Oracle by ODBC/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m). |<p>-</p> |`min(/Oracle by ODBC/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}` |HIGH | |
+|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). |<p>-</p> |`min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m). |<p>-</p> |`min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}` |HIGH | |
+|Oracle TBS '{#TABLESPACE}': Tablespace is OFFLINE |<p>The tablespace is in the offline state.</p> |`last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"])=2` |WARNING | |
+|Oracle TBS '{#TABLESPACE}': Tablespace status has changed (new value received: {ITEM.VALUE}) |<p>Oracle tablespace status has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#1)<>last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace is OFFLINE</p> |
 |Archivelog '{#DEST_NAME}': Log Archive is not valid |<p>ARL destination not in 3 - Valid or 2 - Deferred.</p> |`last(/Oracle by ODBC/oracle.archivelog_log_status["{#DEST_NAME}"])<2` |HIGH | |
 |ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.WARN}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`min(/Oracle by ODBC/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)</p> |
 |ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`min(/Oracle by ODBC/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.HIGH}` |HIGH | |
diff --git a/templates/db/oracle_odbc/template_db_oracle_odbc.yaml b/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
index 3cb0baf6127..152fb8ed3be 100644
--- a/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
+++ b/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-12-01T16:34:59Z'
+  version: '6.0'
+  date: '2021-12-14T17:44:06Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -22,7 +22,7 @@ zabbix_export:
         The "Service's TCP port state" item uses {HOST.CONN} and {$ORACLE.PORT} macros to check the availability of the listener.
         
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -88,7 +88,7 @@ zabbix_export:
             FROM v$database
           username: '{$ORACLE.USER}'
           password: '{$ORACLE.PASSWORD}'
-          description: 'Get info about CDB and  No-CDB databases on instansce.'
+          description: 'Get info about CDB and  No-CDB databases on instance.'
           tags:
             -
               tag: Application
@@ -133,7 +133,7 @@ zabbix_export:
             FROM v$pdbs;
           username: '{$ORACLE.USER}'
           password: '{$ORACLE.PASSWORD}'
-          description: 'Get info about PDB databases on instansce.'
+          description: 'Get info about PDB databases on instance.'
           tags:
             -
               tag: Application
@@ -222,13 +222,13 @@ zabbix_export:
           value_type: TEXT
           params: |
             SELECT
-              df.tablespace_name AS TABLESPACE, 
-              df.type AS TYPE, 
-              NVL(SUM(df.BYTES), 0) AS FILE_BYTES, 
-              NVL(SUM(df.MAX_BYTES), 0) AS MAX_BYTES, 
+              df.tablespace_name AS TABLESPACE,
+              df.type AS TYPE,
+              NVL(SUM(df.BYTES), 0) AS FILE_BYTES,
+              NVL(SUM(df.MAX_BYTES), 0) AS MAX_BYTES,
               NVL(SUM(f.FREE), 0) AS FREE_BYTES,
               SUM(df.BYTES)-SUM(f.FREE) AS USED_BYTES,
-              ROUND(DECODE(SUM(df.MAX_BYTES), 0, 0, (SUM(df.BYTES) / SUM(df.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX, 
+              ROUND(DECODE(SUM(df.MAX_BYTES), 0, 0, (SUM(df.BYTES) / SUM(df.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX,
               ROUND(DECODE(SUM(df.BYTES), 0, 0,(SUM(df.BYTES)-SUM(f.FREE))/ SUM(df.BYTES)* 100), 2) AS USED_FILE_PCT,
               DECODE(df.STATUS, 'ONLINE', 1, 'OFFLINE', 2, 'READ ONLY', 3, 0) AS STATUS
             FROM ( SELECT
@@ -249,10 +249,10 @@ zabbix_export:
                GROUP BY df.tablespace_name, df.TYPE, df.status
             UNION ALL
             SELECT
-              Y.name AS TABLESPACE, 
-              Y.type AS TYPE, 
-              NVL(SUM(Y.BYTES), 0) AS FILE_BYTES, 
-              NVL(SUM(Y.MAX_BYTES), 0) AS MAX_BYTES, 
+              Y.name AS TABLESPACE,
+              Y.type AS TYPE,
+              NVL(SUM(Y.BYTES), 0) AS FILE_BYTES,
+              NVL(SUM(Y.MAX_BYTES), 0) AS MAX_BYTES,
               NVL(MAX(NVL(Y.FREE_BYTES, 0)), 0) AS FREE,
               SUM(Y.BYTES)-MAX(Y.FREE_BYTES) AS USED_BYTES,
               ROUND(DECODE(SUM(Y.MAX_BYTES), 0, 0, (SUM(Y.BYTES) / SUM(Y.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX, 
@@ -1326,7 +1326,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: 'Count of the prolongely locked sessions. (You can change maximum session lock duration in seconds for query by {$ORACLE.SESSION.LOCK.MAX.TIME} macro. Default 600 sec)'
+          description: 'Count of the prolongedly locked sessions. (You can change maximum session lock duration in seconds for query by {$ORACLE.SESSION.LOCK.MAX.TIME} macro. Default 600 sec)'
           preprocessing:
             -
               type: JSONPATH
@@ -1814,7 +1814,7 @@ zabbix_export:
               key: 'oracle.archivelog_log_status["{#DEST_NAME}"]'
               delay: '0'
               history: 7d
-              description: 'Identifies the current status of the destination: 1 - ''Valid'', 2 - ''Dederred'',3 - ''Error'', 0 - ''Unknown'''
+              description: 'Identifies the current status of the destination: 1 - ''Valid'', 2 - ''Deferred'',3 - ''Error'', 0 - ''Unknown'''
               valuemap:
                 name: 'Oracle Archivelog status'
               preprocessing:
@@ -2271,6 +2271,12 @@ zabbix_export:
                   value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
               trigger_prototypes:
                 -
+                  uuid: 3c5f54f41f95440aa18ca5316aeb50f6
+                  expression: 'last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"])=2'
+                  name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
+                  priority: WARNING
+                  description: 'The tablespace is in the offline state.'
+                -
                   uuid: 05c2af5a765842a1a70f2f67355db1b3
                   expression: 'last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#1)<>last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#2)'
                   name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace status has changed (new value received: {ITEM.VALUE})'
@@ -2279,14 +2285,8 @@ zabbix_export:
                   manual_close: 'YES'
                   dependencies:
                     -
-                      name: 'Oracle TBS ''{#TABLESPACE}'': Tablespase is OFFLINE'
+                      name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
                       expression: 'last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"])=2'
-                -
-                  uuid: 3c5f54f41f95440aa18ca5316aeb50f6
-                  expression: 'last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"])=2'
-                  name: 'Oracle TBS ''{#TABLESPACE}'': Tablespase is OFFLINE'
-                  priority: WARNING
-                  description: 'The tablespase is in the offline state.'
             -
               uuid: b9cc0eabdcbc404fb0df2a2a082411f1
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace used, bytes'
@@ -2461,11 +2461,11 @@ zabbix_export:
         -
           macro: '{$ORACLE.SESSION.LOCK.MAX.TIME}'
           value: '600'
-          description: 'Maximum session lock duration in seconds for count the session as a prolongely locked query.'
+          description: 'Maximum session lock duration in seconds for count the session as a prolongedly locked query.'
         -
           macro: '{$ORACLE.SESSION.LONG.LOCK.MAX.WARN}'
           value: '3'
-          description: 'Maximum number of the prolongely locked sessions alert threshold (for trigger expression).'
+          description: 'Maximum number of the prolongedly locked sessions alert threshold (for trigger expression).'
         -
           macro: '{$ORACLE.SESSIONS.LOCK.MAX.WARN}'
           value: '20'
diff --git a/templates/db/postgresql/README.md b/templates/db/postgresql/README.md
index 5288b76e54b..e1257c5ec42 100644
--- a/templates/db/postgresql/README.md
+++ b/templates/db/postgresql/README.md
@@ -1,9 +1,9 @@
 
-# PostgreSQL by user parameters
+# PostgreSQL by Zabbix agent
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Templates to monitor PostgreSQL by Zabbix.
 This template was tested on PostgreSQL versions 9.6, 10 and 11 on Linux and Windows.
 
@@ -103,22 +103,22 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>-</p> |ZABBIX_PASSIVE |pgsql.discovery.db["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]<p>**Filter**:</p> <p>- A: {#DBNAME} MATCHES_REGEX `{$PG.LLD.FILTER.DBNAME}`</p> |
+|Database discovery |<p>-</p> |ZABBIX_PASSIVE |pgsql.discovery.db["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]<p>**Filter**:</p> <p>- {#DBNAME} MATCHES_REGEX `{$PG.LLD.FILTER.DBNAME}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|PostgreSQL |Bgwriter: Buffers allocated per second |<p>Number of buffers allocated</p> |DEPENDENT |pgsql.bgwriter.buffers_alloc.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_alloc`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Buffers written directly by a backend per second |<p>Number of buffers written directly by a backend</p> |DEPENDENT |pgsql.bgwriter.buffers_backend.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Buffers backend fsync per second |<p>Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)</p> |DEPENDENT |pgsql.bgwriter.buffers_backend_fsync.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend_fsync`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Buffers written during checkpoints per second |<p>Number of buffers written during checkpoints</p> |DEPENDENT |pgsql.bgwriter.buffers_checkpoint.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_checkpoint`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Buffers written by the background writer per second |<p>Number of buffers written by the background writer</p> |DEPENDENT |pgsql.bgwriter.buffers_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_clean`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Requested checkpoints per second |<p>Number of requested checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_req.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_req`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Scheduled checkpoints per second |<p>Number of scheduled checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_timed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_timed`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Checkpoint sync time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk</p> |DEPENDENT |pgsql.bgwriter.checkpoint_sync_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Checkpoint write time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds</p> |DEPENDENT |pgsql.bgwriter.checkpoint_write_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Max written per second |<p>Number of times the background writer stopped a cleaning scan because it had written too many buffers</p> |DEPENDENT |pgsql.bgwriter.maxwritten_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxwritten_clean`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Bgwriter: Buffers allocated per second |<p>Number of buffers allocated</p> |DEPENDENT |pgsql.bgwriter.buffers_alloc.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_alloc`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Buffers written directly by a backend per second |<p>Number of buffers written directly by a backend</p> |DEPENDENT |pgsql.bgwriter.buffers_backend.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Buffers backend fsync per second |<p>Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)</p> |DEPENDENT |pgsql.bgwriter.buffers_backend_fsync.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend_fsync`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Buffers written during checkpoints per second |<p>Number of buffers written during checkpoints</p> |DEPENDENT |pgsql.bgwriter.buffers_checkpoint.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_checkpoint`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Buffers written by the background writer per second |<p>Number of buffers written by the background writer</p> |DEPENDENT |pgsql.bgwriter.buffers_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_clean`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Requested checkpoints per second |<p>Number of requested checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_req.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_req`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Scheduled checkpoints per second |<p>Number of scheduled checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_timed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_timed`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Checkpoint sync time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk</p> |DEPENDENT |pgsql.bgwriter.checkpoint_sync_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Checkpoint write time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds</p> |DEPENDENT |pgsql.bgwriter.checkpoint_write_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Max written per second |<p>Number of times the background writer stopped a cleaning scan because it had written too many buffers</p> |DEPENDENT |pgsql.bgwriter.maxwritten_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxwritten_clean`</p><p>- CHANGE_PER_SECOND</p> |
 |PostgreSQL |Status: Cache hit ratio % |<p>Cache hit ratio</p> |ZABBIX_PASSIVE |pgsql.cache.hit["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"] |
 |PostgreSQL |Status: Config hash |<p>PostgreSQL configuration hash</p> |ZABBIX_PASSIVE |pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |PostgreSQL |Connections sum: Active |<p>Total number of connections executing a query</p> |DEPENDENT |pgsql.connections.sum.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.active`</p> |
@@ -141,21 +141,21 @@ There are no template links in this template.
 |PostgreSQL |Status: Uptime |<p>-</p> |ZABBIX_PASSIVE |pgsql.uptime["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"] |
 |PostgreSQL |Status: Version |<p>PostgreSQL version</p> |ZABBIX_PASSIVE |pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |PostgreSQL |WAL: Segments count |<p>Number of WAL segments</p> |DEPENDENT |pgsql.wal.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.count`</p> |
-|PostgreSQL |WAL: Bytes written |<p>WAL write in bytes</p> |DEPENDENT |pgsql.wal.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.write`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |WAL: Bytes written |<p>WAL write in bytes</p> |DEPENDENT |pgsql.wal.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.write`</p><p>- CHANGE_PER_SECOND</p> |
 |PostgreSQL |DB {#DBNAME}: Database size |<p>Database size</p> |ZABBIX_PASSIVE |pgsql.db.size["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}","{#DBNAME}"] |
-|PostgreSQL |DB {#DBNAME}: Blocks hit per second |<p>Total number of times disk blocks were found already in the buffer cache, so that a read was not necessary</p> |DEPENDENT |pgsql.dbstat.blks_hit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_hit`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Total number of disk blocks read in this database</p> |DEPENDENT |pgsql.dbstat.blks_read.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_read`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Detected conflicts per second |<p>Total number of queries canceled due to conflicts with recovery in this database</p> |DEPENDENT |pgsql.dbstat.conflicts.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].conflicts`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Detected deadlocks per second |<p>Total number of detected deadlocks in this database</p> |DEPENDENT |pgsql.dbstat.deadlocks.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].deadlocks`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Temp_bytes written per second |<p>Total amount of data written to temporary files by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_bytes.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_bytes`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Temp_files created per second |<p>Total number of temporary files created by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_files.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_files`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples deleted per second |<p>Total number of rows deleted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_deleted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_deleted`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples fetched per second |<p>Total number of rows fetched by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_fetched.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_fetched`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples inserted per second |<p>Total number of rows inserted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_inserted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_inserted`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples returned per second |<p>Total number of rows updated by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_returned.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_returned`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples updated per second |<p>Total number of rows updated by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_updated.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_updated`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Commits per second |<p>Number of transactions in this database that have been committed</p> |DEPENDENT |pgsql.dbstat.xact_commit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_commit`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Rollbacks per second |<p>Total number of transactions in this database that have been rolled back</p> |DEPENDENT |pgsql.dbstat.xact_rollback.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_rollback`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Blocks hit per second |<p>Total number of times disk blocks were found already in the buffer cache, so that a read was not necessary</p> |DEPENDENT |pgsql.dbstat.blks_hit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_hit`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Total number of disk blocks read in this database</p> |DEPENDENT |pgsql.dbstat.blks_read.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_read`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Detected conflicts per second |<p>Total number of queries canceled due to conflicts with recovery in this database</p> |DEPENDENT |pgsql.dbstat.conflicts.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].conflicts`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Detected deadlocks per second |<p>Total number of detected deadlocks in this database</p> |DEPENDENT |pgsql.dbstat.deadlocks.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].deadlocks`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Temp_bytes written per second |<p>Total amount of data written to temporary files by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_bytes.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_bytes`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Temp_files created per second |<p>Total number of temporary files created by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_files.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_files`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples deleted per second |<p>Total number of rows deleted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_deleted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_deleted`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples fetched per second |<p>Total number of rows fetched by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_fetched.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_fetched`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples inserted per second |<p>Total number of rows inserted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_inserted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_inserted`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples returned per second |<p>Total number of rows updated by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_returned.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_returned`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples updated per second |<p>Total number of rows updated by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_updated.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_updated`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Commits per second |<p>Number of transactions in this database that have been committed</p> |DEPENDENT |pgsql.dbstat.xact_commit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_commit`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Rollbacks per second |<p>Total number of transactions in this database that have been rolled back</p> |DEPENDENT |pgsql.dbstat.xact_rollback.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_rollback`</p><p>- CHANGE_PER_SECOND</p> |
 |PostgreSQL |DB {#DBNAME}: Frozen XID before avtovacuum % |<p>reventing Transaction ID Wraparound Failures</p><p>https://www.postgresql.org/docs/current/routine-vacuuming.html#VACUUM-FOR-WRAPAROUND</p> |DEPENDENT |pgsql.frozenxid.prc_before_av["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.prc_before_av`</p> |
 |PostgreSQL |DB {#DBNAME}: Frozen XID before stop % |<p>Preventing Transaction ID Wraparound Failures</p><p>https://www.postgresql.org/docs/current/routine-vacuuming.html#VACUUM-FOR-WRAPAROUND</p> |DEPENDENT |pgsql.frozenxid.prc_before_stop["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.prc_before_stop`</p> |
 |PostgreSQL |DB {#DBNAME}: Locks total |<p>Total number of locks in the database</p> |DEPENDENT |pgsql.locks.total["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].total`</p> |
@@ -168,8 +168,8 @@ There are no template links in this template.
 |PostgreSQL |DB {#DBNAME}: Queries slow transaction count |<p>Slow transaction query count</p> |DEPENDENT |pgsql.queries.tx.slow_count["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tx_slow_count`</p> |
 |PostgreSQL |DB {#DBNAME}: Queries max transaction time |<p>Max transaction query time</p> |DEPENDENT |pgsql.queries.tx.time_max["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tx_time_max`</p> |
 |PostgreSQL |DB {#DBNAME}: Queries sum transaction time |<p>Sum transaction query time</p> |DEPENDENT |pgsql.queries.tx.time_sum["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tx_time_sum`</p> |
-|PostgreSQL |DB {#DBNAME}: Index scans per second |<p>Number of index scans in the database</p> |DEPENDENT |pgsql.scans.idx.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.idx`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Sequential scans per second |<p>Number of sequential scans in the database</p> |DEPENDENT |pgsql.scans.seq.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.seq`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Index scans per second |<p>Number of index scans in the database</p> |DEPENDENT |pgsql.scans.idx.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.idx`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Sequential scans per second |<p>Number of sequential scans in the database</p> |DEPENDENT |pgsql.scans.seq.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.seq`</p><p>- CHANGE_PER_SECOND</p> |
 |Zabbix_raw_items |PostgreSQL: Get bgwriter |<p>Statistics about the background writer process's activity</p> |ZABBIX_PASSIVE |pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"] |
 |Zabbix_raw_items |PostgreSQL: Get connections sum |<p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ACTIVITY-VIEW</p> |ZABBIX_PASSIVE |pgsql.connections.sum["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"] |
 |Zabbix_raw_items |PostgreSQL: Get dbstat |<p>Collect all metrics from pg_stat_database per database</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-DATABASE-VIEW</p> |ZABBIX_PASSIVE |pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"] |
@@ -184,22 +184,22 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|PostgreSQL: Required checkpoints occurs too frequently (over {$PG.CHECKPOINTS_REQ.MAX.WARN}) |<p>Checkpoints are points in the sequence of transactions at which it is guaranteed that the heap and index data files have been updated with all information written before that checkpoint. At checkpoint time, all dirty data pages are flushed to disk and a special checkpoint record is written to the log file.</p><p>https://www.postgresql.org/docs/current/wal-configuration.html</p> |`last(/PostgreSQL by user parameters/pgsql.bgwriter.checkpoints_req.rate) > {$PG.CHECKPOINTS_REQ.MAX.WARN}` |AVERAGE | |
-|PostgreSQL: Cache hit ratio too low (under {$PG.CACHE_HITRATIO.MIN.WARN} in 5m) |<p>-</p> |`max(/PostgreSQL by user parameters/pgsql.cache.hit["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) < {$PG.CACHE_HITRATIO.MIN.WARN}` |WARNING | |
-|PostgreSQL: Configuration has changed |<p>-</p> |`last(/PostgreSQL by user parameters/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#1)<>last(/PostgreSQL by user parameters/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#2) and length(last(/PostgreSQL by user parameters/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]))>0` |INFO | |
-|PostgreSQL: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m) |<p>-</p> |`min(/PostgreSQL by user parameters/pgsql.connections.sum.total_pct,5m) > {$PG.CONN_TOTAL_PCT.MAX.WARN}` |AVERAGE | |
-|PostgreSQL: Response too long (over {$PG.PING_TIME.MAX.WARN}) |<p>-</p> |`min(/PostgreSQL by user parameters/pgsql.ping.time["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) > {$PG.PING_TIME.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- PostgreSQL: Service is down</p> |
-|PostgreSQL: Service is down |<p>-</p> |`last(/PostgreSQL by user parameters/pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) = 0` |HIGH | |
-|PostgreSQL: Streaming lag with {#MASTER} is too high (over {$PG.REPL_LAG.MAX.WARN} in 5m) |<p>-</p> |`min(/PostgreSQL by user parameters/pgsql.replication.lag.sec["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) > {$PG.REPL_LAG.MAX.WARN}` |AVERAGE | |
-|PostgreSQL: Replication is down |<p>-</p> |`max(/PostgreSQL by user parameters/pgsql.replication.status["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m)=0` |AVERAGE | |
-|PostgreSQL: Service has been restarted (uptime < 10m) |<p>PostgreSQL uptime is less than 10 minutes</p> |`last(/PostgreSQL by user parameters/pgsql.uptime["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) < 10m` |INFO | |
-|PostgreSQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>-</p> |`last(/PostgreSQL by user parameters/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#1)<>last(/PostgreSQL by user parameters/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#2) and length(last(/PostgreSQL by user parameters/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]))>0` |INFO | |
-|DB {#DBNAME}: Too many recovery conflicts (over {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"} in 5m) |<p>The primary and standby servers are in many ways loosely connected. Actions on the primary will have an effect on the standby. As a result, there is potential for negative interactions or conflicts between them.</p><p>https://www.postgresql.org/docs/current/hot-standby.html#HOT-STANDBY-CONFLICT</p> |`min(/PostgreSQL by user parameters/pgsql.dbstat.conflicts.rate["{#DBNAME}"],5m) > {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"}` |AVERAGE | |
-|DB {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m) |<p>-</p> |`min(/PostgreSQL by user parameters/pgsql.dbstat.deadlocks.rate["{#DBNAME}"],5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}` |HIGH | |
-|DB {#DBNAME}: VACUUM FREEZE is required to prevent wraparound (frozen XID less then {$PG.FROZENXID_PCT_STOP.MIN.HIGH:"{#DBNAME}"} %) |<p>Preventing Transaction ID Wraparound Failures</p><p>https://www.postgresql.org/docs/current/routine-vacuuming.html#VACUUM-FOR-WRAPAROUND</p> |`last(/PostgreSQL by user parameters/pgsql.frozenxid.prc_before_stop["{#DBNAME}"])<{$PG.FROZENXID_PCT_STOP.MIN.HIGH:"{#DBNAME}"}` |AVERAGE | |
-|DB {#DBNAME}: Number of locks is too high (over {$PG.LOCKS.MAX.WARN:"{#DBNAME}"} in 5m) |<p>-</p> |`min(/PostgreSQL by user parameters/pgsql.locks.total["{#DBNAME}"],5m)>{$PG.LOCKS.MAX.WARN:"{#DBNAME}"}` |WARNING | |
-|DB {#DBNAME}: Too many slow queries (over {$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"} in 5m) |<p>-</p> |`min(/PostgreSQL by user parameters/pgsql.queries.query.slow_count["{#DBNAME}"],5m)>{$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"}` |WARNING | |
-|PostgreSQL: Failed to get items (no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/PostgreSQL by user parameters/pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],30m) = 1` |WARNING |<p>**Depends on**:</p><p>- PostgreSQL: Service is down</p> |
+|PostgreSQL: Required checkpoints occurs too frequently (over {$PG.CHECKPOINTS_REQ.MAX.WARN}) |<p>Checkpoints are points in the sequence of transactions at which it is guaranteed that the heap and index data files have been updated with all information written before that checkpoint. At checkpoint time, all dirty data pages are flushed to disk and a special checkpoint record is written to the log file.</p><p>https://www.postgresql.org/docs/current/wal-configuration.html</p> |`last(/PostgreSQL by Zabbix agent/pgsql.bgwriter.checkpoints_req.rate) > {$PG.CHECKPOINTS_REQ.MAX.WARN}` |AVERAGE | |
+|PostgreSQL: Cache hit ratio too low (under {$PG.CACHE_HITRATIO.MIN.WARN} in 5m) |<p>-</p> |`max(/PostgreSQL by Zabbix agent/pgsql.cache.hit["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) < {$PG.CACHE_HITRATIO.MIN.WARN}` |WARNING | |
+|PostgreSQL: Configuration has changed |<p>-</p> |`last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#1)<>last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#2) and length(last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]))>0` |INFO | |
+|PostgreSQL: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m) |<p>-</p> |`min(/PostgreSQL by Zabbix agent/pgsql.connections.sum.total_pct,5m) > {$PG.CONN_TOTAL_PCT.MAX.WARN}` |AVERAGE | |
+|PostgreSQL: Response too long (over {$PG.PING_TIME.MAX.WARN}) |<p>-</p> |`min(/PostgreSQL by Zabbix agent/pgsql.ping.time["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) > {$PG.PING_TIME.MAX.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- PostgreSQL: Service is down</p> |
+|PostgreSQL: Service is down |<p>-</p> |`last(/PostgreSQL by Zabbix agent/pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) = 0` |HIGH | |
+|PostgreSQL: Streaming lag with {#MASTER} is too high (over {$PG.REPL_LAG.MAX.WARN} in 5m) |<p>-</p> |`min(/PostgreSQL by Zabbix agent/pgsql.replication.lag.sec["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) > {$PG.REPL_LAG.MAX.WARN}` |AVERAGE | |
+|PostgreSQL: Replication is down |<p>-</p> |`max(/PostgreSQL by Zabbix agent/pgsql.replication.status["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m)=0` |AVERAGE | |
+|PostgreSQL: Service has been restarted (uptime < 10m) |<p>PostgreSQL uptime is less than 10 minutes</p> |`last(/PostgreSQL by Zabbix agent/pgsql.uptime["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) < 10m` |INFO | |
+|PostgreSQL: Version has changed (new version value received: {ITEM.VALUE}) |<p>-</p> |`last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#1)<>last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#2) and length(last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]))>0` |INFO | |
+|DB {#DBNAME}: Too many recovery conflicts (over {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"} in 5m) |<p>The primary and standby servers are in many ways loosely connected. Actions on the primary will have an effect on the standby. As a result, there is potential for negative interactions or conflicts between them.</p><p>https://www.postgresql.org/docs/current/hot-standby.html#HOT-STANDBY-CONFLICT</p> |`min(/PostgreSQL by Zabbix agent/pgsql.dbstat.conflicts.rate["{#DBNAME}"],5m) > {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"}` |AVERAGE | |
+|DB {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m) |<p>-</p> |`min(/PostgreSQL by Zabbix agent/pgsql.dbstat.deadlocks.rate["{#DBNAME}"],5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}` |HIGH | |
+|DB {#DBNAME}: VACUUM FREEZE is required to prevent wraparound (frozen XID less than {$PG.FROZENXID_PCT_STOP.MIN.HIGH:"{#DBNAME}"} %) |<p>Preventing Transaction ID Wraparound Failures</p><p>https://www.postgresql.org/docs/current/routine-vacuuming.html#VACUUM-FOR-WRAPAROUND</p> |`last(/PostgreSQL by Zabbix agent/pgsql.frozenxid.prc_before_stop["{#DBNAME}"])<{$PG.FROZENXID_PCT_STOP.MIN.HIGH:"{#DBNAME}"}` |AVERAGE | |
+|DB {#DBNAME}: Number of locks is too high (over {$PG.LOCKS.MAX.WARN:"{#DBNAME}"} in 5m) |<p>-</p> |`min(/PostgreSQL by Zabbix agent/pgsql.locks.total["{#DBNAME}"],5m)>{$PG.LOCKS.MAX.WARN:"{#DBNAME}"}` |WARNING | |
+|DB {#DBNAME}: Too many slow queries (over {$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"} in 5m) |<p>-</p> |`min(/PostgreSQL by Zabbix agent/pgsql.queries.query.slow_count["{#DBNAME}"],5m)>{$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"}` |WARNING | |
+|PostgreSQL: Failed to get items (no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/PostgreSQL by Zabbix agent/pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],30m) = 1` |WARNING |<p>**Depends on**:</p><p>- PostgreSQL: Service is down</p> |
 
 ## Feedback
 
diff --git a/templates/db/postgresql/template_db_postgresql.yaml b/templates/db/postgresql/template_db_postgresql.yaml
index 00030236f6e..9c3c9927c32 100644
--- a/templates/db/postgresql/template_db_postgresql.yaml
+++ b/templates/db/postgresql/template_db_postgresql.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-15T17:54:17Z'
+  date: '2022-01-10T07:42:30Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -8,12 +8,12 @@ zabbix_export:
   templates:
     -
       uuid: 399bd1ee587245ecac6f39beaa99886f
-      template: 'PostgreSQL by user parameters'
-      name: 'PostgreSQL by user parameters'
+      template: 'PostgreSQL by Zabbix agent'
+      name: 'PostgreSQL by Zabbix agent'
       description: |
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384190-%C2%A0discussion-thread-for-official-zabbix-template-db-postgresql
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -169,7 +169,7 @@ zabbix_export:
           triggers:
             -
               uuid: 65e7954489854ad3ad1698dead7c4c02
-              expression: 'last(/PostgreSQL by user parameters/pgsql.bgwriter.checkpoints_req.rate) > {$PG.CHECKPOINTS_REQ.MAX.WARN}'
+              expression: 'last(/PostgreSQL by Zabbix agent/pgsql.bgwriter.checkpoints_req.rate) > {$PG.CHECKPOINTS_REQ.MAX.WARN}'
               name: 'PostgreSQL: Required checkpoints occurs too frequently (over {$PG.CHECKPOINTS_REQ.MAX.WARN})'
               priority: AVERAGE
               description: |
@@ -296,14 +296,14 @@ zabbix_export:
           triggers:
             -
               uuid: 768d28b9360b46cda3065f5082ba97ac
-              expression: 'nodata(/PostgreSQL by user parameters/pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],30m) = 1'
+              expression: 'nodata(/PostgreSQL by Zabbix agent/pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],30m) = 1'
               name: 'PostgreSQL: Failed to get items (no data for 30m)'
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 30 minutes'
               dependencies:
                 -
                   name: 'PostgreSQL: Service is down'
-                  expression: 'last(/PostgreSQL by user parameters/pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) = 0'
+                  expression: 'last(/PostgreSQL by Zabbix agent/pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) = 0'
         -
           uuid: 70a7581fabd14e05bda762b79811187c
           name: 'Status: Cache hit ratio %'
@@ -319,7 +319,7 @@ zabbix_export:
           triggers:
             -
               uuid: 4d87cc71b40f4b59ad27f30f33b15a69
-              expression: 'max(/PostgreSQL by user parameters/pgsql.cache.hit["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) < {$PG.CACHE_HITRATIO.MIN.WARN}'
+              expression: 'max(/PostgreSQL by Zabbix agent/pgsql.cache.hit["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) < {$PG.CACHE_HITRATIO.MIN.WARN}'
               name: 'PostgreSQL: Cache hit ratio too low (under {$PG.CACHE_HITRATIO.MIN.WARN} in 5m)'
               priority: WARNING
         -
@@ -343,7 +343,7 @@ zabbix_export:
           triggers:
             -
               uuid: b727cfa6d3de4063b6a2dcb6cc84e27b
-              expression: 'last(/PostgreSQL by user parameters/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#1)<>last(/PostgreSQL by user parameters/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#2) and length(last(/PostgreSQL by user parameters/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]))>0'
+              expression: 'last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#1)<>last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#2) and length(last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]))>0'
               name: 'PostgreSQL: Configuration has changed'
               priority: INFO
         -
@@ -466,7 +466,7 @@ zabbix_export:
           triggers:
             -
               uuid: 54ef12b8ff1e4383a3097c71478ceefa
-              expression: 'min(/PostgreSQL by user parameters/pgsql.connections.sum.total_pct,5m) > {$PG.CONN_TOTAL_PCT.MAX.WARN}'
+              expression: 'min(/PostgreSQL by Zabbix agent/pgsql.connections.sum.total_pct,5m) > {$PG.CONN_TOTAL_PCT.MAX.WARN}'
               name: 'PostgreSQL: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m)'
               priority: AVERAGE
         -
@@ -556,13 +556,13 @@ zabbix_export:
           triggers:
             -
               uuid: e19b5630737b4c63886b5df77a3c748c
-              expression: 'min(/PostgreSQL by user parameters/pgsql.ping.time["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) > {$PG.PING_TIME.MAX.WARN}'
+              expression: 'min(/PostgreSQL by Zabbix agent/pgsql.ping.time["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) > {$PG.PING_TIME.MAX.WARN}'
               name: 'PostgreSQL: Response too long (over {$PG.PING_TIME.MAX.WARN})'
               priority: AVERAGE
               dependencies:
                 -
                   name: 'PostgreSQL: Service is down'
-                  expression: 'last(/PostgreSQL by user parameters/pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) = 0'
+                  expression: 'last(/PostgreSQL by Zabbix agent/pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) = 0'
         -
           uuid: f5bd615243b344cb88dac1e83436cc85
           name: 'Status: Ping'
@@ -586,7 +586,7 @@ zabbix_export:
           triggers:
             -
               uuid: 6d9c2b5353ce4f6baeeb0f254fb7d1e2
-              expression: 'last(/PostgreSQL by user parameters/pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) = 0'
+              expression: 'last(/PostgreSQL by Zabbix agent/pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) = 0'
               name: 'PostgreSQL: Service is down'
               priority: HIGH
         -
@@ -625,7 +625,7 @@ zabbix_export:
           triggers:
             -
               uuid: 11831c52e86445498eed42de6a629b65
-              expression: 'min(/PostgreSQL by user parameters/pgsql.replication.lag.sec["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) > {$PG.REPL_LAG.MAX.WARN}'
+              expression: 'min(/PostgreSQL by Zabbix agent/pgsql.replication.lag.sec["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m) > {$PG.REPL_LAG.MAX.WARN}'
               name: 'PostgreSQL: Streaming lag with {#MASTER} is too high (over {$PG.REPL_LAG.MAX.WARN} in 5m)'
               priority: AVERAGE
         -
@@ -655,7 +655,7 @@ zabbix_export:
           triggers:
             -
               uuid: aef1e1d2bab540f8ab738b4a3fad863c
-              expression: 'max(/PostgreSQL by user parameters/pgsql.replication.status["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m)=0'
+              expression: 'max(/PostgreSQL by Zabbix agent/pgsql.replication.status["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],5m)=0'
               name: 'PostgreSQL: Replication is down'
               priority: AVERAGE
         -
@@ -767,7 +767,7 @@ zabbix_export:
           triggers:
             -
               uuid: 85565aba402740868a16c0e4639a98fc
-              expression: 'last(/PostgreSQL by user parameters/pgsql.uptime["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) < 10m'
+              expression: 'last(/PostgreSQL by Zabbix agent/pgsql.uptime["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]) < 10m'
               name: 'PostgreSQL: Service has been restarted (uptime < 10m)'
               priority: INFO
               description: 'PostgreSQL uptime is less than 10 minutes'
@@ -792,7 +792,7 @@ zabbix_export:
           triggers:
             -
               uuid: 8111eb42b0e74fffb43da474677ebc2f
-              expression: 'last(/PostgreSQL by user parameters/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#1)<>last(/PostgreSQL by user parameters/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#2) and length(last(/PostgreSQL by user parameters/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]))>0'
+              expression: 'last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#1)<>last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"],#2) and length(last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]))>0'
               name: 'PostgreSQL: Version has changed (new version value received: {ITEM.VALUE})'
               priority: INFO
         -
@@ -951,7 +951,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 3b51f02258bd4e02829f04ca016dd01d
-                  expression: 'min(/PostgreSQL by user parameters/pgsql.dbstat.conflicts.rate["{#DBNAME}"],5m) > {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"}'
+                  expression: 'min(/PostgreSQL by Zabbix agent/pgsql.dbstat.conflicts.rate["{#DBNAME}"],5m) > {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"}'
                   name: 'DB {#DBNAME}: Too many recovery conflicts (over {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"} in 5m)'
                   priority: AVERAGE
                   description: |
@@ -984,7 +984,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 3bee63fa04d94586937e22aafab9bdd8
-                  expression: 'min(/PostgreSQL by user parameters/pgsql.dbstat.deadlocks.rate["{#DBNAME}"],5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}'
+                  expression: 'min(/PostgreSQL by Zabbix agent/pgsql.dbstat.deadlocks.rate["{#DBNAME}"],5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}'
                   name: 'DB {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m)'
                   priority: HIGH
             -
@@ -1251,8 +1251,8 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 709df9c1e29a4ff68a3de9423ff7ae58
-                  expression: 'last(/PostgreSQL by user parameters/pgsql.frozenxid.prc_before_stop["{#DBNAME}"])<{$PG.FROZENXID_PCT_STOP.MIN.HIGH:"{#DBNAME}"}'
-                  name: 'DB {#DBNAME}: VACUUM FREEZE is required to prevent wraparound (frozen XID less then {$PG.FROZENXID_PCT_STOP.MIN.HIGH:"{#DBNAME}"} %)'
+                  expression: 'last(/PostgreSQL by Zabbix agent/pgsql.frozenxid.prc_before_stop["{#DBNAME}"])<{$PG.FROZENXID_PCT_STOP.MIN.HIGH:"{#DBNAME}"}'
+                  name: 'DB {#DBNAME}: VACUUM FREEZE is required to prevent wraparound (frozen XID less than {$PG.FROZENXID_PCT_STOP.MIN.HIGH:"{#DBNAME}"} %)'
                   priority: AVERAGE
                   description: |
                     Preventing Transaction ID Wraparound Failures
@@ -1290,7 +1290,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: ef7d3c9866df44aa9b378e7f125a34de
-                  expression: 'min(/PostgreSQL by user parameters/pgsql.locks.total["{#DBNAME}"],5m)>{$PG.LOCKS.MAX.WARN:"{#DBNAME}"}'
+                  expression: 'min(/PostgreSQL by Zabbix agent/pgsql.locks.total["{#DBNAME}"],5m)>{$PG.LOCKS.MAX.WARN:"{#DBNAME}"}'
                   name: 'DB {#DBNAME}: Number of locks is too high (over {$PG.LOCKS.MAX.WARN:"{#DBNAME}"} in 5m)'
                   priority: WARNING
             -
@@ -1374,7 +1374,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: facc8f6976664da4ad5567d270f0f311
-                  expression: 'min(/PostgreSQL by user parameters/pgsql.queries.query.slow_count["{#DBNAME}"],5m)>{$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"}'
+                  expression: 'min(/PostgreSQL by Zabbix agent/pgsql.queries.query.slow_count["{#DBNAME}"],5m)>{$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"}'
                   name: 'DB {#DBNAME}: Too many slow queries (over {$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"} in 5m)'
                   priority: WARNING
             -
@@ -1544,13 +1544,13 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.blks_hit.rate["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.blks_read.rate["{#DBNAME}"]'
             -
               uuid: 6bd0a0d65b8d43ad946b145cf8a8b533
@@ -1560,7 +1560,7 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.db.size["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}","{#DBNAME}"]'
             -
               uuid: 41e765d906324595a396d8985b204ff5
@@ -1571,25 +1571,25 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.xact_commit.rate["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.conflicts.rate["{#DBNAME}"]'
                 -
                   sortorder: '2'
                   color: F63100
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.deadlocks.rate["{#DBNAME}"]'
                 -
                   sortorder: '3'
                   color: A54F10
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.xact_rollback.rate["{#DBNAME}"]'
             -
               uuid: 2b260fdf7623476095429434b5c79041
@@ -1599,7 +1599,7 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.locks.total["{#DBNAME}"]'
             -
               uuid: 8a60a92b41b146f49145b86bab559b2e
@@ -1610,42 +1610,42 @@ zabbix_export:
                   color: 1A7C11
                   yaxisside: RIGHT
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.mro.time_max["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   yaxisside: RIGHT
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.query.time_max["{#DBNAME}"]'
                 -
                   sortorder: '2'
                   color: F63100
                   yaxisside: RIGHT
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.tx.time_max["{#DBNAME}"]'
                 -
                   sortorder: '3'
                   drawtype: GRADIENT_LINE
                   color: A54F10
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.mro.time_sum["{#DBNAME}"]'
                 -
                   sortorder: '4'
                   drawtype: GRADIENT_LINE
                   color: FC6EA3
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.query.time_sum["{#DBNAME}"]'
                 -
                   sortorder: '5'
                   drawtype: GRADIENT_LINE
                   color: 6C59DC
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.tx.time_sum["{#DBNAME}"]'
             -
               uuid: 93518b06f71e46ada3dabefa1726b867
@@ -1655,19 +1655,19 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.mro.slow_count["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.query.slow_count["{#DBNAME}"]'
                 -
                   sortorder: '2'
                   color: F63100
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.queries.tx.slow_count["{#DBNAME}"]'
             -
               uuid: 779b872280ad46c7a6cdf95c2df7c646
@@ -1677,14 +1677,14 @@ zabbix_export:
                   drawtype: GRADIENT_LINE
                   color: 1A7C11
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.temp_bytes.rate["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   yaxisside: RIGHT
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.temp_files.rate["{#DBNAME}"]'
             -
               uuid: f10be22e3bac4d66936c34ec99446c64
@@ -1694,31 +1694,31 @@ zabbix_export:
                 -
                   color: 1A7C11
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.tup_deleted.rate["{#DBNAME}"]'
                 -
                   sortorder: '1'
                   color: 2774A4
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.tup_fetched.rate["{#DBNAME}"]'
                 -
                   sortorder: '2'
                   color: F63100
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.tup_inserted.rate["{#DBNAME}"]'
                 -
                   sortorder: '3'
                   color: A54F10
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.tup_returned.rate["{#DBNAME}"]'
                 -
                   sortorder: '4'
                   color: FC6EA3
                   item:
-                    host: 'PostgreSQL by user parameters'
+                    host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.tup_updated.rate["{#DBNAME}"]'
       macros:
         -
@@ -1813,7 +1813,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'DB {#DBNAME}: Tuples'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
                   x: '12'
@@ -1837,7 +1837,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'DB {#DBNAME}: Events'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
                   'y': '5'
@@ -1861,7 +1861,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'DB {#DBNAME}: Block hit/read'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
                   x: '12'
@@ -1886,7 +1886,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'DB {#DBNAME}: Temp files'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
                   'y': '10'
@@ -1910,7 +1910,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'DB {#DBNAME}: Locks'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
                   x: '12'
@@ -1935,7 +1935,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'DB {#DBNAME}: Database size'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
                   'y': '15'
@@ -1959,7 +1959,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'DB {#DBNAME}: Queries'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_PROTOTYPE
                   x: '12'
@@ -1984,7 +1984,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'DB {#DBNAME}: Slow queries'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
         -
           uuid: f2ceabf59fd64ca9828ea55e9b9668bd
           name: 'PostgreSQL stat'
@@ -2005,7 +2005,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'PostgreSQL connections'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_CLASSIC
                   x: '12'
@@ -2021,7 +2021,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'PostgreSQL transactions'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_CLASSIC
                   'y': '5'
@@ -2037,7 +2037,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'PostgreSQL ping'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_CLASSIC
                   x: '12'
@@ -2054,7 +2054,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'PostgreSQL uptime'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_CLASSIC
                   'y': '10'
@@ -2070,7 +2070,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'PostgreSQL replication lag'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_CLASSIC
                   x: '12'
@@ -2087,7 +2087,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'PostgreSQL WAL'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_CLASSIC
                   'y': '15'
@@ -2103,7 +2103,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'PostgreSQL bgwriter'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
                 -
                   type: GRAPH_CLASSIC
                   x: '12'
@@ -2120,7 +2120,7 @@ zabbix_export:
                       name: graphid
                       value:
                         name: 'PostgreSQL checkpoints'
-                        host: 'PostgreSQL by user parameters'
+                        host: 'PostgreSQL by Zabbix agent'
       valuemaps:
         -
           uuid: 2e376ee568d04e7bbe98cbae4181f313
@@ -2165,40 +2165,40 @@ zabbix_export:
           color: 1A7C11
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.buffers_alloc.rate
         -
           sortorder: '1'
           color: 2774A4
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.buffers_clean.rate
         -
           sortorder: '2'
           color: F63100
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.buffers_backend.rate
         -
           sortorder: '3'
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.buffers_checkpoint.rate
         -
           sortorder: '4'
           color: FC6EA3
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.maxwritten_clean.rate
         -
           sortorder: '5'
           color: 6C59DC
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.buffers_backend_fsync.rate
     -
       uuid: 4a105d193df64be7898ac19a2f07faa4
@@ -2208,27 +2208,27 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.checkpoints_timed.rate
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.checkpoints_req.rate
         -
           sortorder: '2'
           color: F63100
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.checkpoint_sync_time
         -
           sortorder: '3'
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.bgwriter.checkpoint_write_time
     -
       uuid: 8d41d719832049a5a1fcd6f4da67fb6a
@@ -2240,48 +2240,48 @@ zabbix_export:
           color: 1A7C11
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.connections.sum.total
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.connections.sum.total_pct
         -
           sortorder: '2'
           color: F63100
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.connections.sum.active
         -
           sortorder: '3'
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.connections.sum.idle
         -
           sortorder: '4'
           color: FC6EA3
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.connections.sum.idle_in_transaction
         -
           sortorder: '5'
           color: 6C59DC
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.connections.sum.prepared
         -
           sortorder: '6'
           color: AC8C14
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.connections.sum.waiting
     -
       uuid: 1e9a55ee61824779a9f46f42ec21abef
@@ -2292,14 +2292,14 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: 'pgsql.ping["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]'
         -
           sortorder: '1'
           color: 2774A4
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: 'pgsql.ping.time["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]'
     -
       uuid: d8cf31fc39584a63b9384d9c3ebf40ee
@@ -2309,7 +2309,7 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: 'pgsql.replication.lag.sec["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]'
     -
       uuid: 10d1de74e9d848399ca038055e5cc8ce
@@ -2320,28 +2320,28 @@ zabbix_export:
           color: 1A7C11
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.transactions.active
         -
           sortorder: '1'
           color: 2774A4
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.transactions.idle
         -
           sortorder: '2'
           color: F63100
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.transactions.prepared
         -
           sortorder: '3'
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.transactions.waiting
     -
       uuid: 45fe7967596741129b4f2462922636bf
@@ -2352,14 +2352,14 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: 'pgsql.uptime["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]'
         -
           sortorder: '1'
           color: 2774A4
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: 'pgsql.cache.hit["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.DB}"]'
     -
       uuid: 93ca2dc7a3ff4a458c45e2a56390ce72
@@ -2369,12 +2369,12 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.wal.write
         -
           sortorder: '1'
           color: 2774A4
           yaxisside: RIGHT
           item:
-            host: 'PostgreSQL by user parameters'
+            host: 'PostgreSQL by Zabbix agent'
             key: pgsql.wal.count
diff --git a/templates/db/postgresql_agent2/README.md b/templates/db/postgresql_agent2/README.md
index 69ba6c6263a..5aa84f6e5c4 100644
--- a/templates/db/postgresql_agent2/README.md
+++ b/templates/db/postgresql_agent2/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template is developed for monitoring DBMS PostgreSQL and its forks.
 
 
@@ -11,7 +11,6 @@ The template is developed for monitoring DBMS PostgreSQL and its forks.
 This template was tested on:
 
 - PostgreSQL, version 10, 11, 12
-- Zabbix, version 5.0
 
 ## Setup
 
@@ -27,10 +26,10 @@ GRANT EXECUTE ON FUNCTION pg_catalog.pg_ls_waldir() TO zbx_monitor;
 ```
 
 2\. Edit pg_hba.conf to allow connections from Zabbix agent:
-
+  
 ```bash
 # TYPE  DATABASE        USER            ADDRESS                 METHOD
-    host            all              zbx_monitor            localhost   	         md5
+  host       all        zbx_monitor     localhost               md5
 ```
 
 For more information please read the PostgreSQL documentation https://www.postgresql.org/docs/current/auth-pg-hba-conf.html.
@@ -67,48 +66,48 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Replication Discovery |<p>-</p> |ZABBIX_PASSIVE |pgsql.replication.process.discovery["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#APPLICATION_NAME} MATCHES_REGEX `{$PG.LLD.FILTER.APPLICATION}`</p> |
-|Database discovery |<p>-</p> |ZABBIX_PASSIVE |pgsql.db.discovery["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$PG.LLD.FILTER.DBNAME}`</p> |
+|Replication Discovery |<p>-</p> |ZABBIX_PASSIVE |pgsql.replication.process.discovery["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Filter**:</p>AND <p>- {#APPLICATION_NAME} MATCHES_REGEX `{$PG.LLD.FILTER.APPLICATION}`</p> |
+|Database discovery |<p>-</p> |ZABBIX_PASSIVE |pgsql.db.discovery["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$PG.LLD.FILTER.DBNAME}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|PostgreSQL |PostgreSQL: Custom queries |<p>Execute custom queries from file *.sql</p> |ZABBIX_PASSIVE |pgsql.custom.query["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DATABASE}",""] |
-|PostgreSQL |WAL: Bytes written |<p>WAL write in bytes</p> |DEPENDENT |pgsql.wal.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.write`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |WAL: Bytes received |<p>WAL receive in bytes</p> |DEPENDENT |pgsql.wal.receive<p>**Preprocessing**:</p><p>- JSONPATH: `$.receive`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |PostgreSQL: Custom queries |<p>Execute custom queries from file *.sql (check for option Plugins.Postgres.CustomQueriesPath at agent configuration)</p> |ZABBIX_PASSIVE |pgsql.custom.query["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DATABASE}",""] |
+|PostgreSQL |WAL: Bytes written |<p>WAL write in bytes</p> |DEPENDENT |pgsql.wal.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.write`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |WAL: Bytes received |<p>WAL receive in bytes</p> |DEPENDENT |pgsql.wal.receive<p>**Preprocessing**:</p><p>- JSONPATH: `$.receive`</p><p>- CHANGE_PER_SECOND</p> |
 |PostgreSQL |WAL: Segments count |<p>Number of WAL segments</p> |DEPENDENT |pgsql.wal.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.count`</p> |
-|PostgreSQL |Bgwriter: Buffers allocated |<p>Number of buffers allocated</p> |DEPENDENT |pgsql.bgwriter.buffers_alloc.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_alloc`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Buffers written directly by a backend |<p>Number of buffers written directly by a backend</p> |DEPENDENT |pgsql.bgwriter.buffers_backend.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Number of bgwriter stopped |<p>Number of times the background writer stopped a cleaning scan because it had written too many buffers</p> |DEPENDENT |pgsql.bgwriter.maxwritten_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxwritten_clean`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Bgwriter: Times a backend execute its own fsync |<p>Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)</p> |DEPENDENT |pgsql.bgwriter.buffers_backend_fsync.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend_fsync`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Checkpoint: Buffers background written |<p>Number of buffers written by the background writer</p> |DEPENDENT |pgsql.bgwriter.buffers_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_clean`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Checkpoint: Buffers checkpoints written |<p>Number of buffers written during checkpoints</p> |DEPENDENT |pgsql.bgwriter.buffers_checkpoint.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_checkpoint`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Checkpoint: By timeout |<p>Number of scheduled checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_timed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_timed`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Checkpoint: Requested |<p>Number of requested checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_req.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_req`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Checkpoint: Checkpoint write time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds</p> |DEPENDENT |pgsql.bgwriter.checkpoint_write_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Checkpoint: Checkpoint write time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk, in milliseconds</p> |DEPENDENT |pgsql.bgwriter.checkpoint_sync_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Checkpoint: Checkpoint sync time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk</p> |DEPENDENT |pgsql.bgwriter.checkpoint_sync_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Bgwriter: Buffers allocated |<p>Number of buffers allocated</p> |DEPENDENT |pgsql.bgwriter.buffers_alloc.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_alloc`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Buffers written directly by a backend |<p>Number of buffers written directly by a backend</p> |DEPENDENT |pgsql.bgwriter.buffers_backend.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Number of bgwriter stopped |<p>Number of times the background writer stopped a cleaning scan because it had written too many buffers</p> |DEPENDENT |pgsql.bgwriter.maxwritten_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxwritten_clean`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Bgwriter: Times a backend execute its own fsync |<p>Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)</p> |DEPENDENT |pgsql.bgwriter.buffers_backend_fsync.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend_fsync`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Checkpoint: Buffers background written |<p>Number of buffers written by the background writer</p> |DEPENDENT |pgsql.bgwriter.buffers_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_clean`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Checkpoint: Buffers checkpoints written |<p>Number of buffers written during checkpoints</p> |DEPENDENT |pgsql.bgwriter.buffers_checkpoint.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_checkpoint`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Checkpoint: By timeout |<p>Number of scheduled checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_timed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_timed`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Checkpoint: Requested |<p>Number of requested checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_req.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_req`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Checkpoint: Checkpoint write time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds</p> |DEPENDENT |pgsql.bgwriter.checkpoint_write_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Checkpoint: Checkpoint write time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk, in milliseconds</p> |DEPENDENT |pgsql.bgwriter.checkpoint_sync_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Checkpoint: Checkpoint sync time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk</p> |DEPENDENT |pgsql.bgwriter.checkpoint_sync_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND</p> |
 |PostgreSQL |Archive: Count of archive files |<p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ARCHIVER-VIEW</p> |DEPENDENT |pgsql.archive.count_archived_files<p>**Preprocessing**:</p><p>- JSONPATH: `$.archived_count`</p> |
 |PostgreSQL |Archive: Count of attempts to archive files |<p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ARCHIVER-VIEW</p> |DEPENDENT |pgsql.archive.failed_trying_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.failed_count`</p> |
 |PostgreSQL |Archive: Count of files in archive_status need to archive |<p>-</p> |DEPENDENT |pgsql.archive.count_files_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.count_files`</p> |
 |PostgreSQL |Archive: Count of files need to archive |<p>Size of files to archive</p> |DEPENDENT |pgsql.archive.size_files_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.size_files`</p> |
 |PostgreSQL |Dbstat: Blocks read time |<p>Time spent reading data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.sum.blk_read_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.blk_read_time`</p><p>- MULTIPLIER: `0.001`</p> |
 |PostgreSQL |Dbstat: Blocks write time |<p>Time spent writing data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.sum.blk_write_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.blk_read_time`</p><p>- MULTIPLIER: `0.001`</p> |
-|PostgreSQL |Dbstat: Checksum failures |<p>Number of data page checksum failures detected (or on a shared object), or NULL if data checksums are not enabled. This metric included in PostgreSQL 12</p> |DEPENDENT |pgsql.dbstat.sum.checksum_failures.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checksum_failures`</p><p>- MATCHES_REGEX: `^\d*$`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Committed transactions |<p>Number of transactions that have been committed</p> |DEPENDENT |pgsql.dbstat.sum.xact_commit.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.xact_commit`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Conflicts |<p>Number of queries canceled due to conflicts with recovery.  (Conflicts occur only on standby servers; see pg_stat_database_conflicts for details.)</p> |DEPENDENT |pgsql.dbstat.sum.conflicts.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.conflicts`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Deadlocks |<p>Number of deadlocks detected</p> |DEPENDENT |pgsql.dbstat.sum.deadlocks.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.deadlocks`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Disk blocks read |<p>Number of disk blocks read</p> |DEPENDENT |pgsql.dbstat.sum.blks_read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.blks_read`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Hit blocks read |<p>Number of times disk blocks were found already in the buffer cache</p> |DEPENDENT |pgsql.dbstat.sum.blks_hit.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.blks_hit`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Number temp bytes |<p>Total amount of data written to temporary files by queries</p> |DEPENDENT |pgsql.dbstat.sum.temp_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.temp_bytes`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Number temp bytes |<p>Number of temporary files created by queries</p> |DEPENDENT |pgsql.dbstat.sum.temp_files.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.temp_files`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Roll backed transactions |<p>Number of transactions that have been rolled back</p> |DEPENDENT |pgsql.dbstat.sum.xact_rollback.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.xact_rollback`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Rows deleted |<p>Number of rows deleted by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_deleted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_deleted`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Rows fetched |<p>Number of rows fetched by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_fetched.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_fetched`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Rows inserted |<p>Number of rows inserted by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_inserted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_inserted`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Rows returned |<p>Number of rows returned by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_returned.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_returned`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |Dbstat: Rows updated |<p>Number of rows updated by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_updated.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_updated`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Checksum failures |<p>Number of data page checksum failures detected (or on a shared object), or NULL if data checksums are not enabled. This metric included in PostgreSQL 12</p> |DEPENDENT |pgsql.dbstat.sum.checksum_failures.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checksum_failures`</p><p>- MATCHES_REGEX: `^\d*$`</p><p>- CHANGE_PER_SECOND</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> -1`</p> |
+|PostgreSQL |Dbstat: Committed transactions |<p>Number of transactions that have been committed</p> |DEPENDENT |pgsql.dbstat.sum.xact_commit.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.xact_commit`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Conflicts |<p>Number of queries canceled due to conflicts with recovery.  (Conflicts occur only on standby servers; see pg_stat_database_conflicts for details.)</p> |DEPENDENT |pgsql.dbstat.sum.conflicts.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.conflicts`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Deadlocks |<p>Number of deadlocks detected</p> |DEPENDENT |pgsql.dbstat.sum.deadlocks.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.deadlocks`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Disk blocks read |<p>Number of disk blocks read</p> |DEPENDENT |pgsql.dbstat.sum.blks_read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.blks_read`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Hit blocks read |<p>Number of times disk blocks were found already in the buffer cache</p> |DEPENDENT |pgsql.dbstat.sum.blks_hit.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.blks_hit`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Number temp bytes |<p>Total amount of data written to temporary files by queries</p> |DEPENDENT |pgsql.dbstat.sum.temp_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.temp_bytes`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Number temp bytes |<p>Number of temporary files created by queries</p> |DEPENDENT |pgsql.dbstat.sum.temp_files.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.temp_files`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Roll backed transactions |<p>Number of transactions that have been rolled back</p> |DEPENDENT |pgsql.dbstat.sum.xact_rollback.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.xact_rollback`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Rows deleted |<p>Number of rows deleted by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_deleted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_deleted`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Rows fetched |<p>Number of rows fetched by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_fetched.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_fetched`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Rows inserted |<p>Number of rows inserted by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_inserted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_inserted`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Rows returned |<p>Number of rows returned by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_returned.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_returned`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |Dbstat: Rows updated |<p>Number of rows updated by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_updated.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_updated`</p><p>- CHANGE_PER_SECOND</p> |
 |PostgreSQL |Dbstat: Backends connected |<p>Number of connected backends</p> |DEPENDENT |pgsql.dbstat.sum.numbackends<p>**Preprocessing**:</p><p>- JSONPATH: `$.numbackends`</p> |
 |PostgreSQL |Connections sum: Active |<p>Total number of connections executing a query</p> |DEPENDENT |pgsql.connections.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.active`</p> |
 |PostgreSQL |Connections sum: Fastpath function call |<p>Total number of connections executing a fast-path function</p> |DEPENDENT |pgsql.connections.fastpath_function_call<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle_in_transaction`</p> |
@@ -136,23 +135,23 @@ There are no template links in this template.
 |PostgreSQL |DB {#DBNAME}: Database age |<p>Database age</p> |ZABBIX_PASSIVE |pgsql.db.age["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
 |PostgreSQL |DB {#DBNAME}: Get bloating tables |<p>Number of bloating tables</p> |ZABBIX_PASSIVE |pgsql.db.bloating_tables["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
 |PostgreSQL |DB {#DBNAME}: Database size |<p>Database size</p> |ZABBIX_PASSIVE |pgsql.db.size["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
-|PostgreSQL |DB {#DBNAME}: Blocks hit per second |<p>Total number of times disk blocks were found already in the buffer cache, so that a read was not necessary</p> |DEPENDENT |pgsql.dbstat.blks_hit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_hit`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Total number of disk blocks read in this database</p> |DEPENDENT |pgsql.dbstat.blks_read.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_read`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Detected conflicts per second |<p>Total number of queries canceled due to conflicts with recovery in this database</p> |DEPENDENT |pgsql.dbstat.conflicts.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].conflicts`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Detected deadlocks per second |<p>Total number of detected deadlocks in this database</p> |DEPENDENT |pgsql.dbstat.deadlocks.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].deadlocks`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Temp_bytes written per second |<p>Total amount of data written to temporary files by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_bytes.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_bytes`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Temp_files created per second |<p>Total number of temporary files created by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_files.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_files`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples deleted per second |<p>Total number of rows deleted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_deleted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_deleted`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples fetched per second |<p>Total number of rows fetched by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_fetched.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_fetched`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples inserted per second |<p>Total number of rows inserted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_inserted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_inserted`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples returned per second |<p>Number of rows returned by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_returned.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_returned`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Tuples updated per second |<p>Total number of rows updated by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_updated.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_updated`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Commits per second |<p>Number of transactions in this database that have been committed</p> |DEPENDENT |pgsql.dbstat.xact_commit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_commit`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Rollbacks per second |<p>Total number of transactions in this database that have been rolled back</p> |DEPENDENT |pgsql.dbstat.xact_rollback.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_rollback`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Blocks hit per second |<p>Total number of times disk blocks were found already in the buffer cache, so that a read was not necessary</p> |DEPENDENT |pgsql.dbstat.blks_hit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_hit`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Total number of disk blocks read in this database</p> |DEPENDENT |pgsql.dbstat.blks_read.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_read`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Detected conflicts per second |<p>Total number of queries canceled due to conflicts with recovery in this database</p> |DEPENDENT |pgsql.dbstat.conflicts.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].conflicts`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Detected deadlocks per second |<p>Total number of detected deadlocks in this database</p> |DEPENDENT |pgsql.dbstat.deadlocks.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].deadlocks`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Temp_bytes written per second |<p>Total amount of data written to temporary files by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_bytes.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_bytes`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Temp_files created per second |<p>Total number of temporary files created by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_files.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_files`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples deleted per second |<p>Total number of rows deleted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_deleted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_deleted`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples fetched per second |<p>Total number of rows fetched by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_fetched.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_fetched`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples inserted per second |<p>Total number of rows inserted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_inserted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_inserted`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples returned per second |<p>Number of rows returned by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_returned.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_returned`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Tuples updated per second |<p>Total number of rows updated by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_updated.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_updated`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Commits per second |<p>Number of transactions in this database that have been committed</p> |DEPENDENT |pgsql.dbstat.xact_commit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_commit`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Rollbacks per second |<p>Total number of transactions in this database that have been rolled back</p> |DEPENDENT |pgsql.dbstat.xact_rollback.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_rollback`</p><p>- CHANGE_PER_SECOND</p> |
 |PostgreSQL |DB {#DBNAME}: Backends connected |<p>Number of backends currently connected to this database</p> |DEPENDENT |pgsql.dbstat.numbackends["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].numbackends`</p> |
-|PostgreSQL |DB {#DBNAME}: Checksum failures |<p>Number of data page checksum failures detected in this database</p> |DEPENDENT |pgsql.dbstat.checksum_failures.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].checksum_failures`</p><p>- MATCHES_REGEX: `^\d*$`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Time spent reading data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.blk_read_time.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blk_read_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Time spent writing data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.blk_write_time.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blk_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Checksum failures |<p>Number of data page checksum failures detected in this database</p> |DEPENDENT |pgsql.dbstat.checksum_failures.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].checksum_failures`</p><p>- MATCHES_REGEX: `^\d*$`</p><p>- CHANGE_PER_SECOND</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> -1`</p> |
+|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Time spent reading data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.blk_read_time.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blk_read_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND</p> |
+|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Time spent writing data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.blk_write_time.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blk_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND</p> |
 |PostgreSQL |DB {#DBNAME}: Num of accessexclusive locks |<p>Number of accessexclusive locks for each database</p> |DEPENDENT |pgsql.locks.accessexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].accessexclusive`</p> |
 |PostgreSQL |DB {#DBNAME}: Num of accessshare locks |<p>Number of accessshare locks for each database</p> |DEPENDENT |pgsql.locks.accessshare["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].accessshare`</p> |
 |PostgreSQL |DB {#DBNAME}: Num of exclusive locks |<p>Number of exclusive locks for each database</p> |DEPENDENT |pgsql.locks.exclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].exclusive`</p> |
@@ -186,3 +185,5 @@ There are no template links in this template.
 
 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/384190-%C2%A0discussion-thread-for-official-zabbix-template-db-postgresql).
+
diff --git a/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml b/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
index c622e66b1ec..2d1b22baede 100644
--- a/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
+++ b/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-26T09:48:24Z'
+  date: '2021-12-16T07:31:47Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -10,7 +10,10 @@ zabbix_export:
       uuid: d0ef7d659a8f4beaaabfc4b6134e737a
       template: 'PostgreSQL by Zabbix agent 2'
       name: 'PostgreSQL by Zabbix agent 2'
-      description: 'Template tooling version used: 0.39'
+      description: |
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384190-%C2%A0discussion-thread-for-official-zabbix-template-db-postgresql
+        
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
diff --git a/templates/db/redis/README.md b/templates/db/redis/README.md
index 45f8b24084e..4f4db51d0fb 100644
--- a/templates/db/redis/README.md
+++ b/templates/db/redis/README.md
@@ -3,11 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor Redis server by Zabbix that work without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `Redis by Zabbix agent 2` — collects metrics by polling zabbix-agent2.
+Template `Redis by Zabbix agent 2` — collects metrics by polling zabbix-agent2.
 
 
 
@@ -30,18 +30,18 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                               | Description                                                                                                                                                                                                                                       | Default                |
-|------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------|
-| {$REDIS.CLIENTS.PRC.MAX.WARN}      | <p>Maximum percentage of connected clients</p>                                                                                                                                                                                                    | `80`                   |
-| {$REDIS.CONN.URI}                  | <p>Connection string in the URI format (password is not used). This param overwrites a value configured in the "Server" option of the configuration file (if it's set), otherwise, the plugin's default value is used: "tcp://localhost:6379"</p> | `tcp://localhost:6379` |
-| {$REDIS.LLD.FILTER.DB.MATCHES}     | <p>Filter of discoverable databases</p>                                                                                                                                                                                                           | `.*`                   |
-| {$REDIS.LLD.FILTER.DB.NOT_MATCHES} | <p>Filter to exclude discovered databases</p>                                                                                                                                                                                                     | `CHANGE_IF_NEEDED`     |
-| {$REDIS.LLD.PROCESS_NAME}          | <p>Redis server process name for LLD</p>                                                                                                                                                                                                          | `redis-server`         |
-| {$REDIS.MEM.FRAG_RATIO.MAX.WARN}   | <p>Maximum memory fragmentation ratio</p>                                                                                                                                                                                                         | `1.5`                  |
-| {$REDIS.MEM.PUSED.MAX.WARN}        | <p>Maximum percentage of memory used</p>                                                                                                                                                                                                          | `90`                   |
-| {$REDIS.PROCESS_NAME}              | <p>Redis server process name</p>                                                                                                                                                                                                                  | `redis-server`         |
-| {$REDIS.REPL.LAG.MAX.WARN}         | <p>Maximum replication lag in seconds</p>                                                                                                                                                                                                         | `30s`                  |
-| {$REDIS.SLOWLOG.COUNT.MAX.WARN}    | <p>Maximum number of slowlog entries per second</p>                                                                                                                                                                                               | `1`                    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$REDIS.CLIENTS.PRC.MAX.WARN} |<p>Maximum percentage of connected clients</p> |`80` |
+|{$REDIS.CONN.URI} |<p>Connection string in the URI format (password is not used). This param overwrites a value configured in the "Server" option of the configuration file (if it's set), otherwise, the plugin's default value is used: "tcp://localhost:6379"</p> |`tcp://localhost:6379` |
+|{$REDIS.LLD.FILTER.DB.MATCHES} |<p>Filter of discoverable databases</p> |`.*` |
+|{$REDIS.LLD.FILTER.DB.NOT_MATCHES} |<p>Filter to exclude discovered databases</p> |`CHANGE_IF_NEEDED` |
+|{$REDIS.LLD.PROCESS_NAME} |<p>Redis server process name for LLD</p> |`redis-server` |
+|{$REDIS.MEM.FRAG_RATIO.MAX.WARN} |<p>Maximum memory fragmentation ratio</p> |`1.5` |
+|{$REDIS.MEM.PUSED.MAX.WARN} |<p>Maximum percentage of memory used</p> |`90` |
+|{$REDIS.PROCESS_NAME} |<p>Redis server process name</p> |`redis-server` |
+|{$REDIS.REPL.LAG.MAX.WARN} |<p>Maximum replication lag in seconds</p> |`30s` |
+|{$REDIS.SLOWLOG.COUNT.MAX.WARN} |<p>Maximum number of slowlog entries per second</p> |`1` |
 
 ## Template links
 
@@ -49,166 +49,166 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                          | Description                                                                                        | Type           | Key and additional info                                                                                                                                                                                                                                                          |
-|-------------------------------|----------------------------------------------------------------------------------------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Keyspace discovery            | <p>Individual keyspace metrics</p>                                                                 | DEPENDENT      | redis.keyspace.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#DB} MATCHES_REGEX `{$REDIS.LLD.FILTER.DB.MATCHES}`</p><p>- B: {#DB} NOT_MATCHES_REGEX `{$REDIS.LLD.FILTER.DB.NOT_MATCHES}`</p> |
-| AOF metrics discovery         | <p>If AOF is activated, additional metrics will be added</p>                                       | DEPENDENT      | redis.persistence.aof.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                                                                                        |
-| Slave metrics discovery       | <p>If the instance is a replica, additional metrics are provided</p>                               | DEPENDENT      | redis.replication.slave.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                                                                                      |
-| Replication metrics discovery | <p>If the instance is the master and the slaves are connected, additional metrics are provided</p> | DEPENDENT      | redis.replication.master.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                                                                                                                                     |
-| Process metrics discovery     | <p>Collect metrics by Zabbix agent if it exists</p>                                                | ZABBIX_PASSIVE | proc.num["{$REDIS.LLD.PROCESS_NAME}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value > 0 ? [{'{#SINGLETON}': ''}] : []);`</p>                                                                                                                             |
-| Version 4+ metrics discovery  | <p>Additional metrics for versions 4+</p>                                                          | DEPENDENT      | redis.metrics.v4.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.redis_version`</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value.split('.')[0]) >= 4 ? [{'{#SINGLETON}': ''}] : []);`</p>                                                                    |
-| Version 5+ metrics discovery  | <p>Additional metrics for versions 5+</p>                                                          | DEPENDENT      | redis.metrics.v5.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.redis_version`</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value.split('.')[0]) >= 5 ? [{'{#SINGLETON}': ''}] : []);`</p>                                                                    |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Keyspace discovery |<p>Individual keyspace metrics</p> |DEPENDENT |redis.keyspace.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#DB} MATCHES_REGEX `{$REDIS.LLD.FILTER.DB.MATCHES}`</p><p>- {#DB} NOT_MATCHES_REGEX `{$REDIS.LLD.FILTER.DB.NOT_MATCHES}`</p> |
+|AOF metrics discovery |<p>If AOF is activated, additional metrics will be added</p> |DEPENDENT |redis.persistence.aof.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Slave metrics discovery |<p>If the instance is a replica, additional metrics are provided</p> |DEPENDENT |redis.replication.slave.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Replication metrics discovery |<p>If the instance is the master and the slaves are connected, additional metrics are provided</p> |DEPENDENT |redis.replication.master.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Process metrics discovery |<p>Collect metrics by Zabbix agent if it exists</p> |ZABBIX_PASSIVE |proc.num["{$REDIS.LLD.PROCESS_NAME}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value > 0 ? [{'{#SINGLETON}': ''}] : []);`</p> |
+|Version 4+ metrics discovery |<p>Additional metrics for versions 4+</p> |DEPENDENT |redis.metrics.v4.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.redis_version`</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value.split('.')[0]) >= 4 ? [{'{#SINGLETON}': ''}] : []);`</p> |
+|Version 5+ metrics discovery |<p>Additional metrics for versions 5+</p> |DEPENDENT |redis.metrics.v5.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.redis_version`</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value.split('.')[0]) >= 5 ? [{'{#SINGLETON}': ''}] : []);`</p> |
 
 ## Items collected
 
-| Group            | Name                                                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Type           | Key and additional info                                                                                                                                              |
-|------------------|-----------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Redis            | Redis: Ping                                                     |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | ZABBIX_PASSIVE | redis.ping["{$REDIS.CONN.URI}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p>                                                                  |
-| Redis            | Redis: Slowlog entries per second                               |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | ZABBIX_PASSIVE | redis.slowlog.count["{$REDIS.CONN.URI}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                                              |
-| Redis            | Redis: CPU sys                                                  | <p>System CPU consumed by the Redis server</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT      | redis.cpu.sys<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPU.used_cpu_sys`</p>                                                                                        |
-| Redis            | Redis: CPU sys children                                         | <p>System CPU consumed by the background processes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT      | redis.cpu.sys_children<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPU.used_cpu_sys_children`</p>                                                                      |
-| Redis            | Redis: CPU user                                                 | <p>User CPU consumed by the Redis server</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.cpu.user<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPU.used_cpu_user`</p>                                                                                      |
-| Redis            | Redis: CPU user children                                        | <p>User CPU consumed by the background processes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | redis.cpu.user_children<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPU.used_cpu_user_children`</p>                                                                    |
-| Redis            | Redis: Blocked clients                                          | <p>The number of connections waiting on a blocking call</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT      | redis.clients.blocked<p>**Preprocessing**:</p><p>- JSONPATH: `$.Clients.blocked_clients`</p>                                                                         |
-| Redis            | Redis: Max input buffer                                         | <p>The biggest input buffer among current client connections</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT      | redis.clients.max_input_buffer<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                             |
-| Redis            | Redis: Max output buffer                                        | <p>The biggest output buffer among current client connections</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT      | redis.clients.max_output_buffer<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                            |
-| Redis            | Redis: Connected clients                                        | <p>The number of connected clients</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT      | redis.clients.connected<p>**Preprocessing**:</p><p>- JSONPATH: `$.Clients.connected_clients`</p>                                                                     |
-| Redis            | Redis: Cluster enabled                                          | <p>Indicate Redis cluster is enabled</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT      | redis.cluster.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.Cluster.cluster_enabled`</p>                                                                         |
-| Redis            | Redis: Memory used                                              | <p>Total number of bytes allocated by Redis using its allocator</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | DEPENDENT      | redis.memory.used_memory<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory`</p>                                                                           |
-| Redis            | Redis: Memory used Lua                                          | <p>Amount of memory used by the Lua engine</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT      | redis.memory.used_memory_lua<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_lua`</p>                                                                   |
-| Redis            | Redis: Memory used peak                                         | <p>Peak memory consumed by Redis (in bytes)</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.used_memory_peak<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_peak`</p>                                                                 |
-| Redis            | Redis: Memory used RSS                                          | <p>Number of bytes that Redis allocated as seen by the operating system</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT      | redis.memory.used_memory_rss<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_rss`</p>                                                                   |
-| Redis            | Redis: Memory fragmentation ratio                               | <p>This ratio is an indication of memory mapping efficiency:</p><p>  — Value over 1.0 indicate that memory fragmentation is very likely. Consider restarting the Redis server so the operating system can recover fragmented memory, especially with a ratio over 1.5.</p><p>  — Value under 1.0 indicate that Redis likely has insufficient memory available. Consider optimizing memory usage or adding more RAM.</p><p>Note: If your peak memory usage is much higher than your current memory usage, the memory fragmentation ratio may be unreliable.</p><p>https://redis.io/topics/memory-optimization</p> | DEPENDENT      | redis.memory.fragmentation_ratio<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_fragmentation_ratio`</p>                                                       |
-| Redis            | Redis: AOF current rewrite time sec                             | <p>Duration of the on-going AOF rewrite operation if any</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.persistence.aof_current_rewrite_time_sec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_current_rewrite_time_sec`</p>                               |
-| Redis            | Redis: AOF enabled                                              | <p>Flag indicating AOF logging is activated</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.persistence.aof_enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_enabled`</p>                                                                 |
-| Redis            | Redis: AOF last bgrewrite status                                | <p>Status of the last AOF rewrite operation</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.persistence.aof_last_bgrewrite_status<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_last_bgrewrite_status`</p><p>- BOOL_TO_DECIMAL                 |
-| Redis            | Redis: AOF last rewrite time sec                                | <p>Duration of the last AOF rewrite</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT      | redis.persistence.aof_last_rewrite_time_sec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_last_rewrite_time_sec`</p>                                     |
-| Redis            | Redis: AOF last write status                                    | <p>Status of the last write operation to the AOF</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | redis.persistence.aof_last_write_status<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_last_write_status`</p><p>- BOOL_TO_DECIMAL                         |
-| Redis            | Redis: AOF rewrite in progress                                  | <p>Flag indicating a AOF rewrite operation is on-going</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT      | redis.persistence.aof_rewrite_in_progress<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_rewrite_in_progress`</p>                                         |
-| Redis            | Redis: AOF rewrite scheduled                                    | <p>Flag indicating an AOF rewrite operation will be scheduled once the on-going RDB save is complete</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT      | redis.persistence.aof_rewrite_scheduled<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_rewrite_scheduled`</p>                                             |
-| Redis            | Redis: Dump loading                                             | <p>Flag indicating if the load of a dump file is on-going</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT      | redis.persistence.loading<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.loading`</p>                                                                         |
-| Redis            | Redis: RDB bgsave in progress                                   | <p>"1" if bgsave is in progress and "0" otherwise</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT      | redis.persistence.rdb_bgsave_in_progress<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_bgsave_in_progress`</p>                                           |
-| Redis            | Redis: RDB changes since last save                              | <p>Number of changes since the last background save</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT      | redis.persistence.rdb_changes_since_last_save<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_changes_since_last_save`</p>                                 |
-| Redis            | Redis: RDB current bgsave time sec                              | <p>Duration of the on-going RDB save operation if any</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | DEPENDENT      | redis.persistence.rdb_current_bgsave_time_sec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_current_bgsave_time_sec`</p>                                 |
-| Redis            | Redis: RDB last bgsave status                                   | <p>Status of the last RDB save operation</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.persistence.rdb_last_bgsave_status<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_last_bgsave_status`</p><p>- BOOL_TO_DECIMAL                       |
-| Redis            | Redis: RDB last bgsave time sec                                 | <p>Duration of the last bg_save operation</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT      | redis.persistence.rdb_last_bgsave_time_sec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_last_bgsave_time_sec`</p>                                       |
-| Redis            | Redis: RDB last save time                                       | <p>Epoch-based timestamp of last successful RDB save</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT      | redis.persistence.rdb_last_save_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_last_save_time`</p>                                                   |
-| Redis            | Redis: Connected slaves                                         | <p>Number of connected slaves</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT      | redis.replication.connected_slaves<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.connected_slaves`</p>                                                       |
-| Redis            | Redis: Replication backlog active                               | <p>Flag indicating replication backlog is active</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | redis.replication.repl_backlog_active<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.repl_backlog_active`</p>                                                 |
-| Redis            | Redis: Replication backlog first byte offset                    | <p>The master offset of the replication backlog buffer</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT      | redis.replication.repl_backlog_first_byte_offset<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.repl_backlog_first_byte_offset`</p>                           |
-| Redis            | Redis: Replication backlog history length                       | <p>Amount of data in the backlog sync buffer</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT      | redis.replication.repl_backlog_histlen<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.repl_backlog_histlen`</p>                                               |
-| Redis            | Redis: Replication backlog size                                 | <p>Total size in bytes of the replication backlog buffer</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.replication.repl_backlog_size<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.repl_backlog_size`</p>                                                     |
-| Redis            | Redis: Replication role                                         | <p>Value is "master" if the instance is replica of no one, or "slave" if the instance is a replica of some master instance. Note that a replica can be master of another replica (chained replication).</p>                                                                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT      | redis.replication.role<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.role`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                     |
-| Redis            | Redis: Master replication offset                                | <p>Replication offset reported by the master</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT      | redis.replication.master_repl_offset<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_repl_offset`</p>                                                   |
-| Redis            | Redis: Process id                                               | <p>PID of the server process</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT      | redis.server.process_id<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.process_id`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                   |
-| Redis            | Redis: Redis mode                                               | <p>The server's mode ("standalone", "sentinel" or "cluster")</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT      | redis.server.redis_mode<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.redis_mode`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                   |
-| Redis            | Redis: Redis version                                            | <p>Version of the Redis server</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT      | redis.server.redis_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.redis_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                             |
-| Redis            | Redis: TCP port                                                 | <p>TCP/IP listen port</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | DEPENDENT      | redis.server.tcp_port<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.tcp_port`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                       |
-| Redis            | Redis: Uptime                                                   | <p>Number of seconds since Redis server start</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT      | redis.server.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.uptime_in_seconds`</p>                                                                          |
-| Redis            | Redis: Evicted keys                                             | <p>Number of evicted keys due to maxmemory limit</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | redis.stats.evicted_keys<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.evicted_keys`</p>                                                                           |
-| Redis            | Redis: Expired keys                                             | <p>Total number of key expiration events</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.stats.expired_keys<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.expired_keys`</p>                                                                           |
-| Redis            | Redis: Instantaneous input bytes per second                     | <p>The network's read rate per second in KB/sec</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | DEPENDENT      | redis.stats.instantaneous_input.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.instantaneous_input_kbps`</p><p>- MULTIPLIER: `1024`</p>                        |
-| Redis            | Redis: Instantaneous operations per sec                         | <p>Number of commands processed per second</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | DEPENDENT      | redis.stats.instantaneous_ops.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.instantaneous_ops_per_sec`</p>                                                    |
-| Redis            | Redis: Instantaneous output bytes per second                    | <p>The network's write rate per second in KB/sec</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | redis.stats.instantaneous_output.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.instantaneous_output_kbps`</p><p>- MULTIPLIER: `1024`</p>                      |
-| Redis            | Redis: Keyspace hits                                            | <p>Number of successful lookup of keys in the main dictionary</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT      | redis.stats.keyspace_hits<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.keyspace_hits`</p>                                                                         |
-| Redis            | Redis: Keyspace misses                                          | <p>Number of failed lookup of keys in the main dictionary</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT      | redis.stats.keyspace_misses<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.keyspace_misses`</p>                                                                     |
-| Redis            | Redis: Latest fork usec                                         | <p>Duration of the latest fork operation in microseconds</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.stats.latest_fork_usec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.latest_fork_usec`</p><p>- MULTIPLIER: `1.0E-5`</p>                                      |
-| Redis            | Redis: Migrate cached sockets                                   | <p>The number of sockets open for MIGRATE purposes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT      | redis.stats.migrate_cached_sockets<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.migrate_cached_sockets`</p>                                                       |
-| Redis            | Redis: Pubsub channels                                          | <p>Global number of pub/sub channels with client subscriptions</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT      | redis.stats.pubsub_channels<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.pubsub_channels`</p>                                                                     |
-| Redis            | Redis: Pubsub patterns                                          | <p>Global number of pub/sub pattern with client subscriptions</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT      | redis.stats.pubsub_patterns<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.pubsub_patterns`</p>                                                                     |
-| Redis            | Redis: Rejected connections                                     | <p>Number of connections rejected because of maxclients limit</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT      | redis.stats.rejected_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.rejected_connections`</p>                                                           |
-| Redis            | Redis: Sync full                                                | <p>The number of full resyncs with replicas</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.stats.sync_full<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.sync_full`</p>                                                                                 |
-| Redis            | Redis: Sync partial err                                         | <p>The number of denied partial resync requests</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | DEPENDENT      | redis.stats.sync_partial_err<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.sync_partial_err`</p>                                                                   |
-| Redis            | Redis: Sync partial ok                                          | <p>The number of accepted partial resync requests</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT      | redis.stats.sync_partial_ok<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.sync_partial_ok`</p>                                                                     |
-| Redis            | Redis: Total commands processed                                 | <p>Total number of commands processed by the server</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT      | redis.stats.total_commands_processed<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.total_commands_processed`</p>                                                   |
-| Redis            | Redis: Total connections received                               | <p>Total number of connections accepted by the server</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | DEPENDENT      | redis.stats.total_connections_received<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.total_connections_received`</p>                                               |
-| Redis            | Redis: Total net input bytes                                    | <p>The total number of bytes read from the network</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT      | redis.stats.total_net_input_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.total_net_input_bytes`</p>                                                         |
-| Redis            | Redis: Total net output bytes                                   | <p>The total number of bytes written to the network</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT      | redis.stats.total_net_output_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.total_net_output_bytes`</p>                                                       |
-| Redis            | Redis: Max clients                                              | <p>Max number of connected clients at the same time.</p><p>Once the limit is reached Redis will close all the new connections sending an error "max number of clients reached".</p>                                                                                                                                                                                                                                                                                                                                                                                                                              | DEPENDENT      | redis.config.maxclients<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxclients`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p>                                         |
-| Redis            | DB {#DB}: Average TTL                                           | <p>Average TTL</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT      | redis.db.avg_ttl["{#DB}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Keyspace["{#DB}"].avg_ttl`</p><p>- MULTIPLIER: `0.001`</p>                                       |
-| Redis            | DB {#DB}: Expires                                               | <p>Number of keys with an expiration</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT      | redis.db.expires["{#DB}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Keyspace["{#DB}"].expires`</p>                                                                   |
-| Redis            | DB {#DB}: Keys                                                  | <p>Total number of keys</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT      | redis.db.keys["{#DB}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Keyspace["{#DB}"].keys`</p>                                                                         |
-| Redis            | Redis: AOF current size{#SINGLETON}                             | <p>AOF current file size</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.persistence.aof_current_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_current_size`</p>                                         |
-| Redis            | Redis: AOF base size{#SINGLETON}                                | <p>AOF file size on latest startup or rewrite</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | DEPENDENT      | redis.persistence.aof_base_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_base_size`</p>                                               |
-| Redis            | Redis: AOF pending rewrite{#SINGLETON}                          | <p>Flag indicating an AOF rewrite operation will</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | redis.persistence.aof_pending_rewrite[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_pending_rewrite`</p>                                   |
-| Redis            | Redis: AOF buffer length{#SINGLETON}                            | <p>Size of the AOF buffer</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT      | redis.persistence.aof_buffer_length[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_buffer_length`</p>                                       |
-| Redis            | Redis: AOF rewrite buffer length{#SINGLETON}                    | <p>Size of the AOF rewrite buffer</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT      | redis.persistence.aof_rewrite_buffer_length[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_rewrite_buffer_length`</p>                       |
-| Redis            | Redis: AOF pending background I/O fsync{#SINGLETON}             | <p>Number of fsync pending jobs in background I/O queue</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT      | redis.persistence.aof_pending_bio_fsync[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_pending_bio_fsync`</p>                               |
-| Redis            | Redis: AOF delayed fsync{#SINGLETON}                            | <p>Delayed fsync counter</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.persistence.aof_delayed_fsync[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_delayed_fsync`</p>                                       |
-| Redis            | Redis: Master host{#SINGLETON}                                  | <p>Host or IP address of the master</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT      | redis.replication.master_host[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_host`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>         |
-| Redis            | Redis: Master port{#SINGLETON}                                  | <p>Master listening TCP port</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT      | redis.replication.master_port[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_port`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>         |
-| Redis            | Redis: Master link status{#SINGLETON}                           | <p>Status of the link (up/down)</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | DEPENDENT      | redis.replication.master_link_status[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_link_status`</p><p>- BOOL_TO_DECIMAL                 |
-| Redis            | Redis: Master last I/O seconds ago{#SINGLETON}                  | <p>Number of seconds since the last interaction with master</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.replication.master_last_io_seconds_ago[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_last_io_seconds_ago`</p>                     |
-| Redis            | Redis: Master sync in progress{#SINGLETON}                      | <p>Indicate the master is syncing to the replica</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | redis.replication.master_sync_in_progress[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_sync_in_progress`</p>                           |
-| Redis            | Redis: Slave replication offset{#SINGLETON}                     | <p>The replication offset of the replica instance</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT      | redis.replication.slave_repl_offset[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.slave_repl_offset`</p>                                       |
-| Redis            | Redis: Slave priority{#SINGLETON}                               | <p>The priority of the instance as a candidate for failover</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.replication.slave_priority[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.slave_priority`</p>                                             |
-| Redis            | Redis: Slave priority{#SINGLETON}                               | <p>Flag indicating if the replica is read-only</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | DEPENDENT      | redis.replication.slave_read_only[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.slave_read_only`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Redis            | Redis slave {#SLAVE_IP}:{#SLAVE_PORT}: Replication lag in bytes | <p>Replication lag in bytes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.replication.lag_bytes["{#SLAVE_IP}:{#SLAVE_PORT}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                   |
-| Redis            | Redis: Number of processes running                              | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | ZABBIX_PASSIVE | proc.num["{$REDIS.PROCESS_NAME}{#SINGLETON}"]                                                                                                                        |
-| Redis            | Redis: Memory usage (rss)                                       | <p>Resident set size memory used by process in bytes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | ZABBIX_PASSIVE | proc.mem["{$REDIS.PROCESS_NAME}{#SINGLETON}",,,,rss]                                                                                                                 |
-| Redis            | Redis: Memory usage (vsize)                                     | <p>Virtual memory size used by process in bytes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | ZABBIX_PASSIVE | proc.mem["{$REDIS.PROCESS_NAME}{#SINGLETON}",,,,vsize]                                                                                                               |
-| Redis            | Redis: CPU utilization                                          | <p>Process CPU utilization percentage.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | ZABBIX_PASSIVE | proc.cpu.util["{$REDIS.PROCESS_NAME}{#SINGLETON}"]                                                                                                                   |
-| Redis            | Redis: Executable path{#SINGLETON}                              | <p>The path to the server's executable</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT      | redis.server.executable[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.executable`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                     |
-| Redis            | Redis: Memory used peak %{#SINGLETON}                           | <p>The percentage of used_memory_peak out of used_memory</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.memory.used_memory_peak_perc[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_peak_perc`</p><p>- REGEX: `(.+)% \1`</p>               |
-| Redis            | Redis: Memory used overhead{#SINGLETON}                         | <p>The sum in bytes of all overheads that the server allocated for managing its internal data structures</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.memory.used_memory_overhead[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_overhead`</p>                                           |
-| Redis            | Redis: Memory used startup{#SINGLETON}                          | <p>Initial amount of memory consumed by Redis at startup in bytes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT      | redis.memory.used_memory_startup[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_startup`</p>                                             |
-| Redis            | Redis: Memory used dataset{#SINGLETON}                          | <p>The size in bytes of the dataset</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | DEPENDENT      | redis.memory.used_memory_dataset[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_dataset`</p>                                             |
-| Redis            | Redis: Memory used dataset %{#SINGLETON}                        | <p>The percentage of used_memory_dataset out of the net memory usage (used_memory minus used_memory_startup)</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT      | redis.memory.used_memory_dataset_perc[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_dataset_perc`</p><p>- REGEX: `(.+)% \1`</p>         |
-| Redis            | Redis: Total system memory{#SINGLETON}                          | <p>The total amount of memory that the Redis host has</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | DEPENDENT      | redis.memory.total_system_memory[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.total_system_memory`</p>                                             |
-| Redis            | Redis: Max memory{#SINGLETON}                                   | <p>Maximum amount of memory allocated to the Redisdb system</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.maxmemory[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.maxmemory`</p>                                                                 |
-| Redis            | Redis: Max memory policy{#SINGLETON}                            | <p>The value of the maxmemory-policy configuration directive</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | DEPENDENT      | redis.memory.maxmemory_policy[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.maxmemory_policy`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>         |
-| Redis            | Redis: Active defrag running{#SINGLETON}                        | <p>Flag indicating if active defragmentation is active</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT      | redis.memory.active_defrag_running[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.active_defrag_running`</p>                                         |
-| Redis            | Redis: Lazyfree pending objects{#SINGLETON}                     | <p>The number of objects waiting to be freed (as a result of calling UNLINK, or FLUSHDB and FLUSHALL with the ASYNC option)</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.lazyfree_pending_objects[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.lazyfree_pending_objects`</p>                                   |
-| Redis            | Redis: RDB last CoW size{#SINGLETON}                            | <p>The size in bytes of copy-on-write allocations during the last RDB save operation</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | DEPENDENT      | redis.persistence.rdb_last_cow_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_last_cow_size`</p>                                       |
-| Redis            | Redis: AOF last CoW size{#SINGLETON}                            | <p>The size in bytes of copy-on-write allocations during the last AOF rewrite operation</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | DEPENDENT      | redis.persistence.aof_last_cow_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_last_cow_size`</p>                                       |
-| Redis            | Redis: Expired stale %{#SINGLETON}                              |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.stats.expired_stale_perc[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.expired_stale_perc`</p>                                                 |
-| Redis            | Redis: Expired time cap reached count{#SINGLETON}               |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.stats.expired_time_cap_reached_count[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.expired_time_cap_reached_count`</p>                         |
-| Redis            | Redis: Slave expires tracked keys{#SINGLETON}                   | <p>The number of keys tracked for expiry purposes (applicable only to writable replicas)</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | DEPENDENT      | redis.stats.slave_expires_tracked_keys[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.slave_expires_tracked_keys`</p>                                 |
-| Redis            | Redis: Active defrag hits{#SINGLETON}                           | <p>Number of value reallocations performed by active the defragmentation process</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | DEPENDENT      | redis.stats.active_defrag_hits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.active_defrag_hits`</p>                                                 |
-| Redis            | Redis: Active defrag misses{#SINGLETON}                         | <p>Number of aborted value reallocations started by the active defragmentation process</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | DEPENDENT      | redis.stats.active_defrag_misses[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.active_defrag_misses`</p>                                             |
-| Redis            | Redis: Active defrag key hits{#SINGLETON}                       | <p>Number of keys that were actively defragmented</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | DEPENDENT      | redis.stats.active_defrag_key_hits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.active_defrag_key_hits`</p>                                         |
-| Redis            | Redis: Active defrag key misses{#SINGLETON}                     | <p>Number of keys that were skipped by the active defragmentation process</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT      | redis.stats.active_defrag_key_misses[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.active_defrag_key_misses`</p>                                     |
-| Redis            | Redis: Replication second offset{#SINGLETON}                    | <p>Offset up to which replication IDs are accepted</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | DEPENDENT      | redis.replication.second_repl_offset[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.second_repl_offset`</p>                                     |
-| Redis            | Redis: Allocator active{#SINGLETON}                             |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.allocator_active[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_active`</p>                                                   |
-| Redis            | Redis: Allocator allocated{#SINGLETON}                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.allocator_allocated[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_allocated`</p>                                             |
-| Redis            | Redis: Allocator resident{#SINGLETON}                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.allocator_resident[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_resident`</p>                                               |
-| Redis            | Redis: Memory used scripts{#SINGLETON}                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.used_memory_scripts[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_scripts`</p>                                             |
-| Redis            | Redis: Memory number of cached scripts{#SINGLETON}              |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.number_of_cached_scripts[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.number_of_cached_scripts`</p>                                   |
-| Redis            | Redis: Allocator fragmentation bytes{#SINGLETON}                |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.allocator_frag_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_frag_bytes`</p>                                           |
-| Redis            | Redis: Allocator fragmentation ratio{#SINGLETON}                |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.allocator_frag_ratio[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_frag_ratio`</p>                                           |
-| Redis            | Redis: Allocator RSS bytes{#SINGLETON}                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.allocator_rss_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_rss_bytes`</p>                                             |
-| Redis            | Redis: Allocator RSS ratio{#SINGLETON}                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.allocator_rss_ratio[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_rss_ratio`</p>                                             |
-| Redis            | Redis: Memory RSS overhead bytes{#SINGLETON}                    |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.rss_overhead_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.rss_overhead_bytes`</p>                                               |
-| Redis            | Redis: Memory RSS overhead ratio{#SINGLETON}                    |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.rss_overhead_ratio[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.rss_overhead_ratio`</p>                                               |
-| Redis            | Redis: Memory fragmentation bytes{#SINGLETON}                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.fragmentation_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_fragmentation_bytes`</p>                                         |
-| Redis            | Redis: Memory not counted for evict{#SINGLETON}                 |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.not_counted_for_evict[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_not_counted_for_evict`</p>                                     |
-| Redis            | Redis: Memory replication backlog{#SINGLETON}                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.replication_backlog[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_replication_backlog`</p>                                         |
-| Redis            | Redis: Memory clients normal{#SINGLETON}                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.mem_clients_normal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_clients_normal`</p>                                               |
-| Redis            | Redis: Memory clients slaves{#SINGLETON}                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | DEPENDENT      | redis.memory.mem_clients_slaves[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_clients_slaves`</p>                                               |
-| Redis            | Redis: Memory AOF buffer{#SINGLETON}                            | <p>Size of the AOF buffer</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | DEPENDENT      | redis.memory.mem_aof_buffer[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_aof_buffer`</p>                                                       |
-| Zabbix_raw_items | Redis: Get info                                                 |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | ZABBIX_PASSIVE | redis.info["{$REDIS.CONN.URI}"]                                                                                                                                      |
-| Zabbix_raw_items | Redis: Get config                                               |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | ZABBIX_PASSIVE | redis.config["{$REDIS.CONN.URI}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                 |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Redis |Redis: Ping | |ZABBIX_PASSIVE |redis.ping["{$REDIS.CONN.URI}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Redis |Redis: Slowlog entries per second | |ZABBIX_PASSIVE |redis.slowlog.count["{$REDIS.CONN.URI}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Redis |Redis: CPU sys |<p>System CPU consumed by the Redis server</p> |DEPENDENT |redis.cpu.sys<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPU.used_cpu_sys`</p> |
+|Redis |Redis: CPU sys children |<p>System CPU consumed by the background processes</p> |DEPENDENT |redis.cpu.sys_children<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPU.used_cpu_sys_children`</p> |
+|Redis |Redis: CPU user |<p>User CPU consumed by the Redis server</p> |DEPENDENT |redis.cpu.user<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPU.used_cpu_user`</p> |
+|Redis |Redis: CPU user children |<p>User CPU consumed by the background processes</p> |DEPENDENT |redis.cpu.user_children<p>**Preprocessing**:</p><p>- JSONPATH: `$.CPU.used_cpu_user_children`</p> |
+|Redis |Redis: Blocked clients |<p>The number of connections waiting on a blocking call</p> |DEPENDENT |redis.clients.blocked<p>**Preprocessing**:</p><p>- JSONPATH: `$.Clients.blocked_clients`</p> |
+|Redis |Redis: Max input buffer |<p>The biggest input buffer among current client connections</p> |DEPENDENT |redis.clients.max_input_buffer<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Redis |Redis: Max output buffer |<p>The biggest output buffer among current client connections</p> |DEPENDENT |redis.clients.max_output_buffer<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Redis |Redis: Connected clients |<p>The number of connected clients</p> |DEPENDENT |redis.clients.connected<p>**Preprocessing**:</p><p>- JSONPATH: `$.Clients.connected_clients`</p> |
+|Redis |Redis: Cluster enabled |<p>Indicate Redis cluster is enabled</p> |DEPENDENT |redis.cluster.enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.Cluster.cluster_enabled`</p> |
+|Redis |Redis: Memory used |<p>Total number of bytes allocated by Redis using its allocator</p> |DEPENDENT |redis.memory.used_memory<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory`</p> |
+|Redis |Redis: Memory used Lua |<p>Amount of memory used by the Lua engine</p> |DEPENDENT |redis.memory.used_memory_lua<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_lua`</p> |
+|Redis |Redis: Memory used peak |<p>Peak memory consumed by Redis (in bytes)</p> |DEPENDENT |redis.memory.used_memory_peak<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_peak`</p> |
+|Redis |Redis: Memory used RSS |<p>Number of bytes that Redis allocated as seen by the operating system</p> |DEPENDENT |redis.memory.used_memory_rss<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_rss`</p> |
+|Redis |Redis: Memory fragmentation ratio |<p>This ratio is an indication of memory mapping efficiency:</p><p>  — Value over 1.0 indicate that memory fragmentation is very likely. Consider restarting the Redis server so the operating system can recover fragmented memory, especially with a ratio over 1.5.</p><p>  — Value under 1.0 indicate that Redis likely has insufficient memory available. Consider optimizing memory usage or adding more RAM.</p><p>Note: If your peak memory usage is much higher than your current memory usage, the memory fragmentation ratio may be unreliable.</p><p>https://redis.io/topics/memory-optimization</p> |DEPENDENT |redis.memory.fragmentation_ratio<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_fragmentation_ratio`</p> |
+|Redis |Redis: AOF current rewrite time sec |<p>Duration of the on-going AOF rewrite operation if any</p> |DEPENDENT |redis.persistence.aof_current_rewrite_time_sec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_current_rewrite_time_sec`</p> |
+|Redis |Redis: AOF enabled |<p>Flag indicating AOF logging is activated</p> |DEPENDENT |redis.persistence.aof_enabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_enabled`</p> |
+|Redis |Redis: AOF last bgrewrite status |<p>Status of the last AOF rewrite operation</p> |DEPENDENT |redis.persistence.aof_last_bgrewrite_status<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_last_bgrewrite_status`</p><p>- BOOL_TO_DECIMAL</p> |
+|Redis |Redis: AOF last rewrite time sec |<p>Duration of the last AOF rewrite</p> |DEPENDENT |redis.persistence.aof_last_rewrite_time_sec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_last_rewrite_time_sec`</p> |
+|Redis |Redis: AOF last write status |<p>Status of the last write operation to the AOF</p> |DEPENDENT |redis.persistence.aof_last_write_status<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_last_write_status`</p><p>- BOOL_TO_DECIMAL</p> |
+|Redis |Redis: AOF rewrite in progress |<p>Flag indicating a AOF rewrite operation is on-going</p> |DEPENDENT |redis.persistence.aof_rewrite_in_progress<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_rewrite_in_progress`</p> |
+|Redis |Redis: AOF rewrite scheduled |<p>Flag indicating an AOF rewrite operation will be scheduled once the on-going RDB save is complete</p> |DEPENDENT |redis.persistence.aof_rewrite_scheduled<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_rewrite_scheduled`</p> |
+|Redis |Redis: Dump loading |<p>Flag indicating if the load of a dump file is on-going</p> |DEPENDENT |redis.persistence.loading<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.loading`</p> |
+|Redis |Redis: RDB bgsave in progress |<p>"1" if bgsave is in progress and "0" otherwise</p> |DEPENDENT |redis.persistence.rdb_bgsave_in_progress<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_bgsave_in_progress`</p> |
+|Redis |Redis: RDB changes since last save |<p>Number of changes since the last background save</p> |DEPENDENT |redis.persistence.rdb_changes_since_last_save<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_changes_since_last_save`</p> |
+|Redis |Redis: RDB current bgsave time sec |<p>Duration of the on-going RDB save operation if any</p> |DEPENDENT |redis.persistence.rdb_current_bgsave_time_sec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_current_bgsave_time_sec`</p> |
+|Redis |Redis: RDB last bgsave status |<p>Status of the last RDB save operation</p> |DEPENDENT |redis.persistence.rdb_last_bgsave_status<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_last_bgsave_status`</p><p>- BOOL_TO_DECIMAL</p> |
+|Redis |Redis: RDB last bgsave time sec |<p>Duration of the last bg_save operation</p> |DEPENDENT |redis.persistence.rdb_last_bgsave_time_sec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_last_bgsave_time_sec`</p> |
+|Redis |Redis: RDB last save time |<p>Epoch-based timestamp of last successful RDB save</p> |DEPENDENT |redis.persistence.rdb_last_save_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_last_save_time`</p> |
+|Redis |Redis: Connected slaves |<p>Number of connected slaves</p> |DEPENDENT |redis.replication.connected_slaves<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.connected_slaves`</p> |
+|Redis |Redis: Replication backlog active |<p>Flag indicating replication backlog is active</p> |DEPENDENT |redis.replication.repl_backlog_active<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.repl_backlog_active`</p> |
+|Redis |Redis: Replication backlog first byte offset |<p>The master offset of the replication backlog buffer</p> |DEPENDENT |redis.replication.repl_backlog_first_byte_offset<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.repl_backlog_first_byte_offset`</p> |
+|Redis |Redis: Replication backlog history length |<p>Amount of data in the backlog sync buffer</p> |DEPENDENT |redis.replication.repl_backlog_histlen<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.repl_backlog_histlen`</p> |
+|Redis |Redis: Replication backlog size |<p>Total size in bytes of the replication backlog buffer</p> |DEPENDENT |redis.replication.repl_backlog_size<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.repl_backlog_size`</p> |
+|Redis |Redis: Replication role |<p>Value is "master" if the instance is replica of no one, or "slave" if the instance is a replica of some master instance. Note that a replica can be master of another replica (chained replication).</p> |DEPENDENT |redis.replication.role<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.role`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: Master replication offset |<p>Replication offset reported by the master</p> |DEPENDENT |redis.replication.master_repl_offset<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_repl_offset`</p> |
+|Redis |Redis: Process id |<p>PID of the server process</p> |DEPENDENT |redis.server.process_id<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.process_id`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: Redis mode |<p>The server's mode ("standalone", "sentinel" or "cluster")</p> |DEPENDENT |redis.server.redis_mode<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.redis_mode`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: Redis version |<p>Version of the Redis server</p> |DEPENDENT |redis.server.redis_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.redis_version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: TCP port |<p>TCP/IP listen port</p> |DEPENDENT |redis.server.tcp_port<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.tcp_port`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: Uptime |<p>Number of seconds since Redis server start</p> |DEPENDENT |redis.server.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.uptime_in_seconds`</p> |
+|Redis |Redis: Evicted keys |<p>Number of evicted keys due to maxmemory limit</p> |DEPENDENT |redis.stats.evicted_keys<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.evicted_keys`</p> |
+|Redis |Redis: Expired keys |<p>Total number of key expiration events</p> |DEPENDENT |redis.stats.expired_keys<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.expired_keys`</p> |
+|Redis |Redis: Instantaneous input bytes per second |<p>The network's read rate per second in KB/sec</p> |DEPENDENT |redis.stats.instantaneous_input.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.instantaneous_input_kbps`</p><p>- MULTIPLIER: `1024`</p> |
+|Redis |Redis: Instantaneous operations per sec |<p>Number of commands processed per second</p> |DEPENDENT |redis.stats.instantaneous_ops.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.instantaneous_ops_per_sec`</p> |
+|Redis |Redis: Instantaneous output bytes per second |<p>The network's write rate per second in KB/sec</p> |DEPENDENT |redis.stats.instantaneous_output.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.instantaneous_output_kbps`</p><p>- MULTIPLIER: `1024`</p> |
+|Redis |Redis: Keyspace hits |<p>Number of successful lookup of keys in the main dictionary</p> |DEPENDENT |redis.stats.keyspace_hits<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.keyspace_hits`</p> |
+|Redis |Redis: Keyspace misses |<p>Number of failed lookup of keys in the main dictionary</p> |DEPENDENT |redis.stats.keyspace_misses<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.keyspace_misses`</p> |
+|Redis |Redis: Latest fork usec |<p>Duration of the latest fork operation in microseconds</p> |DEPENDENT |redis.stats.latest_fork_usec<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.latest_fork_usec`</p><p>- MULTIPLIER: `1.0E-5`</p> |
+|Redis |Redis: Migrate cached sockets |<p>The number of sockets open for MIGRATE purposes</p> |DEPENDENT |redis.stats.migrate_cached_sockets<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.migrate_cached_sockets`</p> |
+|Redis |Redis: Pubsub channels |<p>Global number of pub/sub channels with client subscriptions</p> |DEPENDENT |redis.stats.pubsub_channels<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.pubsub_channels`</p> |
+|Redis |Redis: Pubsub patterns |<p>Global number of pub/sub pattern with client subscriptions</p> |DEPENDENT |redis.stats.pubsub_patterns<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.pubsub_patterns`</p> |
+|Redis |Redis: Rejected connections |<p>Number of connections rejected because of maxclients limit</p> |DEPENDENT |redis.stats.rejected_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.rejected_connections`</p> |
+|Redis |Redis: Sync full |<p>The number of full resyncs with replicas</p> |DEPENDENT |redis.stats.sync_full<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.sync_full`</p> |
+|Redis |Redis: Sync partial err |<p>The number of denied partial resync requests</p> |DEPENDENT |redis.stats.sync_partial_err<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.sync_partial_err`</p> |
+|Redis |Redis: Sync partial ok |<p>The number of accepted partial resync requests</p> |DEPENDENT |redis.stats.sync_partial_ok<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.sync_partial_ok`</p> |
+|Redis |Redis: Total commands processed |<p>Total number of commands processed by the server</p> |DEPENDENT |redis.stats.total_commands_processed<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.total_commands_processed`</p> |
+|Redis |Redis: Total connections received |<p>Total number of connections accepted by the server</p> |DEPENDENT |redis.stats.total_connections_received<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.total_connections_received`</p> |
+|Redis |Redis: Total net input bytes |<p>The total number of bytes read from the network</p> |DEPENDENT |redis.stats.total_net_input_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.total_net_input_bytes`</p> |
+|Redis |Redis: Total net output bytes |<p>The total number of bytes written to the network</p> |DEPENDENT |redis.stats.total_net_output_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.total_net_output_bytes`</p> |
+|Redis |Redis: Max clients |<p>Max number of connected clients at the same time.</p><p>Once the limit is reached Redis will close all the new connections sending an error "max number of clients reached".</p> |DEPENDENT |redis.config.maxclients<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxclients`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|Redis |DB {#DB}: Average TTL |<p>Average TTL</p> |DEPENDENT |redis.db.avg_ttl["{#DB}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Keyspace["{#DB}"].avg_ttl`</p><p>- MULTIPLIER: `0.001`</p> |
+|Redis |DB {#DB}: Expires |<p>Number of keys with an expiration</p> |DEPENDENT |redis.db.expires["{#DB}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Keyspace["{#DB}"].expires`</p> |
+|Redis |DB {#DB}: Keys |<p>Total number of keys</p> |DEPENDENT |redis.db.keys["{#DB}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Keyspace["{#DB}"].keys`</p> |
+|Redis |Redis: AOF current size{#SINGLETON} |<p>AOF current file size</p> |DEPENDENT |redis.persistence.aof_current_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_current_size`</p> |
+|Redis |Redis: AOF base size{#SINGLETON} |<p>AOF file size on latest startup or rewrite</p> |DEPENDENT |redis.persistence.aof_base_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_base_size`</p> |
+|Redis |Redis: AOF pending rewrite{#SINGLETON} |<p>Flag indicating an AOF rewrite operation will</p> |DEPENDENT |redis.persistence.aof_pending_rewrite[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_pending_rewrite`</p> |
+|Redis |Redis: AOF buffer length{#SINGLETON} |<p>Size of the AOF buffer</p> |DEPENDENT |redis.persistence.aof_buffer_length[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_buffer_length`</p> |
+|Redis |Redis: AOF rewrite buffer length{#SINGLETON} |<p>Size of the AOF rewrite buffer</p> |DEPENDENT |redis.persistence.aof_rewrite_buffer_length[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_rewrite_buffer_length`</p> |
+|Redis |Redis: AOF pending background I/O fsync{#SINGLETON} |<p>Number of fsync pending jobs in background I/O queue</p> |DEPENDENT |redis.persistence.aof_pending_bio_fsync[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_pending_bio_fsync`</p> |
+|Redis |Redis: AOF delayed fsync{#SINGLETON} |<p>Delayed fsync counter</p> |DEPENDENT |redis.persistence.aof_delayed_fsync[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_delayed_fsync`</p> |
+|Redis |Redis: Master host{#SINGLETON} |<p>Host or IP address of the master</p> |DEPENDENT |redis.replication.master_host[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_host`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: Master port{#SINGLETON} |<p>Master listening TCP port</p> |DEPENDENT |redis.replication.master_port[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_port`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: Master link status{#SINGLETON} |<p>Status of the link (up/down)</p> |DEPENDENT |redis.replication.master_link_status[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_link_status`</p><p>- BOOL_TO_DECIMAL</p> |
+|Redis |Redis: Master last I/O seconds ago{#SINGLETON} |<p>Number of seconds since the last interaction with master</p> |DEPENDENT |redis.replication.master_last_io_seconds_ago[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_last_io_seconds_ago`</p> |
+|Redis |Redis: Master sync in progress{#SINGLETON} |<p>Indicate the master is syncing to the replica</p> |DEPENDENT |redis.replication.master_sync_in_progress[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.master_sync_in_progress`</p> |
+|Redis |Redis: Slave replication offset{#SINGLETON} |<p>The replication offset of the replica instance</p> |DEPENDENT |redis.replication.slave_repl_offset[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.slave_repl_offset`</p> |
+|Redis |Redis: Slave priority{#SINGLETON} |<p>The priority of the instance as a candidate for failover</p> |DEPENDENT |redis.replication.slave_priority[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.slave_priority`</p> |
+|Redis |Redis: Slave priority{#SINGLETON} |<p>Flag indicating if the replica is read-only</p> |DEPENDENT |redis.replication.slave_read_only[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.slave_read_only`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis slave {#SLAVE_IP}:{#SLAVE_PORT}: Replication lag in bytes |<p>Replication lag in bytes</p> |DEPENDENT |redis.replication.lag_bytes["{#SLAVE_IP}:{#SLAVE_PORT}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Redis |Redis: Number of processes running |<p>-</p> |ZABBIX_PASSIVE |proc.num["{$REDIS.PROCESS_NAME}{#SINGLETON}"] |
+|Redis |Redis: Memory usage (rss) |<p>Resident set size memory used by process in bytes.</p> |ZABBIX_PASSIVE |proc.mem["{$REDIS.PROCESS_NAME}{#SINGLETON}",,,,rss] |
+|Redis |Redis: Memory usage (vsize) |<p>Virtual memory size used by process in bytes.</p> |ZABBIX_PASSIVE |proc.mem["{$REDIS.PROCESS_NAME}{#SINGLETON}",,,,vsize] |
+|Redis |Redis: CPU utilization |<p>Process CPU utilization percentage.</p> |ZABBIX_PASSIVE |proc.cpu.util["{$REDIS.PROCESS_NAME}{#SINGLETON}"] |
+|Redis |Redis: Executable path{#SINGLETON} |<p>The path to the server's executable</p> |DEPENDENT |redis.server.executable[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Server.executable`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: Memory used peak %{#SINGLETON} |<p>The percentage of used_memory_peak out of used_memory</p> |DEPENDENT |redis.memory.used_memory_peak_perc[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_peak_perc`</p><p>- REGEX: `(.+)% \1`</p> |
+|Redis |Redis: Memory used overhead{#SINGLETON} |<p>The sum in bytes of all overheads that the server allocated for managing its internal data structures</p> |DEPENDENT |redis.memory.used_memory_overhead[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_overhead`</p> |
+|Redis |Redis: Memory used startup{#SINGLETON} |<p>Initial amount of memory consumed by Redis at startup in bytes</p> |DEPENDENT |redis.memory.used_memory_startup[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_startup`</p> |
+|Redis |Redis: Memory used dataset{#SINGLETON} |<p>The size in bytes of the dataset</p> |DEPENDENT |redis.memory.used_memory_dataset[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_dataset`</p> |
+|Redis |Redis: Memory used dataset %{#SINGLETON} |<p>The percentage of used_memory_dataset out of the net memory usage (used_memory minus used_memory_startup)</p> |DEPENDENT |redis.memory.used_memory_dataset_perc[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_dataset_perc`</p><p>- REGEX: `(.+)% \1`</p> |
+|Redis |Redis: Total system memory{#SINGLETON} |<p>The total amount of memory that the Redis host has</p> |DEPENDENT |redis.memory.total_system_memory[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.total_system_memory`</p> |
+|Redis |Redis: Max memory{#SINGLETON} |<p>Maximum amount of memory allocated to the Redisdb system</p> |DEPENDENT |redis.memory.maxmemory[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.maxmemory`</p> |
+|Redis |Redis: Max memory policy{#SINGLETON} |<p>The value of the maxmemory-policy configuration directive</p> |DEPENDENT |redis.memory.maxmemory_policy[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.maxmemory_policy`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Redis |Redis: Active defrag running{#SINGLETON} |<p>Flag indicating if active defragmentation is active</p> |DEPENDENT |redis.memory.active_defrag_running[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.active_defrag_running`</p> |
+|Redis |Redis: Lazyfree pending objects{#SINGLETON} |<p>The number of objects waiting to be freed (as a result of calling UNLINK, or FLUSHDB and FLUSHALL with the ASYNC option)</p> |DEPENDENT |redis.memory.lazyfree_pending_objects[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.lazyfree_pending_objects`</p> |
+|Redis |Redis: RDB last CoW size{#SINGLETON} |<p>The size in bytes of copy-on-write allocations during the last RDB save operation</p> |DEPENDENT |redis.persistence.rdb_last_cow_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.rdb_last_cow_size`</p> |
+|Redis |Redis: AOF last CoW size{#SINGLETON} |<p>The size in bytes of copy-on-write allocations during the last AOF rewrite operation</p> |DEPENDENT |redis.persistence.aof_last_cow_size[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Persistence.aof_last_cow_size`</p> |
+|Redis |Redis: Expired stale %{#SINGLETON} |<p>-</p> |DEPENDENT |redis.stats.expired_stale_perc[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.expired_stale_perc`</p> |
+|Redis |Redis: Expired time cap reached count{#SINGLETON} |<p>-</p> |DEPENDENT |redis.stats.expired_time_cap_reached_count[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.expired_time_cap_reached_count`</p> |
+|Redis |Redis: Slave expires tracked keys{#SINGLETON} |<p>The number of keys tracked for expiry purposes (applicable only to writable replicas)</p> |DEPENDENT |redis.stats.slave_expires_tracked_keys[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.slave_expires_tracked_keys`</p> |
+|Redis |Redis: Active defrag hits{#SINGLETON} |<p>Number of value reallocations performed by active the defragmentation process</p> |DEPENDENT |redis.stats.active_defrag_hits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.active_defrag_hits`</p> |
+|Redis |Redis: Active defrag misses{#SINGLETON} |<p>Number of aborted value reallocations started by the active defragmentation process</p> |DEPENDENT |redis.stats.active_defrag_misses[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.active_defrag_misses`</p> |
+|Redis |Redis: Active defrag key hits{#SINGLETON} |<p>Number of keys that were actively defragmented</p> |DEPENDENT |redis.stats.active_defrag_key_hits[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.active_defrag_key_hits`</p> |
+|Redis |Redis: Active defrag key misses{#SINGLETON} |<p>Number of keys that were skipped by the active defragmentation process</p> |DEPENDENT |redis.stats.active_defrag_key_misses[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Stats.active_defrag_key_misses`</p> |
+|Redis |Redis: Replication second offset{#SINGLETON} |<p>Offset up to which replication IDs are accepted</p> |DEPENDENT |redis.replication.second_repl_offset[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Replication.second_repl_offset`</p> |
+|Redis |Redis: Allocator active{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.allocator_active[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_active`</p> |
+|Redis |Redis: Allocator allocated{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.allocator_allocated[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_allocated`</p> |
+|Redis |Redis: Allocator resident{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.allocator_resident[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_resident`</p> |
+|Redis |Redis: Memory used scripts{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.used_memory_scripts[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.used_memory_scripts`</p> |
+|Redis |Redis: Memory number of cached scripts{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.number_of_cached_scripts[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.number_of_cached_scripts`</p> |
+|Redis |Redis: Allocator fragmentation bytes{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.allocator_frag_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_frag_bytes`</p> |
+|Redis |Redis: Allocator fragmentation ratio{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.allocator_frag_ratio[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_frag_ratio`</p> |
+|Redis |Redis: Allocator RSS bytes{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.allocator_rss_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_rss_bytes`</p> |
+|Redis |Redis: Allocator RSS ratio{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.allocator_rss_ratio[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.allocator_rss_ratio`</p> |
+|Redis |Redis: Memory RSS overhead bytes{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.rss_overhead_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.rss_overhead_bytes`</p> |
+|Redis |Redis: Memory RSS overhead ratio{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.rss_overhead_ratio[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.rss_overhead_ratio`</p> |
+|Redis |Redis: Memory fragmentation bytes{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.fragmentation_bytes[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_fragmentation_bytes`</p> |
+|Redis |Redis: Memory not counted for evict{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.not_counted_for_evict[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_not_counted_for_evict`</p> |
+|Redis |Redis: Memory replication backlog{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.replication_backlog[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_replication_backlog`</p> |
+|Redis |Redis: Memory clients normal{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.mem_clients_normal[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_clients_normal`</p> |
+|Redis |Redis: Memory clients slaves{#SINGLETON} |<p>-</p> |DEPENDENT |redis.memory.mem_clients_slaves[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_clients_slaves`</p> |
+|Redis |Redis: Memory AOF buffer{#SINGLETON} |<p>Size of the AOF buffer</p> |DEPENDENT |redis.memory.mem_aof_buffer[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.Memory.mem_aof_buffer`</p> |
+|Zabbix_raw_items |Redis: Get info | |ZABBIX_PASSIVE |redis.info["{$REDIS.CONN.URI}"] |
+|Zabbix_raw_items |Redis: Get config | |ZABBIX_PASSIVE |redis.config["{$REDIS.CONN.URI}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 
 ## Triggers
 
-| Name                                                                                             | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Expression                                                                                                                                     | Severity | Dependencies and additional info                                              |
-|--------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------|
-| Redis: Service is down                                                                           | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{TEMPLATE_NAME:redis.ping["{$REDIS.CONN.URI}"].last()}=0`                                                                                     | AVERAGE  | <p>Manual close: YES</p>                                                      |
-| Redis: Too many entries in the slowlog (over {$REDIS.SLOWLOG.COUNT.MAX.WARN} per second in 5m)   | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{TEMPLATE_NAME:redis.slowlog.count["{$REDIS.CONN.URI}"].min(5m)}>{$REDIS.SLOWLOG.COUNT.MAX.WARN}`                                             | INFO     |                                                                               |
-| Redis: Total number of connected clients is too high (over {$REDIS.CLIENTS.PRC.MAX.WARN}% in 5m) | <p>When the number of clients reaches the value of the "maxclients" parameter, new connections will be rejected.</p><p>https://redis.io/topics/clients#maximum-number-of-clients</p>                                                                                                                                                                                                                                                                                                                                                                                                                             | `{TEMPLATE_NAME:redis.clients.connected.min(5m)}/{Redis:redis.config.maxclients.last()}*100>{$REDIS.CLIENTS.PRC.MAX.WARN}`                     | WARNING  |                                                                               |
-| Redis: Memory fragmentation ratio is too high (over {$REDIS.MEM.FRAG_RATIO.MAX.WARN} in 15m)     | <p>This ratio is an indication of memory mapping efficiency:</p><p>  — Value over 1.0 indicate that memory fragmentation is very likely. Consider restarting the Redis server so the operating system can recover fragmented memory, especially with a ratio over 1.5.</p><p>  — Value under 1.0 indicate that Redis likely has insufficient memory available. Consider optimizing memory usage or adding more RAM.</p><p>Note: If your peak memory usage is much higher than your current memory usage, the memory fragmentation ratio may be unreliable.</p><p>https://redis.io/topics/memory-optimization</p> | `{TEMPLATE_NAME:redis.memory.fragmentation_ratio.min(15m)}>{$REDIS.MEM.FRAG_RATIO.MAX.WARN}`                                                   | WARNING  |                                                                               |
-| Redis: Last AOF write operation failed                                                           | <p>Detailed information about persistence: https://redis.io/topics/persistence</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `{TEMPLATE_NAME:redis.persistence.aof_last_write_status.last()}=0`                                                                             | WARNING  |                                                                               |
-| Redis: Last RDB save operation failed                                                            | <p>Detailed information about persistence: https://redis.io/topics/persistence</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `{TEMPLATE_NAME:redis.persistence.rdb_last_bgsave_status.last()}=0`                                                                            | WARNING  |                                                                               |
-| Redis: Number of slaves has changed                                                              | <p>Redis number of slaves has changed. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{TEMPLATE_NAME:redis.replication.connected_slaves.diff()}=1`                                                                                  | INFO     | <p>Manual close: YES</p>                                                      |
-| Redis: Replication role has changed (new role: {ITEM.VALUE})                                     | <p>Redis replication role has changed. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{TEMPLATE_NAME:redis.replication.role.diff()}=1 and {TEMPLATE_NAME:redis.replication.role.strlen()}>0`                                        | WARNING  | <p>Manual close: YES</p>                                                      |
-| Redis: Version has changed (new version: {ITEM.VALUE})                                           | <p>Redis version has changed. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:redis.server.redis_version.diff()}=1 and {TEMPLATE_NAME:redis.server.redis_version.strlen()}>0`                                | INFO     | <p>Manual close: YES</p>                                                      |
-| Redis: has been restarted (uptime < 10m)                                                         | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `{TEMPLATE_NAME:redis.server.uptime.last()}<10m`                                                                                               | INFO     | <p>Manual close: YES</p>                                                      |
-| Redis: Connections are rejected                                                                  | <p>The number of connections has reached the value of "maxclients".</p><p>https://redis.io/topics/clients</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `{TEMPLATE_NAME:redis.stats.rejected_connections.last()}>0`                                                                                    | HIGH     |                                                                               |
-| Redis: Replication lag with master is too high (over {$REDIS.REPL.LAG.MAX.WARN} in 5m)           | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{TEMPLATE_NAME:redis.replication.master_last_io_seconds_ago[{#SINGLETON}].min(5m)}>{$REDIS.REPL.LAG.MAX.WARN}`                                | WARNING  |                                                                               |
-| Redis: Process is not running                                                                    | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{TEMPLATE_NAME:proc.num["{$REDIS.PROCESS_NAME}{#SINGLETON}"].last()}=0`                                                                       | HIGH     |                                                                               |
-| Redis: Memory usage is too high (over {$REDIS.MEM.PUSED.MAX.WARN}% in 5m)                        | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{TEMPLATE_NAME:redis.memory.used_memory.last()}/{TEMPLATE_NAME:redis.memory.maxmemory[{#SINGLETON}].min(5m)}*100>{$REDIS.MEM.PUSED.MAX.WARN}` | WARNING  |                                                                               |
-| Redis: Failed to fetch info data (or no data for 30m)                                            | <p>Zabbix has not received data for items for the last 30 minutes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `{TEMPLATE_NAME:redis.info["{$REDIS.CONN.URI}"].nodata(30m)}=1`                                                                                | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Redis: Service is down</p> |
-| Redis: Configuration has changed                                                                 | <p>Redis configuration has changed. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `{TEMPLATE_NAME:redis.config["{$REDIS.CONN.URI}"].diff()}=1 and {TEMPLATE_NAME:redis.config["{$REDIS.CONN.URI}"].strlen()}>0`                  | INFO     | <p>Manual close: YES</p>                                                      |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Redis: Service is down |<p>-</p> |`last(/Redis by Zabbix agent 2/redis.ping["{$REDIS.CONN.URI}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|Redis: Too many entries in the slowlog (over {$REDIS.SLOWLOG.COUNT.MAX.WARN} per second in 5m) |<p>-</p> |`min(/Redis by Zabbix agent 2/redis.slowlog.count["{$REDIS.CONN.URI}"],5m)>{$REDIS.SLOWLOG.COUNT.MAX.WARN}` |INFO | |
+|Redis: Total number of connected clients is too high (over {$REDIS.CLIENTS.PRC.MAX.WARN}% in 5m) |<p>When the number of clients reaches the value of the "maxclients" parameter, new connections will be rejected.</p><p>https://redis.io/topics/clients#maximum-number-of-clients</p> |`min(/Redis by Zabbix agent 2/redis.clients.connected,5m)/last(/Redis by Zabbix agent 2/redis.config.maxclients)*100>{$REDIS.CLIENTS.PRC.MAX.WARN}` |WARNING | |
+|Redis: Memory fragmentation ratio is too high (over {$REDIS.MEM.FRAG_RATIO.MAX.WARN} in 15m) |<p>This ratio is an indication of memory mapping efficiency:</p><p>  — Value over 1.0 indicate that memory fragmentation is very likely. Consider restarting the Redis server so the operating system can recover fragmented memory, especially with a ratio over 1.5.</p><p>  — Value under 1.0 indicate that Redis likely has insufficient memory available. Consider optimizing memory usage or adding more RAM.</p><p>Note: If your peak memory usage is much higher than your current memory usage, the memory fragmentation ratio may be unreliable.</p><p>https://redis.io/topics/memory-optimization</p> |`min(/Redis by Zabbix agent 2/redis.memory.fragmentation_ratio,15m)>{$REDIS.MEM.FRAG_RATIO.MAX.WARN}` |WARNING | |
+|Redis: Last AOF write operation failed |<p>Detailed information about persistence: https://redis.io/topics/persistence</p> |`last(/Redis by Zabbix agent 2/redis.persistence.aof_last_write_status)=0` |WARNING | |
+|Redis: Last RDB save operation failed |<p>Detailed information about persistence: https://redis.io/topics/persistence</p> |`last(/Redis by Zabbix agent 2/redis.persistence.rdb_last_bgsave_status)=0` |WARNING | |
+|Redis: Number of slaves has changed |<p>Redis number of slaves has changed. Ack to close.</p> |`last(/Redis by Zabbix agent 2/redis.replication.connected_slaves,#1)<>last(/Redis by Zabbix agent 2/redis.replication.connected_slaves,#2)` |INFO |<p>Manual close: YES</p> |
+|Redis: Replication role has changed (new role: {ITEM.VALUE}) |<p>Redis replication role has changed. Ack to close.</p> |`last(/Redis by Zabbix agent 2/redis.replication.role,#1)<>last(/Redis by Zabbix agent 2/redis.replication.role,#2) and length(last(/Redis by Zabbix agent 2/redis.replication.role))>0` |WARNING |<p>Manual close: YES</p> |
+|Redis: Version has changed (new version: {ITEM.VALUE}) |<p>Redis version has changed. Ack to close.</p> |`last(/Redis by Zabbix agent 2/redis.server.redis_version,#1)<>last(/Redis by Zabbix agent 2/redis.server.redis_version,#2) and length(last(/Redis by Zabbix agent 2/redis.server.redis_version))>0` |INFO |<p>Manual close: YES</p> |
+|Redis: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Redis by Zabbix agent 2/redis.server.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Redis: Connections are rejected |<p>The number of connections has reached the value of "maxclients".</p><p>https://redis.io/topics/clients</p> |`last(/Redis by Zabbix agent 2/redis.stats.rejected_connections)>0` |HIGH | |
+|Redis: Replication lag with master is too high (over {$REDIS.REPL.LAG.MAX.WARN} in 5m) |<p>-</p> |`min(/Redis by Zabbix agent 2/redis.replication.master_last_io_seconds_ago[{#SINGLETON}],5m)>{$REDIS.REPL.LAG.MAX.WARN}` |WARNING | |
+|Redis: Process is not running |<p>-</p> |`last(/Redis by Zabbix agent 2/proc.num["{$REDIS.PROCESS_NAME}{#SINGLETON}"])=0` |HIGH | |
+|Redis: Memory usage is too high (over {$REDIS.MEM.PUSED.MAX.WARN}% in 5m) |<p>-</p> |`last(/Redis by Zabbix agent 2/redis.memory.used_memory)/min(/Redis by Zabbix agent 2/redis.memory.maxmemory[{#SINGLETON}],5m)*100>{$REDIS.MEM.PUSED.MAX.WARN}` |WARNING | |
+|Redis: Failed to fetch info data (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes</p> |`nodata(/Redis by Zabbix agent 2/redis.info["{$REDIS.CONN.URI}"],30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Redis: Service is down</p> |
+|Redis: Configuration has changed |<p>Redis configuration has changed. Ack to close.</p> |`last(/Redis by Zabbix agent 2/redis.config["{$REDIS.CONN.URI}"],#1)<>last(/Redis by Zabbix agent 2/redis.config["{$REDIS.CONN.URI}"],#2) and length(last(/Redis by Zabbix agent 2/redis.config["{$REDIS.CONN.URI}"]))>0` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/db/redis/template_db_redis.yaml b/templates/db/redis/template_db_redis.yaml
index db95e3eeb89..e5d76ab3eb4 100644
--- a/templates/db/redis/template_db_redis.yaml
+++ b/templates/db/redis/template_db_redis.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:04:22Z'
+  version: '6.0'
+  date: '2021-12-16T07:35:55Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -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/389050-discussion-thread-for-official-zabbix-template-redis
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -518,7 +518,7 @@ zabbix_export:
           triggers:
             -
               uuid: 324e0e8fac514ba99d67aea7eb0ddf7c
-              expression: last(/Redis by Zabbix agent 2/redis.persistence.aof_last_write_status)=0
+              expression: 'last(/Redis by Zabbix agent 2/redis.persistence.aof_last_write_status)=0'
               name: 'Redis: Last AOF write operation failed'
               priority: WARNING
               description: 'Detailed information about persistence: https://redis.io/topics/persistence'
@@ -670,7 +670,7 @@ zabbix_export:
           triggers:
             -
               uuid: 44e427ae3ce7419dbac3059be11e31ef
-              expression: last(/Redis by Zabbix agent 2/redis.persistence.rdb_last_bgsave_status)=0
+              expression: 'last(/Redis by Zabbix agent 2/redis.persistence.rdb_last_bgsave_status)=0'
               name: 'Redis: Last RDB save operation failed'
               priority: WARNING
               description: 'Detailed information about persistence: https://redis.io/topics/persistence'
@@ -1030,7 +1030,7 @@ zabbix_export:
           triggers:
             -
               uuid: 4961e91eed2a4e83899d135315748b0e
-              expression: last(/Redis by Zabbix agent 2/redis.server.uptime)<10m
+              expression: 'last(/Redis by Zabbix agent 2/redis.server.uptime)<10m'
               name: 'Redis: has been restarted (uptime < 10m)'
               priority: INFO
               description: 'Uptime is less than 10 minutes'
@@ -1303,7 +1303,7 @@ zabbix_export:
           triggers:
             -
               uuid: 5bf0680529ce496b8fe419e2732c69d1
-              expression: last(/Redis by Zabbix agent 2/redis.stats.rejected_connections)>0
+              expression: 'last(/Redis by Zabbix agent 2/redis.stats.rejected_connections)>0'
               name: 'Redis: Connections are rejected'
               priority: HIGH
               description: |
@@ -3041,6 +3041,10 @@ zabbix_export:
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -3048,10 +3052,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
diff --git a/templates/db/tidb_http/tidb_pd_http/README.md b/templates/db/tidb_http/tidb_pd_http/README.md
index 3ce28364489..6bdfe7691e2 100644
--- a/templates/db/tidb_http/tidb_pd_http/README.md
+++ b/templates/db/tidb_http/tidb_pd_http/README.md
@@ -3,11 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor PD server of TiDB cluster by Zabbix that works without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `TiDB PD by HTTP` — collects metrics by HTTP agent from PD /metrics endpoint and from monitoring API.
+Template `TiDB PD by HTTP` — collects metrics by HTTP agent from PD /metrics endpoint and from monitoring API.
 See https://docs.pingcap.com/tidb/stable/tidb-monitoring-api.
 
 
@@ -48,21 +48,21 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Cluster metrics discovery |<p>Discovery cluster specific metrics.</p> |DEPENDENT |pd.cluster.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="pd_cluster_status")]`</p><p>- JAVASCRIPT: `return JSON.stringify(value != "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Region labels discovery |<p>Discovery region labels specific metrics.</p> |DEPENDENT |pd.region_labels.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_regions_label_level")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Region status discovery |<p>Discovery region status specific metrics.</p> |DEPENDENT |pd.region_status.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_regions_status")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Overrides:**</p><p>Too many missed regions trigger<br> - {#TYPE} MATCHES_REGEX `miss_peer_region_count`<br>  - TRIGGER_PROTOTYPE LIKE `Too many missed regions` - DISCOVER</p><p>Unresponsive peers trigger<br> - {#TYPE} MATCHES_REGEX `down_peer_region_count`<br>  - TRIGGER_PROTOTYPE LIKE `There are unresponsive peers` - DISCOVER</p> |
-|Running scheduler discovery |<p>Discovery scheduler specific metrics.</p> |DEPENDENT |pd.scheduler.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_status" && @.labels.type == "allow")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|gRPC commands discovery |<p>Discovery grpc commands specific metrics.</p> |DEPENDENT |pd.grpc_command.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "grpc_server_handling_seconds_count")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Region discovery |<p>Discovery region specific metrics.</p> |DEPENDENT |pd.region.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Region labels discovery |<p>Discovery region labels specific metrics.</p> |DEPENDENT |pd.region_labels.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_regions_label_level")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Region status discovery |<p>Discovery region status specific metrics.</p> |DEPENDENT |pd.region_status.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_regions_status")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Overrides:**</p><p>Too many missed regions trigger<br> - {#TYPE} MATCHES_REGEX `miss_peer_region_count`<br>  - TRIGGER_PROTOTYPE LIKE `Too many missed regions` - DISCOVER</p><p>Unresponsive peers trigger<br> - {#TYPE} MATCHES_REGEX `down_peer_region_count`<br>  - TRIGGER_PROTOTYPE LIKE `There are unresponsive peers` - DISCOVER</p> |
+|Running scheduler discovery |<p>Discovery scheduler specific metrics.</p> |DEPENDENT |pd.scheduler.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_status" && @.labels.type == "allow")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|gRPC commands discovery |<p>Discovery grpc commands specific metrics.</p> |DEPENDENT |pd.grpc_command.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "grpc_server_handling_seconds_count")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Region discovery |<p>Discovery region specific metrics.</p> |DEPENDENT |pd.region.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
 |PD instance |PD: Status |<p>Status of PD instance.</p> |DEPENDENT |pd.status<p>**Preprocessing**:</p><p>- JSONPATH: `$.status`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|PD instance |PD: GRPC Commands total, rate |<p>The rate at which gRPC commands are completed.</p> |DEPENDENT |pd.grpc_command.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "grpc_server_handling_seconds_count")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|PD instance |PD: GRPC Commands total, rate |<p>The rate at which gRPC commands are completed.</p> |DEPENDENT |pd.grpc_command.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "grpc_server_handling_seconds_count")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
 |PD instance |PD: Version |<p>Version of the PD instance.</p> |DEPENDENT |pd.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |PD instance |PD: Uptime |<p>The runtime of each PD instance.</p> |DEPENDENT |pd.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.start_timestamp`</p><p>- JAVASCRIPT: `//use boottime to calculate uptime return (Math.floor(Date.now()/1000)-Number(value)); `</p> |
-|PD instance |PD: GRPC Commands: {#GRPC_METHOD}, rate |<p>The rate per command type at which gRPC commands are completed.</p> |DEPENDENT |pd.grpc_command.rate[{#GRPC_METHOD}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "grpc_server_handling_seconds_count" && @.labels.grpc_method == "{#GRPC_METHOD}")].value.first()`</p><p>- CHANGE_PER_SECOND |
+|PD instance |PD: GRPC Commands: {#GRPC_METHOD}, rate |<p>The rate per command type at which gRPC commands are completed.</p> |DEPENDENT |pd.grpc_command.rate[{#GRPC_METHOD}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "grpc_server_handling_seconds_count" && @.labels.grpc_method == "{#GRPC_METHOD}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |TiDB cluster |TiDB cluster: Offline stores |<p>-</p> |DEPENDENT |pd.cluster_status.store_offline[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_cluster_status" && @.labels.type == "store_offline_count")].value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |TiDB cluster |TiDB cluster: Tombstone stores |<p>The count of tombstone stores.</p> |DEPENDENT |pd.cluster_status.store_tombstone[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_cluster_status" && @.labels.type == "store_tombstone_count")].value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |TiDB cluster |TiDB cluster: Down stores |<p>The count of down stores.</p> |DEPENDENT |pd.cluster_status.store_down[{#SINGLETON}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_cluster_status" && @.labels.type == "store_down_count")].value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -77,28 +77,26 @@ There are no template links in this template.
 |TiDB cluster |TiDB cluster: Regions label: {#TYPE} |<p>The number of Regions in different label levels.</p> |DEPENDENT |pd.region_labels[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_regions_label_level" && @.labels.type == "{#TYPE}")].value.first()`</p> |
 |TiDB cluster |TiDB cluster: Regions status: {#TYPE} |<p>The health status of Regions indicated via the count of unusual Regions including pending peers, down peers, extra peers, offline peers, missing peers, learner peers and incorrect namespaces.</p> |DEPENDENT |pd.region_status[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_regions_status" && @.labels.type == "{#TYPE}")].value.first()`</p> |
 |TiDB cluster |TiDB cluster: Scheduler status: {#KIND} |<p>The current running schedulers.</p> |DEPENDENT |pd.scheduler[{#KIND}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_regions_status" && @.labels.type == "allow" && @.labels.kind == "{#KIND}")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p> |
-|TiDB cluster |PD: Region heartbeat: active, rate |<p>The count of heartbeats with the ok status per second.</p> |DEPENDENT |pd.region_heartbeat.ok.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.status == "ok" && @.labels.type == "report" && @.labels.address == "{#STORE_ADDRESS}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|TiDB cluster |PD: Region heartbeat: error, rate |<p>The count of heartbeats with the error status per second.</p> |DEPENDENT |pd.region_heartbeat.error.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.status == "err" && @.labels.type == "report" && @.labels.address == "{#STORE_ADDRESS}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|TiDB cluster |PD: Region heartbeat: total, rate |<p>The count of heartbeats reported to PD per instance per second.</p> |DEPENDENT |pd.region_heartbeat.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.type == "report" && @.labels.address == "{#STORE_ADDRESS}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|TiDB cluster |PD: Region schedule push: error, rate | |DEPENDENT |pd.region_heartbeat.push.err.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.type == "push" && @.labels.address == "{#STORE_ADDRESS}" && @.labels.status == "err" )].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|TiDB cluster |PD: Region schedule push: ok, rate | |DEPENDENT |pd.region_heartbeat.push.err.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.type == "push" && @.labels.address == "{#STORE_ADDRESS}" && @.labels.status == "ok" )].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|TiDB cluster |PD: Region schedule push: total, rate | |DEPENDENT |pd.region_heartbeat.push.err.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.type == "push" && @.labels.address == "{#STORE_ADDRESS}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_raw_items |PD: Get instance metrics |<p>Get TiDB PD instance metrics.</p> |HTTP_AGENT |pd.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- PROMETHEUS_TO_JSON |
-|Zabbix_raw_items |PD: Get instance status |<p>Get TiDB PD instance status info.</p> |HTTP_AGENT |pd.get_status<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED |
+|TiDB cluster |PD: Region heartbeat: active, rate |<p>The count of heartbeats with the ok status per second.</p> |DEPENDENT |pd.region_heartbeat.ok.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.status == "ok" && @.labels.type == "report" && @.labels.address == "{#STORE_ADDRESS}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB cluster |PD: Region heartbeat: error, rate |<p>The count of heartbeats with the error status per second.</p> |DEPENDENT |pd.region_heartbeat.error.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.status == "err" && @.labels.type == "report" && @.labels.address == "{#STORE_ADDRESS}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB cluster |PD: Region heartbeat: total, rate |<p>The count of heartbeats reported to PD per instance per second.</p> |DEPENDENT |pd.region_heartbeat.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.type == "report" && @.labels.address == "{#STORE_ADDRESS}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB cluster |PD: Region schedule push: total, rate |<p>-</p> |DEPENDENT |pd.region_heartbeat.push.err.rate[{#STORE_ADDRESS}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "pd_scheduler_region_heartbeat" && @.labels.type == "push" && @.labels.address == "{#STORE_ADDRESS}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_raw_items |PD: Get instance metrics |<p>Get TiDB PD instance metrics.</p> |HTTP_AGENT |pd.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- PROMETHEUS_TO_JSON</p> |
+|Zabbix_raw_items |PD: Get instance status |<p>Get TiDB PD instance status info.</p> |HTTP_AGENT |pd.get_status<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"status": "0"}`</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|PD: Instance is not responding |<p>-</p> |`{TEMPLATE_NAME:pd.status.last()}=0` |AVERAGE | |
-|PD: Version has changed (new version: {ITEM.VALUE}) |<p>PD version has changed. Ack to close.</p> |`{TEMPLATE_NAME:pd.version.diff()}=1 and {TEMPLATE_NAME:pd.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|PD: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:pd.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|TiDB cluster: There are offline TiKV nodes |<p>PD has not received a TiKV heartbeat for a long time.</p> |`{TEMPLATE_NAME:pd.cluster_status.store_down[{#SINGLETON}].last()}>0` |AVERAGE | |
-|TiDB cluster: There are low space TiKV nodes |<p>Indicates that there is no sufficient space on the TiKV node.</p> |`{TEMPLATE_NAME:pd.cluster_status.store_low_space[{#SINGLETON}].last()}>0` |AVERAGE | |
-|TiDB cluster: There are disconnected TiKV nodes |<p>PD does not receive a TiKV heartbeat within 20 seconds. Normally a TiKV heartbeat comes in every 10 seconds.</p> |`{TEMPLATE_NAME:pd.cluster_status.store_disconnected[{#SINGLETON}].last()}>0` |WARNING | |
-|TiDB cluster: Current storage usage is too high (over {$PD.STORAGE_USAGE.MAX.WARN}% for 5m) |<p>Over {$PD.STORAGE_USAGE.MAX.WARN}% of the cluster space is occupied.</p> |`{TEMPLATE_NAME:pd.cluster_status.storage_size[{#SINGLETON}].min(5m)}/{TiDB PD by HTTP:pd.cluster_status.storage_capacity[{#SINGLETON}].last()}*100>{$PD.STORAGE_USAGE.MAX.WARN}` |WARNING | |
-|TiDB cluster: Too many missed regions (over {$PD.MISS_REGION.MAX.WARN} in 5m) |<p>The number of Region replicas is smaller than the value of max-replicas. When a TiKV machine is down and its downtime exceeds max-down-time, it usually leads to missing replicas for some Regions during a period of time. When a TiKV node is made offline, it might result in a small number of Regions with missing replicas.</p> |`{TEMPLATE_NAME:pd.region_status[{#TYPE}].min(5m)}>{$PD.MISS_REGION.MAX.WARN}` |WARNING | |
-|TiDB cluster: There are unresponsive peers |<p>The number of Regions with an unresponsive peer reported by the Raft leader.</p> |`{TEMPLATE_NAME:pd.region_status[{#TYPE}].min(5m)}>0` |WARNING | |
+|PD: Instance is not responding |<p>-</p> |`last(/TiDB PD by HTTP/pd.status)=0` |AVERAGE | |
+|PD: Version has changed (new version: {ITEM.VALUE}) |<p>PD version has changed. Ack to close.</p> |`last(/TiDB PD by HTTP/pd.version,#1)<>last(/TiDB PD by HTTP/pd.version,#2) and length(last(/TiDB PD by HTTP/pd.version))>0` |INFO |<p>Manual close: YES</p> |
+|PD: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/TiDB PD by HTTP/pd.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|TiDB cluster: There are offline TiKV nodes |<p>PD has not received a TiKV heartbeat for a long time.</p> |`last(/TiDB PD by HTTP/pd.cluster_status.store_down[{#SINGLETON}])>0` |AVERAGE | |
+|TiDB cluster: There are low space TiKV nodes |<p>Indicates that there is no sufficient space on the TiKV node.</p> |`last(/TiDB PD by HTTP/pd.cluster_status.store_low_space[{#SINGLETON}])>0` |AVERAGE | |
+|TiDB cluster: There are disconnected TiKV nodes |<p>PD does not receive a TiKV heartbeat within 20 seconds. Normally a TiKV heartbeat comes in every 10 seconds.</p> |`last(/TiDB PD by HTTP/pd.cluster_status.store_disconnected[{#SINGLETON}])>0` |WARNING | |
+|TiDB cluster: Current storage usage is too high (over {$PD.STORAGE_USAGE.MAX.WARN}% for 5m) |<p>Over {$PD.STORAGE_USAGE.MAX.WARN}% of the cluster space is occupied.</p> |`min(/TiDB PD by HTTP/pd.cluster_status.storage_size[{#SINGLETON}],5m)/last(/TiDB PD by HTTP/pd.cluster_status.storage_capacity[{#SINGLETON}])*100>{$PD.STORAGE_USAGE.MAX.WARN}` |WARNING | |
+|TiDB cluster: Too many missed regions (over {$PD.MISS_REGION.MAX.WARN} in 5m) |<p>The number of Region replicas is smaller than the value of max-replicas. When a TiKV machine is down and its downtime exceeds max-down-time, it usually leads to missing replicas for some Regions during a period of time. When a TiKV node is made offline, it might result in a small number of Regions with missing replicas.</p> |`min(/TiDB PD by HTTP/pd.region_status[{#TYPE}],5m)>{$PD.MISS_REGION.MAX.WARN}` |WARNING | |
+|TiDB cluster: There are unresponsive peers |<p>The number of Regions with an unresponsive peer reported by the Raft leader.</p> |`min(/TiDB PD by HTTP/pd.region_status[{#TYPE}],5m)>0` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml b/templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml
index 84f7d99cfb2..69e23bcb624 100644
--- a/templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml
+++ b/templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:40Z'
+  version: '6.0'
+  date: '2021-12-16T07:40:17Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -15,11 +15,11 @@ zabbix_export:
         Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
         Don't forget to change the macros {$PD.URL}, {$PD.PORT}.
         
-        Template `TiDB PD by HTTP` — collects metrics by HTTP agent from PD /metrics endpoint and from monitoring API.
+        Template `TiDB PD by HTTP` — collects metrics by HTTP agent from PD /metrics endpoint and from monitoring API.
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -555,14 +555,14 @@ zabbix_export:
               parameters:
                 - |
                   var lookup = {},
-                  result = [];
+                      result = [];
                   
                   JSON.parse(value).forEach(function (item) {
-                  var grpc_method = item.labels.grpc_method;
-                  if (!(lookup[grpc_method])) {
-                  lookup[grpc_method] = 1;
-                  result.push({ "{#GRPC_METHOD}": grpc_method });
-                  }
+                      var grpc_method = item.labels.grpc_method;
+                      if (!(lookup[grpc_method])) {
+                          lookup[grpc_method] = 1;
+                          result.push({ "{#GRPC_METHOD}": grpc_method });
+                      }
                   })
                   
                   return JSON.stringify(result);
@@ -694,14 +694,14 @@ zabbix_export:
               parameters:
                 - |
                   var lookup = {},
-                  result = [];
+                      result = [];
                   
                   JSON.parse(value).forEach(function (item) {
-                  var address = item.labels.address;
-                  if (!(lookup[address])) {
-                  lookup[address] = 1;
-                  result.push({ "{#STORE_ADDRESS}": address });
-                  }
+                      var address = item.labels.address;
+                      if (!(lookup[address])) {
+                          lookup[address] = 1;
+                          result.push({ "{#STORE_ADDRESS}": address });
+                      }
                   })
                   
                   return JSON.stringify(result);
@@ -750,10 +750,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#TYPE}": item.labels.type,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#TYPE}": item.labels.type,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -814,10 +814,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#TYPE}": item.labels.type,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#TYPE}": item.labels.type,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -898,10 +898,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#KIND}": item.labels.kind,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#KIND}": item.labels.kind,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
diff --git a/templates/db/tidb_http/tidb_tidb_http/README.md b/templates/db/tidb_http/tidb_tidb_http/README.md
index 44f599a780b..2b7e135969a 100644
--- a/templates/db/tidb_http/tidb_tidb_http/README.md
+++ b/templates/db/tidb_http/tidb_tidb_http/README.md
@@ -3,11 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor TiDB server of TiDB cluster by Zabbix that works without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `TiDB by HTTP` — collects metrics by HTTP agent from PD /metrics endpoint and from monitoring API.
+Template `TiDB by HTTP` — collects metrics by HTTP agent from PD /metrics endpoint and from monitoring API.
 See https://docs.pingcap.com/tidb/stable/tidb-monitoring-api.
 
 
@@ -22,9 +22,8 @@ This template was tested on:
 This template works with TiDB server of TiDB cluster.
 Internal service metrics are collected from TiDB /metrics endpoint and from monitoring API.
 See https://docs.pingcap.com/tidb/stable/tidb-monitoring-api.
-Don't forget to change the macros {$TIDB.URL}, {$TIDB.PORT}. 
-Also, see the Macros section for a list of macros used to set trigger values.  
-
+Don't forget to change the macros {$TIDB.URL}, {$TIDB.PORT}.
+Also, see the Macros section for a list of macros used to set trigger values.
 
 ## Zabbix configuration
 
@@ -54,74 +53,74 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|QPS metrics discovery |<p>Discovery QPS specific metrics.</p> |DEPENDENT |tidb.qps.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_query_total")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Statement metrics discovery |<p>Discovery statement specific metrics.</p> |DEPENDENT |tidb.statement.discover<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_executor_statement_total")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|KV metrics discovery |<p>Discovery KV specific metrics.</p> |DEPENDENT |tidb.kv_ops.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_txn_cmd_duration_seconds_count")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Lock resolves discovery |<p>Discovery lock resolves specific metrics.</p> |DEPENDENT |tidb.tikvclient_lock_resolver_action.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_lock_resolver_actions_total")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|KV backoff discovery |<p>Discovery KV backoff specific metrics.</p> |DEPENDENT |tidb.tikvclient_backoff.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_backoff_total")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|GC action results discovery |<p>Discovery GC action results metrics.</p> |DEPENDENT |tidb.tikvclient_gc_action.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_gc_action_result")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Overrides:**</p><p>Failed GC-related operations trigger<br> - {#TYPE} MATCHES_REGEX `failed`<br>  - TRIGGER_PROTOTYPE LIKE `Too many failed GC-related operations` - DISCOVER</p> |
+|QPS metrics discovery |<p>Discovery QPS specific metrics.</p> |DEPENDENT |tidb.qps.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_query_total")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Statement metrics discovery |<p>Discovery statement specific metrics.</p> |DEPENDENT |tidb.statement.discover<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_executor_statement_total")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|KV metrics discovery |<p>Discovery KV specific metrics.</p> |DEPENDENT |tidb.kv_ops.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_txn_cmd_duration_seconds_count")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Lock resolves discovery |<p>Discovery lock resolves specific metrics.</p> |DEPENDENT |tidb.tikvclient_lock_resolver_action.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_lock_resolver_actions_total")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|KV backoff discovery |<p>Discovery KV backoff specific metrics.</p> |DEPENDENT |tidb.tikvclient_backoff.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_backoff_total")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|GC action results discovery |<p>Discovery GC action results metrics.</p> |DEPENDENT |tidb.tikvclient_gc_action.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_gc_action_result")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Overrides:**</p><p>Failed GC-related operations trigger<br> - {#TYPE} MATCHES_REGEX `failed`<br>  - TRIGGER_PROTOTYPE LIKE `Too many failed GC-related operations` - DISCOVER</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
 |TiDB node |TiDB: Status |<p>Status of PD instance.</p> |DEPENDENT |tidb.status<p>**Preprocessing**:</p><p>- JSONPATH: `$.status`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|TiDB node |TiDB: Total "error" server query, rate |<p>The number of queries on TiDB instance per second with failure of command execution results.</p> |DEPENDENT |tidb.server_query.error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total" && @.labels.result == "Error")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Total "ok" server query, rate |<p>The number of queries on TiDB instance per second with success of command execution results.</p> |DEPENDENT |tidb.server_query.ok.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total" && @.labels.result == "OK")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Total server query, rate |<p>The number of queries per second on TiDB instance.</p> |DEPENDENT |tidb.server_query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: SQL statements, rate |<p>The total number of SQL statements executed per second.</p> |DEPENDENT |tidb.statement_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_executor_statement_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Failed Query, rate |<p>The number of error occurred when executing SQL statements per second (such as syntax errors and primary key conflicts).</p> |DEPENDENT |tidb.execute_error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_execute_error_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: KV commands, rate |<p>The number of executed KV commands per second.</p> |DEPENDENT |tidb.tikvclient_txn.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_txn_cmd_duration_seconds_count")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: PD TSO commands, rate |<p>The number of TSO commands that TiDB obtains from PD per second.</p> |DEPENDENT |tidb.pd_tso_cmd.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="pd_client_cmd_handle_cmds_duration_seconds_count" && @.labels.type == "tso")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: PD TSO requests, rate |<p>The number of TSO requests that TiDB obtains from PD per second.</p> |DEPENDENT |tidb.pd_tso_request.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="pd_client_request_handle_requests_duration_seconds_count" && @.labels.type == "tso")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: TiClient region errors, rate |<p>The number of region related errors returned by TiKV per second.</p> |DEPENDENT |tidb.tikvclient_region_err.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_region_err_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Lock resolves, rate |<p>The number of DDL tasks that are waiting.</p> |DEPENDENT |tidb.tikvclient_lock_resolver_action.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_lock_resolver_actions_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
+|TiDB node |TiDB: Total "error" server query, rate |<p>The number of queries on TiDB instance per second with failure of command execution results.</p> |DEPENDENT |tidb.server_query.error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total" && @.labels.result == "Error")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Total "ok" server query, rate |<p>The number of queries on TiDB instance per second with success of command execution results.</p> |DEPENDENT |tidb.server_query.ok.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total" && @.labels.result == "OK")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Total server query, rate |<p>The number of queries per second on TiDB instance.</p> |DEPENDENT |tidb.server_query.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: SQL statements, rate |<p>The total number of SQL statements executed per second.</p> |DEPENDENT |tidb.statement_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_executor_statement_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Failed Query, rate |<p>The number of error occurred when executing SQL statements per second (such as syntax errors and primary key conflicts).</p> |DEPENDENT |tidb.execute_error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_execute_error_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: KV commands, rate |<p>The number of executed KV commands per second.</p> |DEPENDENT |tidb.tikvclient_txn.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_txn_cmd_duration_seconds_count")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: PD TSO commands, rate |<p>The number of TSO commands that TiDB obtains from PD per second.</p> |DEPENDENT |tidb.pd_tso_cmd.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="pd_client_cmd_handle_cmds_duration_seconds_count" && @.labels.type == "tso")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: PD TSO requests, rate |<p>The number of TSO requests that TiDB obtains from PD per second.</p> |DEPENDENT |tidb.pd_tso_request.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="pd_client_request_handle_requests_duration_seconds_count" && @.labels.type == "tso")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: TiClient region errors, rate |<p>The number of region related errors returned by TiKV per second.</p> |DEPENDENT |tidb.tikvclient_region_err.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_region_err_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Lock resolves, rate |<p>The number of DDL tasks that are waiting.</p> |DEPENDENT |tidb.tikvclient_lock_resolver_action.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_lock_resolver_actions_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
 |TiDB node |TiDB: DDL waiting jobs |<p>The number of TiDB operations that resolve locks per second. When TiDB's read or write request encounters a lock, it tries to resolve the lock.</p> |DEPENDENT |tidb.ddl_waiting_jobs<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_ddl_waiting_jobs")].value.sum()`</p> |
-|TiDB node |TiDB: Load schema total, rate |<p>The statistics of the schemas that TiDB obtains from TiKV per second.</p> |DEPENDENT |tidb.domain_load_schema.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_domain_load_schema_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Load schema failed, rate |<p>The total number of failures to reload the latest schema information in TiDB per second.</p> |DEPENDENT |tidb.domain_load_schema.failed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_domain_load_schema_total && @.labels.type == "failed"")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Schema lease "outdate" errors , rate |<p>The number of schema lease errors per second. </p><p>"outdate" errors means that the schema cannot be updated, which is a more serious error and triggers an alert.</p> |DEPENDENT |tidb.session_schema_lease_error.outdate.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_session_schema_lease_error_total && @.labels.type == "outdate"")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Schema lease "change" errors, rate |<p>The number of schema lease errors per second. </p><p>"change" means that the schema has changed</p> |DEPENDENT |tidb.session_schema_lease_error.change.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_session_schema_lease_error_total && @.labels.type == "change"")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: KV backoff, rate |<p>The number of errors returned by TiKV.</p> |DEPENDENT |tidb.tikvclient_backoff.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_backoff_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Keep alive, rate |<p>The number of times that the metrics are refreshed on TiDB instance per minute.</p> |DEPENDENT |tidb.monitor_keep_alive.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_monitor_keep_alive_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- SIMPLE_CHANGE |
+|TiDB node |TiDB: Load schema total, rate |<p>The statistics of the schemas that TiDB obtains from TiKV per second.</p> |DEPENDENT |tidb.domain_load_schema.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_domain_load_schema_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Load schema failed, rate |<p>The total number of failures to reload the latest schema information in TiDB per second.</p> |DEPENDENT |tidb.domain_load_schema.failed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_domain_load_schema_total && @.labels.type == "failed"")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Schema lease "outdate" errors , rate |<p>The number of schema lease errors per second.</p><p>"outdate" errors means that the schema cannot be updated, which is a more serious error and triggers an alert.</p> |DEPENDENT |tidb.session_schema_lease_error.outdate.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_session_schema_lease_error_total && @.labels.type == "outdate"")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Schema lease "change" errors, rate |<p>The number of schema lease errors per second.</p><p>"change" means that the schema has changed</p> |DEPENDENT |tidb.session_schema_lease_error.change.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_session_schema_lease_error_total && @.labels.type == "change"")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: KV backoff, rate |<p>The number of errors returned by TiKV.</p> |DEPENDENT |tidb.tikvclient_backoff.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_backoff_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Keep alive, rate |<p>The number of times that the metrics are refreshed on TiDB instance per minute.</p> |DEPENDENT |tidb.monitor_keep_alive.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_monitor_keep_alive_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- SIMPLE_CHANGE</p> |
 |TiDB node |TiDB: Server connections |<p>The connection number of current TiDB instance.</p> |DEPENDENT |tidb.tidb_server_connections<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_connections")].value.first()`</p> |
 |TiDB node |TiDB: Heap memory usage |<p>Number of heap bytes that are in use.</p> |DEPENDENT |tidb.heap_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="go_memstats_heap_inuse_bytes")].value.first()`</p> |
 |TiDB node |TiDB: RSS memory usage |<p>Resident memory size in bytes.</p> |DEPENDENT |tidb.rss_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="process_resident_memory_bytes")].value.first()`</p> |
 |TiDB node |TiDB: Goroutine count |<p>The number of Goroutines on TiDB instance.</p> |DEPENDENT |tidb.goroutines<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="go_goroutines")].value.first()`</p> |
 |TiDB node |TiDB: Open file descriptors |<p>Number of open file descriptors.</p> |DEPENDENT |tidb.process_open_fds<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="process_open_fds")].value.first()`</p> |
 |TiDB node |TiDB: Open file descriptors, max |<p>Maximum number of open file descriptors.</p> |DEPENDENT |tidb.process_max_fds<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="process_max_fds")].value.first()`</p> |
-|TiDB node |TiDB: CPU |<p>Total user and system CPU usage ratio.</p> |DEPENDENT |tidb.cpu.util<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="process_cpu_seconds_total")].value.first()`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
+|TiDB node |TiDB: CPU |<p>Total user and system CPU usage ratio.</p> |DEPENDENT |tidb.cpu.util<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="process_cpu_seconds_total")].value.first()`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
 |TiDB node |TiDB: Uptime |<p>The runtime of each TiDB instance.</p> |DEPENDENT |tidb.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="process_start_time_seconds")].value.first()`</p><p>- JAVASCRIPT: `//use boottime to calculate uptime return (Math.floor(Date.now()/1000)-Number(value)); `</p> |
 |TiDB node |TiDB: Version |<p>Version of the TiDB instance.</p> |DEPENDENT |tidb.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
-|TiDB node |TiDB: Time jump back, rate |<p>The number of times that the operating system rewinds every second.</p> |DEPENDENT |tidb.monitor_time_jump_back.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_monitor_time_jump_back_total")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Server critical error, rate |<p>The number of critical errors occurred in TiDB per second.</p> |DEPENDENT |tidb.tidb_server_critical_error_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_critical_error_total")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Server panic, rate |<p>The number of panics occurred in TiDB per second.</p> |DEPENDENT |tidb.tidb_server_panic_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_panic_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Server query "OK": {#TYPE}, rate |<p>The number of queries on TiDB instance per second with success of command execution results.</p> |DEPENDENT |tidb.server_query.ok.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total" && @.labels.result == "OK" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Server query "Error": {#TYPE}, rate |<p>The number of queries on TiDB instance per second with failure of command execution results.</p> |DEPENDENT |tidb.server_query.error.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total" && @.labels.result == "Error" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: SQL statements: {#TYPE}, rate |<p>The number of SQL statements executed per second.</p> |DEPENDENT |tidb.statement.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_executor_statement_total" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: KV Commands: {#TYPE}, rate |<p>The number of executed KV commands per second.</p> |DEPENDENT |tidb.tikvclient_txn.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_txn_cmd_duration_seconds_count" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: Lock resolves: {#TYPE}, rate |<p>The number of TiDB operations that resolve locks per second. When TiDB's read or write request encounters a lock, it tries to resolve the lock.</p> |DEPENDENT |tidb.tikvclient_lock_resolver_action.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_lock_resolver_actions_total" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: KV backoff: {#TYPE}, rate |<p>The number of TiDB operations that resolve locks per second. When TiDB's read or write request encounters a lock, it tries to resolve the lock.</p> |DEPENDENT |tidb.tikvclient_backoff.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_backoff_total" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiDB node |TiDB: GC action result: {#TYPE}, rate |<p>The number of results of GC-related operations per second.</p> |DEPENDENT |tidb.tikvclient_gc_action.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_gc_action_result" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_raw_items |TiDB: Get instance metrics |<p>Get TiDB instance metrics.</p> |HTTP_AGENT |tidb.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- PROMETHEUS_TO_JSON |
-|Zabbix_raw_items |TiDB: Get instance status |<p>Get TiDB instance status info.</p> |HTTP_AGENT |tidb.get_status<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED |
+|TiDB node |TiDB: Time jump back, rate |<p>The number of times that the operating system rewinds every second.</p> |DEPENDENT |tidb.monitor_time_jump_back.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_monitor_time_jump_back_total")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Server critical error, rate |<p>The number of critical errors occurred in TiDB per second.</p> |DEPENDENT |tidb.tidb_server_critical_error_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_critical_error_total")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Server panic, rate |<p>The number of panics occurred in TiDB per second.</p> |DEPENDENT |tidb.tidb_server_panic_total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_server_panic_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Server query "OK": {#TYPE}, rate |<p>The number of queries on TiDB instance per second with success of command execution results.</p> |DEPENDENT |tidb.server_query.ok.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total" && @.labels.result == "OK" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Server query "Error": {#TYPE}, rate |<p>The number of queries on TiDB instance per second with failure of command execution results.</p> |DEPENDENT |tidb.server_query.error.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tidb_server_query_total" && @.labels.result == "Error" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: SQL statements: {#TYPE}, rate |<p>The number of SQL statements executed per second.</p> |DEPENDENT |tidb.statement.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_executor_statement_total" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: KV Commands: {#TYPE}, rate |<p>The number of executed KV commands per second.</p> |DEPENDENT |tidb.tikvclient_txn.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_txn_cmd_duration_seconds_count" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: Lock resolves: {#TYPE}, rate |<p>The number of TiDB operations that resolve locks per second. When TiDB's read or write request encounters a lock, it tries to resolve the lock.</p> |DEPENDENT |tidb.tikvclient_lock_resolver_action.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_lock_resolver_actions_total" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: KV backoff: {#TYPE}, rate |<p>The number of TiDB operations that resolve locks per second. When TiDB's read or write request encounters a lock, it tries to resolve the lock.</p> |DEPENDENT |tidb.tikvclient_backoff.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_backoff_total" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiDB node |TiDB: GC action result: {#TYPE}, rate |<p>The number of results of GC-related operations per second.</p> |DEPENDENT |tidb.tikvclient_gc_action.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="tidb_tikvclient_gc_action_result" && @.labels.type == "{#TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_raw_items |TiDB: Get instance metrics |<p>Get TiDB instance metrics.</p> |HTTP_AGENT |tidb.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- PROMETHEUS_TO_JSON</p> |
+|Zabbix_raw_items |TiDB: Get instance status |<p>Get TiDB instance status info.</p> |HTTP_AGENT |tidb.get_status<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"status": "0"}`</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|TiDB: Instance is not responding |<p>-</p> |`{TEMPLATE_NAME:tidb.status.last()}=0` |AVERAGE | |
-|TiDB: Too many region related errors (over {$TIDB.REGION_ERROR.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:tidb.tikvclient_region_err.rate.min(5m)}>{$TIDB.REGION_ERROR.MAX.WARN}` |AVERAGE | |
-|TiDB: Too many DDL waiting jobs (over {$TIDB.DDL.WAITING.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:tidb.ddl_waiting_jobs.min(5m)}>{$TIDB.DDL.WAITING.MAX.WARN}` |WARNING | |
-|TiDB: Too many schema lease errors (over {$TIDB.SCHEMA_LOAD_ERRORS.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:tidb.domain_load_schema.failed.rate.min(5m)}>{$TIDB.SCHEMA_LOAD_ERRORS.MAX.WARN}` |AVERAGE | |
-|TiDB: Too many schema lease errors (over {$TIDB.SCHEMA_LEASE_ERRORS.MAX.WARN} for 5m) |<p>The latest schema information is not reloaded in TiDB within one lease.</p> |`{TEMPLATE_NAME:tidb.session_schema_lease_error.outdate.rate.min(5m)}>{$TIDB.SCHEMA_LEASE_ERRORS.MAX.WARN}` |AVERAGE | |
-|TiDB: Too few keep alive operations (less {$TIDB.MONITOR_KEEP_ALIVE.MAX.WARN} for 5m) |<p>Indicates whether the TiDB process still exists. If the number of times for tidb_monitor_keep_alive_total increases less than 10 per minute, the TiDB process might already exit and an alert is triggered.</p> |`{TEMPLATE_NAME:tidb.monitor_keep_alive.rate.max(5m)}<{$TIDB.MONITOR_KEEP_ALIVE.MAX.WARN}` |AVERAGE | |
-|TiDB: Heap memory usage is too high (over {$TIDB.HEAP.USAGE.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:tidb.heap_bytes.min(5m)}>{$TIDB.HEAP.USAGE.MAX.WARN}` |WARNING | |
-|TiDB: Current number of open files is too high (over {$TIDB.OPEN.FDS.MAX.WARN}% for 5m) |<p>"Heavy file descriptor usage (i.e., near the process’s file descriptor limit) indicates a potential file descriptor exhaustion issue."</p> |`{TEMPLATE_NAME:tidb.process_open_fds.min(5m)}/{TiDB by HTTP:tidb.process_max_fds.last()}*100>{$TIDB.OPEN.FDS.MAX.WARN}` |WARNING | |
-|TiDB: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:tidb.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|TiDB: Version has changed (new version: {ITEM.VALUE}) |<p>TiDB version has changed. Ack to close.</p> |`{TEMPLATE_NAME:tidb.version.diff()}=1 and {TEMPLATE_NAME:tidb.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|TiDB: Too many time jump backs (over {$TIDB.TIME_JUMP_BACK.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:tidb.monitor_time_jump_back.rate.min(5m)}>{$TIDB.TIME_JUMP_BACK.MAX.WARN}` |WARNING | |
-|TiDB: There are panicked TiDB threads |<p>When a panic occurs, an alert is triggered. The thread is often recovered, otherwise, TiDB will frequently restart.</p> |`{TEMPLATE_NAME:tidb.tidb_server_panic_total.rate.last()}>0` |AVERAGE | |
-|TiDB: Too many failed GC-related operations (over {$TIDB.GC_ACTIONS.ERRORS.MAX.WARN} in 5m) |<p>-</p> |`{TEMPLATE_NAME:tidb.tikvclient_gc_action.rate[{#TYPE}].min(5m)}>{$TIDB.GC_ACTIONS.ERRORS.MAX.WARN}` |WARNING | |
+|TiDB: Instance is not responding |<p>-</p> |`last(/TiDB by HTTP/tidb.status)=0` |AVERAGE | |
+|TiDB: Too many region related errors (over {$TIDB.REGION_ERROR.MAX.WARN} for 5m) |<p>-</p> |`min(/TiDB by HTTP/tidb.tikvclient_region_err.rate,5m)>{$TIDB.REGION_ERROR.MAX.WARN}` |AVERAGE | |
+|TiDB: Too many DDL waiting jobs (over {$TIDB.DDL.WAITING.MAX.WARN} for 5m) |<p>-</p> |`min(/TiDB by HTTP/tidb.ddl_waiting_jobs,5m)>{$TIDB.DDL.WAITING.MAX.WARN}` |WARNING | |
+|TiDB: Too many schema lease errors (over {$TIDB.SCHEMA_LOAD_ERRORS.MAX.WARN} for 5m) |<p>-</p> |`min(/TiDB by HTTP/tidb.domain_load_schema.failed.rate,5m)>{$TIDB.SCHEMA_LOAD_ERRORS.MAX.WARN}` |AVERAGE | |
+|TiDB: Too many schema lease errors (over {$TIDB.SCHEMA_LEASE_ERRORS.MAX.WARN} for 5m) |<p>The latest schema information is not reloaded in TiDB within one lease.</p> |`min(/TiDB by HTTP/tidb.session_schema_lease_error.outdate.rate,5m)>{$TIDB.SCHEMA_LEASE_ERRORS.MAX.WARN}` |AVERAGE | |
+|TiDB: Too few keep alive operations (less {$TIDB.MONITOR_KEEP_ALIVE.MAX.WARN} for 5m) |<p>Indicates whether the TiDB process still exists. If the number of times for tidb_monitor_keep_alive_total increases less than 10 per minute, the TiDB process might already exit and an alert is triggered.</p> |`max(/TiDB by HTTP/tidb.monitor_keep_alive.rate,5m)<{$TIDB.MONITOR_KEEP_ALIVE.MAX.WARN}` |AVERAGE | |
+|TiDB: Heap memory usage is too high (over {$TIDB.HEAP.USAGE.MAX.WARN} for 5m) |<p>-</p> |`min(/TiDB by HTTP/tidb.heap_bytes,5m)>{$TIDB.HEAP.USAGE.MAX.WARN}` |WARNING | |
+|TiDB: Current number of open files is too high (over {$TIDB.OPEN.FDS.MAX.WARN}% for 5m) |<p>Heavy file descriptor usage (i.e., near the process's file descriptor limit) indicates a potential file descriptor exhaustion issue.</p> |`min(/TiDB by HTTP/tidb.process_open_fds,5m)/last(/TiDB by HTTP/tidb.process_max_fds)*100>{$TIDB.OPEN.FDS.MAX.WARN}` |WARNING | |
+|TiDB: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/TiDB by HTTP/tidb.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|TiDB: Version has changed (new version: {ITEM.VALUE}) |<p>TiDB version has changed. Ack to close.</p> |`last(/TiDB by HTTP/tidb.version,#1)<>last(/TiDB by HTTP/tidb.version,#2) and length(last(/TiDB by HTTP/tidb.version))>0` |INFO |<p>Manual close: YES</p> |
+|TiDB: Too many time jump backs (over {$TIDB.TIME_JUMP_BACK.MAX.WARN} for 5m) |<p>-</p> |`min(/TiDB by HTTP/tidb.monitor_time_jump_back.rate,5m)>{$TIDB.TIME_JUMP_BACK.MAX.WARN}` |WARNING | |
+|TiDB: There are panicked TiDB threads |<p>When a panic occurs, an alert is triggered. The thread is often recovered, otherwise, TiDB will frequently restart.</p> |`last(/TiDB by HTTP/tidb.tidb_server_panic_total.rate)>0` |AVERAGE | |
+|TiDB: Too many failed GC-related operations (over {$TIDB.GC_ACTIONS.ERRORS.MAX.WARN} in 5m) |<p>-</p> |`min(/TiDB by HTTP/tidb.tikvclient_gc_action.rate[{#TYPE}],5m)>{$TIDB.GC_ACTIONS.ERRORS.MAX.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml b/templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml
index e809f070802..5f3a1c91946 100644
--- a/templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml
+++ b/templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:41Z'
+  version: '6.0'
+  date: '2021-12-16T07:09:48Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,13 +13,13 @@ zabbix_export:
       description: |
         The template to monitor TiDB server of TiDB cluster by Zabbix that works without any external scripts.
         Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
-        Don't forget to change the macros {$TIDB.URL}, {$TIDB.PORT}. 
+        Don't forget to change the macros {$TIDB.URL}, {$TIDB.PORT}.
         
-        Template `TiDB by HTTP` — collects metrics by HTTP agent from PD /metrics endpoint and from monitoring API.
+        Template `TiDB by HTTP` — collects metrics by HTTP agent from PD /metrics endpoint and from monitoring API.
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -508,7 +508,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            The number of schema lease errors per second. 
+            The number of schema lease errors per second.
             "change" means that the schema has changed
           preprocessing:
             -
@@ -535,7 +535,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            The number of schema lease errors per second. 
+            The number of schema lease errors per second.
             "outdate" errors means that the schema cannot be updated, which is a more serious error and triggers an alert.
           preprocessing:
             -
@@ -915,10 +915,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#TYPE}": item.labels.type,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#TYPE}": item.labels.type,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -993,14 +993,14 @@ zabbix_export:
               parameters:
                 - |
                   var lookup = {},
-                  result = [];
+                      result = [];
                   
                   JSON.parse(value).forEach(function (item) {
-                  var type = item.labels.type;
-                  if (!(lookup[type])) {
-                  lookup[type] = 1;
-                  result.push({ "{#TYPE}": type });
-                  }
+                      var type = item.labels.type;
+                      if (!(lookup[type])) {
+                          lookup[type] = 1;
+                          result.push({ "{#TYPE}": type });
+                      }
                   })
                   
                   return JSON.stringify(result);
@@ -1052,10 +1052,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#TYPE}": item.labels.type,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#TYPE}": item.labels.type,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1106,10 +1106,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#TYPE}": item.labels.type,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#TYPE}": item.labels.type,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1167,10 +1167,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#TYPE}": item.labels.type,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#TYPE}": item.labels.type,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1237,10 +1237,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#TYPE}": item.labels.type,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#TYPE}": item.labels.type,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1307,7 +1307,7 @@ zabbix_export:
       expression: 'min(/TiDB by HTTP/tidb.process_open_fds,5m)/last(/TiDB by HTTP/tidb.process_max_fds)*100>{$TIDB.OPEN.FDS.MAX.WARN}'
       name: 'TiDB: Current number of open files is too high (over {$TIDB.OPEN.FDS.MAX.WARN}% for 5m)'
       priority: WARNING
-      description: '"Heavy file descriptor usage (i.e., near the process’s file descriptor limit) indicates a potential file descriptor exhaustion issue."'
+      description: 'Heavy file descriptor usage (i.e., near the process''s file descriptor limit) indicates a potential file descriptor exhaustion issue.'
   graphs:
     -
       uuid: ee25671d0b5446348341be56967a74b2
diff --git a/templates/db/tidb_http/tidb_tikv_http/README.md b/templates/db/tidb_http/tidb_tikv_http/README.md
index 0306aaf125a..7ecc3bf8fd8 100644
--- a/templates/db/tidb_http/tidb_tikv_http/README.md
+++ b/templates/db/tidb_http/tidb_tikv_http/README.md
@@ -3,11 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor TiKV server of TiDB cluster by Zabbix that works without any external scripts.
 Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
 
-Template `TiDB TiKV by HTTP` — collects metrics by HTTP agent from TiKV /metrics endpoint.
+Template `TiDB TiKV by HTTP` — collects metrics by HTTP agent from TiKV /metrics endpoint.
 
 
 This template was tested on:
@@ -20,8 +20,8 @@ This template was tested on:
 
 This template works with TiKV server of TiDB cluster.
 Internal service metrics are collected from TiKV /metrics endpoint.
-Don't forget to change the macros {$TIKV.URL}, {$TIKV.PORT}. 
-Also, see the Macros section for a list of macros used to set trigger values.  
+Don't forget to change the macros {$TIKV.URL}, {$TIKV.PORT}.
+Also, see the Macros section for a list of macros used to set trigger values.
 
 
 ## Zabbix configuration
@@ -47,10 +47,10 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|QPS metrics discovery |<p>Discovery QPS metrics.</p> |DEPENDENT |tikv.qps.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_grpc_msg_duration_seconds_count")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Coprocessor metrics discovery |<p>Discovery coprocessor metrics.</p> |DEPENDENT |tikv.coprocessor.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_duration_seconds_count")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Scheduler metrics discovery |<p>Discovery scheduler metrics.</p> |DEPENDENT |tikv.scheduler.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_stage_total")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Server errors discovery |<p>Discovery server errors metrics.</p> |DEPENDENT |tikv.server_report_failure.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_server_report_failure_msg_total")]`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Overrides:**</p><p>Too many unreachable messages trigger<br> - {#TYPE} MATCHES_REGEX `unreachable`<br>  - TRIGGER_PROTOTYPE LIKE `Too many failure messages` - DISCOVER</p> |
+|QPS metrics discovery |<p>Discovery QPS metrics.</p> |DEPENDENT |tikv.qps.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_grpc_msg_duration_seconds_count")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Coprocessor metrics discovery |<p>Discovery coprocessor metrics.</p> |DEPENDENT |tikv.coprocessor.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_duration_seconds_count")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Scheduler metrics discovery |<p>Discovery scheduler metrics.</p> |DEPENDENT |tikv.scheduler.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_stage_total")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Server errors discovery |<p>Discovery server errors metrics.</p> |DEPENDENT |tikv.server_report_failure.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_server_report_failure_msg_total")]`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Overrides:**</p><p>Too many unreachable messages trigger<br> - {#TYPE} MATCHES_REGEX `unreachable`<br>  - TRIGGER_PROTOTYPE LIKE `Too many failure messages` - DISCOVER</p> |
 
 ## Items collected
 
@@ -61,48 +61,46 @@ There are no template links in this template.
 |TiKV node |TiKV: Capacity size |<p>The capacity size of TiKV instance.</p> |DEPENDENT |tikv.store_size.capacity<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_store_size_bytes" && @.labels.type == "capacity")].value.first()`</p> |
 |TiKV node |TiKV: Bytes read |<p>The total bytes of read in TiKV instance.</p> |DEPENDENT |tikv.engine_flow_bytes.read<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_engine_flow_bytes" && @.labels.db == "kv" && @.labels.type =~ "bytes_read|iter_bytes_read")].value.sum()`</p> |
 |TiKV node |TiKV: Bytes write |<p>The total bytes of write in TiKV instance.</p> |DEPENDENT |tikv.engine_flow_bytes.write<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_engine_flow_bytes" && @.labels.db == "kv" && @.labels.type == "wal_file_bytes")].value.first()`</p> |
-|TiKV node |TiKV: Storage: commands total, rate |<p>Total number of commands received per second.</p> |DEPENDENT |tikv.storage_command.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_storage_command_total")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: CPU util |<p>The CPU usage ratio on TiKV instance.</p> |DEPENDENT |tikv.cpu.util<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_thread_cpu_seconds_total")].value.sum()`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
+|TiKV node |TiKV: Storage: commands total, rate |<p>Total number of commands received per second.</p> |DEPENDENT |tikv.storage_command.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_storage_command_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: CPU util |<p>The CPU usage ratio on TiKV instance.</p> |DEPENDENT |tikv.cpu.util<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_thread_cpu_seconds_total")].value.sum()`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
 |TiKV node |TiKV: RSS memory usage |<p>Resident memory size in bytes.</p> |DEPENDENT |tikv.rss_bytes<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "process_resident_memory_bytes")].value.first()`</p> |
 |TiKV node |TiKV: Regions, count |<p>The number of regions collected in TiKV instance.</p> |DEPENDENT |tikv.region_count<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_raftstore_region_count" && @.labels.type == "region" )].value.first()`</p> |
 |TiKV node |TiKV: Regions, leader |<p>The number of leaders in TiKV instance.</p> |DEPENDENT |tikv.region_leader<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_raftstore_region_count" && @.labels.type == "leader" )].value.first()`</p> |
-|TiKV node |TiKV: Total query, rate |<p>The total QPS in TiKV instance.</p> |DEPENDENT |tikv.grpc_msg.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_grpc_msg_duration_seconds_count")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Total query errors, rate |<p>The total number of gRPC message handling failure per second.</p> |DEPENDENT |tikv.grpc_msg_fail.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_grpc_msg_fail_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Coprocessor: Errors, rate |<p>Total number of push down request error per second.</p> |DEPENDENT |tikv.coprocessor_request_error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_error")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Coprocessor: Requests, rate |<p>Total number of coprocessor requests per second.</p> |DEPENDENT |tikv.coprocessor_request.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_duration_seconds_count")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Coprocessor: Scan keys, rate |<p>Total number of scan keys observed per request per second.</p> |DEPENDENT |tikv.coprocessor_scan_keys.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_scan_keys")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Coprocessor: RocksDB ops, rate |<p>Total number of RocksDB internal operations from PerfContext per second.</p> |DEPENDENT |tikv.coprocessor_rocksdb_perf.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_rocksdb_perf")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Coprocessor: Response size, rate |<p>The total size of coprocessor response per second.</p> |DEPENDENT |tikv.coprocessor_scan_keys.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_response_bytes")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Scheduler: Pending commands |<p>The total number of pending commands. The scheduler receives commands from clients, executes them against the MVCC layer storage engine.</p> |DEPENDENT |tikv.scheduler_contex<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_contex_total")].value.first()`</p> |
-|TiKV node |TiKV: Scheduler: Busy, rate |<p>The total count of too busy schedulers per second.</p> |DEPENDENT |tikv.scheduler_too_busy.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_too_busy_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Scheduler: Commands total, rate |<p>Total number of commands per second.</p> |DEPENDENT |tikv.scheduler_commands.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_stage_total")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Scheduler: Low priority commands total, rate |<p>Total count of low priority commands per second.</p> |DEPENDENT |tikv.commands_pri.low.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_commands_pri_total" && @.labels.priority == "low")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Scheduler: Normal priority commands total, rate |<p>Total count of normal priority commands per second.</p> |DEPENDENT |tikv.commands_pri.normal.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_commands_pri_total" && @.labels.priority == "normal")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Scheduler: High priority commands total, rate |<p>Total count of high priority commands per second.</p> |DEPENDENT |tikv.commands_pri.high.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_commands_pri_total" && @.labels.priority == "high")].value.first()`</p><p>- CHANGE_PER_SECOND |
+|TiKV node |TiKV: Total query, rate |<p>The total QPS in TiKV instance.</p> |DEPENDENT |tikv.grpc_msg.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_grpc_msg_duration_seconds_count")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Total query errors, rate |<p>The total number of gRPC message handling failure per second.</p> |DEPENDENT |tikv.grpc_msg_fail.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_grpc_msg_fail_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Coprocessor: Errors, rate |<p>Total number of push down request error per second.</p> |DEPENDENT |tikv.coprocessor_request_error.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_error")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Coprocessor: Requests, rate |<p>Total number of coprocessor requests per second.</p> |DEPENDENT |tikv.coprocessor_request.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_duration_seconds_count")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Coprocessor: RocksDB ops, rate |<p>Total number of RocksDB internal operations from PerfContext per second.</p> |DEPENDENT |tikv.coprocessor_rocksdb_perf.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_rocksdb_perf")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Coprocessor: Response size, rate |<p>The total size of coprocessor response per second.</p> |DEPENDENT |tikv.coprocessor_scan_keys.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_response_bytes")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Scheduler: Busy, rate |<p>The total count of too busy schedulers per second.</p> |DEPENDENT |tikv.scheduler_too_busy.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_too_busy_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Scheduler: Commands total, rate |<p>Total number of commands per second.</p> |DEPENDENT |tikv.scheduler_commands.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_stage_total")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Scheduler: Low priority commands total, rate |<p>Total count of low priority commands per second.</p> |DEPENDENT |tikv.commands_pri.low.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_commands_pri_total" && @.labels.priority == "low")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Scheduler: Normal priority commands total, rate |<p>Total count of normal priority commands per second.</p> |DEPENDENT |tikv.commands_pri.normal.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_commands_pri_total" && @.labels.priority == "normal")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Scheduler: High priority commands total, rate |<p>Total count of high priority commands per second.</p> |DEPENDENT |tikv.commands_pri.high.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_commands_pri_total" && @.labels.priority == "high")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
 |TiKV node |TiKV: Snapshot: Pending tasks |<p>The number of tasks currently running by the worker or pending.</p> |DEPENDENT |tikv.scheduler_contex<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_worker_pending_task_total")].value.first()`</p> |
 |TiKV node |TiKV: Snapshot: Sending |<p>The total amount of raftstore snapshot traffic.</p> |DEPENDENT |tikv.snapshot.sending<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_raftstore_snapshot_traffic_total" && @.labels.type == "sending")].value.first()`</p> |
 |TiKV node |TiKV: Snapshot: Receiving |<p>The total amount of raftstore snapshot traffic.</p> |DEPENDENT |tikv.snapshot.receiving<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_raftstore_snapshot_traffic_total" && @.labels.type == "receiving")].value.first()`</p> |
 |TiKV node |TiKV: Snapshot: Applying |<p>The total amount of raftstore snapshot traffic.</p> |DEPENDENT |tikv.snapshot.applying<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_raftstore_snapshot_traffic_total" && @.labels.type == "applying")].value.first()`</p> |
 |TiKV node |TiKV: Uptime |<p>The runtime of each TiKV instance.</p> |DEPENDENT |tikv.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="process_start_time_seconds")].value.first()`</p><p>- JAVASCRIPT: `//use boottime to calculate uptime return (Math.floor(Date.now()/1000)-Number(value)); `</p> |
-|TiKV node |TiKV: Server: failure messages total, rate |<p>Total number of reporting failure messages per second.</p> |DEPENDENT |tikv.messages.failure.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_server_report_failure_msg_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|TiKV node |TiKV: Server: failure messages total, rate |<p>Total number of reporting failure messages per second.</p> |DEPENDENT |tikv.messages.failure.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_server_report_failure_msg_total")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
 |TiKV node |TiKV: Query: {#TYPE}, rate |<p>The QPS per command in TiKV instance.</p> |DEPENDENT |tikv.grpc_msg.rate[{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_grpc_msg_duration_seconds_count" && @.labels.type == "{#TYPE}")].value.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> `</p> |
-|TiKV node |TiKV: Coprocessor: {#REQ_TYPE} errors, rate |<p>Total number of push down request error per second.</p> |DEPENDENT |tikv.coprocessor_request_error.rate[{#REQ_TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_error" && @.labels.req == "{#REQ_TYPE}")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Coprocessor: {#REQ_TYPE} requests, rate |<p>Total number of coprocessor requests per second.</p> |DEPENDENT |tikv.coprocessor_request.rate[{#REQ_TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_duration_seconds_count" && @.labels.req == "{#REQ_TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Coprocessor: {#REQ_TYPE} scan keys, rate |<p>Total number of scan keys observed per request per second.</p> |DEPENDENT |tikv.coprocessor_scan_keys.rate[{#REQ_TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_scan_keys_count" && @.labels.req == "{#REQ_TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Coprocessor: {#REQ_TYPE} RocksDB ops, rate |<p>Total number of RocksDB internal operations from PerfContext per second.</p> |DEPENDENT |tikv.coprocessor_rocksdb_perf.rate[{#REQ_TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_rocksdb_perf" && @.labels.req == "{#REQ_TYPE}")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Scheduler: commands {#STAGE}, rate |<p>Total number of commands on each stage per second.</p> |DEPENDENT |tikv.scheduler_stage.rate[{#STAGE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_stage_total" && @.labels.stage == "{#STAGE}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND |
-|TiKV node |TiKV: Store_id {#STORE_ID}: failure messages "{#TYPE}", rate |<p>Total number of reporting failure messages. The metric has two labels: type and store_id. type represents the failure type, and store_id represents the destination peer store id.</p> |DEPENDENT |tikv.messages.failure.rate[{#STORE_ID},{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_server_report_failure_msg_total" && @.labels.store_id == "{#STORE_ID}"  && @.labels.type == "{#TYPE}")].value.sum()`</p><p>- CHANGE_PER_SECOND |
-|Zabbix_raw_items |TiKV: Get instance metrics |<p>Get TiKV instance metrics.</p> |HTTP_AGENT |tikv.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- PROMETHEUS_TO_JSON |
+|TiKV node |TiKV: Coprocessor: {#REQ_TYPE} errors, rate |<p>Total number of push down request error per second.</p> |DEPENDENT |tikv.coprocessor_request_error.rate[{#REQ_TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_error" && @.labels.req == "{#REQ_TYPE}")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Coprocessor: {#REQ_TYPE} requests, rate |<p>Total number of coprocessor requests per second.</p> |DEPENDENT |tikv.coprocessor_request.rate[{#REQ_TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_request_duration_seconds_count" && @.labels.req == "{#REQ_TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Coprocessor: {#REQ_TYPE} scan keys, rate |<p>Total number of scan keys observed per request per second.</p> |DEPENDENT |tikv.coprocessor_scan_keys.rate[{#REQ_TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_scan_keys_count" && @.labels.req == "{#REQ_TYPE}")].value.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Coprocessor: {#REQ_TYPE} RocksDB ops, rate |<p>Total number of RocksDB internal operations from PerfContext per second.</p> |DEPENDENT |tikv.coprocessor_rocksdb_perf.rate[{#REQ_TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_coprocessor_rocksdb_perf" && @.labels.req == "{#REQ_TYPE}")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Scheduler: commands {#STAGE}, rate |<p>Total number of commands on each stage per second.</p> |DEPENDENT |tikv.scheduler_stage.rate[{#STAGE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_scheduler_stage_total" && @.labels.stage == "{#STAGE}")].value.sum()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- CHANGE_PER_SECOND</p> |
+|TiKV node |TiKV: Store_id {#STORE_ID}: failure messages "{#TYPE}", rate |<p>Total number of reporting failure messages. The metric has two labels: type and store_id. type represents the failure type, and store_id represents the destination peer store id.</p> |DEPENDENT |tikv.messages.failure.rate[{#STORE_ID},{#TYPE}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name == "tikv_server_report_failure_msg_total" && @.labels.store_id == "{#STORE_ID}"  && @.labels.type == "{#TYPE}")].value.sum()`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_raw_items |TiKV: Get instance metrics |<p>Get TiKV instance metrics.</p> |HTTP_AGENT |tikv.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- PROMETHEUS_TO_JSON</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|TiKV: Too many coprocessor request error (over {$TIKV.COPOCESSOR.ERRORS.MAX.WARN} in 5m) |<p>-</p> |`{TEMPLATE_NAME:tikv.coprocessor_request_error.rate.min(5m)}>{$TIKV.COPOCESSOR.ERRORS.MAX.WARN}` |WARNING | |
-|TiKV: Too many pending commands (over {$TIKV.PENDING_COMMANDS.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:tikv.scheduler_contex.min(5m)}>{$TIKV.PENDING_COMMANDS.MAX.WARN}` |AVERAGE | |
-|TiKV: Too many pending commands (over {$TIKV.PENDING_TASKS.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:tikv.scheduler_contex.min(5m)}>{$TIKV.PENDING_TASKS.MAX.WARN}` |AVERAGE | |
-|TiKV: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:tikv.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|TiKV: Store_id {#STORE_ID}: Too many failure messages "{#TYPE}" (over {$TIKV.STORE.ERRORS.MAX.WARN} in 5m) |<p>Indicates that the remote TiKV cannot be connected.</p> |`{TEMPLATE_NAME:tikv.messages.failure.rate[{#STORE_ID},{#TYPE}].min(5m)}>{$TIKV.STORE.ERRORS.MAX.WARN}` |WARNING | |
+|TiKV: Too many coprocessor request error (over {$TIKV.COPOCESSOR.ERRORS.MAX.WARN} in 5m) |<p>-</p> |`min(/TiDB TiKV by HTTP/tikv.coprocessor_request_error.rate,5m)>{$TIKV.COPOCESSOR.ERRORS.MAX.WARN}` |WARNING | |
+|TiKV: Too many pending commands (over {$TIKV.PENDING_COMMANDS.MAX.WARN} for 5m) |<p>-</p> |`min(/TiDB TiKV by HTTP/tikv.scheduler_contex,5m)>{$TIKV.PENDING_COMMANDS.MAX.WARN}` |AVERAGE | |
+|TiKV: Too many pending commands (over {$TIKV.PENDING_TASKS.MAX.WARN} for 5m) |<p>-</p> |`min(/TiDB TiKV by HTTP/tikv.scheduler_contex,5m)>{$TIKV.PENDING_TASKS.MAX.WARN}` |AVERAGE | |
+|TiKV: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/TiDB TiKV by HTTP/tikv.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|TiKV: Store_id {#STORE_ID}: Too many failure messages "{#TYPE}" (over {$TIKV.STORE.ERRORS.MAX.WARN} in 5m) |<p>Indicates that the remote TiKV cannot be connected.</p> |`min(/TiDB TiKV by HTTP/tikv.messages.failure.rate[{#STORE_ID},{#TYPE}],5m)>{$TIKV.STORE.ERRORS.MAX.WARN}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml b/templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml
index 2e52df165dd..ae5033259aa 100644
--- a/templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml
+++ b/templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:40Z'
+  version: '6.0'
+  date: '2021-12-16T07:40:23Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,13 +13,13 @@ zabbix_export:
       description: |
         The template to monitor TiKV server of TiDB cluster by Zabbix that works without any external scripts.
         Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
-        Don't forget to change the macros {$TIKV.URL}, {$TIKV.PORT}. 
+        Don't forget to change the macros {$TIKV.URL}, {$TIKV.PORT}.
         
-        Template `TiDB TiKV by HTTP` — collects metrics by HTTP agent from TiKV /metrics endpoint.
+        Template `TiDB TiKV by HTTP` — collects metrics by HTTP agent from TiKV /metrics endpoint.
         
         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.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Databases
@@ -814,10 +814,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#REQ_TYPE}": item.labels.req,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#REQ_TYPE}": item.labels.req,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -864,10 +864,10 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#TYPE}": item.labels.type,
-                  }})
-                  return JSON.stringify({"data": output})
+                       return {
+                           "{#TYPE}": item.labels.type,
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -918,14 +918,14 @@ zabbix_export:
               parameters:
                 - |
                   var lookup = {},
-                  result = [];
+                      result = [];
                   
                   JSON.parse(value).forEach(function (item) {
-                  var stage = item.labels.stage;
-                  if (!(lookup[stage])) {
-                  lookup[stage] = 1;
-                  result.push({ "{#STAGE}": stage });
-                  }
+                      var stage = item.labels.stage;
+                      if (!(lookup[stage])) {
+                          lookup[stage] = 1;
+                          result.push({ "{#STAGE}": stage });
+                      }
                   })
                   
                   return JSON.stringify(result);
@@ -986,12 +986,12 @@ zabbix_export:
               parameters:
                 - |
                   output = JSON.parse(value).map(function(item){
-                  return {
-                  "{#STORE_ID}": item.labels.store_id,
-                  "{#TYPE}": item.labels.type,
+                       return {
+                           "{#STORE_ID}": item.labels.store_id,
+                           "{#TYPE}": item.labels.type,
                   
-                  }})
-                  return JSON.stringify({"data": output})
+                       }})
+                   return JSON.stringify({"data": output})
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
diff --git a/templates/media/brevis.one/README.md b/templates/media/brevis.one/README.md
index 34db110399f..01d79c02bf1 100644
--- a/templates/media/brevis.one/README.md
+++ b/templates/media/brevis.one/README.md
@@ -36,4 +36,4 @@ Make sure this user has access to all hosts, for which you would like problem no
 For more information see [Zabbix](https://www.zabbix.com/documentation/6.0/manual/config/notifications) and [Brevis.one](https://docs.brevis.one/current/en/Content/Home.htm) documentations.
 
 ## Supported versions
-Zabbix 5.4 and higher
+Zabbix 6.0 and higher
diff --git a/templates/media/express.ms/README.md b/templates/media/express.ms/README.md
index 26e546a521c..18f740fc10f 100644
--- a/templates/media/express.ms/README.md
+++ b/templates/media/express.ms/README.md
@@ -48,4 +48,4 @@ Make sure this user has access to all hosts, for which you would like problem no
 For more information see [Zabbix](https://www.zabbix.com/documentation/6.0/manual/config/notifications) and [Express.ms](https://express.ms/docs) documentations.
 
 ## Supported versions
-Zabbix 5.4 and higher
+Zabbix 6.0 and higher
diff --git a/templates/media/github/README.md b/templates/media/github/README.md
index 7adf36e49b8..8efc5c996a8 100644
--- a/templates/media/github/README.md
+++ b/templates/media/github/README.md
@@ -26,7 +26,7 @@ The configuration consists of a _media type_ in Zabbix, which will invoke the we
 
 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.
+Change github_url only 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).
 
diff --git a/templates/media/itop/README.md b/templates/media/itop/README.md
index 553c0ca3546..be46359b095 100644
--- a/templates/media/itop/README.md
+++ b/templates/media/itop/README.md
@@ -29,4 +29,4 @@ Make sure this user has access to all hosts, for which you would like problem no
 For more information see [Zabbix](https://www.zabbix.com/documentation/6.0/manual/config/notifications) and [iTop](https://www.itophub.io/wiki/page) documentations.
 
 ## Supported versions
-Zabbix 5.4 and higher
+Zabbix 6.0 and higher
diff --git a/templates/media/manageengine_servicedesk/README.md b/templates/media/manageengine_servicedesk/README.md
index fc195b0210b..a88542ed056 100644
--- a/templates/media/manageengine_servicedesk/README.md
+++ b/templates/media/manageengine_servicedesk/README.md
@@ -86,4 +86,4 @@ Examples:<br>
 For more information see [Zabbix](https://www.zabbix.com/documentation/6.0/manual/config/notifications) and [ManageEngine ServiceDesk](https://www.manageengine.com/products/service-desk/support.html) documentations.
 
 ## Supported versions
-Zabbix 5.4 and higher
+Zabbix 6.0 and higher
diff --git a/templates/media/rocketchat/README.md b/templates/media/rocketchat/README.md
index bf5dc46422b..5b255077d6b 100644
--- a/templates/media/rocketchat/README.md
+++ b/templates/media/rocketchat/README.md
@@ -42,4 +42,4 @@ Make sure this user has access to all hosts, for which you would like problem no
 For more information see [Zabbix](https://www.zabbix.com/documentation/6.0/manual/config/notifications) and [Rocket.Chat](https://docs.rocket.chat/) documentations.
 
 ## Supported versions
-Zabbix 5.4 and higher
+Zabbix 6.0 and higher
diff --git a/templates/media/slack/README.md b/templates/media/slack/README.md
index 97dc2d5b69d..eebd8cfc9f3 100644
--- a/templates/media/slack/README.md
+++ b/templates/media/slack/README.md
@@ -2,7 +2,7 @@
 # Slack webhook
 ![](images/Slack_RGB.png?raw=true)
 
-This guide describes how to integrate your Zabbix 5.4 and higher installation with Slack using the Zabbix webhook feature. This guide will provide instructions on setting up a media type, a user and an action in Zabbix.
+This guide describes how to integrate your Zabbix 6.0 and higher installation with Slack using the Zabbix webhook feature. This guide will provide instructions on setting up a media type, a user and an action in Zabbix.
 
 ## Setting up a Slack bot
 
diff --git a/templates/media/telegram/README.md b/templates/media/telegram/README.md
index 1834399d265..f7a59c477fb 100644
--- a/templates/media/telegram/README.md
+++ b/templates/media/telegram/README.md
@@ -63,4 +63,4 @@ In the "Send to" field enter Telegram user chat ID or group ID obtained during T
 
 Make sure the user has access to all hosts for which you would like to receive Telegram notifications.
 
-Great, you can now start receivng Zabbix notifications in Telegram!
+Great, you can now start receiving Zabbix notifications in Telegram!
diff --git a/templates/media/victorops/README.md b/templates/media/victorops/README.md
index 5b8d701b6d2..67cfa2e0b56 100644
--- a/templates/media/victorops/README.md
+++ b/templates/media/victorops/README.md
@@ -39,4 +39,4 @@ Make sure this user has access to all hosts, for which you would like problem no
 For more information see [Zabbix](https://www.zabbix.com/documentation/6.0/manual/config/notifications) and [VictorOps](https://help.victorops.com/) documentations.
 
 ## Supported versions
-Zabbix 5.4 and higher
+Zabbix 6.0 and higher
diff --git a/templates/module/00icmp_ping/README.md b/templates/module/00icmp_ping/README.md
deleted file mode 100644
index 4dcb47bca95..00000000000
--- a/templates/module/00icmp_ping/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-
-# ICMP Ping
-
-## 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 |
-|----------------------------|-------------|---------|
-| {$ICMP_LOSS_WARN}          | <p>-</p>    | `20`    |
-| {$ICMP_RESPONSE_TIME_WARN} | <p>-</p>    | `0.15`  |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-
-## Items collected
-
-| Group  | Name               | Description | Type   | Key and additional info |
-|--------|--------------------|-------------|--------|-------------------------|
-| Status | ICMP ping          | <p>-</p>    | SIMPLE | icmpping                |
-| Status | ICMP loss          | <p>-</p>    | SIMPLE | icmppingloss            |
-| Status | ICMP response time | <p>-</p>    | SIMPLE | icmppingsec             |
-
-## Triggers
-
-| Name                         | Description                                                                     | Expression                                                                                            | Severity | Dependencies and additional info                                                    |
-|------------------------------|---------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------|
-| Unavailable by ICMP ping     | <p>Last three attempts returned timeout.  Please check device connectivity.</p> | `{TEMPLATE_NAME:icmpping.max(#3)}=0`                                                                  | HIGH     |                                                                                     |
-| High ICMP ping loss          | <p>-</p>                                                                        | `{TEMPLATE_NAME:icmppingloss.min(5m)}>{$ICMP_LOSS_WARN} and {TEMPLATE_NAME:icmppingloss.min(5m)}<100` | WARNING  | <p>**Depends on**:</p><p>- Unavailable by ICMP ping</p>                             |
-| High ICMP ping response time | <p>-</p>                                                                        | `{TEMPLATE_NAME:icmppingsec.avg(5m)}>{$ICMP_RESPONSE_TIME_WARN}`                                      | WARNING  | <p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/module/ether_like_snmp/README.md b/templates/module/ether_like_snmp/README.md
index 007415ef19e..548f526bb52 100644
--- a/templates/module/ether_like_snmp/README.md
+++ b/templates/module/ether_like_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -20,21 +20,21 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                    | Description                                                                                                           | Type | Key and additional info                                                                                                                                                                                                            |
-|-------------------------|-----------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| EtherLike-MIB Discovery | <p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p> | SNMP | net.if.duplex.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- B: {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|EtherLike-MIB Discovery |<p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p> |SNMP |net.if.duplex.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p> |
 
 ## Items collected
 
-| Group              | Name                                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Type | Key and additional info                           |
-|--------------------|------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------------------------------------------------|
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Duplex status | <p>MIB: EtherLike-MIB</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> | SNMP | net.if.duplex[dot3StatsDuplexStatus.{#SNMPINDEX}] |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Duplex status |<p>MIB: EtherLike-MIB</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> |SNMP |net.if.duplex[dot3StatsDuplexStatus.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                 | Description                                              | Expression                                                                   | Severity | Dependencies and additional info |
-|------------------------------------------------------|----------------------------------------------------------|------------------------------------------------------------------------------|----------|----------------------------------|
-| Interface {#IFNAME}({#IFALIAS}): In half-duplex mode | <p>Please check autonegotiation settings and cabling</p> | `{TEMPLATE_NAME:net.if.duplex[dot3StatsDuplexStatus.{#SNMPINDEX}].last()}=2` | WARNING  | <p>Manual close: YES</p>         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Interface {#IFNAME}({#IFALIAS}): In half-duplex mode |<p>Please check autonegotiation settings and cabling</p> |`last(/EtherLike-MIB SNMP/net.if.duplex[dot3StatsDuplexStatus.{#SNMPINDEX}])=2` |WARNING |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml b/templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml
index 04f2e4c3df7..003f5e1d4e4 100644
--- a/templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml
+++ b/templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:35Z'
+  version: '6.0'
+  date: '2021-12-16T08:28:11Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         EtherLike-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml b/templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml
index ebaae764232..0d49e8ba6b5 100644
--- a/templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml
+++ b/templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-25T12:27:46Z'
+  date: '2021-12-16T08:28:15Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         SNMPv2-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'ICMP Ping'
diff --git a/templates/module/host_resources_snmp/README.md b/templates/module/host_resources_snmp/README.md
index 706005f73f5..874b2ba5870 100644
--- a/templates/module/host_resources_snmp/README.md
+++ b/templates/module/host_resources_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,14 +15,14 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                         | Description                                                                                                 | Default                                                |
-|------------------------------|-------------------------------------------------------------------------------------------------------------|--------------------------------------------------------|
-| {$VFS.FS.FSNAME.MATCHES}     | <p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> | `.+`                                                   |
-| {$VFS.FS.FSNAME.NOT_MATCHES} | <p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> | `^(/dev|/sys|/run|/proc|.+/shm$)`                      |
-| {$VFS.FS.FSTYPE.MATCHES}     | <p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> | `.*(\.4|\.9|hrStorageFixedDisk|hrStorageFlashMemory)$` |
-| {$VFS.FS.FSTYPE.NOT_MATCHES} | <p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> | `CHANGE_IF_NEEDED`                                     |
-| {$VFS.FS.PUSED.MAX.CRIT}     | <p>-</p>                                                                                                    | `90`                                                   |
-| {$VFS.FS.PUSED.MAX.WARN}     | <p>-</p>                                                                                                    | `80`                                                   |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$VFS.FS.FSNAME.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`.+` |
+|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^(/dev|/sys|/run|/proc|.+/shm$)` |
+|{$VFS.FS.FSTYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`.*(\.4|\.9|hrStorageFixedDisk|hrStorageFlashMemory)$` |
+|{$VFS.FS.FSTYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`CHANGE_IF_NEEDED` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
 
 ## Template links
 
@@ -30,24 +30,24 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name              | Description                                                         | Type | Key and additional info                                                                                                                                                                                                                                                                                              |
-|-------------------|---------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Storage discovery | <p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter.</p> | SNMP | vfs.fs.discovery[snmp]<p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter.</p> |SNMP |vfs.fs.discovery[snmp]<p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group   | Name                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Type       | Key and additional info                                                                                                                                                        |
-|---------|------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Storage | {#FSNAME}: 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[hrStorageUsed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p>                                                                          |
-| Storage | {#FSNAME}: Total space       | <p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in units of hrStorageAllocationUnits.</p><p>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.</p><p>For example, the amount of main storage allocated to a buffer pool might be modified or the amount of disk space allocated to virtual storage might be modified.</p> | SNMP       | vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p>                                                                         |
-| Storage | {#FSNAME}: Space utilization | <p>Space utilization in % for {#FSNAME}</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                   | CALCULATED | vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}]<p>**Expression**:</p>`(last("vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]")/last("vfs.fs.total[hrStorageSize.{#SNMPINDEX}]"))*100` |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Storage |{#FSNAME}: 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[hrStorageUsed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p> |
+|Storage |{#FSNAME}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in units of hrStorageAllocationUnits.</p><p>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.</p><p>For example, the amount of main storage allocated to a buffer pool might be modified or the amount of disk space allocated to virtual storage might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p> |
+|Storage |{#FSNAME}: Space utilization |<p>Space utilization in % for {#FSNAME}</p> |CALCULATED |vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageUsed.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
 
 ## Triggers
 
-| Name                                                                                   | Description                                                                                                                                                                                                                                                                     | Expression                                                                                                                                                                                                                                                                                                                                                                             | Severity | Dependencies and additional info                                                                                                              |
-|----------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%) | <p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}.</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[storageUsedPercentage.{#SNMPINDEX}].last()}>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and (({HOST-RESOURCES-MIB storage SNMP:vfs.fs.total[hrStorageSize.{#SNMPINDEX}].last()}-{HOST-RESOURCES-MIB storage SNMP:vfs.fs.used[hrStorageUsed.{#SNMPINDEX}].last()})<5G or {TEMPLATE_NAME:vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}].timeleft(1h,,100)}<1d)`  | AVERAGE  | <p>Manual close: YES</p>                                                                                                                      |
-| {#FSNAME}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}%)            | <p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}.</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[storageUsedPercentage.{#SNMPINDEX}].last()}>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and (({HOST-RESOURCES-MIB storage SNMP:vfs.fs.total[hrStorageSize.{#SNMPINDEX}].last()}-{HOST-RESOURCES-MIB storage SNMP:vfs.fs.used[hrStorageUsed.{#SNMPINDEX}].last()})<10G or {TEMPLATE_NAME:vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}].timeleft(1h,,100)}<1d)` | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%)</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}.</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(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and ((last(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|{#FSNAME}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}.</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(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and ((last(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<10G or timeleft(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%)</p> |
 
 ## Feedback
 
@@ -57,7 +57,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -69,13 +69,13 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                       | Description                                                                                                                              | Default                 |
-|----------------------------|------------------------------------------------------------------------------------------------------------------------------------------|-------------------------|
-| {$MEMORY.NAME.MATCHES}     | <p>This macro is used in memory discovery. Can be overridden on the host or linked template level.</p>                                   | `.*`                    |
-| {$MEMORY.NAME.NOT_MATCHES} | <p>This macro is used in memory discovery. Can be overridden on the host or linked template level if you need to filter out results.</p> | `CHANGE_IF_NEEDED`      |
-| {$MEMORY.TYPE.MATCHES}     | <p>This macro is used in memory discovery. Can be overridden on the host or linked template level.</p>                                   | `.*(\.2|hrStorageRam)$` |
-| {$MEMORY.TYPE.NOT_MATCHES} | <p>This macro is used in memory discovery. Can be overridden on the host or linked template level if you need to filter out results.</p> | `CHANGE_IF_NEEDED`      |
-| {$MEMORY.UTIL.MAX}         | <p>The warning threshold of the "Physical memory: Memory utilization" item.</p>                                                          | `90`                    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$MEMORY.NAME.MATCHES} |<p>This macro is used in memory discovery. Can be overridden on the host or linked template level.</p> |`.*` |
+|{$MEMORY.NAME.NOT_MATCHES} |<p>This macro is used in memory discovery. Can be overridden on the host or linked template level if you need to filter out results.</p> |`CHANGE_IF_NEEDED` |
+|{$MEMORY.TYPE.MATCHES} |<p>This macro is used in memory discovery. Can be overridden on the host or linked template level.</p> |`.*(\.2|hrStorageRam)$` |
+|{$MEMORY.TYPE.NOT_MATCHES} |<p>This macro is used in memory discovery. Can be overridden on the host or linked template level if you need to filter out results.</p> |`CHANGE_IF_NEEDED` |
+|{$MEMORY.UTIL.MAX} |<p>The warning threshold of the "Physical memory: Memory utilization" item.</p> |`90` |
 
 ## Template links
 
@@ -83,23 +83,23 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name             | Description                                                       | Type | Key and additional info                                                                                                                                                                                                                                                                                       |
-|------------------|-------------------------------------------------------------------|------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Memory discovery | <p>HOST-RESOURCES-MIB::hrStorage discovery with memory filter</p> | SNMP | vm.memory.discovery<p>**Filter**:</p>AND <p>- A: {#MEMTYPE} MATCHES_REGEX `{$MEMORY.TYPE.MATCHES}`</p><p>- B: {#MEMTYPE} NOT_MATCHES_REGEX `{$MEMORY.TYPE.NOT_MATCHES}`</p><p>- C: {#MEMNAME} MATCHES_REGEX `{$MEMORY.NAME.MATCHES}`</p><p>- D: {#MEMNAME} NOT_MATCHES_REGEX `{$MEMORY.NAME.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Memory discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with memory filter</p> |SNMP |vm.memory.discovery<p>**Filter**:</p>AND <p>- {#MEMTYPE} MATCHES_REGEX `{$MEMORY.TYPE.MATCHES}`</p><p>- {#MEMTYPE} NOT_MATCHES_REGEX `{$MEMORY.TYPE.NOT_MATCHES}`</p><p>- {#MEMNAME} MATCHES_REGEX `{$MEMORY.NAME.MATCHES}`</p><p>- {#MEMNAME} NOT_MATCHES_REGEX `{$MEMORY.NAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group  | Name                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | Type       | Key and additional info                                                                                                                                                             |
-|--------|--------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Memory | {#MEMNAME}: 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.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p>                                                                            |
-| Memory | {#MEMNAME}: Total memory       | <p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in units of hrStorageAllocationUnits.</p><p>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.</p><p>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.</p> | SNMP       | vm.memory.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p>                                                                           |
-| Memory | {#MEMNAME}: Memory utilization | <p>Memory utilization in %</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                              | CALCULATED | vm.memory.util[memoryUsedPercentage.{#SNMPINDEX}]<p>**Expression**:</p>`last("vm.memory.used[hrStorageUsed.{#SNMPINDEX}]")/last("vm.memory.total[hrStorageSize.{#SNMPINDEX}]")*100` |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Memory |{#MEMNAME}: 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.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p> |
+|Memory |{#MEMNAME}: Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in units of hrStorageAllocationUnits.</p><p>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.</p><p>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.</p> |SNMP |vm.memory.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p> |
+|Memory |{#MEMNAME}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.{#SNMPINDEX}]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.{#SNMPINDEX}])/last(//vm.memory.total[hrStorageSize.{#SNMPINDEX}])*100` |
 
 ## Triggers
 
-| Name                                                              | Description                                      | Expression                                                                                     | Severity | Dependencies and additional info |
-|-------------------------------------------------------------------|--------------------------------------------------|------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| {#MEMNAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) | <p>The system is running out of free memory.</p> | `{TEMPLATE_NAME:vm.memory.util[memoryUsedPercentage.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}` | AVERAGE  |                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#MEMNAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/HOST-RESOURCES-MIB memory SNMP/vm.memory.util[memoryUsedPercentage.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
 
 ## Feedback
 
@@ -109,7 +109,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -121,9 +121,9 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name             | Description | Default |
-|------------------|-------------|---------|
-| {$CPU.UTIL.CRIT} | <p>-</p>    | `90`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
 
 ## Template links
 
@@ -134,15 +134,15 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group | Name            | Description                                                                                                                                                                                                          | Type | Key and additional info                                                               |
-|-------|-----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------------------------------------------------------------------------------------|
-| CPU   | CPU utilization | <p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that processors was not idle.</p><p>Implementations may approximate this one minute smoothing period if necessary.</p> | SNMP | system.cpu.util<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#CPU.UTIL}'].avg()`</p> |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that processors was not idle.</p><p>Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util<p>**Preprocessing**:</p><p>- JSONPATH: `$..['{#CPU.UTIL}'].avg()`</p> |
 
 ## Triggers
 
-| Name                                                 | Description                                                              | Expression                                                 | Severity | Dependencies and additional info |
-|------------------------------------------------------|--------------------------------------------------------------------------|------------------------------------------------------------|----------|----------------------------------|
-| 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.min(5m)}>{$CPU.UTIL.CRIT}` | WARNING  |                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/HOST-RESOURCES-MIB CPU SNMP/system.cpu.util,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
 
 ## Feedback
 
@@ -152,7 +152,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -165,11 +165,11 @@ No specific Zabbix configuration is required.
 
 ## Template links
 
-| Name                            |
-|---------------------------------|
-| HOST-RESOURCES-MIB CPU SNMP     |
-| HOST-RESOURCES-MIB memory SNMP  |
-| HOST-RESOURCES-MIB storage SNMP |
+|Name|
+|----|
+|HOST-RESOURCES-MIB CPU SNMP |
+|HOST-RESOURCES-MIB memory SNMP |
+|HOST-RESOURCES-MIB storage SNMP |
 
 ## Discovery rules
 
diff --git a/templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml b/templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml
index 8404669e397..6821ba05157 100644
--- a/templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml
+++ b/templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:36Z'
+  version: '6.0'
+  date: '2021-12-16T08:28:18Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         HOST-RESOURCES-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -63,7 +63,7 @@ zabbix_export:
         MIBs used:
         HOST-RESOURCES-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -202,7 +202,7 @@ zabbix_export:
       description: |
         HOST-RESOURCES-MIB: CPU, memory and storage(vfs.fs.file) linked together.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'HOST-RESOURCES-MIB CPU SNMP'
@@ -222,7 +222,7 @@ zabbix_export:
               widgets:
                 -
                   type: GRAPH_CLASSIC
-                  width: '24'
+                  width: '12'
                   height: '5'
                   fields:
                     -
@@ -238,11 +238,15 @@ zabbix_export:
                 -
                   type: GRAPH_PROTOTYPE
                   'y': '5'
-                  width: '24'
+                  width: '12'
                   height: '5'
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -250,10 +254,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
@@ -262,11 +262,15 @@ zabbix_export:
                 -
                   type: GRAPH_PROTOTYPE
                   'y': '10'
-                  width: '24'
+                  width: '12'
                   height: '5'
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -274,10 +278,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
@@ -291,7 +291,7 @@ zabbix_export:
         MIBs used:
         HOST-RESOURCES-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/module/icmp_ping/README.md b/templates/module/icmp_ping/README.md
new file mode 100644
index 00000000000..bed6fdf0b68
--- /dev/null
+++ b/templates/module/icmp_ping/README.md
@@ -0,0 +1,49 @@
+
+# ICMP Ping
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$ICMP_LOSS_WARN} |<p>-</p> |`20` |
+|{$ICMP_RESPONSE_TIME_WARN} |<p>-</p> |`0.15` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Status |ICMP ping |<p>-</p> |SIMPLE |icmpping |
+|Status |ICMP loss |<p>-</p> |SIMPLE |icmppingloss |
+|Status |ICMP response time |<p>-</p> |SIMPLE |icmppingsec |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/ICMP Ping/icmpping,#3)=0` |HIGH | |
+|High ICMP ping loss |<p>-</p> |`min(/ICMP Ping/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/ICMP Ping/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
+|High ICMP ping response time |<p>-</p> |`avg(/ICMP Ping/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/module/00icmp_ping/00template_module_icmp_ping.yaml b/templates/module/icmp_ping/template_module_icmp_ping.yaml
index df0961015f8..c082d025e7f 100644
--- a/templates/module/00icmp_ping/00template_module_icmp_ping.yaml
+++ b/templates/module/icmp_ping/template_module_icmp_ping.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:34Z'
+  version: '6.0'
+  date: '2021-12-16T11:49:43Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Template Module ICMP Ping
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/module/interfaces_simple_snmp/README.md b/templates/module/interfaces_simple_snmp/README.md
index 16561603635..690c65b0925 100644
--- a/templates/module/interfaces_simple_snmp/README.md
+++ b/templates/module/interfaces_simple_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,21 +15,21 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                                                         | Default                                                                                                                            |
-|-------------------------------------|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-| {$IF.ERRORS.WARN}                   | <p>-</p>                                                                            | `2`                                                                                                                                |
-| {$IF.UTIL.MAX}                      | <p>-</p>                                                                            | `95`                                                                                                                               |
-| {$IFCONTROL}                        | <p>-</p>                                                                            | `1`                                                                                                                                |
-| {$NET.IF.IFADMINSTATUS.MATCHES}     | <p>Ignore notPresent(6)</p>                                                         | `^.*`                                                                                                                              |
-| {$NET.IF.IFADMINSTATUS.NOT_MATCHES} | <p>Ignore down(2) administrative status</p>                                         | `^2$`                                                                                                                              |
-| {$NET.IF.IFDESCR.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFDESCR.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFNAME.MATCHES}            | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFNAME.NOT_MATCHES}        | <p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> | `(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
-| {$NET.IF.IFOPERSTATUS.MATCHES}      | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFOPERSTATUS.NOT_MATCHES}  | <p>Ignore notPresent(6)</p>                                                         | `^6$`                                                                                                                              |
-| {$NET.IF.IFTYPE.MATCHES}            | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFTYPE.NOT_MATCHES}        | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$IF.ERRORS.WARN} |<p>-</p> |`2` |
+|{$IF.UTIL.MAX} |<p>-</p> |`95` |
+|{$IFCONTROL} |<p>-</p> |`1` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>Ignore notPresent(6)</p> |`^.*` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
 
 ## Template links
 
@@ -37,32 +37,32 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                         | Description                                | Type | Key and additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-|------------------------------|--------------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Network interfaces discovery | <p>Discovering interfaces from IF-MIB.</p> | SNMP | net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group              | Name                                               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type | Key and additional info                                                                                     |
-|--------------------|----------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------|
-| Network_interfaces | Interface {#IFDESCR}: Operational status           | <p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> | SNMP | net.if.status[ifOperStatus.{#SNMPINDEX}]                                                                    |
-| Network_interfaces | Interface {#IFDESCR}: Bits received                | <p>MIB: IF-MIB</p><p>The total number of octets received on the interface,including framing characters. Discontinuities in the value of this counter can occurat re-initialization of the management system, and atother times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | SNMP | net.if.in[ifInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p>   |
-| Network_interfaces | Interface {#IFDESCR}: Bits sent                    | <p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. Discontinuities in the value of this counter can occurat re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | SNMP | net.if.out[ifOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-| Network_interfaces | Interface {#IFDESCR}: Inbound packets with errors  | <p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                    | SNMP | net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                    |
-| Network_interfaces | Interface {#IFDESCR}: Outbound packets with errors | <p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                  | SNMP | net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                  |
-| Network_interfaces | Interface {#IFDESCR}: Outbound packets discarded   | <p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                              | SNMP | net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND              |
-| Network_interfaces | Interface {#IFDESCR}: Inbound packets discarded    | <p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                               | SNMP | net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                |
-| Network_interfaces | Interface {#IFDESCR}: Interface type               | <p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | SNMP | net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>         |
-| Network_interfaces | Interface {#IFDESCR}: Speed                        | <p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second.</p><p>For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made,</p><p>this object should contain the nominal bandwidth.</p><p>If the bandwidth of the interface is greater than the maximum value reportable by this object then</p><p>this object should report its maximum value (4,294,967,295) and ifHighSpeed must be used to report the interace's speed.</p><p>For a sub-layer which has no concept of bandwidth, this object should be zero.</p>                                                                                                                                                                                              | SNMP | net.if.speed[ifSpeed.{#SNMPINDEX}]                                                                          |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Network_interfaces |Interface {#IFDESCR}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[ifOperStatus.{#SNMPINDEX}] |
+|Network_interfaces |Interface {#IFDESCR}: Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,including framing characters. Discontinuities in the value of this counter can occurat re-initialization of the management system, and atother times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[ifInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFDESCR}: Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. Discontinuities in the value of this counter can occurat re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[ifOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFDESCR}: Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFDESCR}: Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFDESCR}: Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFDESCR}: Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFDESCR}: Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Network_interfaces |Interface {#IFDESCR}: Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second.</p><p>For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made,</p><p>this object should contain the nominal bandwidth.</p><p>If the bandwidth of the interface is greater than the maximum value reportable by this object then</p><p>this object should report its maximum value (4,294,967,295) and ifHighSpeed must be used to report the interace's speed.</p><p>For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[ifSpeed.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Expression                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Severity | Dependencies and additional info                                                       |
-|--------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------------------------------------------------------------|
-| Interface {#IFDESCR}: Link down                                                | <p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> | `{$IFCONTROL:"{#IFNAME}"}=1 and ({TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].diff()}=1)`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}<>2 or {$IFCONTROL:"{#IFNAME}"}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  | <p>Manual close: YES</p>                                                               |
-| Interface {#IFDESCR}: High bandwidth usage (> {$IF.UTIL.MAX:"{#IFNAME}"}% )    | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `({TEMPLATE_NAME:net.if.in[ifInOctets.{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Interfaces Simple SNMP:net.if.speed[ifSpeed.{#SNMPINDEX}].last()} or {Interfaces Simple SNMP:net.if.out[ifOutOctets.{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Interfaces Simple SNMP:net.if.speed[ifSpeed.{#SNMPINDEX}].last()}) and {Interfaces Simple SNMP:net.if.speed[ifSpeed.{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.in[ifInOctets.{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Interfaces Simple SNMP:net.if.speed[ifSpeed.{#SNMPINDEX}].last()} and {Interfaces Simple SNMP:net.if.out[ifOutOctets.{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Interfaces Simple SNMP:net.if.speed[ifSpeed.{#SNMPINDEX}].last()}`                                                                                               | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFDESCR}: Link down</p> |
-| Interface {#IFDESCR}: High error rate (> {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `{TEMPLATE_NAME:net.if.in.errors[ifInErrors.{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"} or {Interfaces Simple SNMP:net.if.out.errors[ifOutErrors.{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.in.errors[ifInErrors.{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and {Interfaces Simple SNMP:net.if.out.errors[ifOutErrors.{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                          | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFDESCR}: Link down</p> |
-| Interface {#IFDESCR}: Ethernet has changed to lower speed than it was before   | <p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:net.if.speed[ifSpeed.{#SNMPINDEX}].change()}<0 and {TEMPLATE_NAME:net.if.speed[ifSpeed.{#SNMPINDEX}].last()}>0 and ( {Interfaces Simple SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=6 or {Interfaces Simple SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=7 or {Interfaces Simple SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=11 or {Interfaces Simple SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=62 or {Interfaces Simple SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=69 or {Interfaces Simple SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=117 ) and ({Interfaces Simple SNMP:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}<>2)`<p>Recovery expression:</p>`({TEMPLATE_NAME:net.if.speed[ifSpeed.{#SNMPINDEX}].change()}>0 and {TEMPLATE_NAME:net.if.speed[ifSpeed.{#SNMPINDEX}].prev()}>0) or ({Interfaces Simple SNMP:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}=2)` | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFDESCR}: Link down</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Interface {#IFDESCR}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
+|Interface {#IFDESCR}: High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Interfaces Simple SNMP/net.if.in[ifInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}]) or avg(/Interfaces Simple SNMP/net.if.out[ifOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}])) and last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/Interfaces Simple SNMP/net.if.in[ifInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}]) and avg(/Interfaces Simple SNMP/net.if.out[ifOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFDESCR}: Link down</p> |
+|Interface {#IFDESCR}: High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Interfaces Simple SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Interfaces Simple SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Interfaces Simple SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Interfaces Simple SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFDESCR}: Link down</p> |
+|Interface {#IFDESCR}: Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}])<0 and last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}])>0 and ( last(/Interfaces Simple SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Interfaces Simple SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Interfaces Simple SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Interfaces Simple SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Interfaces Simple SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Interfaces Simple SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}])>0 and last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}],#2)>0) or (last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFDESCR}: Link down</p> |
 
 ## Feedback
 
diff --git a/templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml b/templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml
index 4f1dd2ec315..68c398283e4 100644
--- a/templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml
+++ b/templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:35Z'
+  version: '6.0'
+  date: '2021-12-16T08:28:20Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -20,7 +20,7 @@ zabbix_export:
         
           Description: 32bit counters are used in this template (since there is no ifXtable available). If busy interfaces return incorrect bits sent/received - set update interval to 1m or less.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -346,7 +346,7 @@ zabbix_export:
               recovery_expression: |
                 avg(/Interfaces Simple SNMP/net.if.in[ifInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}]) and
                 avg(/Interfaces Simple SNMP/net.if.out[ifOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces Simple SNMP/net.if.speed[ifSpeed.{#SNMPINDEX}])
-              name: 'Interface {#IFDESCR}: High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}% )'
+              name: 'Interface {#IFDESCR}: High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%)'
               opdata: 'In: {ITEM.LASTVALUE1}, out: {ITEM.LASTVALUE3}, speed: {ITEM.LASTVALUE2}'
               priority: WARNING
               description: 'The network interface utilization is close to its estimated maximum bandwidth.'
@@ -479,6 +479,10 @@ zabbix_export:
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -486,10 +490,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
diff --git a/templates/module/interfaces_snmp/README.md b/templates/module/interfaces_snmp/README.md
index d187da89803..0b8b7a4dc80 100644
--- a/templates/module/interfaces_snmp/README.md
+++ b/templates/module/interfaces_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,23 +15,23 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                                                         | Default                                                                                                                            |
-|-------------------------------------|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-| {$IF.ERRORS.WARN}                   | <p>-</p>                                                                            | `2`                                                                                                                                |
-| {$IF.UTIL.MAX}                      | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$IFCONTROL}                        | <p>-</p>                                                                            | `1`                                                                                                                                |
-| {$NET.IF.IFADMINSTATUS.MATCHES}     | <p>Ignore notPresent(6)</p>                                                         | `^.*`                                                                                                                              |
-| {$NET.IF.IFADMINSTATUS.NOT_MATCHES} | <p>Ignore down(2) administrative status</p>                                         | `^2$`                                                                                                                              |
-| {$NET.IF.IFALIAS.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFALIAS.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFDESCR.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFDESCR.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFNAME.MATCHES}            | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFNAME.NOT_MATCHES}        | <p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> | `(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
-| {$NET.IF.IFOPERSTATUS.MATCHES}      | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFOPERSTATUS.NOT_MATCHES}  | <p>Ignore notPresent(6)</p>                                                         | `^6$`                                                                                                                              |
-| {$NET.IF.IFTYPE.MATCHES}            | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFTYPE.NOT_MATCHES}        | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$IF.ERRORS.WARN} |<p>-</p> |`2` |
+|{$IF.UTIL.MAX} |<p>-</p> |`90` |
+|{$IFCONTROL} |<p>-</p> |`1` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>Ignore notPresent(6)</p> |`^.*` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFALIAS.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFALIAS.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
 
 ## Template links
 
@@ -39,32 +39,32 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                         | Description                                | Type | Key and additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|------------------------------|--------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Network interfaces discovery | <p>Discovering interfaces from IF-MIB.</p> | SNMP | net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group              | Name                                                          | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type | Key and additional info                                                                                       |
-|--------------------|---------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------------------------------------------------------------------------------------------------------------|
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Operational status           | <p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> | SNMP | net.if.status[ifOperStatus.{#SNMPINDEX}]                                                                      |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Bits received                | <p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                              | SNMP | net.if.in[ifHCInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p>   |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Bits sent                    | <p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                       | SNMP | net.if.out[ifHCOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors  | <p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                    | SNMP | net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                      |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors | <p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                  | SNMP | net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                    |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded   | <p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                              | SNMP | net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded    | <p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                               | SNMP | net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                  |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Interface type               | <p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | SNMP | net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>           |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[ifOperStatus.{#SNMPINDEX}] |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[ifHCInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[ifHCOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[ifHighSpeed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 
 ## Triggers
 
-| Name                                                                                      | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Expression                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Severity | Dependencies and additional info                                                                  |
-|-------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------|
-| Interface {#IFNAME}({#IFALIAS}): Link down                                                | <p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> | `{$IFCONTROL:"{#IFNAME}"}=1 and ({TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].diff()}=1)`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}<>2 or {$IFCONTROL:"{#IFNAME}"}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  | <p>Manual close: YES</p>                                                                          |
-| Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (> {$IF.UTIL.MAX:"{#IFNAME}"}% )    | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `({TEMPLATE_NAME:net.if.in[ifHCInOctets.{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Interfaces SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()} or {Interfaces SNMP:net.if.out[ifHCOutOctets.{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Interfaces SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()}) and {Interfaces SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.in[ifHCInOctets.{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Interfaces SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()} and {Interfaces SNMP:net.if.out[ifHCOutOctets.{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Interfaces SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()}`                                                                            | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-| Interface {#IFNAME}({#IFALIAS}): High error rate (> {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `{TEMPLATE_NAME:net.if.in.errors[ifInErrors.{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"} or {Interfaces SNMP:net.if.out.errors[ifOutErrors.{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.in.errors[ifInErrors.{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and {Interfaces SNMP:net.if.out.errors[ifOutErrors.{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-| Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before   | <p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:net.if.speed[ifHighSpeed.{#SNMPINDEX}].change()}<0 and {TEMPLATE_NAME:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()}>0 and ( {Interfaces SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=6 or {Interfaces SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=7 or {Interfaces SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=11 or {Interfaces SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=62 or {Interfaces SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=69 or {Interfaces SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=117 ) and ({Interfaces SNMP:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}<>2)`<p>Recovery expression:</p>`({TEMPLATE_NAME:net.if.speed[ifHighSpeed.{#SNMPINDEX}].change()}>0 and {TEMPLATE_NAME:net.if.speed[ifHighSpeed.{#SNMPINDEX}].prev()}>0) or ({Interfaces SNMP:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}=2)` | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
+|Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Interfaces SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/Interfaces SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/Interfaces SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/Interfaces SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Interfaces SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Interfaces SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Interfaces SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Interfaces SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Interfaces SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Interfaces SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Interfaces SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Interfaces SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Interfaces SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Interfaces SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 
 ## Feedback
 
diff --git a/templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml b/templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml
index f26d6ad68c9..770740e92f9 100644
--- a/templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml
+++ b/templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:34Z'
+  version: '6.0'
+  date: '2021-12-16T08:28:23Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         IF-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -355,7 +355,7 @@ zabbix_export:
               recovery_expression: |
                 avg(/Interfaces SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and
                 avg(/Interfaces SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])
-              name: 'Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}% )'
+              name: 'Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%)'
               opdata: 'In: {ITEM.LASTVALUE1}, out: {ITEM.LASTVALUE3}, speed: {ITEM.LASTVALUE2}'
               priority: WARNING
               description: 'The network interface utilization is close to its estimated maximum bandwidth.'
@@ -494,6 +494,10 @@ zabbix_export:
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -501,10 +505,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
diff --git a/templates/module/interfaces_win_snmp/README.md b/templates/module/interfaces_win_snmp/README.md
index 5cac4ca0bc4..871fd5aeb4c 100644
--- a/templates/module/interfaces_win_snmp/README.md
+++ b/templates/module/interfaces_win_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Special version of interfaces template that is required for Windows OS. Since MS doesn't support 64 bit counters but supports ifAlias and ifHighSpeed.
 
 ## Setup
@@ -16,23 +16,23 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                                                         | Default                                                                                                                            |
-|-------------------------------------|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-| {$IF.ERRORS.WARN}                   | <p>-</p>                                                                            | `2`                                                                                                                                |
-| {$IF.UTIL.MAX}                      | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$IFCONTROL}                        | <p>-</p>                                                                            | `1`                                                                                                                                |
-| {$NET.IF.IFADMINSTATUS.MATCHES}     | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFADMINSTATUS.NOT_MATCHES} | <p>Ignore down(2) administrative status</p>                                         | `^2$`                                                                                                                              |
-| {$NET.IF.IFALIAS.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFALIAS.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFDESCR.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFDESCR.NOT_MATCHES}       | <p>-</p>                                                                            | `Miniport|Virtual|Teredo|Kernel|Loopback|Bluetooth|HTTPS|6to4|QoS|Layer|isatap|ISATAP`                                             |
-| {$NET.IF.IFNAME.MATCHES}            | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFNAME.NOT_MATCHES}        | <p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> | `(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
-| {$NET.IF.IFOPERSTATUS.MATCHES}      | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFOPERSTATUS.NOT_MATCHES}  | <p>Ignore notPresent(6)</p>                                                         | `^6$`                                                                                                                              |
-| {$NET.IF.IFTYPE.MATCHES}            | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFTYPE.NOT_MATCHES}        | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$IF.ERRORS.WARN} |<p>-</p> |`2` |
+|{$IF.UTIL.MAX} |<p>-</p> |`90` |
+|{$IFCONTROL} |<p>-</p> |`1` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFALIAS.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFALIAS.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>-</p> |`Miniport|Virtual|Teredo|Kernel|Loopback|Bluetooth|HTTPS|6to4|QoS|Layer|isatap|ISATAP` |
+|{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
 
 ## Template links
 
@@ -40,32 +40,32 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                         | Description                                | Type | Key and additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|------------------------------|--------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Network interfaces discovery | <p>Discovering interfaces from IF-MIB.</p> | SNMP | net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group              | Name                                                          | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type | Key and additional info                                                                                     |
-|--------------------|---------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------|
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Operational status           | <p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> | SNMP | net.if.status[ifOperStatus.{#SNMPINDEX}]                                                                    |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Bits received                | <p>MIB: IF-MIB</p><p>The total number of octets received on the interface,including framing characters. Discontinuities in the value of this counter can occur at re-initialization of the management system, and atother times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | SNMP | net.if.in[ifInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p>   |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Bits sent                    | <p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | SNMP | net.if.out[ifOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors  | <p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                    | SNMP | net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                    |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors | <p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                  | SNMP | net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                  |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded   | <p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                              | SNMP | net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND              |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded    | <p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p>                                                                                                                                                                                                                                                                                               | SNMP | net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                |
-| Network_interfaces | Interface {#IFNAME}({#IFALIAS}): Interface type               | <p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | SNMP | net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>         |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[ifOperStatus.{#SNMPINDEX}] |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,including framing characters. Discontinuities in the value of this counter can occur at re-initialization of the management system, and atother times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[ifInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[ifOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[ifHighSpeed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 
 ## Triggers
 
-| Name                                                                                      | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Expression                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Severity | Dependencies and additional info                                                                  |
-|-------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------|
-| Interface {#IFNAME}({#IFALIAS}): Link down                                                | <p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> | `{$IFCONTROL:"{#IFNAME}"}=1 and ({TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].diff()}=1)`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}<>2 or {$IFCONTROL:"{#IFNAME}"}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  | <p>Manual close: YES</p>                                                                          |
-| Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (> {$IF.UTIL.MAX:"{#IFNAME}"}% )    | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `({TEMPLATE_NAME:net.if.in[ifInOctets.{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Interfaces Windows SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()} or {Interfaces Windows SNMP:net.if.out[ifOutOctets.{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Interfaces Windows SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()}) and {Interfaces Windows SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.in[ifInOctets.{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Interfaces Windows SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()} and {Interfaces Windows SNMP:net.if.out[ifOutOctets.{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Interfaces Windows SNMP:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()}`                                                                                            | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-| Interface {#IFNAME}({#IFALIAS}): High error rate (> {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `{TEMPLATE_NAME:net.if.in.errors[ifInErrors.{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"} or {Interfaces Windows SNMP:net.if.out.errors[ifOutErrors.{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:net.if.in.errors[ifInErrors.{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and {Interfaces Windows SNMP:net.if.out.errors[ifOutErrors.{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-| Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before   | <p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p>                                                                                                                                                                                                                                                                                                                                                                                                  | `{TEMPLATE_NAME:net.if.speed[ifHighSpeed.{#SNMPINDEX}].change()}<0 and {TEMPLATE_NAME:net.if.speed[ifHighSpeed.{#SNMPINDEX}].last()}>0 and ( {Interfaces Windows SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=6 or {Interfaces Windows SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=7 or {Interfaces Windows SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=11 or {Interfaces Windows SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=62 or {Interfaces Windows SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=69 or {Interfaces Windows SNMP:net.if.type[ifType.{#SNMPINDEX}].last()}=117 ) and ({Interfaces Windows SNMP:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}<>2)`<p>Recovery expression:</p>`({TEMPLATE_NAME:net.if.speed[ifHighSpeed.{#SNMPINDEX}].change()}>0 and {TEMPLATE_NAME:net.if.speed[ifHighSpeed.{#SNMPINDEX}].prev()}>0) or ({Interfaces Windows SNMP:net.if.status[ifOperStatus.{#SNMPINDEX}].last()}=2)` | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
+|Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Interfaces Windows SNMP/net.if.in[ifInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/Interfaces Windows SNMP/net.if.out[ifOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/Interfaces Windows SNMP/net.if.in[ifInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/Interfaces Windows SNMP/net.if.out[ifOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Interfaces Windows SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Interfaces Windows SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Interfaces Windows SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Interfaces Windows SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Interfaces Windows SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Interfaces Windows SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Interfaces Windows SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Interfaces Windows SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Interfaces Windows SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Interfaces Windows SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 
 ## Feedback
 
diff --git a/templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml b/templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml
index 6c2afceb038..eb96375bdf0 100644
--- a/templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml
+++ b/templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:36Z'
+  version: '6.0'
+  date: '2021-12-16T08:28:25Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -20,7 +20,7 @@ zabbix_export:
         
           Description: 32bit counters are used in this template (since 64bit are not supported by Windows OS). If busy interfaces return incorrect bits sent/received - set update interval to 1m or less.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -359,7 +359,7 @@ zabbix_export:
               recovery_expression: |
                 avg(/Interfaces Windows SNMP/net.if.in[ifInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and
                 avg(/Interfaces Windows SNMP/net.if.out[ifOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Interfaces Windows SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])
-              name: 'Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}% )'
+              name: 'Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%)'
               opdata: 'In: {ITEM.LASTVALUE1}, out: {ITEM.LASTVALUE3}, speed: {ITEM.LASTVALUE2}'
               priority: WARNING
               description: 'The network interface utilization is close to its estimated maximum bandwidth.'
@@ -497,6 +497,10 @@ zabbix_export:
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -504,10 +508,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
diff --git a/templates/module/smart_agent2/README.md b/templates/module/smart_agent2/README.md
index 88d6981477e..e8ef4cb73dd 100644
--- a/templates/module/smart_agent2/README.md
+++ b/templates/module/smart_agent2/README.md
@@ -3,11 +3,11 @@
 
 ## Overview
 
-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 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}  
+For Zabbix version: 6.0 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 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.
 
 
@@ -56,7 +56,7 @@ There are no template links in this template.
 |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><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}]: 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> |
diff --git a/templates/module/smart_agent2/template_module_smart_agent2.yaml b/templates/module/smart_agent2/template_module_smart_agent2.yaml
index 1b8c0c184d5..59a06b944a0 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: '6.0'
-  date: '2021-10-01T14:12:43Z'
+  date: '2021-12-16T08:28:27Z'
   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.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -220,7 +220,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               units: '%'
-              description: '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).'
+              description: '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).'
               preprocessing:
                 -
                   type: JSONPATH
diff --git a/templates/module/smart_agent2_active/README.md b/templates/module/smart_agent2_active/README.md
index 8961223cf43..651a225bf93 100644
--- a/templates/module/smart_agent2_active/README.md
+++ b/templates/module/smart_agent2_active/README.md
@@ -1,13 +1,13 @@
 
-# SMART by Zabbix agent active 2
+# SMART by Zabbix agent 2 active
 
 ## Overview
 
-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 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}  
+For Zabbix version: 6.0 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 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.
 
 
@@ -56,7 +56,7 @@ There are no template links in this template.
 |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><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}]: 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> |
@@ -66,12 +66,12 @@ There are no template links in this template.
 
 |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> |`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 | |
+|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 active/smart.disk.sn[{#NAME}],#1)<>last(/SMART by Zabbix agent 2 active/smart.disk.sn[{#NAME}],#2) and length(last(/SMART by Zabbix agent 2 active/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 active/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 active/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 active/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 active/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 active/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 7d71fe56938..292c7e7a8e3 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: '6.0'
-  date: '2021-10-01T14:12:43Z'
+  date: '2021-12-16T11:48:11Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -8,14 +8,14 @@ zabbix_export:
   templates:
     -
       uuid: e518b1340ce44d7389d2cc7c304a97b4
-      template: 'SMART by Zabbix agent active 2'
-      name: 'SMART by Zabbix agent active 2'
+      template: 'SMART by Zabbix agent 2 active'
+      name: 'SMART by Zabbix agent 2 active'
       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 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.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -90,7 +90,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 26a3e4a0b79340b1bb753ec23c07c79b
-                  expression: 'last(/SMART by Zabbix agent active 2/smart.disk.error[{#NAME},{#ID}]) <= {#THRESH}'
+                  expression: 'last(/SMART by Zabbix agent 2 active/smart.disk.error[{#NAME},{#ID}]) <= {#THRESH}'
                   name: 'SMART [{#NAME}]: Attribute {#ID} {#ATTRNAME} is failed'
                   priority: WARNING
                   description: 'The value should be greater than THRESH.'
@@ -223,7 +223,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               units: '%'
-              description: '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).'
+              description: '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).'
               preprocessing:
                 -
                   type: JSONPATH
@@ -242,7 +242,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 68f373252bee4f9e8f3b33d04fc1adbd
-                  expression: 'last(/SMART by Zabbix agent active 2/smart.disk.percentage_used[{#NAME}])>90'
+                  expression: 'last(/SMART by Zabbix agent 2 active/smart.disk.percentage_used[{#NAME}])>90'
                   name: 'SMART [{#NAME}]: NVMe disk percentage using is over 90% of estimated endurance'
                   priority: AVERAGE
             -
@@ -272,7 +272,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 2d5cf100fe094c819d725ee598d37de8
-                  expression: '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'
+                  expression: 'last(/SMART by Zabbix agent 2 active/smart.disk.sn[{#NAME}],#1)<>last(/SMART by Zabbix agent 2 active/smart.disk.sn[{#NAME}],#2) and length(last(/SMART by Zabbix agent 2 active/smart.disk.sn[{#NAME}]))>0'
                   name: 'SMART [{#NAME}]: Disk has been replaced (new serial number received)'
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close.'
@@ -304,18 +304,18 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 7f46b24934854866849dd758cb5999d5
-                  expression: 'avg(/SMART by Zabbix agent active 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}'
+                  expression: 'avg(/SMART by Zabbix agent 2 active/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}'
                   name: 'SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)'
                   priority: AVERAGE
                 -
                   uuid: c903a37f4b004e1593ef85ac893c3f6c
-                  expression: 'avg(/SMART by Zabbix agent active 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.WARN}'
+                  expression: 'avg(/SMART by Zabbix agent 2 active/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.WARN}'
                   name: 'SMART [{#NAME}]: Average disk temperature is too high (over {$SMART.TEMPERATURE.MAX.WARN}°C for 5m)'
                   priority: WARNING
                   dependencies:
                     -
                       name: 'SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)'
-                      expression: 'avg(/SMART by Zabbix agent active 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}'
+                      expression: 'avg(/SMART by Zabbix agent 2 active/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}'
             -
               uuid: 2475415cc95b4103b2933f921e62dd36
               name: 'SMART [{#NAME}]: Self-test passed'
@@ -344,7 +344,7 @@ zabbix_export:
               trigger_prototypes:
                 -
                   uuid: 304bd042b7644a31bb74a1e71808d196
-                  expression: 'last(/SMART by Zabbix agent active 2/smart.disk.test[{#NAME}])="false"'
+                  expression: 'last(/SMART by Zabbix agent 2 active/smart.disk.test[{#NAME}])="false"'
                   name: 'SMART [{#NAME}]: Disk self-test is not passed'
                   priority: HIGH
           overrides:
diff --git a/templates/module/zabbix_agent/README.md b/templates/module/zabbix_agent/README.md
index 39ad94c62a4..be6cc7d5cce 100644
--- a/templates/module/zabbix_agent/README.md
+++ b/templates/module/zabbix_agent/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,9 +15,9 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name             | Description                                                                                                                          | Default |
-|------------------|--------------------------------------------------------------------------------------------------------------------------------------|---------|
-| {$AGENT.TIMEOUT} | <p>Timeout after which agent is considered unavailable. Works only for agents reachable from Zabbix server/proxy (passive mode).</p> | `3m`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$AGENT.TIMEOUT} |<p>Timeout after which agent is considered unavailable. Works only for agents reachable from Zabbix server/proxy (passive mode).</p> |`3m` |
 
 ## Template links
 
@@ -28,19 +28,18 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group            | Name                              | Description                                                                                                            | Type           | Key and additional info                                                           |
-|------------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------|----------------|-----------------------------------------------------------------------------------|
-| Monitoring_agent | Version of Zabbix agent running   | <p>-</p>                                                                                                               | ZABBIX_PASSIVE | agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>  |
-| Monitoring_agent | Host name of Zabbix agent running | <p>-</p>                                                                                                               | ZABBIX_PASSIVE | agent.hostname<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Monitoring_agent | Version of Zabbix agent running   | <p>-</p>                                                                                                               | ZABBIX_PASSIVE | agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>  |
-| Monitoring_agent | Zabbix agent ping                 | <p>The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.</p> | ZABBIX_PASSIVE | agent.ping                                                                        |
-| Status           | Zabbix agent availability         | <p>Monitoring agent availability status</p>                                                                            | INTERNAL       | zabbix[host,agent,available]                                                      |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Monitoring_agent |Version of Zabbix agent running |<p>-</p> |ZABBIX_PASSIVE |agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Monitoring_agent |Host name of Zabbix agent running |<p>-</p> |ZABBIX_PASSIVE |agent.hostname<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Monitoring_agent |Zabbix agent ping |<p>The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.</p> |ZABBIX_PASSIVE |agent.ping |
+|Status |Zabbix agent availability |<p>Monitoring agent availability status</p> |INTERNAL |zabbix[host,agent,available] |
 
 ## Triggers
 
-| Name                                                 | Description                                                                                        | Expression                                                             | Severity | Dependencies and additional info |
-|------------------------------------------------------|----------------------------------------------------------------------------------------------------|------------------------------------------------------------------------|----------|----------------------------------|
-| Zabbix agent is not available (for {$AGENT.TIMEOUT}) | <p>For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.</p> | `{TEMPLATE_NAME:zabbix[host,agent,available].max({$AGENT.TIMEOUT})}=0` | AVERAGE  | <p>Manual close: YES</p>         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Zabbix agent is not available (for {$AGENT.TIMEOUT}) |<p>For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.</p> |`max(/Zabbix agent/zabbix[host,agent,available],{$AGENT.TIMEOUT})=0` |AVERAGE |<p>Manual close: YES</p> |
 
 ## Feedback
 
@@ -50,7 +49,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -62,9 +61,9 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                    | Description                                                                    | Default |
-|-------------------------|--------------------------------------------------------------------------------|---------|
-| {$AGENT.NODATA_TIMEOUT} | <p>No data timeout for active agents. Consider to keep it relatively high.</p> | `30m`   |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$AGENT.NODATA_TIMEOUT} |<p>No data timeout for active agents. Consider to keep it relatively high.</p> |`30m` |
 
 ## Template links
 
@@ -75,18 +74,17 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group            | Name                              | Description                                                                                                            | Type          | Key and additional info                                                           |
-|------------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------|---------------|-----------------------------------------------------------------------------------|
-| Monitoring_agent | Version of Zabbix agent running   | <p>-</p>                                                                                                               | ZABBIX_ACTIVE | agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>  |
-| Monitoring_agent | Host name of Zabbix agent running | <p>-</p>                                                                                                               | ZABBIX_ACTIVE | agent.hostname<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Monitoring_agent | Version of Zabbix agent running   | <p>-</p>                                                                                                               | ZABBIX_ACTIVE | agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>  |
-| Status           | Zabbix agent ping                 | <p>The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.</p> | ZABBIX_ACTIVE | agent.ping                                                                        |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Monitoring_agent |Version of Zabbix agent running |<p>-</p> |ZABBIX_ACTIVE |agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Monitoring_agent |Host name of Zabbix agent running |<p>-</p> |ZABBIX_ACTIVE |agent.hostname<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Status |Zabbix agent ping |<p>The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.</p> |ZABBIX_ACTIVE |agent.ping |
 
 ## Triggers
 
-| Name                                                                  | Description                                                                                                | Expression                                                     | Severity | Dependencies and additional info |
-|-----------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------|----------|----------------------------------|
-| Zabbix agent is not available (or nodata for {$AGENT.NODATA_TIMEOUT}) | <p>For active agents, nodata() with agent.ping is used with {$AGENT.NODATA_TIMEOUT} as time threshold.</p> | `{TEMPLATE_NAME:agent.ping.nodata({$AGENT.NODATA_TIMEOUT})}=1` | AVERAGE  | <p>Manual close: YES</p>         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Zabbix agent is not available (or nodata for {$AGENT.NODATA_TIMEOUT}) |<p>For active agents, nodata() with agent.ping is used with {$AGENT.NODATA_TIMEOUT} as time threshold.</p> |`nodata(/Zabbix agent active/agent.ping,{$AGENT.NODATA_TIMEOUT})=1` |AVERAGE |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/module/zabbix_agent/template_module_zabbix_agent.yaml b/templates/module/zabbix_agent/template_module_zabbix_agent.yaml
index e50e3a8fe2f..39e3bc46a40 100644
--- a/templates/module/zabbix_agent/template_module_zabbix_agent.yaml
+++ b/templates/module/zabbix_agent/template_module_zabbix_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:33Z'
+  version: '6.0'
+  date: '2021-12-16T08:28:32Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Use this template for agents reachable from Zabbix server/proxy (passive mode).
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -118,7 +118,7 @@ zabbix_export:
       description: |
         Use this template instead of 'Template Module Zabbix agent' for agents running in active mode only.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/alcatel_timetra_snmp/README.md b/templates/net/alcatel_timetra_snmp/README.md
index 5ba185d2490..8c68a3a42dc 100644
--- a/templates/net/alcatel_timetra_snmp/README.md
+++ b/templates/net/alcatel_timetra_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,64 +15,64 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS} | <p>-</p>    | `4`     |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS} | <p>-</p>    | `4`     |
-| {$TEMP_CRIT_LOW}   | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}       | <p>-</p>    | `75`    |
-| {$TEMP_WARN}       | <p>-</p>    | `65`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`4` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`4` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`75` |
+|{$TEMP_WARN} |<p>-</p> |`65` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                            | Description | Type | Key and additional info                                                                    |
-|---------------------------------|-------------|------|--------------------------------------------------------------------------------------------|
-| Temperature Discovery           | <p>-</p>    | SNMP | temperature.discovery<p>**Filter**:</p>AND_OR <p>- A: {#TEMP_SENSOR} MATCHES_REGEX `1`</p> |
-| FAN Discovery                   | <p>-</p>    | SNMP | fan.discovery<p>**Filter**:</p>AND_OR <p>- A: {#SNMPVALUE} MATCHES_REGEX `[^1]`</p>        |
-| PSU Discovery                   | <p>-</p>    | SNMP | psu.discovery                                                                              |
-| Entity Serial Numbers Discovery | <p>-</p>    | SNMP | entity_sn.discovery<p>**Filter**:</p>AND <p>- B: {#ENT_SN} MATCHES_REGEX `.+`</p>          |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature Discovery |<p>-</p> |SNMP |temperature.discovery<p>**Filter**:</p>AND_OR <p>- {#TEMP_SENSOR} MATCHES_REGEX `1`</p> |
+|FAN Discovery |<p>-</p> |SNMP |fan.discovery<p>**Filter**:</p>AND_OR <p>- {#SNMPVALUE} MATCHES_REGEX `[^1]`</p> |
+|PSU Discovery |<p>-</p> |SNMP |psu.discovery |
+|Entity Serial Numbers Discovery |<p>-</p> |SNMP |entity_sn.discovery<p>**Filter**:</p>AND <p>- {#ENT_SN} MATCHES_REGEX `.+`</p> |
 
 ## Items collected
 
-| Group        | Name                                | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Type       | Key and additional info                                                                                                                                                                               |
-|--------------|-------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU          | CPU utilization                     | <p>MIB: TIMETRA-SYSTEM-MIB</p><p>The value of sgiCpuUsage indicates the current CPU utilization for the system.</p>                                                                                                                                                                                                                                                                                                                                                                                                               | SNMP       | system.cpu.util[sgiCpuUsage.0]                                                                                                                                                                        |
-| Fans         | #{#SNMPINDEX}: Fan status           | <p>MIB: TIMETRA-SYSTEM-MIB</p><p>Current status of the Fan tray.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                              | SNMP       | sensor.fan.status[tmnxChassisFanOperStatus.{#SNMPINDEX}]                                                                                                                                              |
-| Inventory    | Hardware model name                 | <p>MIB: SNMPv2-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP       | system.hw.model<p>**Preprocessing**:</p><p>- REGEX: `^(\w|-|\.|/)+ (\w|-|\.|/)+ (.+) Copyright \3`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                      |
-| Inventory    | Operating system                    | <p>MIB: SNMPv2-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP       | system.sw.os[sysDescr.0]<p>**Preprocessing**:</p><p>- REGEX: `^((\w|-|\.|/)+) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                       |
-| Inventory    | {#ENT_NAME}: Hardware serial number | <p>MIB: TIMETRA-CHASSIS-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | SNMP       | system.hw.serialnumber[tmnxHwSerialNumber.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                            |
-| Memory       | Used memory                         | <p>MIB: TIMETRA-SYSTEM-MIB</p><p>The value of sgiKbMemoryUsed indicates the total pre-allocated pool memory, in kilobytes, currently in use on the system.</p>                                                                                                                                                                                                                                                                                                                                                                    | SNMP       | vm.memory.used[sgiKbMemoryUsed.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                 |
-| Memory       | Available memory                    | <p>MIB: TIMETRA-SYSTEM-MIB</p><p>The value of sgiKbMemoryAvailable indicates the amount of free memory, in kilobytes, in the overall system that is not allocated to memory pools, but is available in case a memory pool needs to grow.</p>                                                                                                                                                                                                                                                                                      | SNMP       | vm.memory.available[sgiKbMemoryAvailable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                       |
-| Memory       | Total memory                        | <p>Total memory in Bytes</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | CALCULATED | vm.memory.total[snmp]<p>**Expression**:</p>`last("vm.memory.available[sgiKbMemoryAvailable.0]")+last("vm.memory.used[sgiKbMemoryUsed.0]")`                                                            |
-| Memory       | Memory utilization                  | <p>Memory utilization in %</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | CALCULATED | vm.memory.util[vm.memory.util.0]<p>**Expression**:</p>`last("vm.memory.used[sgiKbMemoryUsed.0]")/(last("vm.memory.available[sgiKbMemoryAvailable.0]")+last("vm.memory.used[sgiKbMemoryUsed.0]"))*100` |
-| Power_supply | #{#SNMPINDEX}: Power supply status  | <p>MIB: TIMETRA-SYSTEM-MIB</p><p>The overall status of an equipped power supply. </p><p>For AC multiple powersupplies, this represents the overall status of the first power supplyin the tray (or shelf).</p><p>For any other type, this represents the overall status of the power supply.</p><p>If tmnxChassisPowerSupply1Status is'deviceStateOk', then all monitored statuses are 'deviceStateOk'.</p><p>A value of 'deviceStateFailed' represents a condition where at least one monitored status is in a failed state.</p> | SNMP       | sensor.psu.status[tmnxChassisPowerSupply1Status.{#SNMPINDEX}]                                                                                                                                         |
-| Power_supply | #{#SNMPINDEX}: Power supply status  | <p>MIB: TIMETRA-SYSTEM-MIB</p><p>The overall status of an equipped power supply.</p><p>For AC multiple powersupplies, this represents the overall status of the second power supplyin the tray (or shelf).</p><p>For any other type, this field is unused and set to 'deviceNotEquipped'.</p><p>If tmnxChassisPowerSupply2Status is 'deviceStateOk', then all monitored statuses are 'deviceStateOk'.</p><p>A value of 'deviceStateFailed' represents a condition where at least one monitored status is in a failed state.</p>   | SNMP       | sensor.psu.status[tmnxChassisPowerSupply2Status.{#SNMPINDEX}]                                                                                                                                         |
-| Temperature  | {#SNMPVALUE}: Temperature           | <p>MIB: TIMETRA-SYSTEM-MIB</p><p>The current temperature reading in degrees celsius from this hardware component's temperature sensor.  If this component does not contain a temperature sensor, then the value -1 is returned.</p>                                                                                                                                                                                                                                                                                               | SNMP       | sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}]                                                                                                                                                     |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: TIMETRA-SYSTEM-MIB</p><p>The value of sgiCpuUsage indicates the current CPU utilization for the system.</p> |SNMP |system.cpu.util[sgiCpuUsage.0] |
+|Fans |#{#SNMPINDEX}: Fan status |<p>MIB: TIMETRA-SYSTEM-MIB</p><p>Current status of the Fan tray.</p> |SNMP |sensor.fan.status[tmnxChassisFanOperStatus.{#SNMPINDEX}] |
+|Inventory |Hardware model name |<p>MIB: SNMPv2-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- REGEX: `^(\w|-|\.|/)+ (\w|-|\.|/)+ (.+) Copyright \3`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os[sysDescr.0]<p>**Preprocessing**:</p><p>- REGEX: `^((\w|-|\.|/)+) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: TIMETRA-CHASSIS-MIB</p> |SNMP |system.hw.serialnumber[tmnxHwSerialNumber.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: TIMETRA-SYSTEM-MIB</p><p>The value of sgiKbMemoryUsed indicates the total pre-allocated pool memory, in kilobytes, currently in use on the system.</p> |SNMP |vm.memory.used[sgiKbMemoryUsed.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Available memory |<p>MIB: TIMETRA-SYSTEM-MIB</p><p>The value of sgiKbMemoryAvailable indicates the amount of free memory, in kilobytes, in the overall system that is not allocated to memory pools, but is available in case a memory pool needs to grow.</p> |SNMP |vm.memory.available[sgiKbMemoryAvailable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>Total memory in Bytes</p> |CALCULATED |vm.memory.total[snmp]<p>**Expression**:</p>`last(//vm.memory.available[sgiKbMemoryAvailable.0])+last(//vm.memory.used[sgiKbMemoryUsed.0])` |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[vm.memory.util.0]<p>**Expression**:</p>`last(//vm.memory.used[sgiKbMemoryUsed.0])/(last(//vm.memory.available[sgiKbMemoryAvailable.0])+last(//vm.memory.used[sgiKbMemoryUsed.0]))*100` |
+|Power_supply |#{#SNMPINDEX}: Power supply status |<p>MIB: TIMETRA-SYSTEM-MIB</p><p>The overall status of an equipped power supply.</p><p>For AC multiple powersupplies, this represents the overall status of the first power supplyin the tray (or shelf).</p><p>For any other type, this represents the overall status of the power supply.</p><p>If tmnxChassisPowerSupply1Status is'deviceStateOk', then all monitored statuses are 'deviceStateOk'.</p><p>A value of 'deviceStateFailed' represents a condition where at least one monitored status is in a failed state.</p> |SNMP |sensor.psu.status[tmnxChassisPowerSupply1Status.{#SNMPINDEX}] |
+|Power_supply |#{#SNMPINDEX}: Power supply status |<p>MIB: TIMETRA-SYSTEM-MIB</p><p>The overall status of an equipped power supply.</p><p>For AC multiple powersupplies, this represents the overall status of the second power supplyin the tray (or shelf).</p><p>For any other type, this field is unused and set to 'deviceNotEquipped'.</p><p>If tmnxChassisPowerSupply2Status is 'deviceStateOk', then all monitored statuses are 'deviceStateOk'.</p><p>A value of 'deviceStateFailed' represents a condition where at least one monitored status is in a failed state.</p> |SNMP |sensor.psu.status[tmnxChassisPowerSupply2Status.{#SNMPINDEX}] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: TIMETRA-SYSTEM-MIB</p><p>The current temperature reading in degrees celsius from this hardware component's temperature sensor.  If this component does not contain a temperature sensor, then the value -1 is returned.</p> |SNMP |sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                    | Description                                                                                                               | Expression                                                                                                                                                                                                                  | Severity | Dependencies and additional info                                                                       |
-|-------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|--------------------------------------------------------------------------------------------------------|
-| 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[sgiCpuUsage.0].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                   | WARNING  |                                                                                                        |
-| #{#SNMPINDEX}: Fan is in critical state                                 | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[tmnxChassisFanOperStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                | AVERAGE  |                                                                                                        |
-| 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[sysDescr.0].diff()}=1 and {TEMPLATE_NAME:system.sw.os[sysDescr.0].strlen()}>0`                                                                                                                 | INFO     | <p>Manual close: YES</p>                                                                               |
-| {#ENT_NAME}: Device has been replaced (new serial number received)      | <p>Device serial number has changed. Ack to close</p>                                                                     | `{TEMPLATE_NAME:system.hw.serialnumber[tmnxHwSerialNumber.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber[tmnxHwSerialNumber.{#SNMPINDEX}].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[vm.memory.util.0].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                               | AVERAGE  |                                                                                                        |
-| #{#SNMPINDEX}: Power supply is in critical state                        | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[tmnxChassisPowerSupply1Status.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                           | AVERAGE  |                                                                                                        |
-| #{#SNMPINDEX}: Power supply is in critical state                        | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[tmnxChassisPowerSupply2Status.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                           | AVERAGE  |                                                                                                        |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                        |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                        |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Alcatel Timetra TiMOS SNMP/system.cpu.util[sgiCpuUsage.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|#{#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Alcatel Timetra TiMOS SNMP/sensor.fan.status[tmnxChassisFanOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|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(/Alcatel Timetra TiMOS SNMP/system.sw.os[sysDescr.0],#1)<>last(/Alcatel Timetra TiMOS SNMP/system.sw.os[sysDescr.0],#2) and length(last(/Alcatel Timetra TiMOS SNMP/system.sw.os[sysDescr.0]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Alcatel Timetra TiMOS SNMP/system.hw.serialnumber[tmnxHwSerialNumber.{#SNMPINDEX}],#1)<>last(/Alcatel Timetra TiMOS SNMP/system.hw.serialnumber[tmnxHwSerialNumber.{#SNMPINDEX}],#2) and length(last(/Alcatel Timetra TiMOS SNMP/system.hw.serialnumber[tmnxHwSerialNumber.{#SNMPINDEX}]))>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(/Alcatel Timetra TiMOS SNMP/vm.memory.util[vm.memory.util.0],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|#{#SNMPINDEX}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Alcatel Timetra TiMOS SNMP/sensor.psu.status[tmnxChassisPowerSupply1Status.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|#{#SNMPINDEX}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Alcatel Timetra TiMOS SNMP/sensor.psu.status[tmnxChassisPowerSupply2Status.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml b/templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml
index 72e9999fb60..2a71c390a56 100644
--- a/templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml
+++ b/templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:14Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:35Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         TIMETRA-SYSTEM-MIB
         SNMPv2-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
@@ -291,7 +291,7 @@ zabbix_export:
               trends: 0d
               description: |
                 MIB: TIMETRA-SYSTEM-MIB
-                The overall status of an equipped power supply. 
+                The overall status of an equipped power supply.
                 For AC multiple powersupplies, this represents the overall status of the first power supplyin the tray (or shelf).
                 For any other type, this represents the overall status of the power supply.
                 If tmnxChassisPowerSupply1Status is'deviceStateOk', then all monitored statuses are 'deviceStateOk'.
diff --git a/templates/net/arista_snmp/README.md b/templates/net/arista_snmp/README.md
index fbb3c36b8c1..c9e0d777059 100644
--- a/templates/net/arista_snmp/README.md
+++ b/templates/net/arista_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 This template was tested on:
 
@@ -19,66 +19,66 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                       | Description                                                                       | Default          |
-|----------------------------|-----------------------------------------------------------------------------------|------------------|
-| {$FAN_CRIT_STATUS}         | <p>-</p>                                                                          | `3`              |
-| {$MEMORY.NAME.NOT_MATCHES} | <p>Filter is overridden to ignore RAM(Cache) and RAM(Buffers) memory objects.</p> | `(Buffer|Cache)` |
-| {$PSU_CRIT_STATUS}         | <p>-</p>                                                                          | `2`              |
-| {$VFS.FS.PUSED.MAX.CRIT}   | <p>-</p>                                                                          | `95`             |
-| {$VFS.FS.PUSED.MAX.WARN}   | <p>-</p>                                                                          | `90`             |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$FAN_CRIT_STATUS} |<p>-</p> |`3` |
+|{$MEMORY.NAME.NOT_MATCHES} |<p>Filter is overridden to ignore RAM(Cache) and RAM(Buffers) memory objects.</p> |`(Buffer|Cache)` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`2` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`95` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`90` |
 
 ## Template links
 
-| Name                    |
-|-------------------------|
-| EtherLike-MIB SNMP      |
-| Generic SNMP            |
-| HOST-RESOURCES-MIB SNMP |
-| Interfaces SNMP         |
+|Name|
+|----|
+|HOST-RESOURCES-MIB SNMP |
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description                                                                   | Type      | Key and additional info                                                                                                           |
-|-----------------------|-------------------------------------------------------------------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------|
-| Temperature discovery | <p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with celsius filter</p> | DEPENDENT | temp.discovery<p>**Filter**:</p>AND <p>- B: {#SENSOR_TYPE} MATCHES_REGEX `8`</p><p>- B: {#SENSOR_PRECISION} MATCHES_REGEX `1`</p> |
-| Fan discovery         | <p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with rpm filter</p>     | DEPENDENT | fan.discovery<p>**Filter**:</p>OR <p>- B: {#SENSOR_TYPE} MATCHES_REGEX `10`</p>                                                   |
-| Voltage discovery     | <p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with volts filter</p>   | DEPENDENT | voltage.discovery<p>**Filter**:</p>OR <p>- B: {#SENSOR_TYPE} MATCHES_REGEX `3|4`</p>                                              |
-| Entity discovery      | <p>-</p>                                                                      | SNMP      | entity.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `3`</p>                                               |
-| PSU discovery         | <p>-</p>                                                                      | SNMP      | psu.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `6`</p>                                                  |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature discovery |<p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with temperature filter</p> |DEPENDENT |temp.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_TYPE} MATCHES_REGEX `8`</p><p>- {#SENSOR_PRECISION} MATCHES_REGEX `1`</p><p>**Overrides:**</p><p>trigger THRESHOLD_LO_WARN<br> - {#THRESHOLD_LO_WARN} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Temperature is below the warning threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_LO_CRIT<br> - {#THRESHOLD_LO_CRIT} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Temperature is below the critical threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_HI_WARN<br> - {#THRESHOLD_HI_WARN} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Temperature is above the warning threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_HI_CRIT<br> - {#THRESHOLD_HI_CRIT} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Temperature is above the critical threshold` - NO_DISCOVER</p> |
+|Fan discovery |<p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with rpm filter</p> |DEPENDENT |fan.discovery<p>**Filter**:</p>OR <p>- {#SENSOR_TYPE} MATCHES_REGEX `10`</p><p>**Overrides:**</p><p>trigger THRESHOLD_LO_WARN<br> - {#THRESHOLD_LO_WARN} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Fan speed is below the warning threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_LO_CRIT<br> - {#THRESHOLD_LO_CRIT} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Fan speed is below the critical threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_HI_WARN<br> - {#THRESHOLD_HI_WARN} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Fan speed is above the warning threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_HI_CRIT<br> - {#THRESHOLD_HI_CRIT} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Fan speed is above the critical threshold` - NO_DISCOVER</p> |
+|Voltage discovery |<p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with volts filter</p> |DEPENDENT |voltage.discovery<p>**Filter**:</p>OR <p>- {#SENSOR_TYPE} MATCHES_REGEX `3|4`</p><p>**Overrides:**</p><p>trigger THRESHOLD_LO_WARN<br> - {#THRESHOLD_LO_WARN} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Voltage is below the warning threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_LO_CRIT<br> - {#THRESHOLD_LO_CRIT} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Voltage is below the critical threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_HI_WARN<br> - {#THRESHOLD_HI_WARN} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Voltage is above the warning threshold` - NO_DISCOVER</p><p>trigger THRESHOLD_HI_CRIT<br> - {#THRESHOLD_HI_CRIT} MATCHES_REGEX `^$`<br>  - TRIGGER_PROTOTYPE REGEXP `Voltage is above the critical threshold` - NO_DISCOVER</p> |
+|Entity discovery |<p>-</p> |SNMP |entity.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `3`</p> |
+|PSU discovery |<p>-</p> |SNMP |psu.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `6`</p> |
 
 ## Items collected
 
-| Group            | Name                                | Description                                                                                                                                                                                                                                                                       | Type | Key and additional info                                                                                                      |
-|------------------|-------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------|
-| Fans             | {#SENSOR_INFO}: Fan speed           | <p>MIB: ENTITY-SENSORS-MIB</p><p>The most recent measurement obtained by the agent for this sensor.</p><p>To correctly interpret the value of this object, the associated entPhySensorType,</p><p>entPhySensorScale, and entPhySensorPrecision objects must also be examined.</p> | SNMP | sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}]                                                                             |
-| Fans             | {#SENSOR_INFO}: Fan status          | <p>MIB: ENTITY-SENSORS-MIB</p><p>The operational status of the sensor {#SENSOR_INFO}</p>                                                                                                                                                                                          | SNMP | sensor.fan.status[entPhySensorOperStatus.{#SNMPINDEX}]                                                                       |
-| Inventory        | {#ENT_NAME}: Hardware model name    | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                            | SNMP | system.hw.model[entPhysicalModelName.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p>        |
-| Inventory        | {#ENT_NAME}: Hardware serial number | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                            | SNMP | system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-| Power_supply     | {#ENT_NAME}: Power supply status    | <p>MIB: ENTITY-STATE-MIB</p>                                                                                                                                                                                                                                                      | SNMP | sensor.psu.status[entStateOper.{#SNMPINDEX}]                                                                                 |
-| Temperature      | {#SENSOR_INFO}: Temperature         | <p>MIB: ENTITY-SENSORS-MIB</p><p>The most recent measurement obtained by the agent for this sensor.</p><p>To correctly interpret the value of this object, the associated entPhySensorType,</p><p>entPhySensorScale, and entPhySensorPrecision objects must also be examined.</p> | SNMP | sensor.temp.value[entPhySensorValue.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                         |
-| Temperature      | {#SENSOR_INFO}: Temperature status  | <p>MIB: ENTITY-SENSORS-MIB</p><p>The operational status of the sensor {#SENSOR_INFO}</p>                                                                                                                                                                                          | SNMP | sensor.temp.status[entPhySensorOperStatus.{#SNMPINDEX}]                                                                      |
-| Voltage          | {#SENSOR_INFO}: Voltage             | <p>MIB: ENTITY-SENSORS-MIB</p><p>The most recent measurement obtained by the agent for this sensor.</p><p>To correctly interpret the value of this object, the associated entPhySensorType,</p><p>entPhySensorScale, and entPhySensorPrecision objects must also be examined.</p> | SNMP | sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}]                                                                         |
-| Zabbix_raw_items | Get sensors                         | <p>Gets sensors with type, description, and thresholds.</p>                                                                                                                                                                                                                       | SNMP | sensors.get<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                        |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Fans |{#SENSOR_INFO}: Fan speed |<p>MIB: ENTITY-SENSORS-MIB</p><p>The most recent measurement obtained by the agent for this sensor.</p><p>To correctly interpret the value of this object, the associated entPhySensorType,</p><p>entPhySensorScale, and entPhySensorPrecision objects must also be examined.</p> |SNMP |sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}] |
+|Fans |{#SENSOR_INFO}: Fan status |<p>MIB: ENTITY-SENSORS-MIB</p><p>The operational status of the sensor {#SENSOR_INFO}</p> |SNMP |sensor.fan.status[entPhySensorOperStatus.{#SNMPINDEX}] |
+|Inventory |{#ENT_NAME}: Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model[entPhysicalModelName.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power_supply |{#ENT_NAME}: Power supply status |<p>MIB: ENTITY-STATE-MIB</p> |SNMP |sensor.psu.status[entStateOper.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_INFO}: Temperature |<p>MIB: ENTITY-SENSORS-MIB</p><p>The most recent measurement obtained by the agent for this sensor.</p><p>To correctly interpret the value of this object, the associated entPhySensorType,</p><p>entPhySensorScale, and entPhySensorPrecision objects must also be examined.</p> |SNMP |sensor.temp.value[entPhySensorValue.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |{#SENSOR_INFO}: Temperature status |<p>MIB: ENTITY-SENSORS-MIB</p><p>The operational status of the sensor {#SENSOR_INFO}</p> |SNMP |sensor.temp.status[entPhySensorOperStatus.{#SNMPINDEX}] |
+|Voltage |{#SENSOR_INFO}: Voltage |<p>MIB: ENTITY-SENSORS-MIB</p><p>The most recent measurement obtained by the agent for this sensor.</p><p>To correctly interpret the value of this object, the associated entPhySensorType,</p><p>entPhySensorScale, and entPhySensorPrecision objects must also be examined.</p> |SNMP |sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}] |
+|Zabbix_raw_items |Get sensors |<p>Gets sensors with type, description, and thresholds.</p> |SNMP |sensors.get<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Triggers
 
-| Name                                                                                         | Description                                                               | Expression                                                                                                                                                                    | Severity | Dependencies and additional info                                                                                                                                            |
-|----------------------------------------------------------------------------------------------|---------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| {#SENSOR_INFO}: Fan speed is below the warning threshold of {#THRESHOLD_LO_WARN}rpm for 5m   | <p>This trigger uses fan sensor values defined in the device.</p>         | `{TEMPLATE_NAME:sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}].max(5m)} < {#THRESHOLD_LO_WARN}`                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p><p>- {#SENSOR_INFO}: Fan speed is below the critical threshold of {#THRESHOLD_LO_CRIT}rpm for 5m</p> |
-| {#SENSOR_INFO}: Fan speed is below the critical threshold of {#THRESHOLD_LO_CRIT}rpm for 5m  | <p>This trigger uses fan sensor values defined in the device.</p>         | `{TEMPLATE_NAME:sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}].max(5m)} < {#THRESHOLD_LO_CRIT}`                                                                             | HIGH     | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p>                                                                                                     |
-| {#SENSOR_INFO}: Fan speed is above the warning threshold of {#THRESHOLD_HI_WARN}rpm for 5m   | <p>This trigger uses fan sensor values defined in the device.</p>         | `{TEMPLATE_NAME:sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}].min(5m)} > {#THRESHOLD_HI_WARN}`                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p><p>- {#SENSOR_INFO}: Fan speed is above the critical threshold of {#THRESHOLD_HI_CRIT}rpm for 5m</p> |
-| {#SENSOR_INFO}: Fan speed is above the critical threshold of {#THRESHOLD_HI_CRIT}rpm for 5m  | <p>This trigger uses fan sensor values defined in the device.</p>         | `{TEMPLATE_NAME:sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}].min(5m)} > {#THRESHOLD_HI_CRIT}`                                                                             | HIGH     | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p>                                                                                                     |
-| {#SENSOR_INFO}: Fan is in critical state                                                     | <p>Please check the fan unit</p>                                          | `{TEMPLATE_NAME:sensor.fan.status[entPhySensorOperStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                    | AVERAGE  |                                                                                                                                                                             |
-| {#ENT_NAME}: Device has been replaced (new serial number received)                           | <p>Device serial number has changed. Ack to close</p>                     | `{TEMPLATE_NAME:system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}].strlen()}>0` | INFO     | <p>Manual close: YES</p>                                                                                                                                                    |
-| {#ENT_NAME}: Power supply is in critical state                                               | <p>Please check the power supply unit for errors</p>                      | `{TEMPLATE_NAME:sensor.psu.status[entStateOper.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                              | AVERAGE  |                                                                                                                                                                             |
-| {#SENSOR_INFO}: Temperature is below the warning threshold of {#THRESHOLD_LO_WARN}°C for 5m  | <p>This trigger uses temperature sensor values defined in the device.</p> | `{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].max(5m)} < {#THRESHOLD_LO_WARN}`                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is below the critical threshold of {#THRESHOLD_LO_CRIT}°C for 5m</p>                                                 |
-| {#SENSOR_INFO}: Temperature is below the critical threshold of {#THRESHOLD_LO_CRIT}°C for 5m | <p>This trigger uses temperature sensor values defined in the device.</p> | `{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].max(5m)} < {#THRESHOLD_LO_CRIT}`                                                                            | HIGH     |                                                                                                                                                                             |
-| {#SENSOR_INFO}: Temperature is above the warning threshold of {#THRESHOLD_HI_WARN}°C for 5m  | <p>This trigger uses temperature sensor values defined in the device.</p> | `{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].min(5m)} > {#THRESHOLD_HI_WARN}`                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above the critical threshold of {#THRESHOLD_HI_CRIT}°C for 5m</p>                                                 |
-| {#SENSOR_INFO}: Temperature is above the critical threshold of {#THRESHOLD_HI_CRIT}°C for 5m | <p>This trigger uses temperature sensor values defined in the device.</p> | `{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].min(5m)} > {#THRESHOLD_HI_CRIT}`                                                                            | HIGH     |                                                                                                                                                                             |
-| {#SENSOR_INFO}: Voltage is below the warning threshold of {#THRESHOLD_LO_WARN}V for 5m       | <p>This trigger uses voltage sensor values defined in the device.</p>     | `{TEMPLATE_NAME:sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}].max(5m)} < {#THRESHOLD_LO_WARN}`                                                                         | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Voltage is below the critical threshold of {#THRESHOLD_LO_CRIT}V for 5m</p>                                                      |
-| {#SENSOR_INFO}: Voltage is below the critical threshold of {#THRESHOLD_LO_CRIT}V for 5m      | <p>This trigger uses voltage sensor values defined in the device.</p>     | `{TEMPLATE_NAME:sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}].max(5m)} < {#THRESHOLD_LO_CRIT}`                                                                         | HIGH     |                                                                                                                                                                             |
-| {#SENSOR_INFO}: Voltage is above the warning threshold of {#THRESHOLD_HI_WARN}V for 5m       | <p>This trigger uses voltage sensor values defined in the device.</p>     | `{TEMPLATE_NAME:sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}].min(5m)} > {#THRESHOLD_HI_WARN}`                                                                         | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Voltage is above the critical threshold of {#THRESHOLD_HI_CRIT}V for 5m</p>                                                      |
-| {#SENSOR_INFO}: Voltage is above the critical threshold of {#THRESHOLD_HI_CRIT}V for 5m      | <p>This trigger uses voltage sensor values defined in the device.</p>     | `{TEMPLATE_NAME:sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}].min(5m)} > {#THRESHOLD_HI_CRIT}`                                                                         | HIGH     |                                                                                                                                                                             |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#SENSOR_INFO}: Fan speed is below the warning threshold of {#THRESHOLD_LO_WARN}rpm for 5m |<p>This trigger uses fan sensor values defined in the device.</p> |`max(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_WARN}` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p><p>- {#SENSOR_INFO}: Fan speed is below the critical threshold of {#THRESHOLD_LO_CRIT}rpm for 5m</p> |
+|{#SENSOR_INFO}: Fan speed is below the critical threshold of {#THRESHOLD_LO_CRIT}rpm for 5m |<p>This trigger uses fan sensor values defined in the device.</p> |`max(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}` |HIGH |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p> |
+|{#SENSOR_INFO}: Fan speed is above the warning threshold of {#THRESHOLD_HI_WARN}rpm for 5m |<p>This trigger uses fan sensor values defined in the device.</p> |`min(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_WARN}` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p><p>- {#SENSOR_INFO}: Fan speed is above the critical threshold of {#THRESHOLD_HI_CRIT}rpm for 5m</p> |
+|{#SENSOR_INFO}: Fan speed is above the critical threshold of {#THRESHOLD_HI_CRIT}rpm for 5m |<p>This trigger uses fan sensor values defined in the device.</p> |`min(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_CRIT}` |HIGH |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p> |
+|{#SENSOR_INFO}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Arista SNMP/sensor.fan.status[entPhySensorOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Arista SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}],#1)<>last(/Arista SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}],#2) and length(last(/Arista SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ENT_NAME}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Arista SNMP/sensor.psu.status[entStateOper.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|{#SENSOR_INFO}: Temperature is below the warning threshold of {#THRESHOLD_LO_WARN}°C for 5m |<p>This trigger uses temperature sensor values defined in the device.</p> |`max(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_WARN}` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is below the critical threshold of {#THRESHOLD_LO_CRIT}°C for 5m</p> |
+|{#SENSOR_INFO}: Temperature is below the critical threshold of {#THRESHOLD_LO_CRIT}°C for 5m |<p>This trigger uses temperature sensor values defined in the device.</p> |`max(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}` |HIGH | |
+|{#SENSOR_INFO}: Temperature is above the warning threshold of {#THRESHOLD_HI_WARN}°C for 5m |<p>This trigger uses temperature sensor values defined in the device.</p> |`min(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_WARN}` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above the critical threshold of {#THRESHOLD_HI_CRIT}°C for 5m</p> |
+|{#SENSOR_INFO}: Temperature is above the critical threshold of {#THRESHOLD_HI_CRIT}°C for 5m |<p>This trigger uses temperature sensor values defined in the device.</p> |`min(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_CRIT}` |HIGH | |
+|{#SENSOR_INFO}: Voltage is below the warning threshold of {#THRESHOLD_LO_WARN}V for 5m |<p>This trigger uses voltage sensor values defined in the device.</p> |`max(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_WARN}` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Voltage is below the critical threshold of {#THRESHOLD_LO_CRIT}V for 5m</p> |
+|{#SENSOR_INFO}: Voltage is below the critical threshold of {#THRESHOLD_LO_CRIT}V for 5m |<p>This trigger uses voltage sensor values defined in the device.</p> |`max(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}` |HIGH | |
+|{#SENSOR_INFO}: Voltage is above the warning threshold of {#THRESHOLD_HI_WARN}V for 5m |<p>This trigger uses voltage sensor values defined in the device.</p> |`min(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_WARN}` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Voltage is above the critical threshold of {#THRESHOLD_HI_CRIT}V for 5m</p> |
+|{#SENSOR_INFO}: Voltage is above the critical threshold of {#THRESHOLD_HI_CRIT}V for 5m |<p>This trigger uses voltage sensor values defined in the device.</p> |`min(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_CRIT}` |HIGH | |
 
 ## Feedback
 
diff --git a/templates/net/arista_snmp/template_net_arista_snmp.yaml b/templates/net/arista_snmp/template_net_arista_snmp.yaml
index 2ad49a4cd8c..841763d7bdb 100644
--- a/templates/net/arista_snmp/template_net_arista_snmp.yaml
+++ b/templates/net/arista_snmp/template_net_arista_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:14Z'
+  version: '6.0'
+  date: '2022-01-10T07:55:25Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         ENTITY-STATE-MIB
         ENTITY-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
@@ -358,7 +358,7 @@ zabbix_export:
                 macro: '{#SENSOR_PRECISION}'
                 value: '1'
                 formulaid: A
-          description: 'ENTITY-SENSORS-MIB::EntitySensorDataType discovery with celsius filter'
+          description: 'ENTITY-SENSORS-MIB::EntitySensorDataType discovery with temperature filter'
           item_prototypes:
             -
               uuid: 2851148fc01c4ba5afb5ab6a3deba5ff
diff --git a/templates/net/brocade_fc_sw_snmp/README.md b/templates/net/brocade_fc_sw_snmp/README.md
index fe010ed71ec..3f8d73e0624 100644
--- a/templates/net/brocade_fc_sw_snmp/README.md
+++ b/templates/net/brocade_fc_sw_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://community.brocade.com/dtscp75322/attachments/dtscp75322/fibre/25235/1/FOS_MIB_Reference_v740.pdf
 
 This template was tested on:
@@ -22,69 +22,69 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                            | Description | Default |
-|---------------------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}                | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS}              | <p>-</p>    | `2`     |
-| {$FAN_OK_STATUS}                | <p>-</p>    | `4`     |
-| {$HEALTH_CRIT_STATUS}           | <p>-</p>    | `4`     |
-| {$HEALTH_WARN_STATUS:"offline"} | <p>-</p>    | `2`     |
-| {$HEALTH_WARN_STATUS:"testing"} | <p>-</p>    | `3`     |
-| {$MEMORY.UTIL.MAX}              | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS}              | <p>-</p>    | `2`     |
-| {$PSU_OK_STATUS}                | <p>-</p>    | `4`     |
-| {$TEMP_CRIT_LOW}                | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}                    | <p>-</p>    | `75`    |
-| {$TEMP_WARN_STATUS}             | <p>-</p>    | `5`     |
-| {$TEMP_WARN}                    | <p>-</p>    | `65`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`2` |
+|{$FAN_OK_STATUS} |<p>-</p> |`4` |
+|{$HEALTH_CRIT_STATUS} |<p>-</p> |`4` |
+|{$HEALTH_WARN_STATUS:"offline"} |<p>-</p> |`2` |
+|{$HEALTH_WARN_STATUS:"testing"} |<p>-</p> |`3` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`2` |
+|{$PSU_OK_STATUS} |<p>-</p> |`4` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`75` |
+|{$TEMP_WARN_STATUS} |<p>-</p> |`5` |
+|{$TEMP_WARN} |<p>-</p> |`65` |
 
 ## Template links
 
-| Name            |
-|-----------------|
-| Generic SNMP    |
-| Interfaces SNMP |
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description | Type | Key and additional info                                                                    |
-|-----------------------|-------------|------|--------------------------------------------------------------------------------------------|
-| Temperature Discovery | <p>-</p>    | SNMP | temperature.discovery<p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_TYPE} MATCHES_REGEX `1`</p> |
-| PSU Discovery         | <p>-</p>    | SNMP | psu.discovery<p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_TYPE} MATCHES_REGEX `3`</p>         |
-| FAN Discovery         | <p>-</p>    | SNMP | fan.discovery<p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_TYPE} MATCHES_REGEX `2`</p>         |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature Discovery |<p>-</p> |SNMP |temperature.discovery<p>**Filter**:</p>AND_OR <p>- {#SENSOR_TYPE} MATCHES_REGEX `1`</p> |
+|PSU Discovery |<p>-</p> |SNMP |psu.discovery<p>**Filter**:</p>AND_OR <p>- {#SENSOR_TYPE} MATCHES_REGEX `3`</p> |
+|FAN Discovery |<p>-</p> |SNMP |fan.discovery<p>**Filter**:</p>AND_OR <p>- {#SENSOR_TYPE} MATCHES_REGEX `2`</p> |
 
 ## Items collected
 
-| Group        | Name                                | Description                                                                                                                                                                                                                                                                                                                                                                                                    | Type | Key and additional info                                                                   |
-|--------------|-------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------|
-| CPU          | CPU utilization                     | <p>MIB: SW-MIB</p><p>System's CPU usage.</p>                                                                                                                                                                                                                                                                                                                                                                   | SNMP | system.cpu.util[swCpuUsage.0]                                                             |
-| Fans         | {#SENSOR_INFO}: Fan status          | <p>MIB: SW-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                             | SNMP | sensor.fan.status[swSensorStatus.{#SNMPINDEX}]                                            |
-| Fans         | {#SENSOR_INFO}: Fan speed           | <p>MIB: SW-MIB</p><p>The current value (reading) of the sensor.</p><p>The value, -2147483648, represents an unknown quantity.</p><p>The fan value will be in RPM(revolution per minute)</p>                                                                                                                                                                                                                    | SNMP | sensor.fan.speed[swSensorValue.{#SNMPINDEX}]                                              |
-| Inventory    | Hardware serial number              | <p>MIB: SW-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                             | SNMP | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Inventory    | Firmware version                    | <p>MIB: SW-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                             | SNMP | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>     |
-| Memory       | Memory utilization                  | <p>MIB: SW-MIB</p><p>Memory utilization in %</p>                                                                                                                                                                                                                                                                                                                                                               | SNMP | vm.memory.util[swMemUsage.0]                                                              |
-| Power_supply | {#SENSOR_INFO}: Power supply status | <p>MIB: SW-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                             | SNMP | sensor.psu.status[swSensorStatus.{#SNMPINDEX}]                                            |
-| Status       | Overall system health status        | <p>MIB: SW-MIB</p><p>The current operational status of the switch.The states are as follow:</p><p>online(1) means the switch is accessible by an external Fibre Channel port</p><p>offline(2) means the switch is not accessible</p><p>testing(3) means the switch is in a built-in test mode and is not accessible by an external Fibre Channel port</p><p>faulty(4) means the switch is not operational.</p> | SNMP | system.status[swOperStatus.0]                                                             |
-| Temperature  | {#SENSOR_INFO}: Temperature         | <p>MIB: SW-MIB</p><p>Temperature readings of testpoint: {#SENSOR_INFO}</p>                                                                                                                                                                                                                                                                                                                                     | SNMP | sensor.temp.value[swSensorValue.{#SNMPINDEX}]                                             |
-| Temperature  | {#SENSOR_INFO}: Temperature status  | <p>MIB: SW-MIB</p><p>Temperature status of testpoint: {#SENSOR_INFO}</p>                                                                                                                                                                                                                                                                                                                                       | SNMP | sensor.temp.status[swSensorStatus.{#SNMPINDEX}]                                           |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: SW-MIB</p><p>System's CPU usage.</p> |SNMP |system.cpu.util[swCpuUsage.0] |
+|Fans |{#SENSOR_INFO}: Fan status |<p>MIB: SW-MIB</p> |SNMP |sensor.fan.status[swSensorStatus.{#SNMPINDEX}] |
+|Fans |{#SENSOR_INFO}: Fan speed |<p>MIB: SW-MIB</p><p>The current value (reading) of the sensor.</p><p>The value, -2147483648, represents an unknown quantity.</p><p>The fan value will be in RPM(revolution per minute)</p> |SNMP |sensor.fan.speed[swSensorValue.{#SNMPINDEX}] |
+|Inventory |Hardware serial number |<p>MIB: SW-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: SW-MIB</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Memory utilization |<p>MIB: SW-MIB</p><p>Memory utilization in %</p> |SNMP |vm.memory.util[swMemUsage.0] |
+|Power_supply |{#SENSOR_INFO}: Power supply status |<p>MIB: SW-MIB</p> |SNMP |sensor.psu.status[swSensorStatus.{#SNMPINDEX}] |
+|Status |Overall system health status |<p>MIB: SW-MIB</p><p>The current operational status of the switch.The states are as follow:</p><p>online(1) means the switch is accessible by an external Fibre Channel port</p><p>offline(2) means the switch is not accessible</p><p>testing(3) means the switch is in a built-in test mode and is not accessible by an external Fibre Channel port</p><p>faulty(4) means the switch is not operational.</p> |SNMP |system.status[swOperStatus.0] |
+|Temperature |{#SENSOR_INFO}: Temperature |<p>MIB: SW-MIB</p><p>Temperature readings of testpoint: {#SENSOR_INFO}</p> |SNMP |sensor.temp.value[swSensorValue.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_INFO}: Temperature status |<p>MIB: SW-MIB</p><p>Temperature status of testpoint: {#SENSOR_INFO}</p> |SNMP |sensor.temp.status[swSensorStatus.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                      | Description                                                                                          | Expression                                                                                                                                                                                                                                                                                                   | Severity | Dependencies and additional info                                                                         |
-|---------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------------------------------------------------------------------------------|
-| 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[swCpuUsage.0].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                     | WARNING  |                                                                                                          |
-| {#SENSOR_INFO}: Fan is in critical state                                  | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[swSensorStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                           | AVERAGE  |                                                                                                          |
-| {#SENSOR_INFO}: Fan is not in normal state                                | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[swSensorStatus.{#SNMPINDEX}].count(#1,{$FAN_OK_STATUS},ne)}=1`                                                                                                                                                                                                             | INFO     | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</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[swMemUsage.0].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                    | AVERAGE  |                                                                                                          |
-| {#SENSOR_INFO}: Power supply is in critical state                         | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[swSensorStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                           | AVERAGE  |                                                                                                          |
-| {#SENSOR_INFO}: Power supply is not in normal state                       | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[swSensorStatus.{#SNMPINDEX}].count(#1,{$PSU_OK_STATUS},ne)}=1`                                                                                                                                                                                                             | INFO     | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Power supply is in critical state</p>                         |
-| System status is in critical state                                        | <p>Please check the device for errors</p>                                                            | `{TEMPLATE_NAME:system.status[swOperStatus.0].count(#1,{$HEALTH_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                                         | HIGH     |                                                                                                          |
-| System status is in warning state                                         | <p>Please check the device for warnings</p>                                                          | `{TEMPLATE_NAME:system.status[swOperStatus.0].count(#1,{$HEALTH_WARN_STATUS:"offline"},eq)}=1 or {TEMPLATE_NAME:system.status[swOperStatus.0].count(#1,{$HEALTH_WARN_STATUS:"testing"},eq)}=1`                                                                                                               | WARNING  | <p>**Depends on**:</p><p>- System status is in critical state</p>                                        |
-| {#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[swSensorValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""} or {Brocade FC SNMP:sensor.temp.status[swSensorStatus.{#SNMPINDEX}].last(0)}={$TEMP_WARN_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[swSensorValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3` | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[swSensorValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[swSensorValue.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`                                                                                                  | HIGH     |                                                                                                          |
-| {#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[swSensorValue.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[swSensorValue.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3`                                                                                          | AVERAGE  |                                                                                                          |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Brocade FC SNMP/system.cpu.util[swCpuUsage.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SENSOR_INFO}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Brocade FC SNMP/sensor.fan.status[swSensorStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|{#SENSOR_INFO}: Fan is not in normal state |<p>Please check the fan unit</p> |`count(/Brocade FC SNMP/sensor.fan.status[swSensorStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1` |INFO |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Fan is in critical state</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Brocade FC SNMP/system.hw.serialnumber,#1)<>last(/Brocade FC SNMP/system.hw.serialnumber,#2) and length(last(/Brocade FC SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/Brocade FC SNMP/system.hw.firmware,#1)<>last(/Brocade FC SNMP/system.hw.firmware,#2) and length(last(/Brocade FC 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(/Brocade FC SNMP/vm.memory.util[swMemUsage.0],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|{#SENSOR_INFO}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Brocade FC SNMP/sensor.psu.status[swSensorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|{#SENSOR_INFO}: Power supply is not in normal state |<p>Please check the power supply unit for errors</p> |`count(/Brocade FC SNMP/sensor.psu.status[swSensorStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1` |INFO |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Power supply is in critical state</p> |
+|System status is in critical state |<p>Please check the device for errors</p> |`count(/Brocade FC SNMP/system.status[swOperStatus.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1` |HIGH | |
+|System status is in warning state |<p>Please check the device for warnings</p> |`count(/Brocade FC SNMP/system.status[swOperStatus.0],#1,"eq","{$HEALTH_WARN_STATUS:\"offline\"}")=1 or count(/Brocade FC SNMP/system.status[swOperStatus.0],#1,"eq","{$HEALTH_WARN_STATUS:\"testing\"}")=1` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
+|{#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)>{$TEMP_WARN:""} or last(/Brocade FC SNMP/sensor.temp.status[swSensorStatus.{#SNMPINDEX}])={$TEMP_WARN_STATUS} `<p>Recovery expression:</p>`max(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml b/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml
index f9f3dbeaeb0..893398003b1 100644
--- a/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml
+++ b/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:04Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:41Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -22,7 +22,7 @@ zabbix_export:
           Version: v6.3.1c, v7.0.0c,  v7.4.1c
           Device: all
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/brocade_foundry_sw_snmp/README.md b/templates/net/brocade_foundry_sw_snmp/README.md
index 99f0ccb241b..bb6b22baa7d 100644
--- a/templates/net/brocade_foundry_sw_snmp/README.md
+++ b/templates/net/brocade_foundry_sw_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,10 +15,10 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
 
 ## Template links
 
@@ -29,17 +29,17 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group  | Name               | Description                                                                                                                                                                                                           | Type | Key and additional info                  |
-|--------|--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------|
-| CPU    | CPU utilization    | <p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The statistics collection of 1 minute CPU utilization.</p>                                                                                                                         | SNMP | system.cpu.util[snAgGblCpuUtil1MinAvg.0] |
-| Memory | Memory utilization | <p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The system dynamic memory utilization, in unit of percentage.</p><p>Deprecated: Refer to snAgSystemDRAMUtil.</p><p>For NI platforms, refer to snAgentBrdMemoryUtil100thPercent</p> | SNMP | vm.memory.util[snAgGblDynMemUtil.0]      |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The statistics collection of 1 minute CPU utilization.</p> |SNMP |system.cpu.util[snAgGblCpuUtil1MinAvg.0] |
+|Memory |Memory utilization |<p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The system dynamic memory utilization, in unit of percentage.</p><p>Deprecated: Refer to snAgSystemDRAMUtil.</p><p>For NI platforms, refer to snAgentBrdMemoryUtil100thPercent.</p> |SNMP |vm.memory.util[snAgGblDynMemUtil.0] |
 
 ## Triggers
 
-| Name                                                  | Description                                                              | Expression                                                                          | Severity | Dependencies and additional info |
-|-------------------------------------------------------|--------------------------------------------------------------------------|-------------------------------------------------------------------------------------|----------|----------------------------------|
-| 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[snAgGblCpuUtil1MinAvg.0].min(5m)}>{$CPU.UTIL.CRIT}` | WARNING  |                                  |
-| High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) | <p>The system is running out of free memory.</p>                         | `{TEMPLATE_NAME:vm.memory.util[snAgGblDynMemUtil.0].min(5m)}>{$MEMORY.UTIL.MAX}`    | AVERAGE  |                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Brocade_Foundry Performance SNMP/system.cpu.util[snAgGblCpuUtil1MinAvg.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Brocade_Foundry Performance SNMP/vm.memory.util[snAgGblDynMemUtil.0],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
 
 ## Feedback
 
@@ -49,13 +49,13 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 For devices(old Foundry devices, MLXe and so on) that doesn't support Stackable SNMP Tables: snChasFan2Table, snChasPwrSupply2Table,snAgentTemp2Table -
 FOUNDRY-SN-AGENT-MIB::snChasFanTable, snChasPwrSupplyTable,snAgentTempTable are used instead.
 For example:
 The objects in table snChasPwrSupply2Table is not supported on the NetIron and the FastIron SX devices.
 snChasFan2Table is not supported on  on the NetIron devices.
-snAgentTemp2Table is not supported on old versions of MLXe
+snAgentTemp2Table is not supported on old versions of MLXe.
 
 This template was tested on:
 
@@ -73,60 +73,60 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$FAN_CRIT_STATUS} | <p>-</p>    | `3`     |
-| {$FAN_OK_STATUS}   | <p>-</p>    | `2`     |
-| {$PSU_CRIT_STATUS} | <p>-</p>    | `3`     |
-| {$PSU_OK_STATUS}   | <p>-</p>    | `2`     |
-| {$TEMP_CRIT_LOW}   | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}       | <p>-</p>    | `75`    |
-| {$TEMP_WARN}       | <p>-</p>    | `65`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$FAN_CRIT_STATUS} |<p>-</p> |`3` |
+|{$FAN_OK_STATUS} |<p>-</p> |`2` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`3` |
+|{$PSU_OK_STATUS} |<p>-</p> |`2` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`75` |
+|{$TEMP_WARN} |<p>-</p> |`65` |
 
 ## Template links
 
-| Name                             |
-|----------------------------------|
-| Brocade_Foundry Performance SNMP |
-| Generic SNMP                     |
-| Interfaces SNMP                  |
+|Name|
+|----|
+|Brocade_Foundry Performance SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                          | Description                                                                                                                                               | Type | Key and additional info |
-|-------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------|
-| PSU Discovery                 | <p>snChasPwrSupplyTable: A table of each power supply information. Only installed power supply appears in a table row.</p>                                | SNMP | psu.discovery           |
-| FAN Discovery                 | <p>snChasFanTable: A table of each fan information. Only installed fan appears in a table row.</p>                                                        | SNMP | fan.discovery           |
-| Temperature Discovery         | <p>snAgentTempTable:Table to list temperatures of the modules in the device. This table is applicable to only those modules with temperature sensors.</p> | SNMP | temp.discovery          |
-| Temperature Discovery Chassis | <p>Since temperature of the chassis is not available on all Brocade/Foundry hardware, this LLD is here to avoid unsupported items.</p>                    | SNMP | temp.chassis.discovery  |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|PSU Discovery |<p>snChasPwrSupplyTable: A table of each power supply information. Only installed power supply appears in a table row.</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>snChasFanTable: A table of each fan information. Only installed fan appears in a table row.</p> |SNMP |fan.discovery |
+|Temperature Discovery |<p>snAgentTempTable:Table to list temperatures of the modules in the device. This table is applicable to only those modules with temperature sensors.</p> |SNMP |temp.discovery |
+|Temperature Discovery Chassis |<p>Since temperature of the chassis is not available on all Brocade/Foundry hardware, this LLD is here to avoid unsupported items.</p> |SNMP |temp.chassis.discovery |
 
 ## Items collected
 
-| Group        | Name                                  | Description                                                                                                                                                                                                                                                        | Type | Key and additional info                                                                                    |
-|--------------|---------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------|
-| Fans         | Fan {#FAN_INDEX}: Fan status          | <p>MIB: FOUNDRY-SN-AGENT-MIB</p>                                                                                                                                                                                                                                   | SNMP | sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}]                                                        |
-| Inventory    | Hardware serial number                | <p>MIB: FOUNDRY-SN-AGENT-MIB</p>                                                                                                                                                                                                                                   | SNMP | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                  |
-| Inventory    | Firmware version                      | <p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The version of the running software in the form'major.minor.maintenance[letters]'</p>                                                                                                                                           | SNMP | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                      |
-| Power_supply | PSU {#PSU_INDEX}: Power supply status | <p>MIB: FOUNDRY-SN-AGENT-MIB</p>                                                                                                                                                                                                                                   | SNMP | sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}]                                                  |
-| Temperature  | {#SENSOR_DESCR}: Temperature          | <p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>Temperature of the sensor represented by this row. Each unit is 0.5 degrees Celsius.</p>                                                                                                                                        | SNMP | sensor.temp.value[snAgentTempValue.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.5`</p>        |
-| Temperature  | Chassis #{#SNMPINDEX}: Temperature    | <p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>Temperature of the chassis. Each unit is 0.5 degrees Celsius.</p><p>Only management module built with temperature sensor hardware is applicable.</p><p>For those non-applicable management module, it returns no-such-name.</p> | SNMP | sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.5`</p> |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Fans |Fan {#FAN_INDEX}: Fan status |<p>MIB: FOUNDRY-SN-AGENT-MIB</p> |SNMP |sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}] |
+|Inventory |Hardware serial number |<p>MIB: FOUNDRY-SN-AGENT-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The version of the running software in the form'major.minor.maintenance[letters]'</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Power_supply |PSU {#PSU_INDEX}: Power supply status |<p>MIB: FOUNDRY-SN-AGENT-MIB</p> |SNMP |sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_DESCR}: Temperature |<p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>Temperature of the sensor represented by this row. Each unit is 0.5 degrees Celsius.</p> |SNMP |sensor.temp.value[snAgentTempValue.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.5`</p> |
+|Temperature |Chassis #{#SNMPINDEX}: Temperature |<p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>Temperature of the chassis. Each unit is 0.5 degrees Celsius.</p><p>Only management module built with temperature sensor hardware is applicable.</p><p>For those non-applicable management module, it returns no-such-name.</p> |SNMP |sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.5`</p> |
 
 ## Triggers
 
-| Name                                                                                    | Description                                                                                          | Expression                                                                                                                                                                                                                                            | Severity | Dependencies and additional info                                                                                       |
-|-----------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|------------------------------------------------------------------------------------------------------------------------|
-| Fan {#FAN_INDEX}: Fan is in critical state                                              | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                                               | AVERAGE  |                                                                                                                        |
-| Fan {#FAN_INDEX}: Fan is not in normal state                                            | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}].count(#1,{$FAN_OK_STATUS},ne)}=1`                                                                                                                                                 | INFO     | <p>**Depends on**:</p><p>- Fan {#FAN_INDEX}: Fan is in critical state</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>                                                                                               |
-| PSU {#PSU_INDEX}: Power supply is in critical state                                     | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                                                         | AVERAGE  |                                                                                                                        |
-| PSU {#PSU_INDEX}: Power supply is not in normal state                                   | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}].count(#1,{$PSU_OK_STATUS},ne)}=1`                                                                                                                                           | INFO     | <p>**Depends on**:</p><p>- PSU {#PSU_INDEX}: Power supply is in critical state</p>                                     |
-| {#SENSOR_DESCR}: Temperature is above warning threshold: >{$TEMP_WARN:""}               | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[snAgentTempValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snAgentTempValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`                                     | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p>              |
-| {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}              | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[snAgentTempValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snAgentTempValue.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`                                     | HIGH     |                                                                                                                        |
-| {#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""}                           | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[snAgentTempValue.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snAgentTempValue.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3`                             | AVERAGE  |                                                                                                                        |
-| Chassis #{#SNMPINDEX}: Temperature is above warning threshold: >{$TEMP_WARN:"Chassis"}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"Chassis"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"Chassis"}-3`         | WARNING  | <p>**Depends on**:</p><p>- Chassis #{#SNMPINDEX}: Temperature is above critical threshold: >{$TEMP_CRIT:"Chassis"}</p> |
-| Chassis #{#SNMPINDEX}: Temperature is above critical threshold: >{$TEMP_CRIT:"Chassis"} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"Chassis"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"Chassis"}-3`         | HIGH     |                                                                                                                        |
-| Chassis #{#SNMPINDEX}: Temperature is too low: <{$TEMP_CRIT_LOW:"Chassis"}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"Chassis"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"Chassis"}+3` | AVERAGE  |                                                                                                                        |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Fan {#FAN_INDEX}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Brocade_Foundry Nonstackable SNMP/sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Fan {#FAN_INDEX}: Fan is not in normal state |<p>Please check the fan unit</p> |`count(/Brocade_Foundry Nonstackable SNMP/sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1` |INFO |<p>**Depends on**:</p><p>- Fan {#FAN_INDEX}: Fan is in critical state</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Brocade_Foundry Nonstackable SNMP/system.hw.serialnumber,#1)<>last(/Brocade_Foundry Nonstackable SNMP/system.hw.serialnumber,#2) and length(last(/Brocade_Foundry Nonstackable SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/Brocade_Foundry Nonstackable SNMP/system.hw.firmware,#1)<>last(/Brocade_Foundry Nonstackable SNMP/system.hw.firmware,#2) and length(last(/Brocade_Foundry Nonstackable SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|PSU {#PSU_INDEX}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Brocade_Foundry Nonstackable SNMP/sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|PSU {#PSU_INDEX}: Power supply is not in normal state |<p>Please check the power supply unit for errors</p> |`count(/Brocade_Foundry Nonstackable SNMP/sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1` |INFO |<p>**Depends on**:</p><p>- PSU {#PSU_INDEX}: Power supply is in critical state</p> |
+|{#SENSOR_DESCR}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
+|Chassis #{#SNMPINDEX}: Temperature is above warning threshold: >{$TEMP_WARN:"Chassis"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Chassis"}`<p>Recovery expression:</p>`max(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Chassis"}-3` |WARNING |<p>**Depends on**:</p><p>- Chassis #{#SNMPINDEX}: Temperature is above critical threshold: >{$TEMP_CRIT:"Chassis"}</p> |
+|Chassis #{#SNMPINDEX}: Temperature is above critical threshold: >{$TEMP_CRIT:"Chassis"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Chassis"}`<p>Recovery expression:</p>`max(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Chassis"}-3` |HIGH | |
+|Chassis #{#SNMPINDEX}: Temperature is too low: <{$TEMP_CRIT_LOW:"Chassis"} |<p>-</p> |`avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Chassis"}`<p>Recovery expression:</p>`min(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Chassis"}+3` |AVERAGE | |
 
 ## Feedback
 
@@ -136,7 +136,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 For devices(most of the IronWare Brocade devices) that support Stackable SNMP Tables in FOUNDRY-SN-AGENT-MIB: snChasFan2Table, snChasPwrSupply2Table,snAgentTemp2Table - so objects from all Stack members are provided.
 
 This template was tested on:
@@ -158,58 +158,58 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$FAN_CRIT_STATUS} | <p>-</p>    | `3`     |
-| {$FAN_OK_STATUS}   | <p>-</p>    | `2`     |
-| {$PSU_CRIT_STATUS} | <p>-</p>    | `3`     |
-| {$PSU_OK_STATUS}   | <p>-</p>    | `2`     |
-| {$TEMP_CRIT_LOW}   | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}       | <p>-</p>    | `75`    |
-| {$TEMP_WARN}       | <p>-</p>    | `65`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$FAN_CRIT_STATUS} |<p>-</p> |`3` |
+|{$FAN_OK_STATUS} |<p>-</p> |`2` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`3` |
+|{$PSU_OK_STATUS} |<p>-</p> |`2` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`75` |
+|{$TEMP_WARN} |<p>-</p> |`65` |
 
 ## Template links
 
-| Name                             |
-|----------------------------------|
-| Brocade_Foundry Performance SNMP |
-| Generic SNMP                     |
-| Interfaces SNMP                  |
+|Name|
+|----|
+|Brocade_Foundry Performance SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description                                                                                                                                                              | Type | Key and additional info |
-|-----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------|
-| PSU Discovery         | <p>snChasPwrSupply2Table: A table of each power supply information for each unit. Only installed power supply appears in a table row.</p>                                | SNMP | psu.discovery           |
-| FAN Discovery         | <p>snChasFan2Table: A table of each fan information for each unit. Only installed fan appears in a table row.</p>                                                        | SNMP | fan.discovery           |
-| Temperature Discovery | <p>snAgentTemp2Table:Table to list temperatures of the modules in the device for each unit. This table is applicable to only those modules with temperature sensors.</p> | SNMP | temp.discovery          |
-| Stack Discovery       | <p>Discovering snStackingConfigUnitTable for Model names</p>                                                                                                             | SNMP | stack.discovery         |
-| Chassis Discovery     | <p>snChasUnitIndex: The index to chassis table.</p>                                                                                                                      | SNMP | chassis.discovery       |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|PSU Discovery |<p>snChasPwrSupply2Table: A table of each power supply information for each unit. Only installed power supply appears in a table row.</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>snChasFan2Table: A table of each fan information for each unit. Only installed fan appears in a table row.</p> |SNMP |fan.discovery |
+|Temperature Discovery |<p>snAgentTemp2Table:Table to list temperatures of the modules in the device for each unit. This table is applicable to only those modules with temperature sensors.</p> |SNMP |temp.discovery |
+|Stack Discovery |<p>Discovering snStackingConfigUnitTable for Model names</p> |SNMP |stack.discovery |
+|Chassis Discovery |<p>snChasUnitIndex: The index to chassis table.</p> |SNMP |chassis.discovery |
 
 ## Items collected
 
-| Group        | Name                                                   | Description                                                                                                                                                                          | Type | Key and additional info                                                                                                   |
-|--------------|--------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------------------------------------------------------------------------------------------------------------------------|
-| Fans         | Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan status          | <p>MIB: FOUNDRY-SN-AGENT-MIB</p>                                                                                                                                                     | SNMP | sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}]                                                                      |
-| Inventory    | Firmware version                                       | <p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The version of the running software in the form 'major.minor.maintenance[letters]'</p>                                                            | SNMP | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                     |
-| Inventory    | Unit {#SNMPINDEX}: Hardware model name                 | <p>MIB: FOUNDRY-SN-STACKING-MIB</p><p>A description of the configured/active system type for each unit.</p>                                                                          | SNMP | system.hw.model[snStackingConfigUnitType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Inventory    | Unit {#SNMPVALUE}: Hardware serial number              | <p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The serial number of the chassis for each unit. If the serial number is unknown or unavailable then the value should be a zero length string.</p> | SNMP | system.hw.serialnumber[snChasUnitSerNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>  |
-| Power_supply | Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply status | <p>MIB: FOUNDRY-SN-AGENT-MIB</p>                                                                                                                                                     | SNMP | sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}]                                                                |
-| Temperature  | {#SENSOR_DESCR}: Temperature                           | <p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>Temperature of the sensor represented by this row. Each unit is 0.5 degrees Celsius.</p>                                                          | SNMP | sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.5`</p>                      |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Fans |Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan status |<p>MIB: FOUNDRY-SN-AGENT-MIB</p> |SNMP |sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}] |
+|Inventory |Firmware version |<p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The version of the running software in the form 'major.minor.maintenance[letters]'</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Unit {#SNMPINDEX}: Hardware model name |<p>MIB: FOUNDRY-SN-STACKING-MIB</p><p>A description of the configured/active system type for each unit.</p> |SNMP |system.hw.model[snStackingConfigUnitType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Unit {#SNMPVALUE}: Hardware serial number |<p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>The serial number of the chassis for each unit. If the serial number is unknown or unavailable then the value should be a zero length string.</p> |SNMP |system.hw.serialnumber[snChasUnitSerNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Power_supply |Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply status |<p>MIB: FOUNDRY-SN-AGENT-MIB</p> |SNMP |sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_DESCR}: Temperature |<p>MIB: FOUNDRY-SN-AGENT-MIB</p><p>Temperature of the sensor represented by this row. Each unit is 0.5 degrees Celsius.</p> |SNMP |sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.5`</p> |
 
 ## Triggers
 
-| Name                                                                       | Description                                                                                          | Expression                                                                                                                                                                                                                  | Severity | Dependencies and additional info                                                                          |
-|----------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------|
-| Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan is in critical state                | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                    | AVERAGE  |                                                                                                           |
-| Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan is not in normal state              | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}].count(#1,{$FAN_OK_STATUS},ne)}=1`                                                                                                                      | INFO     | <p>**Depends on**:</p><p>- Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan is in critical state</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>                                                                                  |
-| Unit {#SNMPVALUE}: Device has been replaced (new serial number received)   | <p>Device serial number has changed. Ack to close</p>                                                | `{TEMPLATE_NAME:system.hw.serialnumber[snChasUnitSerNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber[snChasUnitSerNum.{#SNMPINDEX}].strlen()}>0`                                                       | INFO     | <p>Manual close: YES</p>                                                                                  |
-| Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply is in critical state       | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                              | AVERAGE  |                                                                                                           |
-| Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply is not in normal state     | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}].count(#1,{$PSU_OK_STATUS},ne)}=1`                                                                                                                | INFO     | <p>**Depends on**:</p><p>- Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply is in critical state</p>       |
-| {#SENSOR_DESCR}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                           |
-| {#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                           |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Brocade_Foundry Stackable SNMP/sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan is not in normal state |<p>Please check the fan unit</p> |`count(/Brocade_Foundry Stackable SNMP/sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1` |INFO |<p>**Depends on**:</p><p>- Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan is in critical state</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/Brocade_Foundry Stackable SNMP/system.hw.firmware,#1)<>last(/Brocade_Foundry Stackable SNMP/system.hw.firmware,#2) and length(last(/Brocade_Foundry Stackable SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|Unit {#SNMPVALUE}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Brocade_Foundry Stackable SNMP/system.hw.serialnumber[snChasUnitSerNum.{#SNMPINDEX}],#1)<>last(/Brocade_Foundry Stackable SNMP/system.hw.serialnumber[snChasUnitSerNum.{#SNMPINDEX}],#2) and length(last(/Brocade_Foundry Stackable SNMP/system.hw.serialnumber[snChasUnitSerNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Brocade_Foundry Stackable SNMP/sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply is not in normal state |<p>Please check the power supply unit for errors</p> |`count(/Brocade_Foundry Stackable SNMP/sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1` |INFO |<p>**Depends on**:</p><p>- Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply is in critical state</p> |
+|{#SENSOR_DESCR}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml b/templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml
index 4eede7ed5c9..12f782e7e8d 100644
--- a/templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml
+++ b/templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:08Z'
+  version: '6.0'
+  date: '2021-12-17T06:42:55Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -19,7 +19,7 @@ zabbix_export:
         MIBs used:
         FOUNDRY-SN-AGENT-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Brocade_Foundry Performance SNMP'
@@ -365,7 +365,7 @@ zabbix_export:
         MIBs used:
         FOUNDRY-SN-AGENT-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -407,7 +407,7 @@ zabbix_export:
             MIB: FOUNDRY-SN-AGENT-MIB
             The system dynamic memory utilization, in unit of percentage.
             Deprecated: Refer to snAgSystemDRAMUtil.
-            For NI platforms, refer to snAgentBrdMemoryUtil100thPercent
+            For NI platforms, refer to snAgentBrdMemoryUtil100thPercent.
           tags:
             -
               tag: Application
@@ -443,7 +443,7 @@ zabbix_export:
           Version: Version 08.0.40b and above
           Device: ICX 7750 in stack
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Brocade_Foundry Performance SNMP'
diff --git a/templates/net/cisco/cisco_asav_snmp/README.md b/templates/net/cisco/cisco_asav_snmp/README.md
index 779575b990e..0d493eca54a 100644
--- a/templates/net/cisco/cisco_asav_snmp/README.md
+++ b/templates/net/cisco/cisco_asav_snmp/README.md
@@ -4,7 +4,7 @@
 ## Overview
 
 For Zabbix version: 6.0 and higher  
-Secure Firewall ASA Virtual is the virtualized option of popular Secure Firewall ASA solution and offers security in traditional physical data centers and private and public clouds. 
+Secure Firewall ASA Virtual is the virtualized option of popular Secure Firewall ASA solution and offers security in traditional physical data centers and private and public clouds.
 Learn more about Cisco ASAv: https://www.cisco.com/c/en/us/products/collateral/security/adaptive-security-virtual-appliance-asav/adapt-security-virtual-appliance-ds.html
 
 
@@ -46,7 +46,7 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Physical entry discovery |<p>Information about a particular physical entity.</p> |SNMP |cisco.asav.physical.entry.discovery |
-|Interface discovery |<p>Network interfaces discovery</p> |SNMP |cisco.asav.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#CISCO.IF.NAME} MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#CISCO.IF.NAME} NOT_MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#CISCO.IF.STATUS.ADMIN} MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.ADMIN.MATCHES}`</p><p>- D: {#CISCO.IF.STATUS.ADMIN} NOT_MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.ADMIN.NOT_MATCHES}`</p><p>- E: {#CISCO.IF.DESC} MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- F: {#CISCO.IF.DESC} NOT_MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>Network interfaces discovery</p> |SNMP |cisco.asav.net.if.discovery<p>**Filter**:</p>AND <p>- {#CISCO.IF.NAME} MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#CISCO.IF.NAME} NOT_MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#CISCO.IF.STATUS.ADMIN} MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.ADMIN.MATCHES}`</p><p>- {#CISCO.IF.STATUS.ADMIN} NOT_MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.ADMIN.NOT_MATCHES}`</p><p>- {#CISCO.IF.DESC} MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#CISCO.IF.DESC} NOT_MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#CISCO.IF.NAME} NOT_MATCHES_REGEX `{$CISCO.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 |Memory discovery |<p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p> |SNMP |cisco.asav.memory.discovery |
 |CPU discovery |<p>Discovery of cpmCPUTotalTable, a table of CPU monitoring entries.</p> |SNMP |cisco.asav.cpu.discovery |
 |Session discovery |<p>Remote access session discovery</p> |SNMP |cisco.asav.session.discovery |
@@ -70,22 +70,22 @@ There are no template links in this template.
 |Inventory |Cisco ASAv: {#CISCO.ASAV.PHYS.NAME} Model name |<p>MIB: ENTITY-MIB</p><p>The vendor-specific model name identifier string associated</p><p>with this physical component.  The preferred value is the</p><p>customer-visible part number, which may be printed on the</p><p>component itself.</p><p>If the model name string associated with the physical</p><p>component is unknown to the agent, then this object will</p><p>contain a zero-length string.</p> |SNMP |cisco.asav.phys.model[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |Cisco ASAv: {#SNMPVALUE} Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |cisco.asav.memory.used[{#SNMPINDEX}] |
 |Memory |Cisco ASAv: {#SNMPVALUE} Free memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Indicates the number of bytes from the memory pool that are currently unused on the managed device. Note that the sum of ciscoMemoryPoolUsed and ciscoMemoryPoolFree is the total amount of memory in the pool</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |cisco.asav.memory.free[{#SNMPINDEX}] |
-|Memory |Cisco ASAv: {#SNMPVALUE} Memory utilization |<p>Memory utilization in %</p> |CALCULATED |cisco.asav.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last(cisco.asav.memory.used[{#SNMPINDEX}])/(last(cisco.asav.memory.free[{#SNMPINDEX}])+last(cisco.asav.memory.used[{#SNMPINDEX}]))*100` |
+|Memory |Cisco ASAv: {#SNMPVALUE} Memory utilization |<p>Memory utilization in %</p> |CALCULATED |cisco.asav.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last(//cisco.asav.memory.used[{#SNMPINDEX}])/(last(//cisco.asav.memory.free[{#SNMPINDEX}])+last(//cisco.asav.memory.used[{#SNMPINDEX}]))*100` |
 |Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Interface name |<p>MIB: CISCO-PORT-MIB</p><p>Descriptive name that identifies this port.</p> |SNMP |cisco.asav.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |cisco.asav.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |cisco.asav.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |cisco.asav.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |cisco.asav.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming unicast packets |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |cisco.asav.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming multicast packets |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |cisco.asav.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming broadcast packets |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |cisco.asav.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |cisco.asav.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing unicast packets |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |cisco.asav.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing multicast packets |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |cisco.asav.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing broadcast packets |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |cisco.asav.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |cisco.asav.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming unicast packets |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |cisco.asav.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming multicast packets |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |cisco.asav.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming broadcast packets |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |cisco.asav.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |cisco.asav.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing unicast packets |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |cisco.asav.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing multicast packets |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |cisco.asav.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing broadcast packets |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |cisco.asav.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |cisco.asav.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |cisco.asav.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(cisco.asav.net.if.in.traffic[{#SNMPINDEX}]) * (last(cisco.asav.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(cisco.asav.net.if.highspeed[{#SNMPINDEX}]) + (last(cisco.asav.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |cisco.asav.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(cisco.asav.net.if.out.traffic[{#SNMPINDEX}]) * (last(cisco.asav.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(cisco.asav.net.if.highspeed[{#SNMPINDEX}]) + (last(cisco.asav.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |cisco.asav.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//cisco.asav.net.if.in.traffic[{#SNMPINDEX}]) * (last(//cisco.asav.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//cisco.asav.net.if.highspeed[{#SNMPINDEX}]) + (last(//cisco.asav.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |Cisco ASAv: {#CISCO.IF.NAME} Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |cisco.asav.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//cisco.asav.net.if.out.traffic[{#SNMPINDEX}]) * (last(//cisco.asav.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//cisco.asav.net.if.highspeed[{#SNMPINDEX}]) + (last(//cisco.asav.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Authenticate method |<p>MIB:  CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The method used to authenticate the user prior to</p><p>establishing the session.</p> |SNMP |cisco.asav.session.authen.method[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Authorize method |<p>MIB:  CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The method used to authorize the user prior to</p><p>establishing the session.</p> |SNMP |cisco.asav.session.author.method[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Session duration |<p>MIB:  CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The number of seconds elapsed since this session</p><p>was established.</p> |SNMP |cisco.asav.session.duration[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -94,8 +94,8 @@ There are no template links in this template.
 |Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Session protocol |<p>MIB:  CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The protocol underlying this remote access session.</p> |SNMP |cisco.asav.session.protocol[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Encryption algorithm |<p>MIB:  CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The algorithm used by this remote access session to</p><p>encrypt its payload.</p> |SNMP |cisco.asav.session.encryption[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Algorithm validate packets |<p>MIB:  CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The algorithm used by this remote access session to</p><p>to validate packets.</p> |SNMP |cisco.asav.session.authen.algorithm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Incoming traffic |<p>MIB: CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The rate of octets received by this Remote</p><p>Access Session.</p><p>This value is accumulated BEFORE determining whether</p><p>or not the packet should be decompressed.</p> |SNMP |cisco.asav.session.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Outgoing traffic |<p>MIB: CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The rate of octets transmitted by this Remote</p><p>Access Session.</p><p>This value is accumulated AFTER determining whether</p><p>or not the packet should be compressed.</p> |SNMP |cisco.asav.session.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Incoming traffic |<p>MIB: CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The rate of octets received by this Remote</p><p>Access Session.</p><p>This value is accumulated BEFORE determining whether</p><p>or not the packet should be decompressed.</p> |SNMP |cisco.asav.session.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Remote access session |Cisco ASAv: {#CISCO.CRAS.USER} [{#CISCO.CRAS.INDEX}] Outgoing traffic |<p>MIB: CISCO-REMOTE-ACCESS-MONITOR-MIB</p><p>The rate of octets transmitted by this Remote</p><p>Access Session.</p><p>This value is accumulated AFTER determining whether</p><p>or not the packet should be compressed.</p> |SNMP |cisco.asav.session.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |Status |Cisco ASAv: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |Cisco ASAv: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |cisco.asav.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 
@@ -103,12 +103,12 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Cisco ASAv: 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:cisco.asav.cpu.util[{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|Cisco ASAv: {#CISCO.ASAV.PHYS.NAME} has been replaced (new serial number received) |<p>{#CISCO.ASAV.PHYS.NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:cisco.asav.phys.sn[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:cisco.asav.phys.sn[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Cisco ASAv: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:cisco.asav.memory.util[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}` |AVERAGE | |
-|Cisco ASAv: {#CISCO.IF.NAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:cisco.asav.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:cisco.asav.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:cisco.asav.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|Cisco ASAv: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|Cisco ASAv: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:cisco.asav.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
+|Cisco ASAv: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Cisco ASAv SNMP/cisco.asav.cpu.util[{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Cisco ASAv: {#CISCO.ASAV.PHYS.NAME} has been replaced (new serial number received) |<p>{#CISCO.ASAV.PHYS.NAME} serial number has changed. Ack to close</p> |`last(/Cisco ASAv SNMP/cisco.asav.phys.sn[{#SNMPINDEX}],#1)<>last(/Cisco ASAv SNMP/cisco.asav.phys.sn[{#SNMPINDEX}],#2) and length(last(/Cisco ASAv SNMP/cisco.asav.phys.sn[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Cisco ASAv: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Cisco ASAv SNMP/cisco.asav.memory.util[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Cisco ASAv: {#CISCO.IF.NAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/Cisco ASAv SNMP/cisco.asav.net.if.operstatus[{#SNMPINDEX}])=2 and last(/Cisco ASAv SNMP/cisco.asav.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/Cisco ASAv SNMP/cisco.asav.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/Cisco ASAv SNMP/cisco.asav.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|Cisco ASAv: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Cisco ASAv SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|Cisco ASAv: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Cisco ASAv SNMP/cisco.asav.uptime)<10m` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/net/cisco/cisco_asav_snmp/template_net_cisco_asav_snmp.yaml b/templates/net/cisco/cisco_asav_snmp/template_net_cisco_asav_snmp.yaml
index 0ecd3a2e8a9..482cbace450 100644
--- a/templates/net/cisco/cisco_asav_snmp/template_net_cisco_asav_snmp.yaml
+++ b/templates/net/cisco/cisco_asav_snmp/template_net_cisco_asav_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-08-13T03:59:05Z'
+  date: '2021-12-17T06:24:09Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -25,7 +25,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -1317,7 +1317,11 @@ zabbix_export:
         -
           macro: '{$CISCO.LLD.FILTER.IF.ADMIN.MATCHES}'
           value: '1'
-          description: 'Filter of discoverable interfaces by admin status. 1 - Up 2 - Down 3 - Testing'
+          description: |
+            Filter of discoverable interfaces by admin status.
+            1 - Up
+            2 - Down
+            3 - Testing
         -
           macro: '{$CISCO.LLD.FILTER.IF.ADMIN.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1325,7 +1329,9 @@ zabbix_export:
         -
           macro: '{$CISCO.LLD.FILTER.IF.CONTROL.MATCHES}'
           value: '.*'
-          description: 'Filter triggers by discoverable interface names. Used in overrides. Triggers will only be created for interfaces whose names contain the value of the macro.'
+          description: |
+            Filter triggers by discoverable interface names.
+            Used in overrides. Triggers will only be created for interfaces whose names contain the value of the macro.
         -
           macro: '{$CISCO.LLD.FILTER.IF.DESC.MATCHES}'
           value: '.*'
diff --git a/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/README.md b/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/README.md
index 91cc6a0b634..ce0154e6498 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/README.md
+++ b/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/README.md
@@ -3,10 +3,10 @@
 
 ## Overview
 
+For Zabbix version: 6.0 and higher  
 ![Product picture](images/pic.png?raw=true)
 > Courtesy of Cisco Systems, Inc. Unauthorized use not permitted.
 
-For Zabbix version: 5.4 and higher  
 The Cisco Catalyst 3750 Series switches are a premier line of enterprise-class, stackable, multilayer switches that provide high availability, security, and quality of service (QoS) to enhance the operation of the network. Its innovative unified stack management raises the bar in stack management, redundancy, and failover.
 
 https://www.cisco.com/c/en/us/support/switches/catalyst-3750v2-24fs-switch/model.html
@@ -23,31 +23,31 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                                                         | Default                                                                                                                            |
-|-------------------------------------|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-| {$CPU.UTIL.CRIT}                    | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$ICMP_LOSS_WARN}                   | <p>-</p>                                                                            | `20`                                                                                                                               |
-| {$ICMP_RESPONSE_TIME_WARN}          | <p>-</p>                                                                            | `0.15`                                                                                                                             |
-| {$IF.ERRORS.WARN}                   | <p>-</p>                                                                            | `2`                                                                                                                                |
-| {$IF.UTIL.MAX}                      | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$IFCONTROL}                        | <p>-</p>                                                                            | `1`                                                                                                                                |
-| {$MEMORY.UTIL.MAX}                  | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$NET.IF.IFADMINSTATUS.MATCHES}     | <p>-</p>                                                                            | `^.*`                                                                                                                              |
-| {$NET.IF.IFADMINSTATUS.NOT_MATCHES} | <p>Ignore down(2) administrative status</p>                                         | `^2$`                                                                                                                              |
-| {$NET.IF.IFALIAS.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFALIAS.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFDESCR.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFDESCR.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFNAME.MATCHES}            | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFNAME.NOT_MATCHES}        | <p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> | `(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
-| {$NET.IF.IFOPERSTATUS.MATCHES}      | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFOPERSTATUS.NOT_MATCHES}  | <p>Ignore notPresent(6)</p>                                                         | `^6$`                                                                                                                              |
-| {$NET.IF.IFTYPE.MATCHES}            | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFTYPE.NOT_MATCHES}        | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$SNMP.TIMEOUT}                     | <p>-</p>                                                                            | `5m`                                                                                                                               |
-| {$TEMP_CRIT_LOW}                    | <p>-</p>                                                                            | `5`                                                                                                                                |
-| {$TEMP_CRIT}                        | <p>-</p>                                                                            | `60`                                                                                                                               |
-| {$TEMP_WARN}                        | <p>-</p>                                                                            | `50`                                                                                                                               |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$ICMP_LOSS_WARN} |<p>-</p> |`20` |
+|{$ICMP_RESPONSE_TIME_WARN} |<p>-</p> |`0.15` |
+|{$IF.ERRORS.WARN} |<p>-</p> |`2` |
+|{$IF.UTIL.MAX} |<p>-</p> |`90` |
+|{$IFCONTROL} |<p>-</p> |`1` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>-</p> |`^.*` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFALIAS.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFALIAS.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$SNMP.TIMEOUT} |<p>-</p> |`5m` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
@@ -55,88 +55,90 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Type | Key and additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|---------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Network interfaces discovery    | <p>Discovering interfaces from IF-MIB.</p>                                                                                                                                                                                                                                                                                                                                                                                                                         | SNMP | net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
-| EtherLike discovery             | <p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p>                                                                                                                                                                                                                                                                                                                                              | SNMP | net.if.duplex.discovery<p>**Filter**:</p>AND <p>- A: {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- B: {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| Entity Serial Numbers discovery | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | SNMP | entity_sn.discovery<p>**Filter**:</p>AND <p>- B: {#ENT_SN} MATCHES_REGEX `.+`</p><p>- A: {#ENT_CLASS} MATCHES_REGEX `[^3]`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| CPU discovery                   | <p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> | SNMP | cpu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| Memory discovery                | <p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p>                                                                                                                                                                                                                                                       | SNMP | memory.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| Temperature discovery           | <p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                | SNMP | temperature.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| PSU discovery                   | <p>The table of power supply status maintained by the environmental monitor card.</p>                                                                                                                                                                                                                                                                                                                                                                              | SNMP | psu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| FAN discovery                   | <p>The table of fan status maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                                                                                                            | SNMP | fan.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
+|Entity Serial Numbers discovery |<p>-</p> |SNMP |entity_sn.discovery<p>**Filter**:</p>AND <p>- {#ENT_SN} MATCHES_REGEX `.+`</p><p>- {#ENT_CLASS} MATCHES_REGEX `[^3]`</p> |
+|FAN discovery |<p>The table of fan status maintained by the environmental monitor.</p> |SNMP |fan.discovery |
+|Memory discovery |<p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |memory.discovery |
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|EtherLike discovery |<p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p> |SNMP |net.if.duplex.discovery<p>**Filter**:</p>AND <p>- {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p> |
+|PSU discovery |<p>The table of power supply status maintained by the environmental monitor card.</p> |SNMP |psu.discovery |
+|Temperature discovery |<p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p> |SNMP |temperature.discovery |
 
 ## Items collected
 
-| Group   | Name                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type      | Key and additional info         |
-|---------|--------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------------------------------|
-| CPU     | #{#SNMPINDEX}: CPU utilization | <p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> | SNMP      | system.cpu.util[{#SNMPINDEX}]   |
-| Fans    | {#SNMPVALUE}: Fan status       | <p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP      | sensor.fan.status[{#SNMPINDEX}] |
-| General | SNMP traps (fallback)          | <p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP_TRAP | snmptrap.fallback               |
-|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> |SNMP |system.cpu.util[{#SNMPINDEX}] |
+|Fans |{#SNMPVALUE}: Fan status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p> |SNMP |sensor.fan.status[{#SNMPINDEX}] |
+|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |system.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |General |System description |<p>MIB: SNMPv2-MIB</p><p>A textual description of the entity. This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p> |SNMP |system.descr<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE`: `\1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ENTITY-MIB</p><p>Object name: entPhysicalSerialNum</p> |SNMP |system.hw.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
 |Memory |{#SNMPVALUE}: Free memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolFree</p><p>Indicates the number of bytes from the memory pool that are currently unused on the managed device. Note that the sum of ciscoMemoryPoolUsed and ciscoMemoryPoolFree is the total amount of memory in the pool</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.free[{#SNMPINDEX}] |
-|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last("vm.memory.used[{#SNMPINDEX}]")/(last("vm.memory.free[{#SNMPINDEX}]")+last("vm.memory.used[{#SNMPINDEX}]"))*100` |
+|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
+|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last(//vm.memory.used[{#SNMPINDEX}])/(last(//vm.memory.free[{#SNMPINDEX}])+last(//vm.memory.used[{#SNMPINDEX}]))*100` |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Duplex status |<p>MIB: EtherLike-MIB</p><p>Object name: dot3StatsDuplexStatus</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> |SNMP |net.if.duplex[{#SNMPINDEX}] |
 |Power_supply |{#SNMPVALUE}: Power supply status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonSupplyState</p> |SNMP |sensor.psu.status[{#SNMPINDEX}] |
+|Status |ICMP ping | |SIMPLE |icmpping |
+|Status |ICMP loss | |SIMPLE |icmppingloss |
+|Status |ICMP response time | |SIMPLE |icmppingsec |
 |Status |Uptime |<p>MIB: SNMPv2-MIB</p><p>The time (in hundredths of a second) since the network management portion of the system was last re-initialized.</p> |SNMP |system.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
-|Status |SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available] |
-|Status |ICMP ping |<p>-</p> |SIMPLE |icmpping |
-|Status |ICMP loss |<p>-</p> |SIMPLE |icmppingloss |
-|Status |ICMP response time |<p>-</p> |SIMPLE |icmppingsec |
-|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#SNMPINDEX}] |
+|Status |SNMP agent availability | |INTERNAL |zabbix[host,snmp,available] |
 |Temperature |{#SNMPVALUE}: Temperature status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureState</p><p>The current state of the test point being instrumented.</p> |SNMP |sensor.temp.status[{#SNMPINDEX}] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#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>                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24FS SNMP:system.cpu.util[{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | WARNING  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in critical state                                                            | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24FS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in warning state                                                             | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p>                                              |
-| System name has changed (new name: {ITEM.VALUE})                                                  | <p>System name has changed. Ack to close.</p>                                                                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-24FS SNMP:system.name.diff()}=1 and {Cisco Catalyst 3750V2-24FS SNMP:system.name.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>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24FS SNMP:system.hw.serialnumber.diff()}=1 and {Cisco Catalyst 3750V2-24FS SNMP:system.hw.serialnumber.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | INFO     | <p>Manual close: YES</p>                                                                                           |
-| Operating system description has changed                                                          | <p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p>                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24FS SNMP:system.sw.os.diff()}=1 and {Cisco Catalyst 3750V2-24FS SNMP:system.sw.os.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p>            |
-| {#ENT_NAME}: Device has been replaced (new serial number received)                                | <p>Device serial number has changed. Ack to close</p>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24FS SNMP:system.hw.serialnumber[{#SNMPINDEX}].diff()}=1 and {Cisco Catalyst 3750V2-24FS SNMP:system.hw.serialnumber[{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)                              | <p>The system is running out of free memory.</p>                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24FS SNMP:vm.memory.util[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| Interface {#IFNAME}({#IFALIAS}): Link down                                                        | <p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> | `{$IFCONTROL:"{#IFNAME}"}=1 and ({Cisco Catalyst 3750V2-24FS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | AVERAGE  | <p>Manual close: YES</p>                                                                                           |
-| Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )   | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-24FS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24FS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )  | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-24FS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24FS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)  | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24FS SNMP:net.if.in.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24FS SNMP:net.if.in.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24FS SNMP:net.if.out.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24FS SNMP:net.if.out.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before           | <p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p>                                                                                                                                                | `{Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].change()}<0 and {Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0 and ( {Cisco Catalyst 3750V2-24FS SNMP:net.if.type[{#SNMPINDEX}].last()}=6 or {Cisco Catalyst 3750V2-24FS SNMP:net.if.type[{#SNMPINDEX}].last()}=7 or {Cisco Catalyst 3750V2-24FS SNMP:net.if.type[{#SNMPINDEX}].last()}=11 or {Cisco Catalyst 3750V2-24FS SNMP:net.if.type[{#SNMPINDEX}].last()}=62 or {Cisco Catalyst 3750V2-24FS SNMP:net.if.type[{#SNMPINDEX}].last()}=69 or {Cisco Catalyst 3750V2-24FS SNMP:net.if.type[{#SNMPINDEX}].last()}=117 ) and ({Cisco Catalyst 3750V2-24FS SNMP:net.if.status[{#SNMPINDEX}].last()}<>2)`<p>Recovery expression:</p>`({Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].change()}>0 and {Cisco Catalyst 3750V2-24FS SNMP:net.if.speed[{#SNMPINDEX}].prev()}>0) or ({Cisco Catalyst 3750V2-24FS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)` | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): In half-duplex mode                                              | <p>Please check autonegotiation settings and cabling</p>                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24FS SNMP:net.if.duplex[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: Power supply is in critical state                                                   | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24FS SNMP:sensor.psu.status[{#SNMPINDEX}].last(4)}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Power supply is in warning state                                                    | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p>                                     |
-| {HOST.NAME} has been restarted (uptime < 10m)                                                     | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24FS SNMP:system.uptime.last()}<10m`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| No SNMP data collection                                                                           | <p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p>                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-24FS SNMP:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | WARNING  |                                                                                                                    |
-| Unavailable by ICMP ping                                                                          | <p>Last three attempts returned timeout.  Please check device connectivity.</p>                                                                                                                                                                                                                  | `{Cisco Catalyst 3750V2-24FS SNMP:icmpping.max(#3)}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | HIGH     |                                                                                                                    |
-| High ICMP ping loss                                                                               | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24FS SNMP:icmppingloss.min(5m)}>{$ICMP_LOSS_WARN} and {Cisco Catalyst 3750V2-24FS SNMP:icmppingloss.min(5m)}<100`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | WARNING  | <p>**Depends on**:</p><p>- Unavailable by ICMP ping</p>                                                            |
-| High ICMP ping response time                                                                      | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24FS SNMP:icmppingsec.avg(5m)}>{$ICMP_RESPONSE_TIME_WARN}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | WARNING  | <p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p>                                |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"}                | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}               | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | HIGH     |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}                            | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.value[{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is in warning state                                                     | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p>                                      |
-| {#SNMPVALUE}: Temperature is in critical state                                                    | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24FS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | HIGH     |                                                                                                                    |
+|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(/Cisco Catalyst 3750V2-24FS SNMP/system.cpu.util[{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.fan.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Fan is in warning state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.fan.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-24FS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-24FS SNMP/system.name))>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(/Cisco Catalyst 3750V2-24FS SNMP/system.hw.serialnumber,#1)<>last(/Cisco Catalyst 3750V2-24FS SNMP/system.hw.serialnumber,#2) and length(last(/Cisco Catalyst 3750V2-24FS SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|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(/Cisco Catalyst 3750V2-24FS SNMP/system.sw.os,#1)<>last(/Cisco Catalyst 3750V2-24FS SNMP/system.sw.os,#2) and length(last(/Cisco Catalyst 3750V2-24FS SNMP/system.sw.os))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#1)<>last(/Cisco Catalyst 3750V2-24FS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#2) and length(last(/Cisco Catalyst 3750V2-24FS SNMP/system.hw.serialnumber[{#SNMPINDEX}]))>0` |INFO | |
+|{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Cisco Catalyst 3750V2-24FS SNMP/vm.memory.util[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-24FS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24FS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-24FS SNMP/net.if.in[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-24FS SNMP/net.if.in[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-24FS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24FS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-24FS SNMP/net.if.out[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-24FS SNMP/net.if.out[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])<0 and last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])>0 and ( last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.type[{#SNMPINDEX}])=6 or last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.type[{#SNMPINDEX}])=7 or last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.type[{#SNMPINDEX}])=11 or last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.type[{#SNMPINDEX}])=62 or last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.type[{#SNMPINDEX}])=69 or last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.type[{#SNMPINDEX}])=117 ) and (last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.status[{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}])>0 and last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.speed[{#SNMPINDEX}],#2)>0) or (last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.status[{#SNMPINDEX}])=2) ` |INFO |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.status[{#SNMPINDEX}])=2)` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): In half-duplex mode |<p>Please check autonegotiation settings and cabling</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.duplex[{#SNMPINDEX}])=2` |WARNING | |
+|{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.psu.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.psu.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p> |
+|Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/Cisco Catalyst 3750V2-24FS SNMP/icmpping,#3)=0` |HIGH | |
+|High ICMP ping loss |<p>-</p> |`min(/Cisco Catalyst 3750V2-24FS SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Cisco Catalyst 3750V2-24FS SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
+|High ICMP ping response time |<p>-</p> |`avg(/Cisco Catalyst 3750V2-24FS SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/system.uptime)<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Cisco Catalyst 3750V2-24FS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPVALUE}: Temperature is in critical state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.status[{#SNMPINDEX}])=4` |HIGH | |
+|{#SNMPVALUE}: Temperature is in warning state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_WARN:"{#SNMPVALUE}"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"} |<p>-</p> |`avg(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`min(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3` |AVERAGE | |
 
 ## 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/418396-discussion-thread-for-official-zabbix-templates-for-cisco).
+
diff --git a/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml
index 1d312e4b913..70ab823d0cc 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml
@@ -1,10 +1,10 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:12Z'
+  version: '6.0'
+  date: '2021-12-17T06:24:20Z'
   groups:
     -
-      uuid: 57b7ae836ca64446ba2c296389c009b7
-      name: Templates/Modules
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
   templates:
     -
       uuid: 6ff896f545e043cc98de6d98698d41df
@@ -12,20 +12,22 @@ zabbix_export:
       name: 'Cisco Catalyst 3750V2-24FS SNMP'
       description: |
         Template Cisco Catalyst 3750V2-24FS
+          
+          MIBs used:
+          CISCO-MEMORY-POOL-MIB
+          IF-MIB
+          EtherLike-MIB
+          SNMPv2-MIB
+          CISCO-PROCESS-MIB
+          CISCO-ENVMON-MIB
+          ENTITY-MIB
         
-        MIBs used:
-        CISCO-MEMORY-POOL-MIB
-        IF-MIB
-        EtherLike-MIB
-        SNMPv2-MIB
-        CISCO-PROCESS-MIB
-        CISCO-ENVMON-MIB
-        ENTITY-MIB
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
-          name: Templates/Modules
+          name: 'Templates/Network devices'
       items:
         -
           uuid: 1a1244d5dcbc4cbcb5edb70b7cd2b3aa
diff --git a/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/README.md b/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/README.md
index 826021619ca..263c51954e2 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/README.md
+++ b/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/README.md
@@ -3,10 +3,10 @@
 
 ## Overview
 
+For Zabbix version: 6.0 and higher  
 ![Product picture](images/pic.png?raw=true)
 > Courtesy of Cisco Systems, Inc. Unauthorized use not permitted.
 
-For Zabbix version: 5.4 and higher  
 The Cisco Catalyst 3750 Series switches are a premier line of enterprise-class, stackable, multilayer switches that provide high availability, security, and quality of service (QoS) to enhance the operation of the network. Its innovative unified stack management raises the bar in stack management, redundancy, and failover.
 
 https://www.cisco.com/c/en/us/support/switches/catalyst-3750v2-24ps-switch/model.html
@@ -23,31 +23,31 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                                                         | Default                                                                                                                            |
-|-------------------------------------|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-| {$CPU.UTIL.CRIT}                    | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$ICMP_LOSS_WARN}                   | <p>-</p>                                                                            | `20`                                                                                                                               |
-| {$ICMP_RESPONSE_TIME_WARN}          | <p>-</p>                                                                            | `0.15`                                                                                                                             |
-| {$IF.ERRORS.WARN}                   | <p>-</p>                                                                            | `2`                                                                                                                                |
-| {$IF.UTIL.MAX}                      | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$IFCONTROL}                        | <p>-</p>                                                                            | `1`                                                                                                                                |
-| {$MEMORY.UTIL.MAX}                  | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$NET.IF.IFADMINSTATUS.MATCHES}     | <p>-</p>                                                                            | `^.*`                                                                                                                              |
-| {$NET.IF.IFADMINSTATUS.NOT_MATCHES} | <p>Ignore down(2) administrative status</p>                                         | `^2$`                                                                                                                              |
-| {$NET.IF.IFALIAS.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFALIAS.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFDESCR.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFDESCR.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFNAME.MATCHES}            | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFNAME.NOT_MATCHES}        | <p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> | `(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
-| {$NET.IF.IFOPERSTATUS.MATCHES}      | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFOPERSTATUS.NOT_MATCHES}  | <p>Ignore notPresent(6)</p>                                                         | `^6$`                                                                                                                              |
-| {$NET.IF.IFTYPE.MATCHES}            | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFTYPE.NOT_MATCHES}        | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$SNMP.TIMEOUT}                     | <p>-</p>                                                                            | `5m`                                                                                                                               |
-| {$TEMP_CRIT_LOW}                    | <p>-</p>                                                                            | `5`                                                                                                                                |
-| {$TEMP_CRIT}                        | <p>-</p>                                                                            | `60`                                                                                                                               |
-| {$TEMP_WARN}                        | <p>-</p>                                                                            | `50`                                                                                                                               |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$ICMP_LOSS_WARN} |<p>-</p> |`20` |
+|{$ICMP_RESPONSE_TIME_WARN} |<p>-</p> |`0.15` |
+|{$IF.ERRORS.WARN} |<p>-</p> |`2` |
+|{$IF.UTIL.MAX} |<p>-</p> |`90` |
+|{$IFCONTROL} |<p>-</p> |`1` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>-</p> |`^.*` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFALIAS.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFALIAS.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$SNMP.TIMEOUT} |<p>-</p> |`5m` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
@@ -55,88 +55,90 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Type | Key and additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|---------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Network interfaces discovery    | <p>Discovering interfaces from IF-MIB.</p>                                                                                                                                                                                                                                                                                                                                                                                                                         | SNMP | net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
-| EtherLike discovery             | <p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p>                                                                                                                                                                                                                                                                                                                                              | SNMP | net.if.duplex.discovery<p>**Filter**:</p>AND <p>- A: {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- B: {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| Entity Serial Numbers discovery | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | SNMP | entity_sn.discovery<p>**Filter**:</p>AND <p>- B: {#ENT_SN} MATCHES_REGEX `.+`</p><p>- A: {#ENT_CLASS} MATCHES_REGEX `[^3]`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| CPU discovery                   | <p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> | SNMP | cpu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| Memory discovery                | <p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p>                                                                                                                                                                                                                                                       | SNMP | memory.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| Temperature discovery           | <p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                | SNMP | temperature.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| PSU discovery                   | <p>The table of power supply status maintained by the environmental monitor card.</p>                                                                                                                                                                                                                                                                                                                                                                              | SNMP | psu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| FAN discovery                   | <p>The table of fan status maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                                                                                                            | SNMP | fan.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
+|Entity Serial Numbers discovery |<p>-</p> |SNMP |entity_sn.discovery<p>**Filter**:</p>AND <p>- {#ENT_SN} MATCHES_REGEX `.+`</p><p>- {#ENT_CLASS} MATCHES_REGEX `[^3]`</p> |
+|FAN discovery |<p>The table of fan status maintained by the environmental monitor.</p> |SNMP |fan.discovery |
+|Memory discovery |<p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |memory.discovery |
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|EtherLike discovery |<p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p> |SNMP |net.if.duplex.discovery<p>**Filter**:</p>AND <p>- {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p> |
+|PSU discovery |<p>The table of power supply status maintained by the environmental monitor card.</p> |SNMP |psu.discovery |
+|Temperature discovery |<p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p> |SNMP |temperature.discovery |
 
 ## Items collected
 
-| Group   | Name                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type      | Key and additional info         |
-|---------|--------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------------------------------|
-| CPU     | #{#SNMPINDEX}: CPU utilization | <p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> | SNMP      | system.cpu.util[{#SNMPINDEX}]   |
-| Fans    | {#SNMPVALUE}: Fan status       | <p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP      | sensor.fan.status[{#SNMPINDEX}] |
-| General | SNMP traps (fallback)          | <p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP_TRAP | snmptrap.fallback               |
-|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> |SNMP |system.cpu.util[{#SNMPINDEX}] |
+|Fans |{#SNMPVALUE}: Fan status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p> |SNMP |sensor.fan.status[{#SNMPINDEX}] |
+|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |system.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |General |System description |<p>MIB: SNMPv2-MIB</p><p>A textual description of the entity. This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p> |SNMP |system.descr<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE`: `\1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ENTITY-MIB</p><p>Object name: entPhysicalSerialNum</p> |SNMP |system.hw.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
 |Memory |{#SNMPVALUE}: Free memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolFree</p><p>Indicates the number of bytes from the memory pool that are currently unused on the managed device. Note that the sum of ciscoMemoryPoolUsed and ciscoMemoryPoolFree is the total amount of memory in the pool</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.free[{#SNMPINDEX}] |
-|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last("vm.memory.used[{#SNMPINDEX}]")/(last("vm.memory.free[{#SNMPINDEX}]")+last("vm.memory.used[{#SNMPINDEX}]"))*100` |
+|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
+|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last(//vm.memory.used[{#SNMPINDEX}])/(last(//vm.memory.free[{#SNMPINDEX}])+last(//vm.memory.used[{#SNMPINDEX}]))*100` |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Duplex status |<p>MIB: EtherLike-MIB</p><p>Object name: dot3StatsDuplexStatus</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> |SNMP |net.if.duplex[{#SNMPINDEX}] |
 |Power_supply |{#SNMPVALUE}: Power supply status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonSupplyState</p> |SNMP |sensor.psu.status[{#SNMPINDEX}] |
+|Status |ICMP ping | |SIMPLE |icmpping |
+|Status |ICMP loss | |SIMPLE |icmppingloss |
+|Status |ICMP response time | |SIMPLE |icmppingsec |
 |Status |Uptime |<p>MIB: SNMPv2-MIB</p><p>The time (in hundredths of a second) since the network management portion of the system was last re-initialized.</p> |SNMP |system.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
-|Status |SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available] |
-|Status |ICMP ping |<p>-</p> |SIMPLE |icmpping |
-|Status |ICMP loss |<p>-</p> |SIMPLE |icmppingloss |
-|Status |ICMP response time |<p>-</p> |SIMPLE |icmppingsec |
-|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#SNMPINDEX}] |
+|Status |SNMP agent availability | |INTERNAL |zabbix[host,snmp,available] |
 |Temperature |{#SNMPVALUE}: Temperature status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureState</p><p>The current state of the test point being instrumented.</p> |SNMP |sensor.temp.status[{#SNMPINDEX}] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#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>                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24PS SNMP:system.cpu.util[{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | WARNING  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in critical state                                                            | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24PS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in warning state                                                             | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p>                                              |
-| System name has changed (new name: {ITEM.VALUE})                                                  | <p>System name has changed. Ack to close.</p>                                                                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-24PS SNMP:system.name.diff()}=1 and {Cisco Catalyst 3750V2-24PS SNMP:system.name.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>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24PS SNMP:system.hw.serialnumber.diff()}=1 and {Cisco Catalyst 3750V2-24PS SNMP:system.hw.serialnumber.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | INFO     | <p>Manual close: YES</p>                                                                                           |
-| Operating system description has changed                                                          | <p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p>                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24PS SNMP:system.sw.os.diff()}=1 and {Cisco Catalyst 3750V2-24PS SNMP:system.sw.os.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p>            |
-| {#ENT_NAME}: Device has been replaced (new serial number received)                                | <p>Device serial number has changed. Ack to close</p>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24PS SNMP:system.hw.serialnumber[{#SNMPINDEX}].diff()}=1 and {Cisco Catalyst 3750V2-24PS SNMP:system.hw.serialnumber[{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)                              | <p>The system is running out of free memory.</p>                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24PS SNMP:vm.memory.util[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| Interface {#IFNAME}({#IFALIAS}): Link down                                                        | <p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> | `{$IFCONTROL:"{#IFNAME}"}=1 and ({Cisco Catalyst 3750V2-24PS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | AVERAGE  | <p>Manual close: YES</p>                                                                                           |
-| Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )   | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-24PS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24PS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )  | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-24PS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24PS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)  | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24PS SNMP:net.if.in.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24PS SNMP:net.if.in.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24PS SNMP:net.if.out.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24PS SNMP:net.if.out.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before           | <p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p>                                                                                                                                                | `{Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].change()}<0 and {Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0 and ( {Cisco Catalyst 3750V2-24PS SNMP:net.if.type[{#SNMPINDEX}].last()}=6 or {Cisco Catalyst 3750V2-24PS SNMP:net.if.type[{#SNMPINDEX}].last()}=7 or {Cisco Catalyst 3750V2-24PS SNMP:net.if.type[{#SNMPINDEX}].last()}=11 or {Cisco Catalyst 3750V2-24PS SNMP:net.if.type[{#SNMPINDEX}].last()}=62 or {Cisco Catalyst 3750V2-24PS SNMP:net.if.type[{#SNMPINDEX}].last()}=69 or {Cisco Catalyst 3750V2-24PS SNMP:net.if.type[{#SNMPINDEX}].last()}=117 ) and ({Cisco Catalyst 3750V2-24PS SNMP:net.if.status[{#SNMPINDEX}].last()}<>2)`<p>Recovery expression:</p>`({Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].change()}>0 and {Cisco Catalyst 3750V2-24PS SNMP:net.if.speed[{#SNMPINDEX}].prev()}>0) or ({Cisco Catalyst 3750V2-24PS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)` | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): In half-duplex mode                                              | <p>Please check autonegotiation settings and cabling</p>                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24PS SNMP:net.if.duplex[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: Power supply is in critical state                                                   | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24PS SNMP:sensor.psu.status[{#SNMPINDEX}].last(4)}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Power supply is in warning state                                                    | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p>                                     |
-| {HOST.NAME} has been restarted (uptime < 10m)                                                     | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24PS SNMP:system.uptime.last()}<10m`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| No SNMP data collection                                                                           | <p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p>                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-24PS SNMP:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | WARNING  |                                                                                                                    |
-| Unavailable by ICMP ping                                                                          | <p>Last three attempts returned timeout.  Please check device connectivity.</p>                                                                                                                                                                                                                  | `{Cisco Catalyst 3750V2-24PS SNMP:icmpping.max(#3)}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | HIGH     |                                                                                                                    |
-| High ICMP ping loss                                                                               | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24PS SNMP:icmppingloss.min(5m)}>{$ICMP_LOSS_WARN} and {Cisco Catalyst 3750V2-24PS SNMP:icmppingloss.min(5m)}<100`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | WARNING  | <p>**Depends on**:</p><p>- Unavailable by ICMP ping</p>                                                            |
-| High ICMP ping response time                                                                      | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24PS SNMP:icmppingsec.avg(5m)}>{$ICMP_RESPONSE_TIME_WARN}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | WARNING  | <p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p>                                |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"}                | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}               | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | HIGH     |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}                            | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.value[{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is in warning state                                                     | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p>                                      |
-| {#SNMPVALUE}: Temperature is in critical state                                                    | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24PS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | HIGH     |                                                                                                                    |
+|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(/Cisco Catalyst 3750V2-24PS SNMP/system.cpu.util[{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.fan.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Fan is in warning state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.fan.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-24PS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-24PS SNMP/system.name))>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(/Cisco Catalyst 3750V2-24PS SNMP/system.hw.serialnumber,#1)<>last(/Cisco Catalyst 3750V2-24PS SNMP/system.hw.serialnumber,#2) and length(last(/Cisco Catalyst 3750V2-24PS SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|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(/Cisco Catalyst 3750V2-24PS SNMP/system.sw.os,#1)<>last(/Cisco Catalyst 3750V2-24PS SNMP/system.sw.os,#2) and length(last(/Cisco Catalyst 3750V2-24PS SNMP/system.sw.os))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#1)<>last(/Cisco Catalyst 3750V2-24PS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#2) and length(last(/Cisco Catalyst 3750V2-24PS SNMP/system.hw.serialnumber[{#SNMPINDEX}]))>0` |INFO | |
+|{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Cisco Catalyst 3750V2-24PS SNMP/vm.memory.util[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-24PS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24PS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-24PS SNMP/net.if.in[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-24PS SNMP/net.if.in[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-24PS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24PS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-24PS SNMP/net.if.out[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-24PS SNMP/net.if.out[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])<0 and last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])>0 and ( last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.type[{#SNMPINDEX}])=6 or last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.type[{#SNMPINDEX}])=7 or last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.type[{#SNMPINDEX}])=11 or last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.type[{#SNMPINDEX}])=62 or last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.type[{#SNMPINDEX}])=69 or last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.type[{#SNMPINDEX}])=117 ) and (last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.status[{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}])>0 and last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.speed[{#SNMPINDEX}],#2)>0) or (last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.status[{#SNMPINDEX}])=2) ` |INFO |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.status[{#SNMPINDEX}])=2)` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): In half-duplex mode |<p>Please check autonegotiation settings and cabling</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.duplex[{#SNMPINDEX}])=2` |WARNING | |
+|{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.psu.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.psu.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p> |
+|Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/Cisco Catalyst 3750V2-24PS SNMP/icmpping,#3)=0` |HIGH | |
+|High ICMP ping loss |<p>-</p> |`min(/Cisco Catalyst 3750V2-24PS SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Cisco Catalyst 3750V2-24PS SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
+|High ICMP ping response time |<p>-</p> |`avg(/Cisco Catalyst 3750V2-24PS SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/system.uptime)<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Cisco Catalyst 3750V2-24PS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPVALUE}: Temperature is in critical state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.status[{#SNMPINDEX}])=4` |HIGH | |
+|{#SNMPVALUE}: Temperature is in warning state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_WARN:"{#SNMPVALUE}"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"} |<p>-</p> |`avg(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`min(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3` |AVERAGE | |
 
 ## 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/418396-discussion-thread-for-official-zabbix-templates-for-cisco).
+
diff --git a/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml
index dd8c3e2b1cd..7b8fc1be134 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml
@@ -1,10 +1,10 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:10Z'
+  version: '6.0'
+  date: '2021-12-17T07:22:56Z'
   groups:
     -
-      uuid: 57b7ae836ca64446ba2c296389c009b7
-      name: Templates/Modules
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
   templates:
     -
       uuid: 4583f0c3bc894251a6c5e7129cb5b9aa
@@ -12,20 +12,22 @@ zabbix_export:
       name: 'Cisco Catalyst 3750V2-24PS SNMP'
       description: |
         Template Cisco Catalyst 3750V2-24PS
+          
+          MIBs used:
+          CISCO-MEMORY-POOL-MIB
+          IF-MIB
+          EtherLike-MIB
+          SNMPv2-MIB
+          CISCO-PROCESS-MIB
+          CISCO-ENVMON-MIB
+          ENTITY-MIB
         
-        MIBs used:
-        CISCO-MEMORY-POOL-MIB
-        IF-MIB
-        EtherLike-MIB
-        SNMPv2-MIB
-        CISCO-PROCESS-MIB
-        CISCO-ENVMON-MIB
-        ENTITY-MIB
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
-          name: Templates/Modules
+          name: 'Templates/Network devices'
       items:
         -
           uuid: 84ef605d7c914f62b4497ed6fdaccd8a
diff --git a/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/README.md b/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/README.md
index 34e6c8020b5..0e1f17e9284 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/README.md
+++ b/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/README.md
@@ -3,10 +3,10 @@
 
 ## Overview
 
+For Zabbix version: 6.0 and higher  
 ![Product picture](images/pic.png?raw=true)
 > Courtesy of Cisco Systems, Inc. Unauthorized use not permitted.
 
-For Zabbix version: 5.4 and higher  
 The Cisco Catalyst 3750 Series switches are a premier line of enterprise-class, stackable, multilayer switches that provide high availability, security, and quality of service (QoS) to enhance the operation of the network. Its innovative unified stack management raises the bar in stack management, redundancy, and failover.
 
 https://www.cisco.com/c/en/us/support/switches/catalyst-3750v2-24ts-switch/model.html
@@ -23,31 +23,31 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                                                         | Default                                                                                                                            |
-|-------------------------------------|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-| {$CPU.UTIL.CRIT}                    | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$ICMP_LOSS_WARN}                   | <p>-</p>                                                                            | `20`                                                                                                                               |
-| {$ICMP_RESPONSE_TIME_WARN}          | <p>-</p>                                                                            | `0.15`                                                                                                                             |
-| {$IF.ERRORS.WARN}                   | <p>-</p>                                                                            | `2`                                                                                                                                |
-| {$IF.UTIL.MAX}                      | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$IFCONTROL}                        | <p>-</p>                                                                            | `1`                                                                                                                                |
-| {$MEMORY.UTIL.MAX}                  | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$NET.IF.IFADMINSTATUS.MATCHES}     | <p>-</p>                                                                            | `^.*`                                                                                                                              |
-| {$NET.IF.IFADMINSTATUS.NOT_MATCHES} | <p>Ignore down(2) administrative status</p>                                         | `^2$`                                                                                                                              |
-| {$NET.IF.IFALIAS.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFALIAS.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFDESCR.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFDESCR.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFNAME.MATCHES}            | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFNAME.NOT_MATCHES}        | <p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> | `(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
-| {$NET.IF.IFOPERSTATUS.MATCHES}      | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFOPERSTATUS.NOT_MATCHES}  | <p>Ignore notPresent(6)</p>                                                         | `^6$`                                                                                                                              |
-| {$NET.IF.IFTYPE.MATCHES}            | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFTYPE.NOT_MATCHES}        | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$SNMP.TIMEOUT}                     | <p>-</p>                                                                            | `5m`                                                                                                                               |
-| {$TEMP_CRIT_LOW}                    | <p>-</p>                                                                            | `5`                                                                                                                                |
-| {$TEMP_CRIT}                        | <p>-</p>                                                                            | `60`                                                                                                                               |
-| {$TEMP_WARN}                        | <p>-</p>                                                                            | `50`                                                                                                                               |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$ICMP_LOSS_WARN} |<p>-</p> |`20` |
+|{$ICMP_RESPONSE_TIME_WARN} |<p>-</p> |`0.15` |
+|{$IF.ERRORS.WARN} |<p>-</p> |`2` |
+|{$IF.UTIL.MAX} |<p>-</p> |`90` |
+|{$IFCONTROL} |<p>-</p> |`1` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>-</p> |`^.*` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFALIAS.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFALIAS.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$SNMP.TIMEOUT} |<p>-</p> |`5m` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
@@ -55,88 +55,90 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Type | Key and additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|---------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Network interfaces discovery    | <p>Discovering interfaces from IF-MIB.</p>                                                                                                                                                                                                                                                                                                                                                                                                                         | SNMP | net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
-| EtherLike discovery             | <p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p>                                                                                                                                                                                                                                                                                                                                              | SNMP | net.if.duplex.discovery<p>**Filter**:</p>AND <p>- A: {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- B: {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| Entity Serial Numbers discovery | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | SNMP | entity_sn.discovery<p>**Filter**:</p>AND <p>- B: {#ENT_SN} MATCHES_REGEX `.+`</p><p>- A: {#ENT_CLASS} MATCHES_REGEX `[^3]`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| CPU discovery                   | <p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> | SNMP | cpu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| Memory discovery                | <p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p>                                                                                                                                                                                                                                                       | SNMP | memory.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| Temperature discovery           | <p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                | SNMP | temperature.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| PSU discovery                   | <p>The table of power supply status maintained by the environmental monitor card.</p>                                                                                                                                                                                                                                                                                                                                                                              | SNMP | psu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| FAN discovery                   | <p>The table of fan status maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                                                                                                            | SNMP | fan.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
+|Entity Serial Numbers discovery |<p>-</p> |SNMP |entity_sn.discovery<p>**Filter**:</p>AND <p>- {#ENT_SN} MATCHES_REGEX `.+`</p><p>- {#ENT_CLASS} MATCHES_REGEX `[^3]`</p> |
+|FAN discovery |<p>The table of fan status maintained by the environmental monitor.</p> |SNMP |fan.discovery |
+|Memory discovery |<p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |memory.discovery |
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|EtherLike discovery |<p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p> |SNMP |net.if.duplex.discovery<p>**Filter**:</p>AND <p>- {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p> |
+|PSU discovery |<p>The table of power supply status maintained by the environmental monitor card.</p> |SNMP |psu.discovery |
+|Temperature discovery |<p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p> |SNMP |temperature.discovery |
 
 ## Items collected
 
-| Group   | Name                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type      | Key and additional info         |
-|---------|--------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------------------------------|
-| CPU     | #{#SNMPINDEX}: CPU utilization | <p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> | SNMP      | system.cpu.util[{#SNMPINDEX}]   |
-| Fans    | {#SNMPVALUE}: Fan status       | <p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP      | sensor.fan.status[{#SNMPINDEX}] |
-| General | SNMP traps (fallback)          | <p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP_TRAP | snmptrap.fallback               |
-|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> |SNMP |system.cpu.util[{#SNMPINDEX}] |
+|Fans |{#SNMPVALUE}: Fan status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p> |SNMP |sensor.fan.status[{#SNMPINDEX}] |
+|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |system.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |General |System description |<p>MIB: SNMPv2-MIB</p><p>A textual description of the entity. This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p> |SNMP |system.descr<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE`: `\1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ENTITY-MIB</p><p>Object name: entPhysicalSerialNum</p> |SNMP |system.hw.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
 |Memory |{#SNMPVALUE}: Free memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolFree</p><p>Indicates the number of bytes from the memory pool that are currently unused on the managed device. Note that the sum of ciscoMemoryPoolUsed and ciscoMemoryPoolFree is the total amount of memory in the pool</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.free[{#SNMPINDEX}] |
-|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last("vm.memory.used[{#SNMPINDEX}]")/(last("vm.memory.free[{#SNMPINDEX}]")+last("vm.memory.used[{#SNMPINDEX}]"))*100` |
+|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
+|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last(//vm.memory.used[{#SNMPINDEX}])/(last(//vm.memory.free[{#SNMPINDEX}])+last(//vm.memory.used[{#SNMPINDEX}]))*100` |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Duplex status |<p>MIB: EtherLike-MIB</p><p>Object name: dot3StatsDuplexStatus</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> |SNMP |net.if.duplex[{#SNMPINDEX}] |
 |Power_supply |{#SNMPVALUE}: Power supply status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonSupplyState</p> |SNMP |sensor.psu.status[{#SNMPINDEX}] |
+|Status |ICMP ping | |SIMPLE |icmpping |
+|Status |ICMP loss | |SIMPLE |icmppingloss |
+|Status |ICMP response time | |SIMPLE |icmppingsec |
 |Status |Uptime |<p>MIB: SNMPv2-MIB</p><p>The time (in hundredths of a second) since the network management portion of the system was last re-initialized.</p> |SNMP |system.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
-|Status |SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available] |
-|Status |ICMP ping |<p>-</p> |SIMPLE |icmpping |
-|Status |ICMP loss |<p>-</p> |SIMPLE |icmppingloss |
-|Status |ICMP response time |<p>-</p> |SIMPLE |icmppingsec |
-|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#SNMPINDEX}] |
+|Status |SNMP agent availability | |INTERNAL |zabbix[host,snmp,available] |
 |Temperature |{#SNMPVALUE}: Temperature status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureState</p><p>The current state of the test point being instrumented.</p> |SNMP |sensor.temp.status[{#SNMPINDEX}] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#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>                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24TS SNMP:system.cpu.util[{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | WARNING  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in critical state                                                            | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24TS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in warning state                                                             | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p>                                              |
-| System name has changed (new name: {ITEM.VALUE})                                                  | <p>System name has changed. Ack to close.</p>                                                                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-24TS SNMP:system.name.diff()}=1 and {Cisco Catalyst 3750V2-24TS SNMP:system.name.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>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24TS SNMP:system.hw.serialnumber.diff()}=1 and {Cisco Catalyst 3750V2-24TS SNMP:system.hw.serialnumber.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | INFO     | <p>Manual close: YES</p>                                                                                           |
-| Operating system description has changed                                                          | <p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p>                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24TS SNMP:system.sw.os.diff()}=1 and {Cisco Catalyst 3750V2-24TS SNMP:system.sw.os.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p>            |
-| {#ENT_NAME}: Device has been replaced (new serial number received)                                | <p>Device serial number has changed. Ack to close</p>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24TS SNMP:system.hw.serialnumber[{#SNMPINDEX}].diff()}=1 and {Cisco Catalyst 3750V2-24TS SNMP:system.hw.serialnumber[{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)                              | <p>The system is running out of free memory.</p>                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-24TS SNMP:vm.memory.util[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| Interface {#IFNAME}({#IFALIAS}): Link down                                                        | <p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> | `{$IFCONTROL:"{#IFNAME}"}=1 and ({Cisco Catalyst 3750V2-24TS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | AVERAGE  | <p>Manual close: YES</p>                                                                                           |
-| Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )   | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-24TS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24TS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )  | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-24TS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24TS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)  | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24TS SNMP:net.if.in.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24TS SNMP:net.if.in.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-24TS SNMP:net.if.out.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24TS SNMP:net.if.out.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before           | <p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p>                                                                                                                                                | `{Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].change()}<0 and {Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0 and ( {Cisco Catalyst 3750V2-24TS SNMP:net.if.type[{#SNMPINDEX}].last()}=6 or {Cisco Catalyst 3750V2-24TS SNMP:net.if.type[{#SNMPINDEX}].last()}=7 or {Cisco Catalyst 3750V2-24TS SNMP:net.if.type[{#SNMPINDEX}].last()}=11 or {Cisco Catalyst 3750V2-24TS SNMP:net.if.type[{#SNMPINDEX}].last()}=62 or {Cisco Catalyst 3750V2-24TS SNMP:net.if.type[{#SNMPINDEX}].last()}=69 or {Cisco Catalyst 3750V2-24TS SNMP:net.if.type[{#SNMPINDEX}].last()}=117 ) and ({Cisco Catalyst 3750V2-24TS SNMP:net.if.status[{#SNMPINDEX}].last()}<>2)`<p>Recovery expression:</p>`({Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].change()}>0 and {Cisco Catalyst 3750V2-24TS SNMP:net.if.speed[{#SNMPINDEX}].prev()}>0) or ({Cisco Catalyst 3750V2-24TS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)` | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): In half-duplex mode                                              | <p>Please check autonegotiation settings and cabling</p>                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24TS SNMP:net.if.duplex[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: Power supply is in critical state                                                   | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24TS SNMP:sensor.psu.status[{#SNMPINDEX}].last(4)}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Power supply is in warning state                                                    | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p>                                     |
-| {HOST.NAME} has been restarted (uptime < 10m)                                                     | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-24TS SNMP:system.uptime.last()}<10m`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| No SNMP data collection                                                                           | <p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p>                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-24TS SNMP:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | WARNING  |                                                                                                                    |
-| Unavailable by ICMP ping                                                                          | <p>Last three attempts returned timeout.  Please check device connectivity.</p>                                                                                                                                                                                                                  | `{Cisco Catalyst 3750V2-24TS SNMP:icmpping.max(#3)}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | HIGH     |                                                                                                                    |
-| High ICMP ping loss                                                                               | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24TS SNMP:icmppingloss.min(5m)}>{$ICMP_LOSS_WARN} and {Cisco Catalyst 3750V2-24TS SNMP:icmppingloss.min(5m)}<100`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | WARNING  | <p>**Depends on**:</p><p>- Unavailable by ICMP ping</p>                                                            |
-| High ICMP ping response time                                                                      | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24TS SNMP:icmppingsec.avg(5m)}>{$ICMP_RESPONSE_TIME_WARN}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | WARNING  | <p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p>                                |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"}                | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}               | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | HIGH     |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}                            | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.value[{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is in warning state                                                     | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p>                                      |
-| {#SNMPVALUE}: Temperature is in critical state                                                    | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-24TS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | HIGH     |                                                                                                                    |
+|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(/Cisco Catalyst 3750V2-24TS SNMP/system.cpu.util[{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.fan.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Fan is in warning state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.fan.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-24TS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-24TS SNMP/system.name))>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(/Cisco Catalyst 3750V2-24TS SNMP/system.hw.serialnumber,#1)<>last(/Cisco Catalyst 3750V2-24TS SNMP/system.hw.serialnumber,#2) and length(last(/Cisco Catalyst 3750V2-24TS SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|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(/Cisco Catalyst 3750V2-24TS SNMP/system.sw.os,#1)<>last(/Cisco Catalyst 3750V2-24TS SNMP/system.sw.os,#2) and length(last(/Cisco Catalyst 3750V2-24TS SNMP/system.sw.os))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#1)<>last(/Cisco Catalyst 3750V2-24TS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#2) and length(last(/Cisco Catalyst 3750V2-24TS SNMP/system.hw.serialnumber[{#SNMPINDEX}]))>0` |INFO | |
+|{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Cisco Catalyst 3750V2-24TS SNMP/vm.memory.util[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-24TS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24TS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-24TS SNMP/net.if.in[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-24TS SNMP/net.if.in[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-24TS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24TS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-24TS SNMP/net.if.out[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-24TS SNMP/net.if.out[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])<0 and last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])>0 and ( last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.type[{#SNMPINDEX}])=6 or last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.type[{#SNMPINDEX}])=7 or last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.type[{#SNMPINDEX}])=11 or last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.type[{#SNMPINDEX}])=62 or last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.type[{#SNMPINDEX}])=69 or last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.type[{#SNMPINDEX}])=117 ) and (last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.status[{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}])>0 and last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.speed[{#SNMPINDEX}],#2)>0) or (last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.status[{#SNMPINDEX}])=2) ` |INFO |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.status[{#SNMPINDEX}])=2)` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): In half-duplex mode |<p>Please check autonegotiation settings and cabling</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.duplex[{#SNMPINDEX}])=2` |WARNING | |
+|{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.psu.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.psu.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p> |
+|Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/Cisco Catalyst 3750V2-24TS SNMP/icmpping,#3)=0` |HIGH | |
+|High ICMP ping loss |<p>-</p> |`min(/Cisco Catalyst 3750V2-24TS SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Cisco Catalyst 3750V2-24TS SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
+|High ICMP ping response time |<p>-</p> |`avg(/Cisco Catalyst 3750V2-24TS SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/system.uptime)<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Cisco Catalyst 3750V2-24TS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPVALUE}: Temperature is in critical state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.status[{#SNMPINDEX}])=4` |HIGH | |
+|{#SNMPVALUE}: Temperature is in warning state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_WARN:"{#SNMPVALUE}"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"} |<p>-</p> |`avg(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`min(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3` |AVERAGE | |
 
 ## 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/418396-discussion-thread-for-official-zabbix-templates-for-cisco).
+
diff --git a/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml
index 62baa7fa6a3..b3da85daa20 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml
@@ -1,10 +1,10 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:10Z'
+  version: '6.0'
+  date: '2021-12-17T07:23:03Z'
   groups:
     -
-      uuid: 57b7ae836ca64446ba2c296389c009b7
-      name: Templates/Modules
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
   templates:
     -
       uuid: 30d084c6b7844b7cab6cf820b00bb7b2
@@ -12,20 +12,22 @@ zabbix_export:
       name: 'Cisco Catalyst 3750V2-24TS SNMP'
       description: |
         Template Cisco Catalyst 3750V2-24TS
+          
+          MIBs used:
+          CISCO-MEMORY-POOL-MIB
+          IF-MIB
+          EtherLike-MIB
+          SNMPv2-MIB
+          CISCO-PROCESS-MIB
+          CISCO-ENVMON-MIB
+          ENTITY-MIB
         
-        MIBs used:
-        CISCO-MEMORY-POOL-MIB
-        IF-MIB
-        EtherLike-MIB
-        SNMPv2-MIB
-        CISCO-PROCESS-MIB
-        CISCO-ENVMON-MIB
-        ENTITY-MIB
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
-          name: Templates/Modules
+          name: 'Templates/Network devices'
       items:
         -
           uuid: 872058629f19424995e696d1354fbe01
diff --git a/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/README.md b/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/README.md
index d109fd483d9..b30a4d486e7 100644
--- a/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/README.md
+++ b/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/README.md
@@ -3,10 +3,10 @@
 
 ## Overview
 
+For Zabbix version: 6.0 and higher  
 ![Product picture](images/pic.png?raw=true)
 > Courtesy of Cisco Systems, Inc. Unauthorized use not permitted.
 
-For Zabbix version: 5.4 and higher  
 The Cisco Catalyst 3750 Series switches are a premier line of enterprise-class, stackable, multilayer switches that provide high availability, security, and quality of service (QoS) to enhance the operation of the network. Its innovative unified stack management raises the bar in stack management, redundancy, and failover.
 
 https://www.cisco.com/c/en/us/support/switches/catalyst-3750v2-48ps-switch/model.html
@@ -23,31 +23,31 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                                                         | Default                                                                                                                            |
-|-------------------------------------|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-| {$CPU.UTIL.CRIT}                    | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$ICMP_LOSS_WARN}                   | <p>-</p>                                                                            | `20`                                                                                                                               |
-| {$ICMP_RESPONSE_TIME_WARN}          | <p>-</p>                                                                            | `0.15`                                                                                                                             |
-| {$IF.ERRORS.WARN}                   | <p>-</p>                                                                            | `2`                                                                                                                                |
-| {$IF.UTIL.MAX}                      | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$IFCONTROL}                        | <p>-</p>                                                                            | `1`                                                                                                                                |
-| {$MEMORY.UTIL.MAX}                  | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$NET.IF.IFADMINSTATUS.MATCHES}     | <p>-</p>                                                                            | `^.*`                                                                                                                              |
-| {$NET.IF.IFADMINSTATUS.NOT_MATCHES} | <p>Ignore down(2) administrative status</p>                                         | `^2$`                                                                                                                              |
-| {$NET.IF.IFALIAS.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFALIAS.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFDESCR.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFDESCR.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFNAME.MATCHES}            | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFNAME.NOT_MATCHES}        | <p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> | `(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
-| {$NET.IF.IFOPERSTATUS.MATCHES}      | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFOPERSTATUS.NOT_MATCHES}  | <p>Ignore notPresent(6)</p>                                                         | `^6$`                                                                                                                              |
-| {$NET.IF.IFTYPE.MATCHES}            | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFTYPE.NOT_MATCHES}        | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$SNMP.TIMEOUT}                     | <p>-</p>                                                                            | `5m`                                                                                                                               |
-| {$TEMP_CRIT_LOW}                    | <p>-</p>                                                                            | `5`                                                                                                                                |
-| {$TEMP_CRIT}                        | <p>-</p>                                                                            | `60`                                                                                                                               |
-| {$TEMP_WARN}                        | <p>-</p>                                                                            | `50`                                                                                                                               |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$ICMP_LOSS_WARN} |<p>-</p> |`20` |
+|{$ICMP_RESPONSE_TIME_WARN} |<p>-</p> |`0.15` |
+|{$IF.ERRORS.WARN} |<p>-</p> |`2` |
+|{$IF.UTIL.MAX} |<p>-</p> |`90` |
+|{$IFCONTROL} |<p>-</p> |`1` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>-</p> |`^.*` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFALIAS.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFALIAS.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$SNMP.TIMEOUT} |<p>-</p> |`5m` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
@@ -55,88 +55,90 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Type | Key and additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|---------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Network interfaces discovery    | <p>Discovering interfaces from IF-MIB.</p>                                                                                                                                                                                                                                                                                                                                                                                                                         | SNMP | net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
-| EtherLike discovery             | <p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p>                                                                                                                                                                                                                                                                                                                                              | SNMP | net.if.duplex.discovery<p>**Filter**:</p>AND <p>- A: {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- B: {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| Entity Serial Numbers discovery | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | SNMP | entity_sn.discovery<p>**Filter**:</p>AND <p>- B: {#ENT_SN} MATCHES_REGEX `.+`</p><p>- A: {#ENT_CLASS} MATCHES_REGEX `[^3]`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| CPU discovery                   | <p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> | SNMP | cpu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| Memory discovery                | <p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p>                                                                                                                                                                                                                                                       | SNMP | memory.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| Temperature discovery           | <p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                | SNMP | temperature.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| PSU discovery                   | <p>The table of power supply status maintained by the environmental monitor card.</p>                                                                                                                                                                                                                                                                                                                                                                              | SNMP | psu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| FAN discovery                   | <p>The table of fan status maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                                                                                                            | SNMP | fan.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
+|Entity Serial Numbers discovery |<p>-</p> |SNMP |entity_sn.discovery<p>**Filter**:</p>AND <p>- {#ENT_SN} MATCHES_REGEX `.+`</p><p>- {#ENT_CLASS} MATCHES_REGEX `[^3]`</p> |
+|FAN discovery |<p>The table of fan status maintained by the environmental monitor.</p> |SNMP |fan.discovery |
+|Memory discovery |<p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |memory.discovery |
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|EtherLike discovery |<p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p> |SNMP |net.if.duplex.discovery<p>**Filter**:</p>AND <p>- {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p> |
+|PSU discovery |<p>The table of power supply status maintained by the environmental monitor card.</p> |SNMP |psu.discovery |
+|Temperature discovery |<p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p> |SNMP |temperature.discovery |
 
 ## Items collected
 
-| Group   | Name                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type      | Key and additional info         |
-|---------|--------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------------------------------|
-| CPU     | #{#SNMPINDEX}: CPU utilization | <p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> | SNMP      | system.cpu.util[{#SNMPINDEX}]   |
-| Fans    | {#SNMPVALUE}: Fan status       | <p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP      | sensor.fan.status[{#SNMPINDEX}] |
-| General | SNMP traps (fallback)          | <p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP_TRAP | snmptrap.fallback               |
-|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> |SNMP |system.cpu.util[{#SNMPINDEX}] |
+|Fans |{#SNMPVALUE}: Fan status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p> |SNMP |sensor.fan.status[{#SNMPINDEX}] |
+|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |system.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |General |System description |<p>MIB: SNMPv2-MIB</p><p>A textual description of the entity. This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p> |SNMP |system.descr<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE`: `\1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ENTITY-MIB</p><p>Object name: entPhysicalSerialNum</p> |SNMP |system.hw.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
 |Memory |{#SNMPVALUE}: Free memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolFree</p><p>Indicates the number of bytes from the memory pool that are currently unused on the managed device. Note that the sum of ciscoMemoryPoolUsed and ciscoMemoryPoolFree is the total amount of memory in the pool</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.free[{#SNMPINDEX}] |
-|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last("vm.memory.used[{#SNMPINDEX}]")/(last("vm.memory.free[{#SNMPINDEX}]")+last("vm.memory.used[{#SNMPINDEX}]"))*100` |
+|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
+|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last(//vm.memory.used[{#SNMPINDEX}])/(last(//vm.memory.free[{#SNMPINDEX}])+last(//vm.memory.used[{#SNMPINDEX}]))*100` |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Duplex status |<p>MIB: EtherLike-MIB</p><p>Object name: dot3StatsDuplexStatus</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> |SNMP |net.if.duplex[{#SNMPINDEX}] |
 |Power_supply |{#SNMPVALUE}: Power supply status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonSupplyState</p> |SNMP |sensor.psu.status[{#SNMPINDEX}] |
+|Status |ICMP ping | |SIMPLE |icmpping |
+|Status |ICMP loss | |SIMPLE |icmppingloss |
+|Status |ICMP response time | |SIMPLE |icmppingsec |
 |Status |Uptime |<p>MIB: SNMPv2-MIB</p><p>The time (in hundredths of a second) since the network management portion of the system was last re-initialized.</p> |SNMP |system.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
-|Status |SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available] |
-|Status |ICMP ping |<p>-</p> |SIMPLE |icmpping |
-|Status |ICMP loss |<p>-</p> |SIMPLE |icmppingloss |
-|Status |ICMP response time |<p>-</p> |SIMPLE |icmppingsec |
-|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#SNMPINDEX}] |
+|Status |SNMP agent availability | |INTERNAL |zabbix[host,snmp,available] |
 |Temperature |{#SNMPVALUE}: Temperature status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureState</p><p>The current state of the test point being instrumented.</p> |SNMP |sensor.temp.status[{#SNMPINDEX}] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#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>                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48PS SNMP:system.cpu.util[{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | WARNING  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in critical state                                                            | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-48PS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in warning state                                                             | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p>                                              |
-| System name has changed (new name: {ITEM.VALUE})                                                  | <p>System name has changed. Ack to close.</p>                                                                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-48PS SNMP:system.name.diff()}=1 and {Cisco Catalyst 3750V2-48PS SNMP:system.name.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>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-48PS SNMP:system.hw.serialnumber.diff()}=1 and {Cisco Catalyst 3750V2-48PS SNMP:system.hw.serialnumber.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | INFO     | <p>Manual close: YES</p>                                                                                           |
-| Operating system description has changed                                                          | <p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p>                                                                                                                                                                        | `{Cisco Catalyst 3750V2-48PS SNMP:system.sw.os.diff()}=1 and {Cisco Catalyst 3750V2-48PS SNMP:system.sw.os.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p>            |
-| {#ENT_NAME}: Device has been replaced (new serial number received)                                | <p>Device serial number has changed. Ack to close</p>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-48PS SNMP:system.hw.serialnumber[{#SNMPINDEX}].diff()}=1 and {Cisco Catalyst 3750V2-48PS SNMP:system.hw.serialnumber[{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)                              | <p>The system is running out of free memory.</p>                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-48PS SNMP:vm.memory.util[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| Interface {#IFNAME}({#IFALIAS}): Link down                                                        | <p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> | `{$IFCONTROL:"{#IFNAME}"}=1 and ({Cisco Catalyst 3750V2-48PS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | AVERAGE  | <p>Manual close: YES</p>                                                                                           |
-| Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )   | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-48PS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48PS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )  | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-48PS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48PS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)  | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-48PS SNMP:net.if.in.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48PS SNMP:net.if.in.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-48PS SNMP:net.if.out.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48PS SNMP:net.if.out.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before           | <p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p>                                                                                                                                                | `{Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].change()}<0 and {Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0 and ( {Cisco Catalyst 3750V2-48PS SNMP:net.if.type[{#SNMPINDEX}].last()}=6 or {Cisco Catalyst 3750V2-48PS SNMP:net.if.type[{#SNMPINDEX}].last()}=7 or {Cisco Catalyst 3750V2-48PS SNMP:net.if.type[{#SNMPINDEX}].last()}=11 or {Cisco Catalyst 3750V2-48PS SNMP:net.if.type[{#SNMPINDEX}].last()}=62 or {Cisco Catalyst 3750V2-48PS SNMP:net.if.type[{#SNMPINDEX}].last()}=69 or {Cisco Catalyst 3750V2-48PS SNMP:net.if.type[{#SNMPINDEX}].last()}=117 ) and ({Cisco Catalyst 3750V2-48PS SNMP:net.if.status[{#SNMPINDEX}].last()}<>2)`<p>Recovery expression:</p>`({Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].change()}>0 and {Cisco Catalyst 3750V2-48PS SNMP:net.if.speed[{#SNMPINDEX}].prev()}>0) or ({Cisco Catalyst 3750V2-48PS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)` | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): In half-duplex mode                                              | <p>Please check autonegotiation settings and cabling</p>                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48PS SNMP:net.if.duplex[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: Power supply is in critical state                                                   | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-48PS SNMP:sensor.psu.status[{#SNMPINDEX}].last(4)}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Power supply is in warning state                                                    | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p>                                     |
-| {HOST.NAME} has been restarted (uptime < 10m)                                                     | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-48PS SNMP:system.uptime.last()}<10m`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| No SNMP data collection                                                                           | <p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p>                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-48PS SNMP:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | WARNING  |                                                                                                                    |
-| Unavailable by ICMP ping                                                                          | <p>Last three attempts returned timeout.  Please check device connectivity.</p>                                                                                                                                                                                                                  | `{Cisco Catalyst 3750V2-48PS SNMP:icmpping.max(#3)}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | HIGH     |                                                                                                                    |
-| High ICMP ping loss                                                                               | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48PS SNMP:icmppingloss.min(5m)}>{$ICMP_LOSS_WARN} and {Cisco Catalyst 3750V2-48PS SNMP:icmppingloss.min(5m)}<100`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | WARNING  | <p>**Depends on**:</p><p>- Unavailable by ICMP ping</p>                                                            |
-| High ICMP ping response time                                                                      | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48PS SNMP:icmppingsec.avg(5m)}>{$ICMP_RESPONSE_TIME_WARN}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | WARNING  | <p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p>                                |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"}                | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}               | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | HIGH     |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}                            | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.value[{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is in warning state                                                     | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p>                                      |
-| {#SNMPVALUE}: Temperature is in critical state                                                    | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-48PS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | HIGH     |                                                                                                                    |
+|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(/Cisco Catalyst 3750V2-48PS SNMP/system.cpu.util[{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.fan.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Fan is in warning state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.fan.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-48PS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-48PS SNMP/system.name))>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(/Cisco Catalyst 3750V2-48PS SNMP/system.hw.serialnumber,#1)<>last(/Cisco Catalyst 3750V2-48PS SNMP/system.hw.serialnumber,#2) and length(last(/Cisco Catalyst 3750V2-48PS SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|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(/Cisco Catalyst 3750V2-48PS SNMP/system.sw.os,#1)<>last(/Cisco Catalyst 3750V2-48PS SNMP/system.sw.os,#2) and length(last(/Cisco Catalyst 3750V2-48PS SNMP/system.sw.os))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#1)<>last(/Cisco Catalyst 3750V2-48PS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#2) and length(last(/Cisco Catalyst 3750V2-48PS SNMP/system.hw.serialnumber[{#SNMPINDEX}]))>0` |INFO | |
+|{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Cisco Catalyst 3750V2-48PS SNMP/vm.memory.util[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-48PS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-48PS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-48PS SNMP/net.if.in[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-48PS SNMP/net.if.in[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-48PS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-48PS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-48PS SNMP/net.if.out[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-48PS SNMP/net.if.out[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])<0 and last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])>0 and ( last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.type[{#SNMPINDEX}])=6 or last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.type[{#SNMPINDEX}])=7 or last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.type[{#SNMPINDEX}])=11 or last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.type[{#SNMPINDEX}])=62 or last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.type[{#SNMPINDEX}])=69 or last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.type[{#SNMPINDEX}])=117 ) and (last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.status[{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}])>0 and last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.speed[{#SNMPINDEX}],#2)>0) or (last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.status[{#SNMPINDEX}])=2) ` |INFO |<p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.status[{#SNMPINDEX}])=2)` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): In half-duplex mode |<p>Please check autonegotiation settings and cabling</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.duplex[{#SNMPINDEX}])=2` |WARNING | |
+|{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.psu.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.psu.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p> |
+|Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/Cisco Catalyst 3750V2-48PS SNMP/icmpping,#3)=0` |HIGH | |
+|High ICMP ping loss |<p>-</p> |`min(/Cisco Catalyst 3750V2-48PS SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Cisco Catalyst 3750V2-48PS SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
+|High ICMP ping response time |<p>-</p> |`avg(/Cisco Catalyst 3750V2-48PS SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/system.uptime)<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Cisco Catalyst 3750V2-48PS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPVALUE}: Temperature is in critical state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.status[{#SNMPINDEX}])=4` |HIGH | |
+|{#SNMPVALUE}: Temperature is in warning state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_WARN:"{#SNMPVALUE}"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"} |<p>-</p> |`avg(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`min(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3` |AVERAGE | |
 
 ## 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/418396-discussion-thread-for-official-zabbix-templates-for-cisco).
+
diff --git a/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml
index 444a8f10b66..24af0e435d5 100644
--- a/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml
@@ -1,10 +1,10 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:11Z'
+  version: '6.0'
+  date: '2021-12-17T07:23:11Z'
   groups:
     -
-      uuid: 57b7ae836ca64446ba2c296389c009b7
-      name: Templates/Modules
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
   templates:
     -
       uuid: ea096c13a09b4d7a9be0aab1cec95206
@@ -12,20 +12,22 @@ zabbix_export:
       name: 'Cisco Catalyst 3750V2-48PS SNMP'
       description: |
         Template Cisco Catalyst 3750V2-48PS
+          
+          MIBs used:
+          CISCO-MEMORY-POOL-MIB
+          IF-MIB
+          EtherLike-MIB
+          SNMPv2-MIB
+          CISCO-PROCESS-MIB
+          CISCO-ENVMON-MIB
+          ENTITY-MIB
         
-        MIBs used:
-        CISCO-MEMORY-POOL-MIB
-        IF-MIB
-        EtherLike-MIB
-        SNMPv2-MIB
-        CISCO-PROCESS-MIB
-        CISCO-ENVMON-MIB
-        ENTITY-MIB
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
-          name: Templates/Modules
+          name: 'Templates/Network devices'
       items:
         -
           uuid: d729b3a06df94b6890fe4c62f8d26f60
diff --git a/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/README.md b/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/README.md
index 48f0eff4651..b338e98658f 100644
--- a/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/README.md
+++ b/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/README.md
@@ -3,10 +3,10 @@
 
 ## Overview
 
+For Zabbix version: 6.0 and higher  
 ![Product picture](images/pic.png?raw=true)
 > Courtesy of Cisco Systems, Inc. Unauthorized use not permitted.
 
-For Zabbix version: 5.4 and higher  
 The Cisco Catalyst 3750 Series switches are a premier line of enterprise-class, stackable, multilayer switches that provide high availability, security, and quality of service (QoS) to enhance the operation of the network. Its innovative unified stack management raises the bar in stack management, redundancy, and failover.
 
 https://www.cisco.com/c/en/us/support/switches/catalyst-3750v2-48ts-switch/model.html
@@ -23,31 +23,31 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description                                                                         | Default                                                                                                                            |
-|-------------------------------------|-------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
-| {$CPU.UTIL.CRIT}                    | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$ICMP_LOSS_WARN}                   | <p>-</p>                                                                            | `20`                                                                                                                               |
-| {$ICMP_RESPONSE_TIME_WARN}          | <p>-</p>                                                                            | `0.15`                                                                                                                             |
-| {$IF.ERRORS.WARN}                   | <p>-</p>                                                                            | `2`                                                                                                                                |
-| {$IF.UTIL.MAX}                      | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$IFCONTROL}                        | <p>-</p>                                                                            | `1`                                                                                                                                |
-| {$MEMORY.UTIL.MAX}                  | <p>-</p>                                                                            | `90`                                                                                                                               |
-| {$NET.IF.IFADMINSTATUS.MATCHES}     | <p>-</p>                                                                            | `^.*`                                                                                                                              |
-| {$NET.IF.IFADMINSTATUS.NOT_MATCHES} | <p>Ignore down(2) administrative status</p>                                         | `^2$`                                                                                                                              |
-| {$NET.IF.IFALIAS.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFALIAS.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFDESCR.MATCHES}           | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFDESCR.NOT_MATCHES}       | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$NET.IF.IFNAME.MATCHES}            | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFNAME.NOT_MATCHES}        | <p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> | `(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
-| {$NET.IF.IFOPERSTATUS.MATCHES}      | <p>-</p>                                                                            | `^.*$`                                                                                                                             |
-| {$NET.IF.IFOPERSTATUS.NOT_MATCHES}  | <p>Ignore notPresent(6)</p>                                                         | `^6$`                                                                                                                              |
-| {$NET.IF.IFTYPE.MATCHES}            | <p>-</p>                                                                            | `.*`                                                                                                                               |
-| {$NET.IF.IFTYPE.NOT_MATCHES}        | <p>-</p>                                                                            | `CHANGE_IF_NEEDED`                                                                                                                 |
-| {$SNMP.TIMEOUT}                     | <p>-</p>                                                                            | `5m`                                                                                                                               |
-| {$TEMP_CRIT_LOW}                    | <p>-</p>                                                                            | `5`                                                                                                                                |
-| {$TEMP_CRIT}                        | <p>-</p>                                                                            | `60`                                                                                                                               |
-| {$TEMP_WARN}                        | <p>-</p>                                                                            | `50`                                                                                                                               |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$ICMP_LOSS_WARN} |<p>-</p> |`20` |
+|{$ICMP_RESPONSE_TIME_WARN} |<p>-</p> |`0.15` |
+|{$IF.ERRORS.WARN} |<p>-</p> |`2` |
+|{$IF.UTIL.MAX} |<p>-</p> |`90` |
+|{$IFCONTROL} |<p>-</p> |`1` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$NET.IF.IFADMINSTATUS.MATCHES} |<p>-</p> |`^.*` |
+|{$NET.IF.IFADMINSTATUS.NOT_MATCHES} |<p>Ignore down(2) administrative status</p> |`^2$` |
+|{$NET.IF.IFALIAS.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFALIAS.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFDESCR.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFDESCR.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9a-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(6)</p> |`^6$` |
+|{$NET.IF.IFTYPE.MATCHES} |<p>-</p> |`.*` |
+|{$NET.IF.IFTYPE.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
+|{$SNMP.TIMEOUT} |<p>-</p> |`5m` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
@@ -55,88 +55,90 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Type | Key and additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|---------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Network interfaces discovery    | <p>Discovering interfaces from IF-MIB.</p>                                                                                                                                                                                                                                                                                                                                                                                                                         | SNMP | net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
-| EtherLike discovery             | <p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p>                                                                                                                                                                                                                                                                                                                                              | SNMP | net.if.duplex.discovery<p>**Filter**:</p>AND <p>- A: {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- B: {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| Entity Serial Numbers discovery | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                           | SNMP | entity_sn.discovery<p>**Filter**:</p>AND <p>- B: {#ENT_SN} MATCHES_REGEX `.+`</p><p>- A: {#ENT_CLASS} MATCHES_REGEX `[^3]`</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| CPU discovery                   | <p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> | SNMP | cpu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| Memory discovery                | <p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p>                                                                                                                                                                                                                                                       | SNMP | memory.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| Temperature discovery           | <p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                | SNMP | temperature.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| PSU discovery                   | <p>The table of power supply status maintained by the environmental monitor card.</p>                                                                                                                                                                                                                                                                                                                                                                              | SNMP | psu.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| FAN discovery                   | <p>The table of fan status maintained by the environmental monitor.</p>                                                                                                                                                                                                                                                                                                                                                                                            | SNMP | fan.discovery                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
+|Entity Serial Numbers discovery |<p>-</p> |SNMP |entity_sn.discovery<p>**Filter**:</p>AND <p>- {#ENT_SN} MATCHES_REGEX `.+`</p><p>- {#ENT_CLASS} MATCHES_REGEX `[^3]`</p> |
+|FAN discovery |<p>The table of fan status maintained by the environmental monitor.</p> |SNMP |fan.discovery |
+|Memory discovery |<p>Discovery of ciscoMemoryPoolTable, a table of memory pool monitoring entries.</p><p>http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |memory.discovery |
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|EtherLike discovery |<p>Discovering interfaces from IF-MIB and EtherLike-MIB. Interfaces with up(1) Operational Status are discovered.</p> |SNMP |net.if.duplex.discovery<p>**Filter**:</p>AND <p>- {#IFOPERSTATUS} MATCHES_REGEX `1`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(2|3)`</p> |
+|PSU discovery |<p>The table of power supply status maintained by the environmental monitor card.</p> |SNMP |psu.discovery |
+|Temperature discovery |<p>Discovery of ciscoEnvMonTemperatureTable (ciscoEnvMonTemperatureDescr), a table of ambient temperature status</p><p>maintained by the environmental monitor.</p> |SNMP |temperature.discovery |
 
 ## Items collected
 
-| Group   | Name                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type      | Key and additional info         |
-|---------|--------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------------------------------|
-| CPU     | #{#SNMPINDEX}: CPU utilization | <p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> | SNMP      | system.cpu.util[{#SNMPINDEX}]   |
-| Fans    | {#SNMPVALUE}: Fan status       | <p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP      | sensor.fan.status[{#SNMPINDEX}] |
-| General | SNMP traps (fallback)          | <p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP_TRAP | snmptrap.fallback               |
-|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: CISCO-PROCESS-MIB</p><p>Object name: cpmCPUTotal5minRev</p><p>The cpmCPUTotal5minRev MIB object provides a more accurate view of the performance of the router over time than the MIB objects cpmCPUTotal1minRev and cpmCPUTotal5secRev . These MIB objects are not accurate because they look at CPU at one minute and five second intervals, respectively. These MIBs enable you to monitor the trends and plan the capacity of your network. The recommended baseline rising threshold for cpmCPUTotal5minRev is 90 percent. Depending on the platform, some routers that run at 90 percent, for example, 2500s, can exhibit performance degradation versus a high-end router, for example, the 7500 series, which can operate fine.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> |SNMP |system.cpu.util[{#SNMPINDEX}] |
+|Fans |{#SNMPVALUE}: Fan status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonFanState</p> |SNMP |sensor.fan.status[{#SNMPINDEX}] |
+|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |system.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |General |System description |<p>MIB: SNMPv2-MIB</p><p>A textual description of the entity. This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p> |SNMP |system.descr<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |system.location<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System name |<p>MIB: SNMPv2-MIB</p><p>An administratively-assigned name for this managed node.By convention, this is the node's fully-qualified domain name.  If the name is unknown, the value is the zero-length string.</p> |SNMP |system.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |system.objectid<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os<p>**Preprocessing**:</p><p>- REGEX: `Version (.+), RELEASE`: `\1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ENTITY-MIB</p><p>Object name: entPhysicalSerialNum</p> |SNMP |system.hw.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
 |Memory |{#SNMPVALUE}: Free memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolFree</p><p>Indicates the number of bytes from the memory pool that are currently unused on the managed device. Note that the sum of ciscoMemoryPoolUsed and ciscoMemoryPoolFree is the total amount of memory in the pool</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.free[{#SNMPINDEX}] |
-|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last("vm.memory.used[{#SNMPINDEX}]")/(last("vm.memory.free[{#SNMPINDEX}]")+last("vm.memory.used[{#SNMPINDEX}]"))*100` |
+|Memory |{#SNMPVALUE}: Used memory |<p>MIB: CISCO-MEMORY-POOL-MIB</p><p>Object name: ciscoMemoryPoolUsed</p><p>Indicates the number of bytes from the memory pool that are currently in use by applications on the managed device.</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html</p> |SNMP |vm.memory.used[{#SNMPINDEX}] |
+|Memory |{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPINDEX}]<p>**Expression**:</p>`last(//vm.memory.used[{#SNMPINDEX}])/(last(//vm.memory.free[{#SNMPINDEX}])+last(//vm.memory.used[{#SNMPINDEX}]))*100` |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND: ``</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Duplex status |<p>MIB: EtherLike-MIB</p><p>Object name: dot3StatsDuplexStatus</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> |SNMP |net.if.duplex[{#SNMPINDEX}] |
 |Power_supply |{#SNMPVALUE}: Power supply status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonSupplyState</p> |SNMP |sensor.psu.status[{#SNMPINDEX}] |
+|Status |ICMP ping | |SIMPLE |icmpping |
+|Status |ICMP loss | |SIMPLE |icmppingloss |
+|Status |ICMP response time | |SIMPLE |icmppingsec |
 |Status |Uptime |<p>MIB: SNMPv2-MIB</p><p>The time (in hundredths of a second) since the network management portion of the system was last re-initialized.</p> |SNMP |system.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
-|Status |SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available] |
-|Status |ICMP ping |<p>-</p> |SIMPLE |icmpping |
-|Status |ICMP loss |<p>-</p> |SIMPLE |icmppingloss |
-|Status |ICMP response time |<p>-</p> |SIMPLE |icmppingsec |
-|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#SNMPINDEX}] |
+|Status |SNMP agent availability | |INTERNAL |zabbix[host,snmp,available] |
 |Temperature |{#SNMPVALUE}: Temperature status |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureState</p><p>The current state of the test point being instrumented.</p> |SNMP |sensor.temp.status[{#SNMPINDEX}] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: CISCO-ENVMON-MIB</p><p>Object name: ciscoEnvMonTemperatureValue</p><p>The current measurement of the test point being instrumented.</p> |SNMP |sensor.temp.value[{#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>                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48TS SNMP:system.cpu.util[{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | WARNING  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in critical state                                                            | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-48TS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Fan is in warning state                                                             | <p>Please check the fan unit</p>                                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.fan.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p>                                              |
-| System name has changed (new name: {ITEM.VALUE})                                                  | <p>System name has changed. Ack to close.</p>                                                                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-48TS SNMP:system.name.diff()}=1 and {Cisco Catalyst 3750V2-48TS SNMP:system.name.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>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-48TS SNMP:system.hw.serialnumber.diff()}=1 and {Cisco Catalyst 3750V2-48TS SNMP:system.hw.serialnumber.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | INFO     | <p>Manual close: YES</p>                                                                                           |
-| Operating system description has changed                                                          | <p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p>                                                                                                                                                                        | `{Cisco Catalyst 3750V2-48TS SNMP:system.sw.os.diff()}=1 and {Cisco Catalyst 3750V2-48TS SNMP:system.sw.os.strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p>            |
-| {#ENT_NAME}: Device has been replaced (new serial number received)                                | <p>Device serial number has changed. Ack to close</p>                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-48TS SNMP:system.hw.serialnumber[{#SNMPINDEX}].diff()}=1 and {Cisco Catalyst 3750V2-48TS SNMP:system.hw.serialnumber[{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | INFO     | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)                              | <p>The system is running out of free memory.</p>                                                                                                                                                                                                                                                 | `{Cisco Catalyst 3750V2-48TS SNMP:vm.memory.util[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| Interface {#IFNAME}({#IFALIAS}): Link down                                                        | <p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> | `{$IFCONTROL:"{#IFNAME}"}=1 and ({Cisco Catalyst 3750V2-48TS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | AVERAGE  | <p>Manual close: YES</p>                                                                                           |
-| Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )   | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-48TS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48TS SNMP:net.if.in[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% )  | <p>The network interface utilization is close to its estimated maximum bandwidth.</p>                                                                                                                                                                                                            | `({Cisco Catalyst 3750V2-48TS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*{Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].last()}) and {Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48TS SNMP:net.if.out[{#SNMPINDEX}].avg(15m)}<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*{Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].last()}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)  | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-48TS SNMP:net.if.in.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48TS SNMP:net.if.in.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) | <p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p>                                                                                                                                                                                                                        | `{Cisco Catalyst 3750V2-48TS SNMP:net.if.out.errors[{#SNMPINDEX}].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48TS SNMP:net.if.out.errors[{#SNMPINDEX}].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before           | <p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p>                                                                                                                                                | `{Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].change()}<0 and {Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].last()}>0 and ( {Cisco Catalyst 3750V2-48TS SNMP:net.if.type[{#SNMPINDEX}].last()}=6 or {Cisco Catalyst 3750V2-48TS SNMP:net.if.type[{#SNMPINDEX}].last()}=7 or {Cisco Catalyst 3750V2-48TS SNMP:net.if.type[{#SNMPINDEX}].last()}=11 or {Cisco Catalyst 3750V2-48TS SNMP:net.if.type[{#SNMPINDEX}].last()}=62 or {Cisco Catalyst 3750V2-48TS SNMP:net.if.type[{#SNMPINDEX}].last()}=69 or {Cisco Catalyst 3750V2-48TS SNMP:net.if.type[{#SNMPINDEX}].last()}=117 ) and ({Cisco Catalyst 3750V2-48TS SNMP:net.if.status[{#SNMPINDEX}].last()}<>2)`<p>Recovery expression:</p>`({Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].change()}>0 and {Cisco Catalyst 3750V2-48TS SNMP:net.if.speed[{#SNMPINDEX}].prev()}>0) or ({Cisco Catalyst 3750V2-48TS SNMP:net.if.status[{#SNMPINDEX}].last()}=2)` | INFO     | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p>                  |
-| Interface {#IFNAME}({#IFALIAS}): In half-duplex mode                                              | <p>Please check autonegotiation settings and cabling</p>                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48TS SNMP:net.if.duplex[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| {#SNMPVALUE}: Power supply is in critical state                                                   | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-48TS SNMP:sensor.psu.status[{#SNMPINDEX}].last(4)}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Power supply is in warning state                                                    | <p>Please check the power supply unit for errors</p>                                                                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.psu.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p>                                     |
-| {HOST.NAME} has been restarted (uptime < 10m)                                                     | <p>Uptime is less than 10 minutes</p>                                                                                                                                                                                                                                                            | `{Cisco Catalyst 3750V2-48TS SNMP:system.uptime.last()}<10m`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | WARNING  | <p>Manual close: YES</p>                                                                                           |
-| No SNMP data collection                                                                           | <p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p>                                                                                                                                                                                                    | `{Cisco Catalyst 3750V2-48TS SNMP:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | WARNING  |                                                                                                                    |
-| Unavailable by ICMP ping                                                                          | <p>Last three attempts returned timeout.  Please check device connectivity.</p>                                                                                                                                                                                                                  | `{Cisco Catalyst 3750V2-48TS SNMP:icmpping.max(#3)}=0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | HIGH     |                                                                                                                    |
-| High ICMP ping loss                                                                               | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48TS SNMP:icmppingloss.min(5m)}>{$ICMP_LOSS_WARN} and {Cisco Catalyst 3750V2-48TS SNMP:icmppingloss.min(5m)}<100`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | WARNING  | <p>**Depends on**:</p><p>- Unavailable by ICMP ping</p>                                                            |
-| High ICMP ping response time                                                                      | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48TS SNMP:icmppingsec.avg(5m)}>{$ICMP_RESPONSE_TIME_WARN}`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | WARNING  | <p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p>                                |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"}                | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}               | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                             | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.value[{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"{#SNMPVALUE}"}-3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | HIGH     |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}                            | <p>-</p>                                                                                                                                                                                                                                                                                         | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.value[{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`{Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.value[{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  |                                                                                                                    |
-| {#SNMPVALUE}: Temperature is in warning state                                                     | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=2`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p>                                      |
-| {#SNMPVALUE}: Temperature is in critical state                                                    | <p>This trigger uses temperature sensor state</p>                                                                                                                                                                                                                                                | `{Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=3 or {Cisco Catalyst 3750V2-48TS SNMP:sensor.temp.status[{#SNMPINDEX}].last()}=4`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | HIGH     |                                                                                                                    |
+|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(/Cisco Catalyst 3750V2-48TS SNMP/system.cpu.util[{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.fan.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Fan is in warning state |<p>Please check the fan unit</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.fan.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-48TS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-48TS SNMP/system.name))>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(/Cisco Catalyst 3750V2-48TS SNMP/system.hw.serialnumber,#1)<>last(/Cisco Catalyst 3750V2-48TS SNMP/system.hw.serialnumber,#2) and length(last(/Cisco Catalyst 3750V2-48TS SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|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(/Cisco Catalyst 3750V2-48TS SNMP/system.sw.os,#1)<>last(/Cisco Catalyst 3750V2-48TS SNMP/system.sw.os,#2) and length(last(/Cisco Catalyst 3750V2-48TS SNMP/system.sw.os))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#1)<>last(/Cisco Catalyst 3750V2-48TS SNMP/system.hw.serialnumber[{#SNMPINDEX}],#2) and length(last(/Cisco Catalyst 3750V2-48TS SNMP/system.hw.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Cisco Catalyst 3750V2-48TS SNMP/vm.memory.util[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): High input error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-48TS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-48TS SNMP/net.if.in.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High inbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-48TS SNMP/net.if.in[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-48TS SNMP/net.if.in[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High output error rate ( > {$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco Catalyst 3750V2-48TS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-48TS SNMP/net.if.out.errors[{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High outbound bandwidth usage ( > {$IF.UTIL.MAX:"{#IFNAME}"}% ) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco Catalyst 3750V2-48TS SNMP/net.if.out[{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])) and last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])>0 `<p>Recovery expression:</p>`avg(/Cisco Catalyst 3750V2-48TS SNMP/net.if.out[{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])<0 and last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])>0 and ( last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.type[{#SNMPINDEX}])=6 or last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.type[{#SNMPINDEX}])=7 or last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.type[{#SNMPINDEX}])=11 or last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.type[{#SNMPINDEX}])=62 or last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.type[{#SNMPINDEX}])=69 or last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.type[{#SNMPINDEX}])=117 ) and (last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.status[{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}])>0 and last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.speed[{#SNMPINDEX}],#2)>0) or (last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.status[{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.status[{#SNMPINDEX}])=2)` |AVERAGE |<p>Manual close: YES</p> |
+|Interface {#IFNAME}({#IFALIAS}): In half-duplex mode |<p>Please check autonegotiation settings and cabling</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.duplex[{#SNMPINDEX}])=2` |WARNING |<p>Manual close: YES</p> |
+|{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.psu.status[{#SNMPINDEX}])=4` |AVERAGE | |
+|{#SNMPVALUE}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.psu.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p> |
+|Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/Cisco Catalyst 3750V2-48TS SNMP/icmpping,#3)=0` |HIGH | |
+|High ICMP ping loss |<p>-</p> |`min(/Cisco Catalyst 3750V2-48TS SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Cisco Catalyst 3750V2-48TS SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
+|High ICMP ping response time |<p>-</p> |`avg(/Cisco Catalyst 3750V2-48TS SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/system.uptime)<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Cisco Catalyst 3750V2-48TS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPVALUE}: Temperature is in critical state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.status[{#SNMPINDEX}])=4` |HIGH | |
+|{#SNMPVALUE}: Temperature is in warning state |<p>This trigger uses temperature sensor state</p> |`last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.status[{#SNMPINDEX}])=2` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is in critical state</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`max(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_WARN:"{#SNMPVALUE}"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}</p> |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"} |<p>-</p> |`avg(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}`<p>Recovery expression:</p>`min(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}+3` |AVERAGE | |
 
 ## 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/418396-discussion-thread-for-official-zabbix-templates-for-cisco).
+
diff --git a/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml
index a8bc6d2bfd3..d4c58b335d0 100644
--- a/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml
@@ -1,10 +1,10 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:11Z'
+  version: '6.0'
+  date: '2021-12-17T07:32:40Z'
   groups:
     -
-      uuid: 57b7ae836ca64446ba2c296389c009b7
-      name: Templates/Modules
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
   templates:
     -
       uuid: f744679600844c07b2b4eedda9bc3d0c
@@ -12,20 +12,22 @@ zabbix_export:
       name: 'Cisco Catalyst 3750V2-48TS SNMP'
       description: |
         Template Cisco Catalyst 3750V2-48TS
+          
+          MIBs used:
+          CISCO-MEMORY-POOL-MIB
+          IF-MIB
+          EtherLike-MIB
+          SNMPv2-MIB
+          CISCO-PROCESS-MIB
+          CISCO-ENVMON-MIB
+          ENTITY-MIB
         
-        MIBs used:
-        CISCO-MEMORY-POOL-MIB
-        IF-MIB
-        EtherLike-MIB
-        SNMPv2-MIB
-        CISCO-PROCESS-MIB
-        CISCO-ENVMON-MIB
-        ENTITY-MIB
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
-          name: Templates/Modules
+          name: 'Templates/Network devices'
       items:
         -
           uuid: 5d096334d7e2455797c9a5a46fecfaec
diff --git a/templates/net/cisco/cisco_snmp/README.md b/templates/net/cisco/cisco_snmp/README.md
index 7dfe73c1a38..f6b3ae1b28d 100644
--- a/templates/net/cisco/cisco_snmp/README.md
+++ b/templates/net/cisco/cisco_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -51,7 +51,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -75,7 +75,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|CPU Discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
+|CPU Discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable,</p><p>indexed with cpmCPUTotalIndex.</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
 
 ## Items collected
 
@@ -97,7 +97,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -121,13 +121,13 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|CPU Discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,</p><p>indexed with cpmCPUTotalIndex .</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
+|CPU Discovery |<p>If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable,</p><p>indexed with cpmCPUTotalIndex.</p><p>This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,</p><p>like different CPU chips, group of CPUs, or CPUs in different modules/cards.</p><p>In case of a single CPU, cpmCPUTotalTable has only one entry.</p> |SNMP |cpu.discovery |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |{#SNMPVALUE}: CPU utilization |<p>MIB: CISCO-PROCESS-MIB</p><p>The overall CPU busy percentage in the last 5 minute</p><p>period. This object deprecates the avgBusy5 object from</p><p>the OLD-CISCO-SYSTEM-MIB. This object is deprecated</p><p>by cpmCPUTotal5minRev which has the changed range</p><p>of value (0..100)</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> |SNMP |system.cpu.util[cpmCPUTotal5min.{#SNMPINDEX}] |
+|CPU |{#SNMPVALUE}: CPU utilization |<p>MIB: CISCO-PROCESS-MIB</p><p>The overall CPU busy percentage in the last 5 minute</p><p>period. This object deprecates the avgBusy5 object from</p><p>the OLD-CISCO-SYSTEM-MIB. This object is deprecated</p><p>by cpmCPUTotal5minRev which has the changed range</p><p>of value (0..100).</p><p>Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html</p> |SNMP |system.cpu.util[cpmCPUTotal5min.{#SNMPINDEX}] |
 
 ## Triggers
 
@@ -143,7 +143,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -186,7 +186,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -205,7 +205,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Entity Serial Numbers Discovery |<p>-</p> |SNMP |entity_sn.discovery<p>**Filter**:</p>AND <p>- B: {#ENT_SN} MATCHES_REGEX `.+`</p><p>- A: {#ENT_CLASS} MATCHES_REGEX `^3$`</p> |
+|Entity Serial Numbers Discovery |<p>-</p> |SNMP |entity_sn.discovery<p>**Filter**:</p>AND <p>- {#ENT_SN} MATCHES_REGEX `.+`</p><p>- {#ENT_CLASS} MATCHES_REGEX `^3$`</p> |
 
 ## Items collected
 
@@ -232,7 +232,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -304,7 +304,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -354,7 +354,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -397,7 +397,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
diff --git a/templates/net/cisco/cisco_snmp/template_net_cisco_snmp.yaml b/templates/net/cisco/cisco_snmp/template_net_cisco_snmp.yaml
index 674a18438d1..81f5b3cc6f1 100644
--- a/templates/net/cisco/cisco_snmp/template_net_cisco_snmp.yaml
+++ b/templates/net/cisco/cisco_snmp/template_net_cisco_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T09:48:10Z'
+  date: '2021-12-17T06:25:03Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -19,7 +19,7 @@ zabbix_export:
         MIBs used:
         CISCO-ENVMON-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -285,7 +285,7 @@ zabbix_export:
         MIBs used:
         CISCO-MEMORY-POOL-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -381,7 +381,7 @@ zabbix_export:
         MIBs used:
         CISCO-PROCESS-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -394,8 +394,8 @@ zabbix_export:
           key: cpu.discovery
           delay: 1h
           description: |
-            If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,
-            indexed with cpmCPUTotalIndex .
+            If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable,
+            indexed with cpmCPUTotalIndex.
             This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,
             like different CPU chips, group of CPUs, or CPUs in different modules/cards.
             In case of a single CPU, cpmCPUTotalTable has only one entry.
@@ -416,7 +416,7 @@ zabbix_export:
                 period. This object deprecates the avgBusy5 object from
                 the OLD-CISCO-SYSTEM-MIB. This object is deprecated
                 by cpmCPUTotal5minRev which has the changed range
-                of value (0..100)
+                of value (0..100).
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
@@ -457,7 +457,7 @@ zabbix_export:
         MIBs used:
         CISCO-PROCESS-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -470,8 +470,8 @@ zabbix_export:
           key: cpu.discovery
           delay: 1h
           description: |
-            If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable ,
-            indexed with cpmCPUTotalIndex .
+            If your IOS device has several CPUs, you must use CISCO-PROCESS-MIB and its object cpmCPUTotal5minRev from the table called cpmCPUTotalTable,
+            indexed with cpmCPUTotalIndex.
             This table allows CISCO-PROCESS-MIB to keep CPU statistics for different physical entities in the router,
             like different CPU chips, group of CPUs, or CPUs in different modules/cards.
             In case of a single CPU, cpmCPUTotalTable has only one entry.
@@ -530,7 +530,7 @@ zabbix_export:
         ENTITY-MIB
         SNMPv2-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -674,7 +674,7 @@ zabbix_export:
       description: |
         Cisco IOS Software releases prior to 12.0(3)T
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Cisco CISCO-ENVMON-MIB SNMP'
@@ -702,7 +702,7 @@ zabbix_export:
           Version: IOS for example: 12.1(22)EA11, 15.4(3)M2
           Device: C2911, C7600
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Cisco CISCO-ENVMON-MIB SNMP'
@@ -728,7 +728,7 @@ zabbix_export:
       description: |
         Cisco IOS Software releases later to 12.0(3)T and prior to 12.2(3.5)
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Cisco CISCO-ENVMON-MIB SNMP'
@@ -755,7 +755,7 @@ zabbix_export:
         MIBs used:
         OLD-CISCO-CPU-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/dell_force_s_series_snmp/README.md b/templates/net/dell_force_s_series_snmp/README.md
index 226ff08a60e..b7c8bce0153 100644
--- a/templates/net/dell_force_s_series_snmp/README.md
+++ b/templates/net/dell_force_s_series_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,64 +15,64 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS} | <p>-</p>    | `2`     |
-| {$FAN_OK_STATUS}   | <p>-</p>    | `1`     |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS} | <p>-</p>    | `2`     |
-| {$PSU_OK_STATUS}   | <p>-</p>    | `1`     |
-| {$TEMP_CRIT_LOW}   | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}       | <p>-</p>    | `65`    |
-| {$TEMP_WARN}       | <p>-</p>    | `55`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`2` |
+|{$FAN_OK_STATUS} |<p>-</p> |`1` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`2` |
+|{$PSU_OK_STATUS} |<p>-</p> |`1` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`65` |
+|{$TEMP_WARN} |<p>-</p> |`55` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                               | Description                                                      | Type | Key and additional info |
-|------------------------------------|------------------------------------------------------------------|------|-------------------------|
-| CPU and Memory and Flash Discovery | <p>-</p>                                                         | SNMP | module.discovery        |
-| PSU Discovery                      | <p>A list of power supply residents in the S-series chassis.</p> | SNMP | psu.discovery           |
-| FAN Discovery                      | <p>-</p>                                                         | SNMP | fan.discovery           |
-| Stack Unit Discovery               | <p>-</p>                                                         | SNMP | stack.discovery         |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU and Memory and Flash Discovery |<p>-</p> |SNMP |module.discovery |
+|PSU Discovery |<p>A list of power supply residents in the S-series chassis.</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>-</p> |SNMP |fan.discovery |
+|Stack Unit Discovery |<p>-</p> |SNMP |stack.discovery |
 
 ## Items collected
 
-| Group        | Name                                      | Description                                                                                 | Type | Key and additional info                                                                                                         |
-|--------------|-------------------------------------------|---------------------------------------------------------------------------------------------|------|---------------------------------------------------------------------------------------------------------------------------------|
-| CPU          | #{#SNMPINDEX}: CPU utilization            | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>CPU utilization in percentage for last 1 minute.</p> | SNMP | system.cpu.util[chStackUnitCpuUtil1Min.{#SNMPINDEX}]                                                                            |
-| Fans         | Fan {#SNMPVALUE}: Fan status              | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The status of the fan tray {#SNMPVALUE}.</p>         | SNMP | sensor.fan.status[chSysFanTrayOperStatus.{#SNMPINDEX}]                                                                          |
-| Inventory    | #{#SNMPVALUE}: Hardware model name        | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The plugged-in model ID for this unit.</p>           | SNMP | system.hw.model[chStackUnitModelID.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>             |
-| Inventory    | #{#SNMPVALUE}: Hardware serial number     | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The unit's serial number.</p>                        | SNMP | system.hw.serialnumber[chStackUnitSerialNumber.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Inventory    | #{#SNMPVALUE}: Hardware version(revision) | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The unit manufacturer's product revision</p>         | SNMP | system.hw.version[chStackUnitProductRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>        |
-| Inventory    | #{#SNMPVALUE}: Operating system           | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>Current code version of this unit.</p>               | SNMP | system.sw.os[chStackUnitCodeVersion.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>            |
-| Memory       | #{#SNMPINDEX}: Memory utilization         | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>Total memory usage in percentage.</p>                | SNMP | vm.memory.util[chStackUnitMemUsageUtil.{#SNMPINDEX}]                                                                            |
-| Power_supply | PSU {#SNMPVALUE}: Power supply status     | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The status of the power supply {#SNMPVALUE}</p>      | SNMP | sensor.psu.status[chSysPowerSupplyOperStatus.{#SNMPINDEX}]                                                                      |
-| Temperature  | Device {#SNMPVALUE}: Temperature          | <p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The temperature of the unit.</p>                     | SNMP | sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}]                                                                                 |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>CPU utilization in percentage for last 1 minute.</p> |SNMP |system.cpu.util[chStackUnitCpuUtil1Min.{#SNMPINDEX}] |
+|Fans |Fan {#SNMPVALUE}: Fan status |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The status of the fan tray {#SNMPVALUE}.</p> |SNMP |sensor.fan.status[chSysFanTrayOperStatus.{#SNMPINDEX}] |
+|Inventory |#{#SNMPVALUE}: Hardware model name |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The plugged-in model ID for this unit.</p> |SNMP |system.hw.model[chStackUnitModelID.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |#{#SNMPVALUE}: Hardware serial number |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The unit's serial number.</p> |SNMP |system.hw.serialnumber[chStackUnitSerialNumber.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |#{#SNMPVALUE}: Hardware version(revision) |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The unit manufacturer's product revision</p> |SNMP |system.hw.version[chStackUnitProductRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |#{#SNMPVALUE}: Operating system |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>Current code version of this unit.</p> |SNMP |system.sw.os[chStackUnitCodeVersion.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |#{#SNMPINDEX}: Memory utilization |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>Total memory usage in percentage.</p> |SNMP |vm.memory.util[chStackUnitMemUsageUtil.{#SNMPINDEX}] |
+|Power_supply |PSU {#SNMPVALUE}: Power supply status |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The status of the power supply {#SNMPVALUE}</p> |SNMP |sensor.psu.status[chSysPowerSupplyOperStatus.{#SNMPINDEX}] |
+|Temperature |Device {#SNMPVALUE}: Temperature |<p>MIB: F10-S-SERIES-CHASSIS-MIB</p><p>The temperature of the unit.</p> |SNMP |sensor.temp.value[chStackUnitTemp.{#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[chStackUnitCpuUtil1Min.{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                         | WARNING  |                                                                                                               |
-| Fan {#SNMPVALUE}: Fan is in critical state                                     | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[chSysFanTrayOperStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                              | AVERAGE  |                                                                                                               |
-| Fan {#SNMPVALUE}: Fan is not in normal state                                   | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[chSysFanTrayOperStatus.{#SNMPINDEX}].count(#1,{$FAN_OK_STATUS},ne)}=1`                                                                                                                | INFO     | <p>**Depends on**:</p><p>- Fan {#SNMPVALUE}: Fan is in critical state</p>                                     |
-| #{#SNMPVALUE}: Device has been replaced (new serial number received)           | <p>Device serial number has changed. Ack to close</p>                                                                     | `{TEMPLATE_NAME:system.hw.serialnumber[chStackUnitSerialNumber.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber[chStackUnitSerialNumber.{#SNMPINDEX}].strlen()}>0`                                     | INFO     | <p>Manual close: YES</p>                                                                                      |
-| #{#SNMPVALUE}: 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[chStackUnitCodeVersion.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.sw.os[chStackUnitCodeVersion.{#SNMPINDEX}].strlen()}>0`                                                           | INFO     | <p>Manual close: YES</p>                                                                                      |
-| #{#SNMPINDEX}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)           | <p>The system is running out of free memory.</p>                                                                          | `{TEMPLATE_NAME:vm.memory.util[chStackUnitMemUsageUtil.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                       | AVERAGE  |                                                                                                               |
-| PSU {#SNMPVALUE}: Power supply is in critical state                            | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[chSysPowerSupplyOperStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                          | AVERAGE  |                                                                                                               |
-| PSU {#SNMPVALUE}: Power supply is not in normal state                          | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[chSysPowerSupplyOperStatus.{#SNMPINDEX}].count(#1,{$PSU_OK_STATUS},ne)}=1`                                                                                                            | INFO     | <p>**Depends on**:</p><p>- PSU {#SNMPVALUE}: Power supply is in critical state</p>                            |
-| Device {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- Device {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| Device {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                               |
-| Device {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                               |
+|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(/Dell Force S-Series SNMP/system.cpu.util[chStackUnitCpuUtil1Min.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Fan {#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Dell Force S-Series SNMP/sensor.fan.status[chSysFanTrayOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Fan {#SNMPVALUE}: Fan is not in normal state |<p>Please check the fan unit</p> |`count(/Dell Force S-Series SNMP/sensor.fan.status[chSysFanTrayOperStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1` |INFO |<p>**Depends on**:</p><p>- Fan {#SNMPVALUE}: Fan is in critical state</p> |
+|#{#SNMPVALUE}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Dell Force S-Series SNMP/system.hw.serialnumber[chStackUnitSerialNumber.{#SNMPINDEX}],#1)<>last(/Dell Force S-Series SNMP/system.hw.serialnumber[chStackUnitSerialNumber.{#SNMPINDEX}],#2) and length(last(/Dell Force S-Series SNMP/system.hw.serialnumber[chStackUnitSerialNumber.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|#{#SNMPVALUE}: 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(/Dell Force S-Series SNMP/system.sw.os[chStackUnitCodeVersion.{#SNMPINDEX}],#1)<>last(/Dell Force S-Series SNMP/system.sw.os[chStackUnitCodeVersion.{#SNMPINDEX}],#2) and length(last(/Dell Force S-Series SNMP/system.sw.os[chStackUnitCodeVersion.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|#{#SNMPINDEX}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Dell Force S-Series SNMP/vm.memory.util[chStackUnitMemUsageUtil.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|PSU {#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Dell Force S-Series SNMP/sensor.psu.status[chSysPowerSupplyOperStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|PSU {#SNMPVALUE}: Power supply is not in normal state |<p>Please check the power supply unit for errors</p> |`count(/Dell Force S-Series SNMP/sensor.psu.status[chSysPowerSupplyOperStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1` |INFO |<p>**Depends on**:</p><p>- PSU {#SNMPVALUE}: Power supply is in critical state</p> |
+|Device {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- Device {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|Device {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|Device {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml b/templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml
index a30e5b8c65f..c1699e30f04 100644
--- a/templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml
+++ b/templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:12Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:48Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         F10-S-SERIES-CHASSIS-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
diff --git a/templates/net/dlink_des7200_snmp/README.md b/templates/net/dlink_des7200_snmp/README.md
index 8e35c9a0875..6819181ccac 100644
--- a/templates/net/dlink_des7200_snmp/README.md
+++ b/templates/net/dlink_des7200_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,59 +15,59 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS} | <p>-</p>    | `5`     |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS} | <p>-</p>    | `5`     |
-| {$TEMP_CRIT_LOW}   | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}       | <p>-</p>    | `75`    |
-| {$TEMP_WARN}       | <p>-</p>    | `65`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`5` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`5` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`75` |
+|{$TEMP_WARN} |<p>-</p> |`65` |
 
 ## Template links
 
-| Name            |
-|-----------------|
-| Generic SNMP    |
-| Interfaces SNMP |
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description | Type | Key and additional info |
-|-----------------------|-------------|------|-------------------------|
-| Memory Discovery      | <p>-</p>    | SNMP | memory.discovery        |
-| Temperature Discovery | <p>-</p>    | SNMP | temperature.discovery   |
-| PSU Discovery         | <p>-</p>    | SNMP | psu.discovery           |
-| FAN Discovery         | <p>-</p>    | SNMP | fan.discovery           |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Memory Discovery |<p>-</p> |SNMP |memory.discovery |
+|Temperature Discovery |<p>-</p> |SNMP |temperature.discovery |
+|PSU Discovery |<p>-</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>-</p> |SNMP |fan.discovery |
 
 ## Items collected
 
-| Group        | Name                              | Description                                                                                                                                                                                                                         | Type | Key and additional info                                                                              |
-|--------------|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------|
-| CPU          | CPU utilization                   | <p>MIB: MY-PROCESS-MIB</p><p>CPU utilization in %</p>                                                                                                                                                                               | SNMP | system.cpu.util[myCPUUtilization5Min.0]                                                              |
-| Fans         | {#SNMPVALUE}: Fan status          | <p>MIB: MY-SYSTEM-MIB</p>                                                                                                                                                                                                           | SNMP | sensor.fan.status[mySystemFanIsNormal.{#SNMPINDEX}]                                                  |
-| Inventory    | Hardware model name               | <p>MIB: SNMPv2-MIB</p><p>A textual description of the entity. This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p> | SNMP | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                   |
-| Inventory    | Firmware version                  | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                              | SNMP | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                |
-| Inventory    | Hardware version(revision)        | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                              | SNMP | system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                 |
-| Inventory    | Operating system                  | <p>MIB: MY-SYSTEM-MIB</p>                                                                                                                                                                                                           | SNMP | system.sw.os[mySystemSwVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Memory       | {#SNMPINDEX}: Memory utilization  | <p>MIB: MY-MEMORY-MIB</p><p>This is the memory pool utilization currently.</p>                                                                                                                                                      | SNMP | vm.memory.util[myMemoryPoolCurrentUtilization.{#SNMPINDEX}]                                          |
-| Power_supply | {#SNMPVALUE}: Power supply status | <p>MIB: MY-SYSTEM-MIB</p>                                                                                                                                                                                                           | SNMP | sensor.psu.status[mySystemElectricalSourceIsNormal.{#SNMPINDEX}]                                     |
-| Temperature  | {#SNMPVALUE}: Temperature         | <p>MIB: MY-SYSTEM-MIB</p><p>Return the current temperature of the FastSwitch.The temperature display is not supported for the current temperature returns to 0.</p>                                                                 | SNMP | sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}]                                           |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: MY-PROCESS-MIB</p><p>CPU utilization in %</p> |SNMP |system.cpu.util[myCPUUtilization5Min.0] |
+|Fans |{#SNMPVALUE}: Fan status |<p>MIB: MY-SYSTEM-MIB</p> |SNMP |sensor.fan.status[mySystemFanIsNormal.{#SNMPINDEX}] |
+|Inventory |Hardware model name |<p>MIB: SNMPv2-MIB</p><p>A textual description of the entity. This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware version(revision) |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: MY-SYSTEM-MIB</p> |SNMP |system.sw.os[mySystemSwVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |{#SNMPINDEX}: Memory utilization |<p>MIB: MY-MEMORY-MIB</p><p>This is the memory pool utilization currently.</p> |SNMP |vm.memory.util[myMemoryPoolCurrentUtilization.{#SNMPINDEX}] |
+|Power_supply |{#SNMPVALUE}: Power supply status |<p>MIB: MY-SYSTEM-MIB</p> |SNMP |sensor.psu.status[mySystemElectricalSourceIsNormal.{#SNMPINDEX}] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: MY-SYSTEM-MIB</p><p>Return the current temperature of the FastSwitch.The temperature display is not supported for the current temperature returns to 0.</p> |SNMP |sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                    | Description                                                                                                               | Expression                                                                                                                                                                                                                                    | Severity | Dependencies and additional info                                                                       |
-|-------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|--------------------------------------------------------------------------------------------------------|
-| 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[myCPUUtilization5Min.0].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                            | WARNING  |                                                                                                        |
-| {#SNMPVALUE}: Fan is in critical state                                  | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[mySystemFanIsNormal.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                                       | AVERAGE  |                                                                                                        |
-| 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>                                                                               |
-| 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[mySystemSwVersion.0].diff()}=1 and {TEMPLATE_NAME:system.sw.os[mySystemSwVersion.0].strlen()}>0`                                                                                                                 | INFO     | <p>Manual close: YES</p>                                                                               |
-| {#SNMPINDEX}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)     | <p>The system is running out of free memory.</p>                                                                          | `{TEMPLATE_NAME:vm.memory.util[myMemoryPoolCurrentUtilization.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                      | AVERAGE  |                                                                                                        |
-| {#SNMPVALUE}: Power supply is in critical state                         | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[mySystemElectricalSourceIsNormal.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                                          | AVERAGE  |                                                                                                        |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                        |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                        |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/D-Link DES 7200 SNMP/system.cpu.util[myCPUUtilization5Min.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/D-Link DES 7200 SNMP/sensor.fan.status[mySystemFanIsNormal.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/D-Link DES 7200 SNMP/system.hw.firmware,#1)<>last(/D-Link DES 7200 SNMP/system.hw.firmware,#2) and length(last(/D-Link DES 7200 SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|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(/D-Link DES 7200 SNMP/system.sw.os[mySystemSwVersion.0],#1)<>last(/D-Link DES 7200 SNMP/system.sw.os[mySystemSwVersion.0],#2) and length(last(/D-Link DES 7200 SNMP/system.sw.os[mySystemSwVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|{#SNMPINDEX}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/D-Link DES 7200 SNMP/vm.memory.util[myMemoryPoolCurrentUtilization.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/D-Link DES 7200 SNMP/sensor.psu.status[mySystemElectricalSourceIsNormal.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml b/templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml
index 2e165283de6..3e7976e9e36 100644
--- a/templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml
+++ b/templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:07Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:53Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -20,7 +20,7 @@ zabbix_export:
         ENTITY-MIB
         MY-SYSTEM-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/dlink_des_snmp/README.md b/templates/net/dlink_des_snmp/README.md
index bbb7afc91cb..94fe92e846d 100644
--- a/templates/net/dlink_des_snmp/README.md
+++ b/templates/net/dlink_des_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,60 +15,60 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS} | <p>-</p>    | `2`     |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS} | <p>-</p>    | `4`     |
-| {$TEMP_CRIT_LOW}   | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}       | <p>-</p>    | `75`    |
-| {$TEMP_WARN}       | <p>-</p>    | `65`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`2` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`4` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`75` |
+|{$TEMP_WARN} |<p>-</p> |`65` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description                                     | Type | Key and additional info                                                          |
-|-----------------------|-------------------------------------------------|------|----------------------------------------------------------------------------------|
-| Memory Discovery      | <p>-</p>                                        | SNMP | memory.discovery                                                                 |
-| Temperature Discovery | <p>-</p>                                        | SNMP | temperature.discovery                                                            |
-| PSU Discovery         | <p>swPowerID of EQUIPMENT-MIB::swPowerTable</p> | SNMP | psu.discovery<p>**Filter**:</p>AND_OR <p>- A: {#STATUS} MATCHES_REGEX `[^0]`</p> |
-| FAN Discovery         | <p>swFanID of EQUIPMENT-MIB::swFanTable</p>     | SNMP | fan.discovery<p>**Filter**:</p>AND_OR <p>- A: {#STATUS} MATCHES_REGEX `[^0]`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Memory Discovery |<p>-</p> |SNMP |memory.discovery |
+|Temperature Discovery |<p>-</p> |SNMP |temperature.discovery |
+|PSU Discovery |<p>swPowerID of EQUIPMENT-MIB::swPowerTable</p> |SNMP |psu.discovery<p>**Filter**:</p>AND_OR <p>- {#STATUS} MATCHES_REGEX `[^0]`</p> |
+|FAN Discovery |<p>swFanID of EQUIPMENT-MIB::swFanTable</p> |SNMP |fan.discovery<p>**Filter**:</p>AND_OR <p>- {#STATUS} MATCHES_REGEX `[^0]`</p> |
 
 ## Items collected
 
-| Group        | Name                               | Description                                                                                                                                                                                                                                                                                                                                                                                                                | Type | Key and additional info                                                                   |
-|--------------|------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------|
-| CPU          | CPU utilization                    | <p>MIB: DLINK-AGENT-MIB</p><p>The unit of time is 1 minute. The value will be between 0% (idle) and 100%(very busy).</p>                                                                                                                                                                                                                                                                                                   | SNMP | system.cpu.util[agentCPUutilizationIn1min.0]                                              |
-| Fans         | #{#SNMPVALUE}: Fan status          | <p>MIB: EQUIPMENT-MIB</p><p>Indicates the current fan status.</p><p>speed-0     : If the fan function is normal and the fan does not spin            due to the temperature not  reaching the threshold, the status of the fan is speed 0.</p><p>speed-low   : Fan spin using the lowest speed.</p><p>speed-middle: Fan spin using the middle speed.</p><p>speed-high  : Fan spin using the highest speed.</p>             | SNMP | sensor.fan.status[swFanStatus.{#SNMPINDEX}]                                               |
-| Inventory    | Hardware model name                | <p>MIB: SNMPv2-MIB</p><p>A textual description of the entity.  This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p>                                                                                                                                                                                       | SNMP | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>        |
-| Inventory    | Hardware serial number             | <p>MIB: DLINK-AGENT-MIB</p><p>A text string containing the serial number of this device.</p>                                                                                                                                                                                                                                                                                                                               | SNMP | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Inventory    | Firmware version                   | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                     | SNMP | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>     |
-| Inventory    | Hardware version(revision)         | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                     | SNMP | system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>      |
-| Memory       | #{#SNMPVALUE}: Memory utilization  | <p>MIB: DLINK-AGENT-MIB</p><p>The percentage of used DRAM memory of the total DRAM memory available.The value will be between 0%(idle) and 100%(very busy)</p>                                                                                                                                                                                                                                                             | SNMP | vm.memory.util[agentDRAMutilization.{#SNMPINDEX}]                                         |
-| Power_supply | #{#SNMPVALUE}: Power supply status | <p>MIB: EQUIPMENT-MIB</p><p>Indicates the current power status.</p><p>lowVoltage : The voltage of the power unit is too low.</p><p>overCurrent: The current of the power unit is too high.</p><p>working    : The power unit is working normally.</p><p>fail       : The power unit has failed.</p><p>connect    : The power unit is connected but not powered on.</p><p>disconnect : The power unit is not connected.</p> | SNMP | sensor.psu.status[swPowerStatus.{#SNMPINDEX}]                                             |
-| Temperature  | #{#SNMPVALUE}: Temperature         | <p>MIB: EQUIPMENT-MIB</p><p>The shelf current temperature.</p>                                                                                                                                                                                                                                                                                                                                                             | SNMP | sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}]                                      |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: DLINK-AGENT-MIB</p><p>The unit of time is 1 minute. The value will be between 0% (idle) and 100%(very busy).</p> |SNMP |system.cpu.util[agentCPUutilizationIn1min.0] |
+|Fans |#{#SNMPVALUE}: Fan status |<p>MIB: EQUIPMENT-MIB</p><p>Indicates the current fan status.</p><p>speed-0     : If the fan function is normal and the fan does not spin            due to the temperature not  reaching the threshold, the status of the fan is speed 0.</p><p>speed-low   : Fan spin using the lowest speed.</p><p>speed-middle: Fan spin using the middle speed.</p><p>speed-high  : Fan spin using the highest speed.</p> |SNMP |sensor.fan.status[swFanStatus.{#SNMPINDEX}] |
+|Inventory |Hardware model name |<p>MIB: SNMPv2-MIB</p><p>A textual description of the entity.  This value should</p><p>include the full name and version identification of the system's hardware type, software operating-system, and</p><p>networking software.</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: DLINK-AGENT-MIB</p><p>A text string containing the serial number of this device.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware version(revision) |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |#{#SNMPVALUE}: Memory utilization |<p>MIB: DLINK-AGENT-MIB</p><p>The percentage of used DRAM memory of the total DRAM memory available.The value will be between 0%(idle) and 100%(very busy)</p> |SNMP |vm.memory.util[agentDRAMutilization.{#SNMPINDEX}] |
+|Power_supply |#{#SNMPVALUE}: Power supply status |<p>MIB: EQUIPMENT-MIB</p><p>Indicates the current power status.</p><p>lowVoltage : The voltage of the power unit is too low.</p><p>overCurrent: The current of the power unit is too high.</p><p>working    : The power unit is working normally.</p><p>fail       : The power unit has failed.</p><p>connect    : The power unit is connected but not powered on.</p><p>disconnect : The power unit is not connected.</p> |SNMP |sensor.psu.status[swPowerStatus.{#SNMPINDEX}] |
+|Temperature |#{#SNMPVALUE}: Temperature |<p>MIB: EQUIPMENT-MIB</p><p>The shelf current temperature.</p> |SNMP |sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                     | Description                                                                                          | Expression                                                                                                                                                                                                                        | Severity | Dependencies and additional info                                                                        |
-|--------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------------|
-| 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[agentCPUutilizationIn1min.0].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                           | WARNING  |                                                                                                         |
-| #{#SNMPVALUE}: Fan is in critical state                                  | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[swFanStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                                   | AVERAGE  |                                                                                                         |
-| 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>                                                                                |
-| #{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)     | <p>The system is running out of free memory.</p>                                                     | `{TEMPLATE_NAME:vm.memory.util[agentDRAMutilization.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                    | AVERAGE  |                                                                                                         |
-| #{#SNMPVALUE}: Power supply is in critical state                         | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[swPowerStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                                                 | AVERAGE  |                                                                                                         |
-| #{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- #{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| #{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                         |
-| #{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/D-Link DES_DGS Switch SNMP/system.cpu.util[agentCPUutilizationIn1min.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|#{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/D-Link DES_DGS Switch SNMP/sensor.fan.status[swFanStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/D-Link DES_DGS Switch SNMP/system.hw.serialnumber,#1)<>last(/D-Link DES_DGS Switch SNMP/system.hw.serialnumber,#2) and length(last(/D-Link DES_DGS Switch SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/D-Link DES_DGS Switch SNMP/system.hw.firmware,#1)<>last(/D-Link DES_DGS Switch SNMP/system.hw.firmware,#2) and length(last(/D-Link DES_DGS Switch SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|#{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/D-Link DES_DGS Switch SNMP/vm.memory.util[agentDRAMutilization.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|#{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/D-Link DES_DGS Switch SNMP/sensor.psu.status[swPowerStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|#{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- #{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|#{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|#{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml b/templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml
index 41b6a0c242c..c012208071a 100644
--- a/templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml
+++ b/templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:03Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:57Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -25,7 +25,7 @@ zabbix_export:
           Version: Firmware: 1.73R008,hardware revision: B1
           Device: DGS-3420-26SC Gigabit Ethernet Switch
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
diff --git a/templates/net/extreme_snmp/README.md b/templates/net/extreme_snmp/README.md
index 9055c58a143..0d01418b96e 100644
--- a/templates/net/extreme_snmp/README.md
+++ b/templates/net/extreme_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,66 +15,66 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                | Description | Default |
-|---------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}    | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS}  | <p>-</p>    | `2`     |
-| {$MEMORY.UTIL.MAX}  | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS}  | <p>-</p>    | `3`     |
-| {$TEMP_CRIT_LOW}    | <p>-</p>    | `5`     |
-| {$TEMP_CRIT_STATUS} | <p>-</p>    | `1`     |
-| {$TEMP_CRIT}        | <p>-</p>    | `65`    |
-| {$TEMP_WARN}        | <p>-</p>    | `55`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`2` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`3` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT_STATUS} |<p>-</p> |`1` |
+|{$TEMP_CRIT} |<p>-</p> |`65` |
+|{$TEMP_WARN} |<p>-</p> |`55` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name             | Description                                                 | Type | Key and additional info |
-|------------------|-------------------------------------------------------------|------|-------------------------|
-| Memory Discovery | <p>-</p>                                                    | SNMP | memory.discovery        |
-| PSU Discovery    | <p>Table of status of all power supplies in the system.</p> | SNMP | psu.discovery           |
-| FAN Discovery    | <p>-</p>                                                    | SNMP | fan.discovery           |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Memory Discovery |<p>-</p> |SNMP |memory.discovery |
+|PSU Discovery |<p>Table of status of all power supplies in the system.</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>-</p> |SNMP |fan.discovery |
 
 ## Items collected
 
-| Group        | Name                                  | Description                                                                                                                                                                                                                                                                                                                    | Type       | Key and additional info                                                                                                                                                                                                                                                              |
-|--------------|---------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU          | CPU utilization                       | <p>MIB: EXTREME-SOFTWARE-MONITOR-MIB</p><p>Total CPU utlization (percentage) as of last sampling.</p>                                                                                                                                                                                                                          | SNMP       | system.cpu.util[extremeCpuMonitorTotalUtilization.0]                                                                                                                                                                                                                                 |
-| Fans         | Fan {#SNMPVALUE}: Fan status          | <p>MIB: EXTREME-SYSTEM-MIB</p><p>Operational status of a cooling fan.</p>                                                                                                                                                                                                                                                      | SNMP       | sensor.fan.status[extremeFanOperational.{#SNMPINDEX}]                                                                                                                                                                                                                                |
-| Fans         | Fan {#SNMPVALUE}: Fan speed           | <p>MIB: EXTREME-SYSTEM-MIB</p><p>The speed (RPM) of a cooling fan in the fantray {#SNMPVALUE}</p>                                                                                                                                                                                                                              | SNMP       | sensor.fan.speed[extremeFanSpeed.{#SNMPINDEX}]                                                                                                                                                                                                                                       |
-| Inventory    | Hardware model name                   | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                         | SNMP       | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                                                   |
-| Inventory    | Hardware serial number                | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                         | SNMP       | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                                            |
-| Inventory    | Firmware version                      | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                         | SNMP       | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                                                |
-| Inventory    | Hardware version(revision)            | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                         | SNMP       | system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                                                 |
-| Inventory    | Operating system                      | <p>MIB: EXTREME-SYSTEM-MIB</p><p>The software revision of the primary image stored in this device.</p><p>This string will have a zero length if the revision is unknown, invalid or not present.</p><p>This will also be reported in RMON2 probeSoftwareRev if this is the software image currently running in the device.</p> | SNMP       | system.sw.os[extremePrimarySoftwareRev.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                         |
-| Memory       | #{#SNMPVALUE}: Available memory       | <p>MIB: EXTREME-SOFTWARE-MONITOR-MIB</p><p>Total amount of free memory in Kbytes in the system.</p>                                                                                                                                                                                                                            | SNMP       | vm.memory.available[extremeMemoryMonitorSystemFree.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                 |
-| Memory       | #{#SNMPVALUE}: Total memory           | <p>MIB: EXTREME-SOFTWARE-MONITOR-MIB</p><p>Total amount of DRAM in Kbytes in the system.</p>                                                                                                                                                                                                                                   | SNMP       | vm.memory.total[extremeMemoryMonitorSystemTotal.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                    |
-| Memory       | #{#SNMPVALUE}: Memory utilization     | <p>Memory utilization in %</p>                                                                                                                                                                                                                                                                                                 | CALCULATED | vm.memory.util[{#SNMPVALUE}]<p>**Expression**:</p>`(last("vm.memory.total[extremeMemoryMonitorSystemTotal.{#SNMPINDEX}]") - last("vm.memory.available[extremeMemoryMonitorSystemFree.{#SNMPINDEX}]")) / last("vm.memory.total[extremeMemoryMonitorSystemTotal.{#SNMPINDEX}]") * 100` |
-| Power_supply | PSU {#SNMPVALUE}: Power supply status | <p>MIB: EXTREME-SYSTEM-MIB</p><p>Status of the power supply {#SNMPVALUE}</p>                                                                                                                                                                                                                                                   | SNMP       | sensor.psu.status[extremePowerSupplyStatus.{#SNMPINDEX}]                                                                                                                                                                                                                             |
-| Temperature  | Device: Temperature                   | <p>MIB: EXTREME-SYSTEM-MIB</p><p>Temperature readings of testpoint: Device</p><p>Reference: https://gtacknowledge.extremenetworks.com/articles/Q_A/Does-EXOS-support-temperature-polling-via-SNMP-on-all-nodes-in-a-stack</p>                                                                                                  | SNMP       | sensor.temp.value[extremeCurrentTemperature.0]                                                                                                                                                                                                                                       |
-| Temperature  | Device: Temperature status            | <p>MIB: EXTREME-SYSTEM-MIB</p><p>Temperature status of testpoint: Device</p>                                                                                                                                                                                                                                                   | SNMP       | sensor.temp.status[extremeOverTemperatureAlarm.0]                                                                                                                                                                                                                                    |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: EXTREME-SOFTWARE-MONITOR-MIB</p><p>Total CPU utlization (percentage) as of last sampling.</p> |SNMP |system.cpu.util[extremeCpuMonitorTotalUtilization.0] |
+|Fans |Fan {#SNMPVALUE}: Fan status |<p>MIB: EXTREME-SYSTEM-MIB</p><p>Operational status of a cooling fan.</p> |SNMP |sensor.fan.status[extremeFanOperational.{#SNMPINDEX}] |
+|Fans |Fan {#SNMPVALUE}: Fan speed |<p>MIB: EXTREME-SYSTEM-MIB</p><p>The speed (RPM) of a cooling fan in the fantray {#SNMPVALUE}</p> |SNMP |sensor.fan.speed[extremeFanSpeed.{#SNMPINDEX}] |
+|Inventory |Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware version(revision) |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: EXTREME-SYSTEM-MIB</p><p>The software revision of the primary image stored in this device.</p><p>This string will have a zero length if the revision is unknown, invalid or not present.</p><p>This will also be reported in RMON2 probeSoftwareRev if this is the software image currently running in the device.</p> |SNMP |system.sw.os[extremePrimarySoftwareRev.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |#{#SNMPVALUE}: Available memory |<p>MIB: EXTREME-SOFTWARE-MONITOR-MIB</p><p>Total amount of free memory in Kbytes in the system.</p> |SNMP |vm.memory.available[extremeMemoryMonitorSystemFree.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |#{#SNMPVALUE}: Total memory |<p>MIB: EXTREME-SOFTWARE-MONITOR-MIB</p><p>Total amount of DRAM in Kbytes in the system.</p> |SNMP |vm.memory.total[extremeMemoryMonitorSystemTotal.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |#{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[{#SNMPVALUE}]<p>**Expression**:</p>`(last(//vm.memory.total[extremeMemoryMonitorSystemTotal.{#SNMPINDEX}]) - last(//vm.memory.available[extremeMemoryMonitorSystemFree.{#SNMPINDEX}])) / last(//vm.memory.total[extremeMemoryMonitorSystemTotal.{#SNMPINDEX}]) * 100` |
+|Power_supply |PSU {#SNMPVALUE}: Power supply status |<p>MIB: EXTREME-SYSTEM-MIB</p><p>Status of the power supply {#SNMPVALUE}</p> |SNMP |sensor.psu.status[extremePowerSupplyStatus.{#SNMPINDEX}] |
+|Temperature |Device: Temperature |<p>MIB: EXTREME-SYSTEM-MIB</p><p>Temperature readings of testpoint: Device</p><p>Reference: https://gtacknowledge.extremenetworks.com/articles/Q_A/Does-EXOS-support-temperature-polling-via-SNMP-on-all-nodes-in-a-stack</p> |SNMP |sensor.temp.value[extremeCurrentTemperature.0] |
+|Temperature |Device: Temperature status |<p>MIB: EXTREME-SYSTEM-MIB</p><p>Temperature status of testpoint: Device</p> |SNMP |sensor.temp.status[extremeOverTemperatureAlarm.0] |
 
 ## Triggers
 
-| Name                                                                 | Description                                                                                                               | Expression                                                                                                                                                                                                                                                                                                        | Severity | Dependencies and additional info                                                                 |
-|----------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|--------------------------------------------------------------------------------------------------|
-| 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[extremeCpuMonitorTotalUtilization.0].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                   | WARNING  |                                                                                                  |
-| Fan {#SNMPVALUE}: Fan is in critical state                           | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[extremeFanOperational.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                         | AVERAGE  |                                                                                                  |
-| 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>                                                                         |
-| 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[extremePrimarySoftwareRev.0].diff()}=1 and {TEMPLATE_NAME:system.sw.os[extremePrimarySoftwareRev.0].strlen()}>0`                                                                                                                                                                     | INFO     | <p>Manual close: YES</p>                                                                         |
-| #{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) | <p>The system is running out of free memory.</p>                                                                          | `{TEMPLATE_NAME:vm.memory.util[{#SNMPVALUE}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                         | AVERAGE  |                                                                                                  |
-| PSU {#SNMPVALUE}: Power supply is in critical state                  | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[extremePowerSupplyStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                      | AVERAGE  |                                                                                                  |
-| Device: Temperature is above warning threshold: >{$TEMP_WARN:""}     | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[extremeCurrentTemperature.0].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[extremeCurrentTemperature.0].max(5m)}<{$TEMP_WARN:""}-3`                                                                                                     | WARNING  | <p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| Device: Temperature is above critical threshold: >{$TEMP_CRIT:""}    | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[extremeCurrentTemperature.0].avg(5m)}>{$TEMP_CRIT:""} or {Extreme EXOS SNMP:sensor.temp.status[extremeOverTemperatureAlarm.0].last()}={$TEMP_CRIT_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[extremeCurrentTemperature.0].max(5m)}<{$TEMP_CRIT:""}-3` | HIGH     |                                                                                                  |
-| Device: Temperature is too low: <{$TEMP_CRIT_LOW:""}                 | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[extremeCurrentTemperature.0].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[extremeCurrentTemperature.0].min(5m)}>{$TEMP_CRIT_LOW:""}+3`                                                                                             | AVERAGE  |                                                                                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Extreme EXOS SNMP/system.cpu.util[extremeCpuMonitorTotalUtilization.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Fan {#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Extreme EXOS SNMP/sensor.fan.status[extremeFanOperational.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Extreme EXOS SNMP/system.hw.serialnumber,#1)<>last(/Extreme EXOS SNMP/system.hw.serialnumber,#2) and length(last(/Extreme EXOS SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/Extreme EXOS SNMP/system.hw.firmware,#1)<>last(/Extreme EXOS SNMP/system.hw.firmware,#2) and length(last(/Extreme EXOS SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|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(/Extreme EXOS SNMP/system.sw.os[extremePrimarySoftwareRev.0],#1)<>last(/Extreme EXOS SNMP/system.sw.os[extremePrimarySoftwareRev.0],#2) and length(last(/Extreme EXOS SNMP/system.sw.os[extremePrimarySoftwareRev.0]))>0` |INFO |<p>Manual close: YES</p> |
+|#{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Extreme EXOS SNMP/vm.memory.util[{#SNMPVALUE}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|PSU {#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Extreme EXOS SNMP/sensor.psu.status[extremePowerSupplyStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Extreme EXOS SNMP/sensor.temp.value[extremeCurrentTemperature.0],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/Extreme EXOS SNMP/sensor.temp.value[extremeCurrentTemperature.0],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Extreme EXOS SNMP/sensor.temp.value[extremeCurrentTemperature.0],5m)>{$TEMP_CRIT:""} or last(/Extreme EXOS SNMP/sensor.temp.status[extremeOverTemperatureAlarm.0])={$TEMP_CRIT_STATUS} `<p>Recovery expression:</p>`max(/Extreme EXOS SNMP/sensor.temp.value[extremeCurrentTemperature.0],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Extreme EXOS SNMP/sensor.temp.value[extremeCurrentTemperature.0],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Extreme EXOS SNMP/sensor.temp.value[extremeCurrentTemperature.0],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/extreme_snmp/template_net_extreme_snmp.yaml b/templates/net/extreme_snmp/template_net_extreme_snmp.yaml
index 6afc03dd418..11ecfc54af3 100644
--- a/templates/net/extreme_snmp/template_net_extreme_snmp.yaml
+++ b/templates/net/extreme_snmp/template_net_extreme_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:03Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:02Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         EXTREME-SYSTEM-MIB
         ENTITY-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
diff --git a/templates/net/f5_bigip_snmp/README.md b/templates/net/f5_bigip_snmp/README.md
index 3ad51a4348a..59336702a20 100644
--- a/templates/net/f5_bigip_snmp/README.md
+++ b/templates/net/f5_bigip_snmp/README.md
@@ -1,5 +1,5 @@
 
-# Big-IP SNMP
+# F5 Big-IP SNMP
 
 ## Overview
 
@@ -43,7 +43,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|File system discovery |<p>A table containing entries of system disk usage information.</p> |SNMP |bigip.disktable.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- A: {#PART.NAME} MATCHES_REGEX `{$BIGIP.LLD.FILTER.PART.NAME.MATCHES}`</p><p>- B: {#PART.NAME} NOT_MATCHES_REGEX `{$BIGIP.LLD.FILTER.PART.NAME.NOT_MATCHES}`</p> |
+|File system discovery |<p>A table containing entries of system disk usage information.</p> |SNMP |bigip.disktable.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#PART.NAME} MATCHES_REGEX `{$BIGIP.LLD.FILTER.PART.NAME.MATCHES}`</p><p>- {#PART.NAME} NOT_MATCHES_REGEX `{$BIGIP.LLD.FILTER.PART.NAME.NOT_MATCHES}`</p> |
 |Memory discovery |<p>Containing system statistics information of the memory usage</p> |SNMP |bigip.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |CPU discovery |<p>A table containing entries of system CPU usage information for a system.</p> |SNMP |bigip.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network interface discovery |<p>A table containing statistic information of the interfaces on the device.</p> |SNMP |bigip.net.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -122,42 +122,42 @@ There are no template links in this template.
 |Modules |F5 BIG-IP: Module [{#MODULE.NAME}]: Memory ratio |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The ratio of available memory to allocate. Only valid if level is 'custom'</p> |SNMP |bigip.module.memory.ratio[{#MODULE.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Modules |F5 BIG-IP: Module [{#MODULE.NAME}]: CPU ratio |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The ratio of CPU to allocate to this module. Only valid if level is 'custom'</p> |SNMP |bigip.module.cpu.ratio[{#MODULE.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Modules |F5 BIG-IP: Module [{#MODULE.NAME}]: Disk ratio |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The ratio of available disk space to allocate to this module. Only valid if level is 'custom'</p> |SNMP |bigip.module.disk.ratio[{#MODULE.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of packets received on this interface.</p> |SNMP |bigip.net.in.pkts.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of bytes received on this interface.</p> |SNMP |bigip.net.in.bytes.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of packets transmitted out of the specified interface.</p> |SNMP |bigip.net.out.pkts.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of bytes transmitted out of the specified interface.</p> |SNMP |bigip.net.out.bytes.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming multicast packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of multicast packets received on this interface.</p> |SNMP |bigip.net.in.multicast.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing multicast packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of multicast packets transmitted out of the specified interface.</p> |SNMP |bigip.net.out.multicast.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of packets received on this interface.</p> |SNMP |bigip.net.in.pkts.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of bytes received on this interface.</p> |SNMP |bigip.net.in.bytes.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of packets transmitted out of the specified interface.</p> |SNMP |bigip.net.out.pkts.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of bytes transmitted out of the specified interface.</p> |SNMP |bigip.net.out.bytes.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming multicast packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of multicast packets received on this interface.</p> |SNMP |bigip.net.in.multicast.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing multicast packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of multicast packets transmitted out of the specified interface.</p> |SNMP |bigip.net.out.multicast.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming packet error |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The number of received packets that are either undersized,</p><p>oversized, or have FCS errors by the specified interface.</p> |SNMP |bigip.net.in.error[{#IF.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing packet error |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The number of excessive collisions, incremented for each</p><p>frame that experienced 16 collisions during transmission and</p><p>was aborted on the specified interface.</p> |SNMP |bigip.net.out.error[{#IF.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming packet drops |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The number of packets dropped on ingress for various reasons on the specified interface.</p> |SNMP |bigip.net.in.drops[{#IF.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing packet drops |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The number of packets aged out or with excessive transmission</p><p>delays due to multiple deferrals on the specified interface.</p> |SNMP |bigip.net.out.drops[{#IF.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Collisions |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The number of collisions on the specified interface, incremented by the</p><p>number of collisions experienced during transmissions of a frame</p> |SNMP |bigip.net.collisions[{#IF.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming QnQ packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of double tagged packets received on the specified interface.</p> |SNMP |bigip.net.in.qq.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing QnQ packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of double tagged packets transmitted out of the specified interface.</p> |SNMP |bigip.net.out.qq.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Pause state |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The pause state of the specified interface.</p><p>none - no pause;</p><p>txrx - pause all data flow;</p><p>tx - pause out going data flow;</p><p>rx - pause in coming data flow.</p> |SNMP |bigip.net.pause[{#IF.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified virtual server from client-side.</p> |SNMP |bigip.vserver.net.in.pkts.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified virtual server from client-side.</p> |SNMP |bigip.vserver.net.in.bytes.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to client-side from the specified virtual server.</p> |SNMP |bigip.vserver.net.out.pkts.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes sent to client-side from the specified virtual server.</p> |SNMP |bigip.vserver.net.out.bytes.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Incoming QnQ packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of double tagged packets received on the specified interface.</p> |SNMP |bigip.net.in.qq.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing QnQ packet, rate |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The rate of double tagged packets transmitted out of the specified interface.</p> |SNMP |bigip.net.out.qq.rate[{#IF.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Interface [{#IF.NAME}]: Pause state |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The pause state of the specified interface.</p><p>none - no pause;</p><p>txrx - pause all data flow;</p><p>tx - pause outgoing data flow;</p><p>rx - pause incoming data flow.</p> |SNMP |bigip.net.pause[{#IF.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified virtual server from client-side.</p> |SNMP |bigip.vserver.net.in.pkts.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified virtual server from client-side.</p> |SNMP |bigip.vserver.net.in.bytes.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to client-side from the specified virtual server.</p> |SNMP |bigip.vserver.net.out.pkts.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes sent to client-side from the specified virtual server.</p> |SNMP |bigip.vserver.net.out.bytes.rate[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Current connections |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The current connections from client-side to the specified virtual server.</p> |SNMP |bigip.vserver.net.conn[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 5s |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 5 seconds.</p> |SNMP |bigip.vserver.usage.5s[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 1m |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 1 minute.</p> |SNMP |bigip.vserver.usage.1m[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 5m |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The percentage of time Virtual Server was busy over the last 5 minutes.</p> |SNMP |bigip.vserver.usage.5m[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Connections hit a rate limit |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The last recorded value for the number of connections to the virtual server when connections hit a rate limit;</p><p>this calculation is only maintained if rate limiting is configured for the service.</p> |SNMP |bigip.vserver.overlimit[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Duration of exceeding rate limit |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>Duration of time in seconds the specified virtual server has exceeded the configured connection rate limit.</p> |SNMP |bigip.vserver.overtime[{#VSERVER.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified node address from server-side.</p> |SNMP |bigip.node.net.in.pkts.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified node address from server-side.</p> |SNMP |bigip.node.net.in.bytes.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to server-side from the specified node address.</p> |SNMP |bigip.node.net.out.pkts.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes sent to server-side from the specified node address.</p> |SNMP |bigip.node.net.out.bytes.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified node address from server-side.</p> |SNMP |bigip.node.net.in.pkts.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified node address from server-side.</p> |SNMP |bigip.node.net.in.bytes.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to server-side from the specified node address.</p> |SNMP |bigip.node.net.out.pkts.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes sent to server-side from the specified node address.</p> |SNMP |bigip.node.net.out.bytes.rate[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Current connections |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The current connections from server-side to the specified node address.</p> |SNMP |bigip.node.net.conn[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Current sessions |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The number of current sessions going through the specified node address.</p> |SNMP |bigip.node.net.sessions[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Connections hit a rate limit |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The last recorded value for the number of connections to the node address when connections hit a rate limit;</p><p>this calculation is only maintained if rate limiting is configured for the node.</p> |SNMP |bigip.node.overlimit[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Node [{#NODE.NAME}]: Duration of exceeding rate limit |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>Duration of time in seconds the specified node address has exceeded the</p><p>configured connection rate limit.</p> |SNMP |bigip.node.overtime[{#NODE.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified pool from server-side.</p> |SNMP |bigip.pool.net.in.pkts.rate[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified pool from server-side.</p> |SNMP |bigip.pool.net.in.bytes.rate[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to server-side from the specified pool.</p> |SNMP |bigip.pool.net.out.pkts.rate[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes sent to server-side from the specified pool.</p> |SNMP |bigip.pool.net.out.bytes.rate[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Incoming packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets received by the specified pool from server-side.</p> |SNMP |bigip.pool.net.in.pkts.rate[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Incoming traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes received by the specified pool from server-side.</p> |SNMP |bigip.pool.net.in.bytes.rate[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Outgoing packet, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of packets sent to server-side from the specified pool.</p> |SNMP |bigip.pool.net.out.pkts.rate[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Outgoing traffic, rate |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The rate of bytes sent to server-side from the specified pool.</p> |SNMP |bigip.pool.net.out.bytes.rate[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Current connections |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The current connections from server-side to the specified pool.</p> |SNMP |bigip.pool.net.conn[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Current sessions |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The number of current sessions going through the specified pool.</p> |SNMP |bigip.pool.net.sessions[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Queue |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>Number of connections currently in queue, sum.</p> |SNMP |bigip.pool.queue[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -183,26 +183,26 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|F5 BIG-IP: Cluster not in sync: {ITEM.VALUE} |<p>-</p> |`{TEMPLATE_NAME:bigip.failover.count(10m,3,ne)}>8 and {TEMPLATE_NAME:bigip.failover.count(10m,4,ne)}>6` |WARNING |<p>Manual close: YES</p> |
-|F5 BIG-IP: The device is inconsistent with the device group: {ITEM.VALUE} |<p>The device is inconsistent with the device group, requires user intervention</p> |`{TEMPLATE_NAME:bigip.syncstatus.last()}=4` |WARNING |<p>Manual close: YES</p> |
-|F5 BIG-IP: Changes have been made on the device not sync to the device group: {ITEM.VALUE} |<p>Changes have been made on the device not sync to the device group, requires user intervention</p> |`{TEMPLATE_NAME:bigip.syncstatus.last()}=2` |WARNING |<p>Manual close: YES</p> |
-|F5 BIG-IP: High CPU utilization (over {$BIGIP.CPU.UTIL.WARN.MAX}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`{TEMPLATE_NAME:bigip.cpu.usageratio.5m[{#HOST.ID},{#CPU.ID}].last()}>{$BIGIP.CPU.UTIL.WARN.MAX}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.cpu.usageratio.5m[{#HOST.ID},{#CPU.ID}].last()}<{$BIGIP.CPU.UTIL.WARN.MIN}` |WARNING | |
-|F5 BIG-IP: Fan[{#FAN.INDEX}] is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:bigip.chassis.fan.status[{#FAN.INDEX}].last()}=0` |AVERAGE | |
-|F5 BIG-IP: Fan[{#FAN.INDEX}] is not present |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:bigip.chassis.fan.status[{#FAN.INDEX}].last()}=2` |INFO | |
-|F5 BIG-IP: Low free space in file system [{#PART.NAME}] (less than {$BIGIP.FS.FREE.WARN.MIN}% for 5m) |<p>The system is running out of free space.</p> |`{TEMPLATE_NAME:bigip.disktable.freeblocks[{#PART.NAME}].last()}/{Big-IP SNMP:bigip.disktable.totalblocks[{#PART.NAME}].last()}*100<{$BIGIP.FS.FREE.WARN.MIN:"{#PART.NAME}"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.disktable.freeblocks[{#PART.NAME}].last()}/{Big-IP SNMP:bigip.disktable.totalblocks[{#PART.NAME}].last()}*100>{$BIGIP.FS.FREE.WARN.MAX:"{#PART.NAME}"}` |WARNING |<p>Manual close: YES</p> |
-|F5 BIG-IP: Chassis has been replaced (new serial number received) |<p>Chassis serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:bigip.serialnumber.diff()}=1 and {TEMPLATE_NAME:bigip.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|F5 BIG-IP: High memory utilization in host [{#HOST.ID}] (over {$BIGIP.MEMORY.UTIL.WARN.MAX}%) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:bigip.memory.used[{#HOST.ID}].last()}/{Big-IP SNMP:bigip.memory.total[{#HOST.ID}].last()}*100>{$BIGIP.MEMORY.UTIL.WARN.MAX}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.memory.used[{#HOST.ID}].last()}/{Big-IP SNMP:bigip.memory.total[{#HOST.ID}].last()}*100<{$BIGIP.MEMORY.UTIL.WARN.MIN}` |WARNING | |
-|F5 BIG-IP: High swap utilization in host [{#HOST.ID}] (over {$BIGIP.SWAP.UTIL.WARN.MAX}%) |<p>The system is running out of free swap memory.</p> |`{TEMPLATE_NAME:bigip.memory.used.swap[{#HOST.ID}].last()}/{Big-IP SNMP:bigip.memory.total.swap[{#HOST.ID}].last()}*100>{$BIGIP.SWAP.UTIL.WARN.MAX}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.memory.used.swap[{#HOST.ID}].last()}/{Big-IP SNMP:bigip.memory.total.swap[{#HOST.ID}].last()}*100>{$BIGIP.SWAP.UTIL.WARN.MIN}` |WARNING | |
-|F5 BIG-IP: There are errors on the network interface ({#IF.NAME}) |<p>-</p> |`{TEMPLATE_NAME:bigip.net.in.error[{#IF.NAME}].last()}>{TEMPLATE_NAME:bigip.net.in.error[{#IF.NAME}].prev()} or {Big-IP SNMP:bigip.net.out.error[{#IF.NAME}].last()}>{Big-IP SNMP:bigip.net.out.error[{#IF.NAME}].prev()}` |AVERAGE | |
-|F5 BIG-IP: Pool {#POOL.NAME} is not available in some capacity: {ITEM.VALUE1} |<p>-</p> |`{TEMPLATE_NAME:bigip.pool.available[{#POOL.NAME}].count(120m,1,ne)}>20` |AVERAGE |<p>**Depends on**:</p><p>- F5 BIG-IP: Pool {#POOL.NAME} is not enabled in some capacity: {ITEM.VALUE1}</p> |
-|F5 BIG-IP: Pool {#POOL.NAME} is not enabled in some capacity: {ITEM.VALUE1} |<p>-</p> |`{TEMPLATE_NAME:bigip.pool.enabled[{#POOL.NAME}].count(120m,1,ne)}>4` |AVERAGE | |
-|F5 BIG-IP: Power supply [{#POWER.INDEX}] is in critical state |<p>Please check the power supply unit</p> |`{TEMPLATE_NAME:bigip.chassis.power.status[{#POWER.INDEX}].last()}=0` |HIGH | |
-|F5 BIG-IP: Power supply [{#POWER.INDEX}] is not present |<p>Please check the power supply unit</p> |`{TEMPLATE_NAME:bigip.chassis.power.status[{#POWER.INDEX}].last()}=2` |INFO | |
-|F5 BIG-IP: Less than {$BIGIP.CERT.MIN} days left until the certificate expires ({#CERT.NAME}) |<p>Please check certificate</p> |`{TEMPLATE_NAME:bigip.cert.expiration.date[{#CERT.NAME}].last()} - 86400 * {$BIGIP.CERT.MIN} < {TEMPLATE_NAME:bigip.cert.expiration.date[{#CERT.NAME}].now()}` |WARNING | |
-|F5 BIG-IP: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|F5 BIG-IP: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:bigip.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.HIGH} °C |<p>-</p> |`{TEMPLATE_NAME:bigip.chassis.temp.value[{#TEMP.INDEX}].last()}>{$BIGIP.TEMP.HIGH}` |HIGH | |
-|F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.WARN} °C |<p>-</p> |`{TEMPLATE_NAME:bigip.chassis.temp.value[{#TEMP.INDEX}].last()}>{$BIGIP.TEMP.WARN}` |WARNING |<p>**Depends on**:</p><p>- F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.HIGH} °C</p> |
+|F5 BIG-IP: Cluster not in sync: {ITEM.VALUE} |<p>-</p> |`count(/F5 Big-IP SNMP/bigip.failover,10m,"ne","3")>8 and count(/F5 Big-IP SNMP/bigip.failover,10m,"ne","4")>6` |WARNING |<p>Manual close: YES</p> |
+|F5 BIG-IP: The device is inconsistent with the device group: {ITEM.VALUE} |<p>The device is inconsistent with the device group, requires user intervention</p> |`last(/F5 Big-IP SNMP/bigip.syncstatus)=4` |WARNING |<p>Manual close: YES</p> |
+|F5 BIG-IP: Changes have been made on the device not sync to the device group: {ITEM.VALUE} |<p>Changes have been made on the device not sync to the device group, requires user intervention</p> |`last(/F5 Big-IP SNMP/bigip.syncstatus)=2` |WARNING |<p>Manual close: YES</p> |
+|F5 BIG-IP: High CPU utilization (over {$BIGIP.CPU.UTIL.WARN.MAX}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`last(/F5 Big-IP SNMP/bigip.cpu.usageratio.5m[{#HOST.ID},{#CPU.ID}])>{$BIGIP.CPU.UTIL.WARN.MAX}`<p>Recovery expression:</p>`last(/F5 Big-IP SNMP/bigip.cpu.usageratio.5m[{#HOST.ID},{#CPU.ID}])<{$BIGIP.CPU.UTIL.WARN.MIN}` |WARNING | |
+|F5 BIG-IP: Fan[{#FAN.INDEX}] is in critical state |<p>Please check the fan unit</p> |`last(/F5 Big-IP SNMP/bigip.chassis.fan.status[{#FAN.INDEX}])=0` |AVERAGE | |
+|F5 BIG-IP: Fan[{#FAN.INDEX}] is not present |<p>Please check the fan unit</p> |`last(/F5 Big-IP SNMP/bigip.chassis.fan.status[{#FAN.INDEX}])=2` |INFO | |
+|F5 BIG-IP: Low free space in file system [{#PART.NAME}] (less than {$BIGIP.FS.FREE.WARN.MIN}% for 5m) |<p>The system is running out of free space.</p> |`last(/F5 Big-IP SNMP/bigip.disktable.freeblocks[{#PART.NAME}])/last(/F5 Big-IP SNMP/bigip.disktable.totalblocks[{#PART.NAME}])*100<{$BIGIP.FS.FREE.WARN.MIN:"{#PART.NAME}"}`<p>Recovery expression:</p>`last(/F5 Big-IP SNMP/bigip.disktable.freeblocks[{#PART.NAME}])/last(/F5 Big-IP SNMP/bigip.disktable.totalblocks[{#PART.NAME}])*100>{$BIGIP.FS.FREE.WARN.MAX:"{#PART.NAME}"}` |WARNING |<p>Manual close: YES</p> |
+|F5 BIG-IP: Chassis has been replaced (new serial number received) |<p>Chassis serial number has changed. Ack to close</p> |`last(/F5 Big-IP SNMP/bigip.serialnumber,#1)<>last(/F5 Big-IP SNMP/bigip.serialnumber,#2) and length(last(/F5 Big-IP SNMP/bigip.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|F5 BIG-IP: High memory utilization in host [{#HOST.ID}] (over {$BIGIP.MEMORY.UTIL.WARN.MAX}%) |<p>The system is running out of free memory.</p> |`last(/F5 Big-IP SNMP/bigip.memory.used[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total[{#HOST.ID}])*100>{$BIGIP.MEMORY.UTIL.WARN.MAX}`<p>Recovery expression:</p>`last(/F5 Big-IP SNMP/bigip.memory.used[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total[{#HOST.ID}])*100<{$BIGIP.MEMORY.UTIL.WARN.MIN}` |WARNING | |
+|F5 BIG-IP: High swap utilization in host [{#HOST.ID}] (over {$BIGIP.SWAP.UTIL.WARN.MAX}%) |<p>The system is running out of free swap memory.</p> |`last(/F5 Big-IP SNMP/bigip.memory.used.swap[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total.swap[{#HOST.ID}])*100>{$BIGIP.SWAP.UTIL.WARN.MAX}`<p>Recovery expression:</p>`last(/F5 Big-IP SNMP/bigip.memory.used.swap[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total.swap[{#HOST.ID}])*100>{$BIGIP.SWAP.UTIL.WARN.MIN}` |WARNING | |
+|F5 BIG-IP: There are errors on the network interface ({#IF.NAME}) |<p>-</p> |`last(/F5 Big-IP SNMP/bigip.net.in.error[{#IF.NAME}])>last(/F5 Big-IP SNMP/bigip.net.in.error[{#IF.NAME}],#2) or last(/F5 Big-IP SNMP/bigip.net.out.error[{#IF.NAME}])>last(/F5 Big-IP SNMP/bigip.net.out.error[{#IF.NAME}],#2)` |AVERAGE | |
+|F5 BIG-IP: Pool {#POOL.NAME} is not available in some capacity: {ITEM.VALUE1} |<p>-</p> |`count(/F5 Big-IP SNMP/bigip.pool.available[{#POOL.NAME}],120m,"ne","1")>20` |AVERAGE |<p>**Depends on**:</p><p>- F5 BIG-IP: Pool {#POOL.NAME} is not enabled in some capacity: {ITEM.VALUE1}</p> |
+|F5 BIG-IP: Pool {#POOL.NAME} is not enabled in some capacity: {ITEM.VALUE1} |<p>-</p> |`count(/F5 Big-IP SNMP/bigip.pool.enabled[{#POOL.NAME}],120m,"ne","1")>4` |AVERAGE | |
+|F5 BIG-IP: Power supply [{#POWER.INDEX}] is in critical state |<p>Please check the power supply unit</p> |`last(/F5 Big-IP SNMP/bigip.chassis.power.status[{#POWER.INDEX}])=0` |HIGH | |
+|F5 BIG-IP: Power supply [{#POWER.INDEX}] is not present |<p>Please check the power supply unit</p> |`last(/F5 Big-IP SNMP/bigip.chassis.power.status[{#POWER.INDEX}])=2` |INFO | |
+|F5 BIG-IP: Less than {$BIGIP.CERT.MIN} days left until the certificate expires ({#CERT.NAME}) |<p>Please check certificate</p> |`last(/F5 Big-IP SNMP/bigip.cert.expiration.date[{#CERT.NAME}]) - 86400 * {$BIGIP.CERT.MIN} < now()` |WARNING | |
+|F5 BIG-IP: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/F5 Big-IP SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|F5 BIG-IP: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/F5 Big-IP SNMP/bigip.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.HIGH} °C |<p>-</p> |`last(/F5 Big-IP SNMP/bigip.chassis.temp.value[{#TEMP.INDEX}])>{$BIGIP.TEMP.HIGH}` |HIGH | |
+|F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.WARN} °C |<p>-</p> |`last(/F5 Big-IP SNMP/bigip.chassis.temp.value[{#TEMP.INDEX}])>{$BIGIP.TEMP.WARN}` |WARNING |<p>**Depends on**:</p><p>- F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.HIGH} °C</p> |
 
 ## Feedback
 
diff --git a/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml b/templates/net/f5_bigip_snmp/template_net_f5_bigip_snmp.yaml
index 0f3579e82dc..c25e5b22643 100644
--- a/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml
+++ b/templates/net/f5_bigip_snmp/template_net_f5_bigip_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-07T10:51:14Z'
+  date: '2022-01-10T07:56:32Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -16,7 +16,7 @@ zabbix_export:
         F5-BIGIP-LOCAL-MIB
         F5-BIGIP-SYSTEM-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -2286,8 +2286,8 @@ zabbix_export:
                 The pause state of the specified interface.
                 none - no pause;
                 txrx - pause all data flow;
-                tx - pause out going data flow;
-                rx - pause in coming data flow.
+                tx - pause outgoing data flow;
+                rx - pause incoming data flow.
               valuemap:
                 name: 'Pause state'
               preprocessing:
diff --git a/templates/net/generic_snmp/README.md b/templates/net/generic_snmp/README.md
index d3030c9ad49..20c90271b42 100644
--- a/templates/net/generic_snmp/README.md
+++ b/templates/net/generic_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Use this template if you can't find the template for specific vendor or device family.
 
 ## Setup
@@ -17,11 +17,11 @@ No specific Zabbix configuration is required.
 
 ## Template links
 
-| Name                   |
-|------------------------|
-| EtherLike-MIB SNMP     |
-| Generic SNMP           |
-| Interfaces Simple SNMP |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces Simple SNMP |
 
 ## Discovery rules
 
diff --git a/templates/net/generic_snmp/template_net_generic_snmp.yaml b/templates/net/generic_snmp/template_net_generic_snmp.yaml
index c2130dd5bff..075ca5aabe5 100644
--- a/templates/net/generic_snmp/template_net_generic_snmp.yaml
+++ b/templates/net/generic_snmp/template_net_generic_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:14Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:02Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Template Net Network Generic Device
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
diff --git a/templates/net/hp_hh3c_snmp/README.md b/templates/net/hp_hh3c_snmp/README.md
index 20d50bc389b..73c53c6c5b4 100644
--- a/templates/net/hp_hh3c_snmp/README.md
+++ b/templates/net/hp_hh3c_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 http://certifiedgeek.weebly.com/blog/hp-comware-snmp-mib-for-cpu-memory-and-temperature
 http://www.h3c.com.hk/products___solutions/technology/system_management/configuration_example/200912/656451_57_0.htm
 
@@ -22,66 +22,66 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                | Description | Default |
-|-------------------------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}                    | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS:"fanError"}       | <p>-</p>    | `41`    |
-| {$FAN_CRIT_STATUS:"hardwareFaulty"} | <p>-</p>    | `91`    |
-| {$MEMORY.UTIL.MAX}                  | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS:"hardwareFaulty"} | <p>-</p>    | `91`    |
-| {$PSU_CRIT_STATUS:"psuError"}       | <p>-</p>    | `51`    |
-| {$PSU_CRIT_STATUS:"rpsError"}       | <p>-</p>    | `61`    |
-| {$TEMP_CRIT_LOW}                    | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}                        | <p>-</p>    | `60`    |
-| {$TEMP_WARN}                        | <p>-</p>    | `50`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS:"fanError"} |<p>-</p> |`41` |
+|{$FAN_CRIT_STATUS:"hardwareFaulty"} |<p>-</p> |`91` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS:"hardwareFaulty"} |<p>-</p> |`91` |
+|{$PSU_CRIT_STATUS:"psuError"} |<p>-</p> |`51` |
+|{$PSU_CRIT_STATUS:"rpsError"} |<p>-</p> |`61` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description                                                                                              | Type | Key and additional info                                                                                                                                                                                                                                       |
-|-----------------------|----------------------------------------------------------------------------------------------------------|------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Module Discovery      | <p>Filter limits results to 'Module level1' or Fabric Modules</p>                                        | SNMP | module.discovery<p>**Filter**:</p>OR <p>- A: {#SNMPVALUE} MATCHES_REGEX `^(MODULE|Module) (LEVEL|level)1$`</p><p>- A: {#SNMPVALUE} MATCHES_REGEX `(Fabric|FABRIC) (.+) (Module|MODULE)`</p>                                                                   |
-| Temperature Discovery | <p>Discovering modules temperature (same filter as in Module Discovery) plus and temperature sensors</p> | SNMP | temp.discovery<p>**Filter**:</p>OR <p>- A: {#SNMPVALUE} MATCHES_REGEX `^(MODULE|Module) (LEVEL|level)1$`</p><p>- A: {#SNMPVALUE} MATCHES_REGEX `(Fabric|FABRIC) (.+) (Module|MODULE)`</p><p>- A: {#SNMPVALUE} MATCHES_REGEX `(T|t)emperature.*(s|S)ensor`</p> |
-| FAN Discovery         | <p>Discovering all entities of PhysicalClass - 7: fan(7)</p>                                             | SNMP | fan.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `7`</p>                                                                                                                                                                              |
-| PSU Discovery         | <p>Discovering all entities of PhysicalClass - 6: powerSupply(6)</p>                                     | SNMP | psu.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `6`</p>                                                                                                                                                                              |
-| Entity Discovery      | <p>-</p>                                                                                                 | SNMP | entity.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `3`</p>                                                                                                                                                                           |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Module Discovery |<p>Filter limits results to 'Module level1' or Fabric Modules</p> |SNMP |module.discovery<p>**Filter**:</p>OR <p>- {#SNMPVALUE} MATCHES_REGEX `^(MODULE|Module) (LEVEL|level)1$`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(Fabric|FABRIC) (.+) (Module|MODULE)`</p> |
+|Temperature Discovery |<p>Discovering modules temperature (same filter as in Module Discovery) plus and temperature sensors</p> |SNMP |temp.discovery<p>**Filter**:</p>OR <p>- {#SNMPVALUE} MATCHES_REGEX `^(MODULE|Module) (LEVEL|level)1$`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(Fabric|FABRIC) (.+) (Module|MODULE)`</p><p>- {#SNMPVALUE} MATCHES_REGEX `(T|t)emperature.*(s|S)ensor`</p> |
+|FAN Discovery |<p>Discovering all entities of PhysicalClass - 7: fan(7)</p> |SNMP |fan.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `7`</p> |
+|PSU Discovery |<p>Discovering all entities of PhysicalClass - 6: powerSupply(6)</p> |SNMP |psu.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `6`</p> |
+|Entity Discovery |<p>-</p> |SNMP |entity.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `3`</p> |
 
 ## Items collected
 
-| Group        | Name                                    | Description                                                                                                                                                                                                                                       | Type | Key and additional info                                                                                                      |
-|--------------|-----------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------|
-| CPU          | {#MODULE_NAME}: CPU utilization         | <p>MIB: HH3C-ENTITY-EXT-MIB</p><p>The CPU usage for this entity. Generally, the CPU usage</p><p>will calculate the overall CPU usage on the entity, and it</p><p>is not sensible with the number of CPU on the entity</p>                         | SNMP | system.cpu.util[hh3cEntityExtCpuUsage.{#SNMPINDEX}]                                                                          |
-| Fans         | {#ENT_NAME}: Fan status                 | <p>MIB: HH3C-ENTITY-EXT-MIB</p><p>Indicate the error state of this entity object.</p><p>fanError(41) means that the fan stops working.</p>                                                                                                        | SNMP | sensor.fan.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}]                                                                     |
-| Inventory    | {#ENT_NAME}: Hardware model name        | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                            | SNMP | system.hw.model[entPhysicalDescr.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>            |
-| Inventory    | {#ENT_NAME}: Hardware serial number     | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                            | SNMP | system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Inventory    | {#ENT_NAME}: Firmware version           | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                            | SNMP | system.hw.firmware[entPhysicalFirmwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>   |
-| Inventory    | {#ENT_NAME}: Hardware version(revision) | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                            | SNMP | system.hw.version[entPhysicalHardwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>    |
-| Inventory    | {#ENT_NAME}: Operating system           | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                            | SNMP | system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>         |
-| Memory       | {#MODULE_NAME}: Memory utilization      | <p>MIB: HH3C-ENTITY-EXT-MIB</p><p>The memory usage for the entity. This object indicates what</p><p>percent of memory are used.</p>                                                                                                               | SNMP | vm.memory.util[hh3cEntityExtMemUsage.{#SNMPINDEX}]                                                                           |
-| Power_supply | {#ENT_NAME}: Power supply status        | <p>MIB: HH3C-ENTITY-EXT-MIB</p><p>Indicate the error state of this entity object.</p><p>psuError(51) means that the Power Supply Unit is in the state of fault.</p><p>rpsError(61) means the Redundant Power Supply is in the state of fault.</p> | SNMP | sensor.psu.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}]                                                                     |
-| Temperature  | {#SNMPVALUE}: Temperature               | <p>MIB: HH3C-ENTITY-EXT-MIB</p><p>The temperature for the {#SNMPVALUE}.</p>                                                                                                                                                                       | SNMP | sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}]                                                                     |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |{#MODULE_NAME}: CPU utilization |<p>MIB: HH3C-ENTITY-EXT-MIB</p><p>The CPU usage for this entity. Generally, the CPU usage</p><p>will calculate the overall CPU usage on the entity, and it</p><p>is not sensible with the number of CPU on the entity</p> |SNMP |system.cpu.util[hh3cEntityExtCpuUsage.{#SNMPINDEX}] |
+|Fans |{#ENT_NAME}: Fan status |<p>MIB: HH3C-ENTITY-EXT-MIB</p><p>Indicate the error state of this entity object.</p><p>fanError(41) means that the fan stops working.</p> |SNMP |sensor.fan.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}] |
+|Inventory |{#ENT_NAME}: Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model[entPhysicalDescr.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Firmware version |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.firmware[entPhysicalFirmwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Hardware version(revision) |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.version[entPhysicalHardwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Operating system |<p>MIB: ENTITY-MIB</p> |SNMP |system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |{#MODULE_NAME}: Memory utilization |<p>MIB: HH3C-ENTITY-EXT-MIB</p><p>The memory usage for the entity. This object indicates what</p><p>percent of memory are used.</p> |SNMP |vm.memory.util[hh3cEntityExtMemUsage.{#SNMPINDEX}] |
+|Power_supply |{#ENT_NAME}: Power supply status |<p>MIB: HH3C-ENTITY-EXT-MIB</p><p>Indicate the error state of this entity object.</p><p>psuError(51) means that the Power Supply Unit is in the state of fault.</p><p>rpsError(61) means the Redundant Power Supply is in the state of fault.</p> |SNMP |sensor.psu.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: HH3C-ENTITY-EXT-MIB</p><p>The temperature for the {#SNMPVALUE}.</p> |SNMP |sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                    | Description                                                                                                               | Expression                                                                                                                                                                                                                                                                                                                                                                      | Severity | Dependencies and additional info                                                                       |
-|-------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|--------------------------------------------------------------------------------------------------------|
-| {#MODULE_NAME}: 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[hh3cEntityExtCpuUsage.{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                                                                  | WARNING  |                                                                                                        |
-| {#ENT_NAME}: Fan is in critical state                                   | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"fanError"},eq)}=1 or {TEMPLATE_NAME:sensor.fan.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"hardwareFaulty"},eq)}=1`                                                                                                                          | AVERAGE  |                                                                                                        |
-| {#ENT_NAME}: Device has been replaced (new serial number received)      | <p>Device serial number has changed. Ack to close</p>                                                                     | `{TEMPLATE_NAME:system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                   | INFO     | <p>Manual close: YES</p>                                                                               |
-| {#ENT_NAME}: Firmware has changed                                       | <p>Firmware version has changed. Ack to close</p>                                                                         | `{TEMPLATE_NAME:system.hw.firmware[entPhysicalFirmwareRev.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.firmware[entPhysicalFirmwareRev.{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                       | INFO     | <p>Manual close: YES</p>                                                                               |
-| {#ENT_NAME}: 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[entPhysicalSoftwareRev.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                                   | INFO     | <p>Manual close: YES</p>                                                                               |
-| {#MODULE_NAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)   | <p>The system is running out of free memory.</p>                                                                          | `{TEMPLATE_NAME:vm.memory.util[hh3cEntityExtMemUsage.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                                                                 | AVERAGE  |                                                                                                        |
-| {#ENT_NAME}: Power supply is in critical state                          | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS:"psuError"},eq)}=1 or {TEMPLATE_NAME:sensor.psu.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS:"rpsError"},eq)}=1 or {TEMPLATE_NAME:sensor.psu.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS:"hardwareFaulty"},eq)}=1` | AVERAGE  |                                                                                                        |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`                                                                                                                                               | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`                                                                                                                                               | HIGH     |                                                                                                        |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3`                                                                                                                                       | AVERAGE  |                                                                                                        |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#MODULE_NAME}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/HP Comware HH3C SNMP/system.cpu.util[hh3cEntityExtCpuUsage.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#ENT_NAME}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/HP Comware HH3C SNMP/sensor.fan.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"fanError\"}")=1 or count(/HP Comware HH3C SNMP/sensor.fan.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"hardwareFaulty\"}")=1` |AVERAGE | |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/HP Comware HH3C SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}],#1)<>last(/HP Comware HH3C SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}],#2) and length(last(/HP Comware HH3C SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ENT_NAME}: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/HP Comware HH3C SNMP/system.hw.firmware[entPhysicalFirmwareRev.{#SNMPINDEX}],#1)<>last(/HP Comware HH3C SNMP/system.hw.firmware[entPhysicalFirmwareRev.{#SNMPINDEX}],#2) and length(last(/HP Comware HH3C SNMP/system.hw.firmware[entPhysicalFirmwareRev.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ENT_NAME}: 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(/HP Comware HH3C SNMP/system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}],#1)<>last(/HP Comware HH3C SNMP/system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}],#2) and length(last(/HP Comware HH3C SNMP/system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#MODULE_NAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/HP Comware HH3C SNMP/vm.memory.util[hh3cEntityExtMemUsage.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|{#ENT_NAME}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/HP Comware HH3C SNMP/sensor.psu.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"psuError\"}")=1 or count(/HP Comware HH3C SNMP/sensor.psu.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"rpsError\"}")=1 or count(/HP Comware HH3C SNMP/sensor.psu.status[hh3cEntityExtErrorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"hardwareFaulty\"}")=1` |AVERAGE | |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml b/templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml
index 93ce1b3dd88..49756ff15e5 100644
--- a/templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml
+++ b/templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:09Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:04Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -23,7 +23,7 @@ zabbix_export:
           Version: 1910-48 Switch Software Version 5.20.99, Release 1116 Copyright(c)2010-2016 Hewlett Packard Enterprise Development LP
           Device: HP 1910-48
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
diff --git a/templates/net/hp_hpn_snmp/README.md b/templates/net/hp_hpn_snmp/README.md
index 2ac9ae38e66..55fd57c5df2 100644
--- a/templates/net/hp_hpn_snmp/README.md
+++ b/templates/net/hp_hpn_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 This template was tested on:
 
@@ -20,70 +20,70 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                         | Description | Default |
-|------------------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}             | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS:"bad"}     | <p>-</p>    | `2`     |
-| {$FAN_WARN_STATUS:"warning"} | <p>-</p>    | `3`     |
-| {$MEMORY.UTIL.MAX}           | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS:"bad"}     | <p>-</p>    | `2`     |
-| {$PSU_WARN_STATUS:"warning"} | <p>-</p>    | `3`     |
-| {$TEMP_CRIT_LOW}             | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}                 | <p>-</p>    | `60`    |
-| {$TEMP_WARN}                 | <p>-</p>    | `50`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS:"bad"} |<p>-</p> |`2` |
+|{$FAN_WARN_STATUS:"warning"} |<p>-</p> |`3` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS:"bad"} |<p>-</p> |`2` |
+|{$PSU_WARN_STATUS:"warning"} |<p>-</p> |`3` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description                                                                                                                  | Type | Key and additional info                                                                                                                         |
-|-----------------------|------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------|
-| Temperature Discovery | <p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with celsius filter</p>                                                | SNMP | temp.precision0.discovery<p>**Filter**:</p>AND <p>- B: {#SENSOR_TYPE} MATCHES_REGEX `8`</p><p>- B: {#SENSOR_PRECISION} MATCHES_REGEX `0`</p>    |
-| Memory Discovery      | <p>Discovery of NETSWITCH-MIB::hpLocalMemTable, A table that contains information on all the local memory for each slot.</p> | SNMP | memory.discovery                                                                                                                                |
-| FAN Discovery         | <p>Discovering all entities of hpicfSensorObjectId that ends with: 11.2.3.7.8.3.2 - fans and are present</p>                 | SNMP | fan.discovery<p>**Filter**:</p>AND <p>- A: {#ENT_CLASS} MATCHES_REGEX `.+8.3.2$`</p><p>- A: {#ENT_STATUS} MATCHES_REGEX `(1|2|3|4)`</p>         |
-| PSU Discovery         | <p>Discovering all entities of hpicfSensorObjectId that ends with: 11.2.3.7.8.3.1 - power supplies and are present</p>       | SNMP | psu.discovery<p>**Filter**:</p>AND <p>- A: {#ENT_CLASS} MATCHES_REGEX `.+8.3.1$`</p><p>- A: {#ENT_STATUS} MATCHES_REGEX `(1|2|3|4)`</p>         |
-| Temp Status Discovery | <p>Discovering all entities of hpicfSensorObjectId that ends with: 11.2.3.7.8.3.3 - over temp status and are present</p>     | SNMP | temp.status.discovery<p>**Filter**:</p>AND <p>- A: {#ENT_CLASS} MATCHES_REGEX `.+8.3.3$`</p><p>- A: {#ENT_STATUS} MATCHES_REGEX `(1|2|3|4)`</p> |
-| Entity Discovery      | <p>-</p>                                                                                                                     | SNMP | entity.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `3`</p>                                                             |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature Discovery |<p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with temperature filter</p> |SNMP |temp.precision0.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_TYPE} MATCHES_REGEX `8`</p><p>- {#SENSOR_PRECISION} MATCHES_REGEX `0`</p> |
+|Memory Discovery |<p>Discovery of NETSWITCH-MIB::hpLocalMemTable, A table that contains information on all the local memory for each slot.</p> |SNMP |memory.discovery |
+|FAN Discovery |<p>Discovering all entities of hpicfSensorObjectId that ends with: 11.2.3.7.8.3.2 - fans and are present</p> |SNMP |fan.discovery<p>**Filter**:</p>AND <p>- {#ENT_CLASS} MATCHES_REGEX `.+8.3.2$`</p><p>- {#ENT_STATUS} MATCHES_REGEX `(1|2|3|4)`</p> |
+|PSU Discovery |<p>Discovering all entities of hpicfSensorObjectId that ends with: 11.2.3.7.8.3.1 - power supplies and are present</p> |SNMP |psu.discovery<p>**Filter**:</p>AND <p>- {#ENT_CLASS} MATCHES_REGEX `.+8.3.1$`</p><p>- {#ENT_STATUS} MATCHES_REGEX `(1|2|3|4)`</p> |
+|Temp Status Discovery |<p>Discovering all entities of hpicfSensorObjectId that ends with: 11.2.3.7.8.3.3 - over temp status and are present</p> |SNMP |temp.status.discovery<p>**Filter**:</p>AND <p>- {#ENT_CLASS} MATCHES_REGEX `.+8.3.3$`</p><p>- {#ENT_STATUS} MATCHES_REGEX `(1|2|3|4)`</p> |
+|Entity Discovery |<p>-</p> |SNMP |entity.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `3`</p> |
 
 ## Items collected
 
-| Group        | Name                                    | Description                                                                                                                                                                                                                                                                                                                                | Type       | Key and additional info                                                                                                                                                           |
-|--------------|-----------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU          | CPU utilization                         | <p>MIB: STATISTICS-MIB</p><p>The CPU utilization in percent(%).</p><p>Reference: http://h20564.www2.hpe.com/hpsc/doc/public/display?docId=emr_na-c02597344&sp4ts.oid=51079</p>                                                                                                                                                             | SNMP       | system.cpu.util[hpSwitchCpuStat.0]                                                                                                                                                |
-| Fans         | {#ENT_DESCR}: Fan status                | <p>MIB: HP-ICF-CHASSIS</p><p>Actual status indicated by the sensor: {#ENT_DESCR}</p>                                                                                                                                                                                                                                                       | SNMP       | sensor.fan.status[hpicfSensorStatus.{#SNMPINDEX}]                                                                                                                                 |
-| Inventory    | Hardware serial number                  | <p>MIB: SEMI-MIB</p>                                                                                                                                                                                                                                                                                                                       | SNMP       | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                         |
-| Inventory    | Firmware version                        | <p>MIB: NETSWITCH-MIB</p><p>Contains the operating code version number (also known as software or firmware).</p><p>For example, a software version such as A.08.01 is described as follows:</p><p>A    the function set available in your router</p><p>08   the common release number</p><p>01   updates to the current common release</p> | SNMP       | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                             |
-| Inventory    | {#ENT_NAME}: Hardware model name        | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                                     | SNMP       | system.hw.model[entPhysicalDescr.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                 |
-| Inventory    | {#ENT_NAME}: Hardware version(revision) | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                                     | SNMP       | system.hw.version[entPhysicalHardwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                         |
-| Memory       | #{#SNMPVALUE}: Used memory              | <p>MIB: NETSWITCH-MIB</p><p>The number of currently allocated bytes.</p>                                                                                                                                                                                                                                                                   | SNMP       | vm.memory.used[hpLocalMemAllocBytes.{#SNMPINDEX}]                                                                                                                                 |
-| Memory       | #{#SNMPVALUE}: Available memory         | <p>MIB: NETSWITCH-MIB</p><p>The number of available (unallocated) bytes.</p>                                                                                                                                                                                                                                                               | SNMP       | vm.memory.available[hpLocalMemFreeBytes.{#SNMPINDEX}]                                                                                                                             |
-| Memory       | #{#SNMPVALUE}: Total memory             | <p>MIB: NETSWITCH-MIB</p><p>The number of currently installed bytes.</p>                                                                                                                                                                                                                                                                   | SNMP       | vm.memory.total[hpLocalMemTotalBytes.{#SNMPINDEX}]                                                                                                                                |
-| Memory       | #{#SNMPVALUE}: Memory utilization       | <p>Memory utilization in %</p>                                                                                                                                                                                                                                                                                                             | CALCULATED | vm.memory.util[snmp.{#SNMPINDEX}]<p>**Expression**:</p>`last("vm.memory.used[hpLocalMemAllocBytes.{#SNMPINDEX}]")/last("vm.memory.total[hpLocalMemTotalBytes.{#SNMPINDEX}]")*100` |
-| Power_supply | {#ENT_DESCR}: Power supply status       | <p>MIB: HP-ICF-CHASSIS</p><p>Actual status indicated by the sensor: {#ENT_DESCR}</p>                                                                                                                                                                                                                                                       | SNMP       | sensor.psu.status[hpicfSensorStatus.{#SNMPINDEX}]                                                                                                                                 |
-| Temperature  | {#SENSOR_INFO}: Temperature             | <p>MIB: ENTITY-SENSORS-MIB</p><p>The most recent measurement obtained by the agent for this sensor.</p><p>To correctly interpret the value of this object, the associated entPhySensorType,</p><p>entPhySensorScale, and entPhySensorPrecision objects must also be examined.</p>                                                          | SNMP       | sensor.temp.value[entPhySensorValue.{#SNMPINDEX}]                                                                                                                                 |
-| Temperature  | {#ENT_DESCR}: Temperature status        | <p>MIB: HP-ICF-CHASSIS</p><p>Actual status indicated by the sensor: {#ENT_DESCR}</p>                                                                                                                                                                                                                                                       | SNMP       | sensor.temp.status[hpicfSensorStatus.{#SNMPINDEX}]                                                                                                                                |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: STATISTICS-MIB</p><p>The CPU utilization in percent(%).</p><p>Reference: http://h20564.www2.hpe.com/hpsc/doc/public/display?docId=emr_na-c02597344&sp4ts.oid=51079</p> |SNMP |system.cpu.util[hpSwitchCpuStat.0] |
+|Fans |{#ENT_DESCR}: Fan status |<p>MIB: HP-ICF-CHASSIS</p><p>Actual status indicated by the sensor: {#ENT_DESCR}</p> |SNMP |sensor.fan.status[hpicfSensorStatus.{#SNMPINDEX}] |
+|Inventory |Hardware serial number |<p>MIB: SEMI-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: NETSWITCH-MIB</p><p>Contains the operating code version number (also known as software or firmware).</p><p>For example, a software version such as A.08.01 is described as follows:</p><p>A    the function set available in your router</p><p>08   the common release number</p><p>01   updates to the current common release</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model[entPhysicalDescr.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Hardware version(revision) |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.version[entPhysicalHardwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |#{#SNMPVALUE}: Used memory |<p>MIB: NETSWITCH-MIB</p><p>The number of currently allocated bytes.</p> |SNMP |vm.memory.used[hpLocalMemAllocBytes.{#SNMPINDEX}] |
+|Memory |#{#SNMPVALUE}: Available memory |<p>MIB: NETSWITCH-MIB</p><p>The number of available (unallocated) bytes.</p> |SNMP |vm.memory.available[hpLocalMemFreeBytes.{#SNMPINDEX}] |
+|Memory |#{#SNMPVALUE}: Total memory |<p>MIB: NETSWITCH-MIB</p><p>The number of currently installed bytes.</p> |SNMP |vm.memory.total[hpLocalMemTotalBytes.{#SNMPINDEX}] |
+|Memory |#{#SNMPVALUE}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[snmp.{#SNMPINDEX}]<p>**Expression**:</p>`last(//vm.memory.used[hpLocalMemAllocBytes.{#SNMPINDEX}])/last(//vm.memory.total[hpLocalMemTotalBytes.{#SNMPINDEX}])*100` |
+|Power_supply |{#ENT_DESCR}: Power supply status |<p>MIB: HP-ICF-CHASSIS</p><p>Actual status indicated by the sensor: {#ENT_DESCR}</p> |SNMP |sensor.psu.status[hpicfSensorStatus.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_INFO}: Temperature |<p>MIB: ENTITY-SENSORS-MIB</p><p>The most recent measurement obtained by the agent for this sensor.</p><p>To correctly interpret the value of this object, the associated entPhySensorType,</p><p>entPhySensorScale, and entPhySensorPrecision objects must also be examined.</p> |SNMP |sensor.temp.value[entPhySensorValue.{#SNMPINDEX}] |
+|Temperature |{#ENT_DESCR}: Temperature status |<p>MIB: HP-ICF-CHASSIS</p><p>Actual status indicated by the sensor: {#ENT_DESCR}</p> |SNMP |sensor.temp.status[hpicfSensorStatus.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                      | Description                                                                                          | Expression                                                                                                                                                                                                                  | Severity | Dependencies and additional info                                                                         |
-|---------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------------------------------------------------------------------------------|
-| 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[hpSwitchCpuStat.0].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                               | WARNING  |                                                                                                          |
-| {#ENT_DESCR}: Fan is in critical state                                    | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[hpicfSensorStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"bad"},eq)}=1`                                                                                                                 | AVERAGE  |                                                                                                          |
-| {#ENT_DESCR}: Fan is in warning state                                     | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[hpicfSensorStatus.{#SNMPINDEX}].count(#1,{$FAN_WARN_STATUS:"warning"},eq)}=1`                                                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#ENT_DESCR}: Fan is in critical state</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>                                                                                 |
-| #{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)      | <p>The system is running out of free memory.</p>                                                     | `{TEMPLATE_NAME:vm.memory.util[snmp.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                              | AVERAGE  |                                                                                                          |
-| {#ENT_DESCR}: Power supply is in critical state                           | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[hpicfSensorStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS:"bad"},eq)}=1`                                                                                                                 | AVERAGE  |                                                                                                          |
-| {#ENT_DESCR}: Power supply is in warning state                            | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[hpicfSensorStatus.{#SNMPINDEX}].count(#1,{$PSU_WARN_STATUS:"warning"},eq)}=1`                                                                                                             | WARNING  | <p>**Depends on**:</p><p>- {#ENT_DESCR}: Power supply is in critical state</p>                           |
-| {#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                          |
-| {#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                          |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/HP Enterprise Switch SNMP/system.cpu.util[hpSwitchCpuStat.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#ENT_DESCR}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/HP Enterprise Switch SNMP/sensor.fan.status[hpicfSensorStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"bad\"}")=1` |AVERAGE | |
+|{#ENT_DESCR}: Fan is in warning state |<p>Please check the fan unit</p> |`count(/HP Enterprise Switch SNMP/sensor.fan.status[hpicfSensorStatus.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"warning\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#ENT_DESCR}: Fan is in critical state</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/HP Enterprise Switch SNMP/system.hw.serialnumber,#1)<>last(/HP Enterprise Switch SNMP/system.hw.serialnumber,#2) and length(last(/HP Enterprise Switch SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/HP Enterprise Switch SNMP/system.hw.firmware,#1)<>last(/HP Enterprise Switch SNMP/system.hw.firmware,#2) and length(last(/HP Enterprise Switch SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|#{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/HP Enterprise Switch SNMP/vm.memory.util[snmp.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|{#ENT_DESCR}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/HP Enterprise Switch SNMP/sensor.psu.status[hpicfSensorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"bad\"}")=1` |AVERAGE | |
+|{#ENT_DESCR}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`count(/HP Enterprise Switch SNMP/sensor.psu.status[hpicfSensorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"warning\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#ENT_DESCR}: Power supply is in critical state</p> |
+|{#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml b/templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml
index 265862c7c82..580c69f63ec 100644
--- a/templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml
+++ b/templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:04Z'
+  version: '6.0'
+  date: '2022-01-10T07:56:45Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -21,7 +21,7 @@ zabbix_export:
         ENTITY-MIB
         STATISTICS-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
@@ -415,7 +415,7 @@ zabbix_export:
                 macro: '{#SENSOR_PRECISION}'
                 value: '0'
                 formulaid: A
-          description: 'ENTITY-SENSORS-MIB::EntitySensorDataType discovery with celsius filter'
+          description: 'ENTITY-SENSORS-MIB::EntitySensorDataType discovery with temperature filter'
           item_prototypes:
             -
               uuid: 0f33142de9874eb288d48337becae31a
diff --git a/templates/net/huawei_snmp/README.md b/templates/net/huawei_snmp/README.md
index 921ddf75513..3f72939e764 100644
--- a/templates/net/huawei_snmp/README.md
+++ b/templates/net/huawei_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Reference: https://www.slideshare.net/Huanetwork/huawei-s5700-naming-conventions-and-port-numbering-conventions
 Reference: http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234
 
@@ -17,56 +17,56 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS} | <p>-</p>    | `2`     |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
-| {$TEMP_CRIT_LOW}   | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}       | <p>-</p>    | `60`    |
-| {$TEMP_WARN}       | <p>-</p>    | `50`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`2` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name             | Description                                                                                                                                       | Type | Key and additional info                                                             |
-|------------------|---------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------|
-| MPU Discovery    | <p>http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234. Filter limits results to Main Processing Units</p> | SNMP | mpu.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_NAME} MATCHES_REGEX `MPU.*`</p> |
-| Entity Discovery | <p>-</p>                                                                                                                                          | SNMP | entity.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `3`</p> |
-| FAN Discovery    | <p>-</p>                                                                                                                                          | SNMP | discovery.fans                                                                      |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|MPU Discovery |<p>http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234. Filter limits results to Main Processing Units</p> |SNMP |mpu.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_NAME} MATCHES_REGEX `MPU.*`</p> |
+|Entity Discovery |<p>-</p> |SNMP |entity.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `3`</p> |
+|FAN Discovery |<p>-</p> |SNMP |discovery.fans |
 
 ## Items collected
 
-| Group       | Name                                    | Description                                                                                                                                                                                                                                                                                                                    | Type | Key and additional info                                                                                                      |
-|-------------|-----------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------|
-| CPU         | {#ENT_NAME}: CPU utilization            | <p>MIB: HUAWEI-ENTITY-EXTENT-MIB</p><p>The CPU usage for this entity. Generally, the CPU usage will calculate the overall CPU usage on the entity, and itis not sensible with the number of CPU on the entity.</p><p>Reference: http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234</p> | SNMP | system.cpu.util[hwEntityCpuUsage.{#SNMPINDEX}]                                                                               |
-| Fans        | #{#SNMPVALUE}: Fan status               | <p>MIB: HUAWEI-ENTITY-EXTENT-MIB</p>                                                                                                                                                                                                                                                                                           | SNMP | sensor.fan.status[hwEntityFanState.{#SNMPINDEX}]                                                                             |
-| Inventory   | {#ENT_NAME}: Hardware serial number     | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                         | SNMP | system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Inventory   | {#ENT_NAME}: Hardware version(revision) | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                         | SNMP | system.hw.version[entPhysicalHardwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>    |
-| Inventory   | {#ENT_NAME}: Operating system           | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                         | SNMP | system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>         |
-| Inventory   | {#ENT_NAME}: Hardware model name        | <p>MIB: ENTITY-MIB</p>                                                                                                                                                                                                                                                                                                         | SNMP | system.hw.model[entPhysicalDescr.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>            |
-| Memory      | {#ENT_NAME}: Memory utilization         | <p>MIB: HUAWEI-ENTITY-EXTENT-MIB</p><p>The memory usage for the entity. This object indicates what percent of memory are used.</p><p>Reference: http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234</p>                                                                                 | SNMP | vm.memory.util[hwEntityMemUsage.{#SNMPINDEX}]                                                                                |
-| Temperature | {#ENT_NAME}: Temperature                | <p>MIB: HUAWEI-ENTITY-EXTENT-MIB</p><p>The temperature for the {#SNMPVALUE}.</p>                                                                                                                                                                                                                                               | SNMP | sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}]                                                                          |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |{#ENT_NAME}: CPU utilization |<p>MIB: HUAWEI-ENTITY-EXTENT-MIB</p><p>The CPU usage for this entity. Generally, the CPU usage will calculate the overall CPU usage on the entity, and itis not sensible with the number of CPU on the entity.</p><p>Reference: http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234</p> |SNMP |system.cpu.util[hwEntityCpuUsage.{#SNMPINDEX}] |
+|Fans |#{#SNMPVALUE}: Fan status |<p>MIB: HUAWEI-ENTITY-EXTENT-MIB</p> |SNMP |sensor.fan.status[hwEntityFanState.{#SNMPINDEX}] |
+|Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Hardware version(revision) |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.version[entPhysicalHardwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Operating system |<p>MIB: ENTITY-MIB</p> |SNMP |system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model[entPhysicalDescr.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |{#ENT_NAME}: Memory utilization |<p>MIB: HUAWEI-ENTITY-EXTENT-MIB</p><p>The memory usage for the entity. This object indicates what percent of memory are used.</p><p>Reference: http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234</p> |SNMP |vm.memory.util[hwEntityMemUsage.{#SNMPINDEX}] |
+|Temperature |{#ENT_NAME}: Temperature |<p>MIB: HUAWEI-ENTITY-EXTENT-MIB</p><p>The temperature for the {#SNMPVALUE}.</p> |SNMP |sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                   | Description                                                                                                               | Expression                                                                                                                                                                                                                      | Severity | Dependencies and additional info                                                                      |
-|------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------|
-| {#ENT_NAME}: 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[hwEntityCpuUsage.{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                       | WARNING  |                                                                                                       |
-| #{#SNMPVALUE}: Fan is in critical state                                | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[hwEntityFanState.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                            | AVERAGE  |                                                                                                       |
-| {#ENT_NAME}: Device has been replaced (new serial number received)     | <p>Device serial number has changed. Ack to close</p>                                                                     | `{TEMPLATE_NAME:system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}].strlen()}>0`                                                   | INFO     | <p>Manual close: YES</p>                                                                              |
-| {#ENT_NAME}: 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[entPhysicalSoftwareRev.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}].strlen()}>0`                                                                   | INFO     | <p>Manual close: YES</p>                                                                              |
-| {#ENT_NAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)     | <p>The system is running out of free memory.</p>                                                                          | `{TEMPLATE_NAME:vm.memory.util[hwEntityMemUsage.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                      | AVERAGE  |                                                                                                       |
-| {#ENT_NAME}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- {#ENT_NAME}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#ENT_NAME}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                       |
-| {#ENT_NAME}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                       |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#ENT_NAME}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Huawei VRP SNMP/system.cpu.util[hwEntityCpuUsage.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|#{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Huawei VRP SNMP/sensor.fan.status[hwEntityFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Huawei VRP SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}],#1)<>last(/Huawei VRP SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}],#2) and length(last(/Huawei VRP SNMP/system.hw.serialnumber[entPhysicalSerialNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ENT_NAME}: 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(/Huawei VRP SNMP/system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}],#1)<>last(/Huawei VRP SNMP/system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}],#2) and length(last(/Huawei VRP SNMP/system.sw.os[entPhysicalSoftwareRev.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ENT_NAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Huawei VRP SNMP/vm.memory.util[hwEntityMemUsage.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|{#ENT_NAME}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#ENT_NAME}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#ENT_NAME}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#ENT_NAME}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/huawei_snmp/template_net_huawei_snmp.yaml b/templates/net/huawei_snmp/template_net_huawei_snmp.yaml
index 3865dac81b0..8074da37b80 100644
--- a/templates/net/huawei_snmp/template_net_huawei_snmp.yaml
+++ b/templates/net/huawei_snmp/template_net_huawei_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:04Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:11Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -17,7 +17,7 @@ zabbix_export:
         HUAWEI-ENTITY-EXTENT-MIB
         ENTITY-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
diff --git a/templates/net/intel_qlogic_infiniband_snmp/README.md b/templates/net/intel_qlogic_infiniband_snmp/README.md
index 3ac31e5a01c..23b45974d66 100644
--- a/templates/net/intel_qlogic_infiniband_snmp/README.md
+++ b/templates/net/intel_qlogic_infiniband_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,57 +15,57 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                | Description | Default |
-|---------------------|-------------|---------|
-| {$FAN_CRIT_STATUS}  | <p>-</p>    | `3`     |
-| {$PSU_CRIT_STATUS}  | <p>-</p>    | `3`     |
-| {$PSU_WARN_STATUS}  | <p>-</p>    | `4`     |
-| {$TEMP_CRIT_LOW}    | <p>-</p>    | `5`     |
-| {$TEMP_CRIT_STATUS} | <p>-</p>    | `3`     |
-| {$TEMP_CRIT}        | <p>-</p>    | `60`    |
-| {$TEMP_WARN_STATUS} | <p>-</p>    | `2`     |
-| {$TEMP_WARN}        | <p>-</p>    | `50`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$FAN_CRIT_STATUS} |<p>-</p> |`3` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`3` |
+|{$PSU_WARN_STATUS} |<p>-</p> |`4` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT_STATUS} |<p>-</p> |`3` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN_STATUS} |<p>-</p> |`2` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
-| Name            |
-|-----------------|
-| Generic SNMP    |
-| Interfaces SNMP |
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description                                                                                  | Type | Key and additional info                                                           |
-|-----------------------|----------------------------------------------------------------------------------------------|------|-----------------------------------------------------------------------------------|
-| Temperature Discovery | <p>Discovering sensor's table with temperature filter</p>                                    | SNMP | temp.discovery<p>**Filter**:</p>AND <p>- B: {#SENSOR_TYPE} MATCHES_REGEX `2`</p>  |
-| Unit Discovery        | <p>-</p>                                                                                     | SNMP | unit.discovery<p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `2`</p> |
-| PSU Discovery         | <p>A textual description of the power supply, that can be assigned by the administrator.</p> | SNMP | psu.discovery                                                                     |
-| FAN Discovery         | <p>icsChassisFanDescription of icsChassisFanTable</p>                                        | SNMP | fan.discovery                                                                     |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature Discovery |<p>Discovering sensor's table with temperature filter</p> |SNMP |temp.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_TYPE} MATCHES_REGEX `2`</p> |
+|Unit Discovery |<p>-</p> |SNMP |unit.discovery<p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `2`</p> |
+|PSU Discovery |<p>A textual description of the power supply, that can be assigned by the administrator.</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>icsChassisFanDescription of icsChassisFanTable</p> |SNMP |fan.discovery |
 
 ## Items collected
 
-| Group        | Name                                | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Type | Key and additional info                                                                                                                     |
-|--------------|-------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------------------------------------------------------------------------------------------------------------------------------------------|
-| Fans         | {#SNMPVALUE}: Fan status            | <p>MIB: ICS-CHASSIS-MIB</p><p>The operational status of the fan unit.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | SNMP | sensor.fan.status[icsChassisFanOperStatus.{#SNMPINDEX}]                                                                                     |
-| Inventory    | Hardware model name                 | <p>MIB: ICS-CHASSIS-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | SNMP | system.hw.model<p>**Preprocessing**:</p><p>- REGEX: `(.+) - Firmware \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                      |
-| Inventory    | Firmware version                    | <p>MIB: ICS-CHASSIS-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | SNMP | system.hw.firmware<p>**Preprocessing**:</p><p>- REGEX: `Firmware Version: ([0-9.]+), \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>      |
-| Inventory    | {#ENT_NAME}: Hardware serial number | <p>MIB: ICS-CHASSIS-MIB</p><p>The serial number of the FRU.  If not available, this value is a zero-length string.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | SNMP | system.hw.serialnumber[icsChassisSystemUnitFruSerialNumber.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Power_supply | {#SNMPVALUE}: Power supply status   | <p>MIB: ICS-CHASSIS-MIB</p><p>Actual status of the power supply:</p><p>(1) unknown: status not known.</p><p>(2) disabled: power supply is disabled.</p><p>(3) failed - power supply is unable to supply power due to failure.</p><p>(4) warning - power supply is supplying power, but an output or sensor is bad or warning.</p><p>(5) standby - power supply believed usable,but not supplying power.</p><p>(6) engaged - power supply is supplying power.</p><p>(7) redundant - power supply is supplying power, but not needed.</p><p>(8) notPresent - power supply is supplying power is not present.</p> | SNMP | sensor.psu.status[icsChassisPowerSupplyEntry.{#SNMPINDEX}]                                                                                  |
-| Temperature  | {#SENSOR_INFO}: Temperature         | <p>MIB: ICS-CHASSIS-MIB</p><p>The current value read from the sensor.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | SNMP | sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}]                                                                                   |
-| Temperature  | {#SENSOR_INFO}: Temperature status  | <p>MIB: ICS-CHASSIS-MIB</p><p>The operational status of the sensor.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP | sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}]                                                                             |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Fans |{#SNMPVALUE}: Fan status |<p>MIB: ICS-CHASSIS-MIB</p><p>The operational status of the fan unit.</p> |SNMP |sensor.fan.status[icsChassisFanOperStatus.{#SNMPINDEX}] |
+|Inventory |Hardware model name |<p>MIB: ICS-CHASSIS-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- REGEX: `(.+) - Firmware \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: ICS-CHASSIS-MIB</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- REGEX: `Firmware Version: ([0-9.]+), \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#ENT_NAME}: Hardware serial number |<p>MIB: ICS-CHASSIS-MIB</p><p>The serial number of the FRU.  If not available, this value is a zero-length string.</p> |SNMP |system.hw.serialnumber[icsChassisSystemUnitFruSerialNumber.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Power_supply |{#SNMPVALUE}: Power supply status |<p>MIB: ICS-CHASSIS-MIB</p><p>Actual status of the power supply:</p><p>(1) unknown: status not known.</p><p>(2) disabled: power supply is disabled.</p><p>(3) failed - power supply is unable to supply power due to failure.</p><p>(4) warning - power supply is supplying power, but an output or sensor is bad or warning.</p><p>(5) standby - power supply believed usable,but not supplying power.</p><p>(6) engaged - power supply is supplying power.</p><p>(7) redundant - power supply is supplying power, but not needed.</p><p>(8) notPresent - power supply is supplying power is not present.</p> |SNMP |sensor.psu.status[icsChassisPowerSupplyEntry.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_INFO}: Temperature |<p>MIB: ICS-CHASSIS-MIB</p><p>The current value read from the sensor.</p> |SNMP |sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_INFO}: Temperature status |<p>MIB: ICS-CHASSIS-MIB</p><p>The operational status of the sensor.</p> |SNMP |sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                      | Description                                                                                          | Expression                                                                                                                                                                                                                                                                                                                                                        | Severity | Dependencies and additional info                                                                         |
-|---------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------------------------------------------------------------------------------|
-| {#SNMPVALUE}: Fan is in critical state                                    | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[icsChassisFanOperStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                                                                       | AVERAGE  |                                                                                                          |
-| 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>                                                                                 |
-| {#ENT_NAME}: Device has been replaced (new serial number received)        | <p>Device serial number has changed. Ack to close</p>                                                | `{TEMPLATE_NAME:system.hw.serialnumber[icsChassisSystemUnitFruSerialNumber.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber[icsChassisSystemUnitFruSerialNumber.{#SNMPINDEX}].strlen()}>0`                                                                                                                                                       | INFO     | <p>Manual close: YES</p>                                                                                 |
-| {#SNMPVALUE}: Power supply is in critical state                           | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[icsChassisPowerSupplyEntry.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                                                                    | AVERAGE  |                                                                                                          |
-| {#SNMPVALUE}: Power supply is in warning state                            | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[icsChassisPowerSupplyEntry.{#SNMPINDEX}].count(#1,{$PSU_WARN_STATUS},eq)}=1`                                                                                                                                                                                                                                                    | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p>                           |
-| {#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""} or {Intel_Qlogic Infiniband SNMP:sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}].last(0)}={$TEMP_WARN_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3` | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""} or {Intel_Qlogic Infiniband SNMP:sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}].last(0)}={$TEMP_CRIT_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3` | HIGH     |                                                                                                          |
-| {#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3`                                                                                                                       | AVERAGE  |                                                                                                          |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Intel_Qlogic Infiniband SNMP/sensor.fan.status[icsChassisFanOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/Intel_Qlogic Infiniband SNMP/system.hw.firmware,#1)<>last(/Intel_Qlogic Infiniband SNMP/system.hw.firmware,#2) and length(last(/Intel_Qlogic Infiniband SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|{#ENT_NAME}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Intel_Qlogic Infiniband SNMP/system.hw.serialnumber[icsChassisSystemUnitFruSerialNumber.{#SNMPINDEX}],#1)<>last(/Intel_Qlogic Infiniband SNMP/system.hw.serialnumber[icsChassisSystemUnitFruSerialNumber.{#SNMPINDEX}],#2) and length(last(/Intel_Qlogic Infiniband SNMP/system.hw.serialnumber[icsChassisSystemUnitFruSerialNumber.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Intel_Qlogic Infiniband SNMP/sensor.psu.status[icsChassisPowerSupplyEntry.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|{#SNMPVALUE}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`count(/Intel_Qlogic Infiniband SNMP/sensor.psu.status[icsChassisPowerSupplyEntry.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Power supply is in critical state</p> |
+|{#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Intel_Qlogic Infiniband SNMP/sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}],5m)>{$TEMP_WARN:""} or last(/Intel_Qlogic Infiniband SNMP/sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}])={$TEMP_WARN_STATUS} `<p>Recovery expression:</p>`max(/Intel_Qlogic Infiniband SNMP/sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Intel_Qlogic Infiniband SNMP/sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""} or last(/Intel_Qlogic Infiniband SNMP/sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}])={$TEMP_CRIT_STATUS} `<p>Recovery expression:</p>`max(/Intel_Qlogic Infiniband SNMP/sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Intel_Qlogic Infiniband SNMP/sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Intel_Qlogic Infiniband SNMP/sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml b/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml
index 5735b53fc67..e6261a76aa5 100644
--- a/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml
+++ b/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:08Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:15Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         ICS-CHASSIS-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/juniper_snmp/README.md b/templates/net/juniper_snmp/README.md
index 57bd5149189..4c92099bd49 100644
--- a/templates/net/juniper_snmp/README.md
+++ b/templates/net/juniper_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,64 +15,64 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                          | Description | Default |
-|-------------------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}              | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS}            | <p>-</p>    | `6`     |
-| {$HEALTH_CRIT_STATUS}         | <p>-</p>    | `3`     |
-| {$MEMORY.UTIL.MAX}            | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS}            | <p>-</p>    | `6`     |
-| {$TEMP_CRIT:"Routing Engine"} | <p>-</p>    | `80`    |
-| {$TEMP_CRIT_LOW}              | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}                  | <p>-</p>    | `60`    |
-| {$TEMP_WARN:"Routing Engine"} | <p>-</p>    | `70`    |
-| {$TEMP_WARN}                  | <p>-</p>    | `50`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`6` |
+|{$HEALTH_CRIT_STATUS} |<p>-</p> |`3` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`6` |
+|{$TEMP_CRIT:"Routing Engine"} |<p>-</p> |`80` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"Routing Engine"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                     | Description                                                                                                                                                                                  | Type | Key and additional info                                                                                       |
-|--------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------------------------------------------------------------------------------------------------------------|
-| CPU and Memory Discovery | <p>Scanning JUNIPER-MIB::jnxOperatingTable for CPU and Memory</p><p>http://kb.juniper.net/InfoCenter/index?page=content&id=KB17526&actp=search. Filter limits results to Routing Engines</p> | SNMP | jnxOperatingTable.discovery<p>**Filter**:</p>AND_OR <p>- A: {#SNMPVALUE} MATCHES_REGEX `Routing Engine.*`</p> |
-| Temperature discovery    | <p>Scanning JUNIPER-MIB::jnxOperatingTable for Temperature</p><p>http://kb.juniper.net/InfoCenter/index?page=content&id=KB17526&actp=search. Filter limits results to Routing Engines</p>    | SNMP | jnxOperatingTable.discovery.temp<p>**Filter**:</p>AND_OR <p>- A: {#SNMPVALUE} MATCHES_REGEX `[^0]+`</p>       |
-| FAN Discovery            | <p>Scanning JUNIPER-MIB::jnxOperatingTable for Fans</p>                                                                                                                                      | SNMP | jnxOperatingTable.discovery.fans                                                                              |
-| PSU Discovery            | <p>Scanning JUNIPER-MIB::jnxOperatingTable for Power Supplies</p>                                                                                                                            | SNMP | jnxOperatingTable.discovery.psu                                                                               |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU and Memory Discovery |<p>Scanning JUNIPER-MIB::jnxOperatingTable for CPU and Memory</p><p>http://kb.juniper.net/InfoCenter/index?page=content&id=KB17526&actp=search. Filter limits results to Routing Engines</p> |SNMP |jnxOperatingTable.discovery<p>**Filter**:</p>AND_OR <p>- {#SNMPVALUE} MATCHES_REGEX `Routing Engine.*`</p> |
+|Temperature discovery |<p>Scanning JUNIPER-MIB::jnxOperatingTable for Temperature</p><p>http://kb.juniper.net/InfoCenter/index?page=content&id=KB17526&actp=search. Filter limits results to Routing Engines</p> |SNMP |jnxOperatingTable.discovery.temp<p>**Filter**:</p>AND_OR <p>- {#SNMPVALUE} MATCHES_REGEX `[^0]+`</p> |
+|FAN Discovery |<p>Scanning JUNIPER-MIB::jnxOperatingTable for Fans</p> |SNMP |jnxOperatingTable.discovery.fans |
+|PSU Discovery |<p>Scanning JUNIPER-MIB::jnxOperatingTable for Power Supplies</p> |SNMP |jnxOperatingTable.discovery.psu |
 
 ## Items collected
 
-| Group        | Name                              | Description                                                                                                                                                                                                                                                                                                                                                                                                                       | Type | Key and additional info                                                                                                                         |
-|--------------|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU          | {#SNMPVALUE}: CPU utilization     | <p>MIB: JUNIPER-MIB</p><p>The CPU utilization in percentage of this subject. Zero if unavailable or inapplicable.</p><p>Reference: http://kb.juniper.net/library/CUSTOMERSERVICE/GLOBAL_JTAC/BK26199/SRX%20SNMP%20Monitoring%20Guide_v1.1.pdf</p>                                                                                                                                                                                 | SNMP | system.cpu.util[jnxOperatingCPU.{#SNMPINDEX}]                                                                                                   |
-| Fans         | {#SNMPVALUE}: Fan status          | <p>MIB: JUNIPER-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                           | SNMP | sensor.fan.status[jnxOperatingState.4.{#SNMPINDEX}]                                                                                             |
-| Inventory    | Hardware serial number            | <p>MIB: JUNIPER-MIB</p><p>The serial number of this subject, blank if unknown or unavailable.</p>                                                                                                                                                                                                                                                                                                                                 | SNMP | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                       |
-| Inventory    | Hardware model name               | <p>MIB: JUNIPER-MIB</p><p>The name, model, or detailed description of the box,indicating which product the box is about, for example 'M40'.</p>                                                                                                                                                                                                                                                                                   | SNMP | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                              |
-| Inventory    | Operating system                  | <p>MIB: SNMPv2-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP | system.sw.os[sysDescr.0]<p>**Preprocessing**:</p><p>- REGEX: `kernel (JUNOS [0-9a-zA-Z\.\-]+) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Memory       | {#SNMPVALUE}: Memory utilization  | <p>MIB: JUNIPER-MIB</p><p>The buffer pool utilization in percentage of this subject.  Zero if unavailable or inapplicable.</p><p>Reference: http://kb.juniper.net/library/CUSTOMERSERVICE/GLOBAL_JTAC/BK26199/SRX%20SNMP%20Monitoring%20Guide_v1.1.pdf</p>                                                                                                                                                                        | SNMP | vm.memory.util[jnxOperatingBuffer.{#SNMPINDEX}]                                                                                                 |
-| Power_supply | {#SNMPVALUE}: Power supply status | <p>MIB: JUNIPER-MIB</p><p>If they are using DC power supplies there is a known issue on PR 1064039 where the fans do not detect the temperature correctly and fail to cool the power supply causing the shutdown to occur.</p><p>This is fixed in Junos 13.3R7 https://forums.juniper.net/t5/Routing/PEM-0-not-OK-MX104/m-p/289644#M14122</p>                                                                                     | SNMP | sensor.psu.status[jnxOperatingState.2.{#SNMPINDEX}]                                                                                             |
-| Status       | Overall system health status      | <p>MIB: JUNIPER-ALARM-MIB</p><p>The red alarm indication on the craft interface panel.</p><p>The red alarm is on when there is some system</p><p>failure or power supply failure or the system</p><p>is experiencing a hardware malfunction or some</p><p>threshold is being exceeded.</p><p>This red alarm state could be turned off by the</p><p>ACO/LT (Alarm Cut Off / Lamp Test) button on the</p><p>front panel module.</p> | SNMP | system.status[jnxRedAlarmState.0]                                                                                                               |
-| Temperature  | {#SENSOR_INFO}: Temperature       | <p>MIB: JUNIPER-MIB</p><p>The temperature in Celsius (degrees C) of {#SENSOR_INFO}</p>                                                                                                                                                                                                                                                                                                                                            | SNMP | sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}]                                                                                                |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |{#SNMPVALUE}: CPU utilization |<p>MIB: JUNIPER-MIB</p><p>The CPU utilization in percentage of this subject. Zero if unavailable or inapplicable.</p><p>Reference: http://kb.juniper.net/library/CUSTOMERSERVICE/GLOBAL_JTAC/BK26199/SRX%20SNMP%20Monitoring%20Guide_v1.1.pdf</p> |SNMP |system.cpu.util[jnxOperatingCPU.{#SNMPINDEX}] |
+|Fans |{#SNMPVALUE}: Fan status |<p>MIB: JUNIPER-MIB</p> |SNMP |sensor.fan.status[jnxOperatingState.4.{#SNMPINDEX}] |
+|Inventory |Hardware serial number |<p>MIB: JUNIPER-MIB</p><p>The serial number of this subject, blank if unknown or unavailable.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>MIB: JUNIPER-MIB</p><p>The name, model, or detailed description of the box,indicating which product the box is about, for example 'M40'.</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: SNMPv2-MIB</p> |SNMP |system.sw.os[sysDescr.0]<p>**Preprocessing**:</p><p>- REGEX: `kernel (JUNOS [0-9a-zA-Z\.\-]+) \1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |{#SNMPVALUE}: Memory utilization |<p>MIB: JUNIPER-MIB</p><p>The buffer pool utilization in percentage of this subject.  Zero if unavailable or inapplicable.</p><p>Reference: http://kb.juniper.net/library/CUSTOMERSERVICE/GLOBAL_JTAC/BK26199/SRX%20SNMP%20Monitoring%20Guide_v1.1.pdf</p> |SNMP |vm.memory.util[jnxOperatingBuffer.{#SNMPINDEX}] |
+|Power_supply |{#SNMPVALUE}: Power supply status |<p>MIB: JUNIPER-MIB</p><p>If they are using DC power supplies there is a known issue on PR 1064039 where the fans do not detect the temperature correctly and fail to cool the power supply causing the shutdown to occur.</p><p>This is fixed in Junos 13.3R7 https://forums.juniper.net/t5/Routing/PEM-0-not-OK-MX104/m-p/289644#M14122</p> |SNMP |sensor.psu.status[jnxOperatingState.2.{#SNMPINDEX}] |
+|Status |Overall system health status |<p>MIB: JUNIPER-ALARM-MIB</p><p>The red alarm indication on the craft interface panel.</p><p>The red alarm is on when there is some system</p><p>failure or power supply failure or the system</p><p>is experiencing a hardware malfunction or some</p><p>threshold is being exceeded.</p><p>This red alarm state could be turned off by the</p><p>ACO/LT (Alarm Cut Off / Lamp Test) button on the</p><p>front panel module.</p> |SNMP |system.status[jnxRedAlarmState.0] |
+|Temperature |{#SENSOR_INFO}: Temperature |<p>MIB: JUNIPER-MIB</p><p>The temperature in Celsius (degrees C) of {#SENSOR_INFO}</p> |SNMP |sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                      | Description                                                                                                               | Expression                                                                                                                                                                                                                | Severity | Dependencies and additional info                                                                         |
-|---------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------------------------------------------------------------------------------|
-| {#SNMPVALUE}: 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[jnxOperatingCPU.{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                  | WARNING  |                                                                                                          |
-| {#SNMPVALUE}: Fan is in critical state                                    | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[jnxOperatingState.4.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                                   | AVERAGE  |                                                                                                          |
-| 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>                                                                                 |
-| 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[sysDescr.0].diff()}=1 and {TEMPLATE_NAME:system.sw.os[sysDescr.0].strlen()}>0`                                                                                                               | INFO     | <p>Manual close: YES</p>                                                                                 |
-| {#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)       | <p>The system is running out of free memory.</p>                                                                          | `{TEMPLATE_NAME:vm.memory.util[jnxOperatingBuffer.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                              | AVERAGE  |                                                                                                          |
-| {#SNMPVALUE}: Power supply is in critical state                           | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[jnxOperatingState.2.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                                   | AVERAGE  |                                                                                                          |
-| System status is in critical state                                        | <p>Please check the device for errors</p>                                                                                 | `{TEMPLATE_NAME:system.status[jnxRedAlarmState.0].count(#1,{$HEALTH_CRIT_STATUS},eq)}=1`                                                                                                                                  | HIGH     |                                                                                                          |
-| {#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                          |
-| {#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                          |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#SNMPVALUE}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Juniper SNMP/system.cpu.util[jnxOperatingCPU.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Juniper SNMP/sensor.fan.status[jnxOperatingState.4.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Juniper SNMP/system.hw.serialnumber,#1)<>last(/Juniper SNMP/system.hw.serialnumber,#2) and length(last(/Juniper SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|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(/Juniper SNMP/system.sw.os[sysDescr.0],#1)<>last(/Juniper SNMP/system.sw.os[sysDescr.0],#2) and length(last(/Juniper SNMP/system.sw.os[sysDescr.0]))>0` |INFO |<p>Manual close: YES</p> |
+|{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Juniper SNMP/vm.memory.util[jnxOperatingBuffer.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Juniper SNMP/sensor.psu.status[jnxOperatingState.2.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|System status is in critical state |<p>Please check the device for errors</p> |`count(/Juniper SNMP/system.status[jnxRedAlarmState.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1` |HIGH | |
+|{#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/juniper_snmp/template_net_juniper_snmp.yaml b/templates/net/juniper_snmp/template_net_juniper_snmp.yaml
index ced6ff0e75b..48ebfb89e1a 100644
--- a/templates/net/juniper_snmp/template_net_juniper_snmp.yaml
+++ b/templates/net/juniper_snmp/template_net_juniper_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:13Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:19Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         JUNIPER-MIB
         SNMPv2-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
diff --git a/templates/net/mellanox_snmp/README.md b/templates/net/mellanox_snmp/README.md
index 52b502933d1..6c11718baaf 100644
--- a/templates/net/mellanox_snmp/README.md
+++ b/templates/net/mellanox_snmp/README.md
@@ -8,6 +8,8 @@ The updated template for monitoring the Mellanox network switches over SNMP agen
 
 ## 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
@@ -63,13 +65,13 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature Discovery |<p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with celsius filter</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- B: {#SENSOR_TYPE} MATCHES_REGEX `8`</p><p>- B: {#SENSOR_PRECISION} MATCHES_REGEX `1`</p> |
-|Fan Discovery |<p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with rpm filter</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>OR <p>- B: {#SNMPVALUE} MATCHES_REGEX `10`</p> |
-|Entity Discovery |<p>-</p> |SNMP |entity.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `3`</p> |
-|PSU Discovery |<p>-</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#ENT_CLASS} MATCHES_REGEX `6`</p> |
-|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter.</p> |SNMP |vfs.fs.discovery[snmp]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
-|Memory discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with memory filter</p> |SNMP |vm.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- A: {#MEMTYPE} MATCHES_REGEX `{$MEMORY.TYPE.MATCHES}`</p><p>- B: {#MEMTYPE} NOT_MATCHES_REGEX `{$MEMORY.TYPE.NOT_MATCHES}`</p><p>- C: {#MEMNAME} MATCHES_REGEX `{$MEMORY.NAME.MATCHES}`</p><p>- D: {#MEMNAME} NOT_MATCHES_REGEX `{$MEMORY.NAME.NOT_MATCHES}`</p> |
-|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
+|Temperature Discovery |<p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with temperature filter</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#SENSOR_TYPE} MATCHES_REGEX `8`</p><p>- {#SENSOR_PRECISION} MATCHES_REGEX `1`</p> |
+|Fan Discovery |<p>ENTITY-SENSORS-MIB::EntitySensorDataType discovery with rpm filter</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>OR <p>- {#SNMPVALUE} MATCHES_REGEX `10`</p> |
+|Entity Discovery |<p>-</p> |SNMP |entity.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `3`</p> |
+|PSU Discovery |<p>-</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#ENT_CLASS} MATCHES_REGEX `6`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter.</p> |SNMP |vfs.fs.discovery[snmp]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
+|Memory discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with memory filter</p> |SNMP |vm.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#MEMTYPE} MATCHES_REGEX `{$MEMORY.TYPE.MATCHES}`</p><p>- {#MEMTYPE} NOT_MATCHES_REGEX `{$MEMORY.TYPE.NOT_MATCHES}`</p><p>- {#MEMNAME} MATCHES_REGEX `{$MEMORY.NAME.MATCHES}`</p><p>- {#MEMNAME} NOT_MATCHES_REGEX `{$MEMORY.NAME.NOT_MATCHES}`</p> |
+|Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -90,12 +92,12 @@ There are no template links in this template.
 |Memory |{#MEMNAME}: Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in units of hrStorageAllocationUnits.</p><p>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.</p><p>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.</p> |SNMP |vm.memory.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p> |
 |Memory |{#MEMNAME}: Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.{#SNMPINDEX}]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.{#SNMPINDEX}])/last(//vm.memory.total[hrStorageSize.{#SNMPINDEX}])*100` |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[ifOperStatus.{#SNMPINDEX}] |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[ifHCInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[ifHCOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[ifHCInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[ifHCOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[ifHighSpeed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Power_supply |{#ENT_NAME}: Power supply status |<p>MIB: ENTITY-STATE-MIB</p> |SNMP |sensor.psu.status[entStateOper.{#SNMPINDEX}] |
diff --git a/templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml b/templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml
index cfd58f4e779..895e9ba8813 100644
--- a/templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml
+++ b/templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-27T15:19:05Z'
+  date: '2022-01-10T07:57:02Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -21,7 +21,7 @@ zabbix_export:
         ENTITY-MIB
         IF-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -940,7 +940,7 @@ zabbix_export:
                 macro: '{#SENSOR_PRECISION}'
                 value: '1'
                 formulaid: A
-          description: 'ENTITY-SENSORS-MIB::EntitySensorDataType discovery with celsius filter'
+          description: 'ENTITY-SENSORS-MIB::EntitySensorDataType discovery with temperature filter'
           item_prototypes:
             -
               uuid: 4f298c0f2b6547b7b1827b3faebd1089
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
index 9635951b529..364e2dad0b0 100644
--- 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
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 73cd51dcc50..d8a789f7a6d 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:33:45Z'
+  date: '2021-12-17T18:06:27Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 3f129861a33..2faf365bb45 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 6f364306c7d..0b4a2ef7a59 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:34:28Z'
+  date: '2021-12-17T18:06:32Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 15ce4eed9a9..f3653912d2f 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index e4f2747a8a3..8b7921685aa 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:41:03Z'
+  date: '2021-12-17T18:06:36Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
index 5d96cf774a2..0efd867275a 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index ccfc1615c7c..939e867e4cd 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:34:46Z'
+  date: '2021-12-17T18:06:41Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
index 5ca87f980d5..74fc282f667 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 5795f8b6d79..2ed606d510f 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:37:49Z'
+  date: '2021-12-17T18:06:46Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 58d8fdb46dd..72e4742fe2e 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index d680631cf4f..8827dc5d954 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:37:29Z'
+  date: '2021-12-17T18:06:50Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
index dd86d052661..a16699cf977 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index e57900e69d6..fc99dfa30a8 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:38:51Z'
+  date: '2021-12-17T18:06:55Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 62218c93e3a..0685326553e 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 6707a72e500..67e6bf83424 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:35:13Z'
+  date: '2021-12-17T18:06:59Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
index d271b7ba261..8037f69b2fe 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 432b1131799..459b9588b8b 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:40:07Z'
+  date: '2021-12-17T18:07:04Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
index 11ac7103594..3d19bd358ee 100644
--- a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index d2260c6c841..4566a6189ce 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:35:50Z'
+  date: '2021-12-17T18:07:09Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
index 833f7bce41f..96a2087cd4d 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index f4d1c89bcc5..a9530017f98 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:34:02Z'
+  date: '2021-12-17T18:07:13Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 6aa4920e362..45d50d39e49 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index ef590590474..74b8716d7ba 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:33:37Z'
+  date: '2021-12-17T18:07:18Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
index ee7a5ab19f4..df76491ff66 100644
--- a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 0196d3bb728..1c3ea7986b6 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:38:00Z'
+  date: '2021-12-17T18:07:23Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index de158b1cd68..f69ae0e627f 100644
--- 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
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 040cc0923c2..49f2a694ae7 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:32:56Z'
+  date: '2021-12-17T18:07:28Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 18cb712a0fe..ffda551d904 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 22edab74042..a4a38c8955c 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:34:37Z'
+  date: '2021-12-17T18:07:32Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 5768e57bd79..4d24fde58b9 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index e8ff5ff13b2..e61dc5c63f1 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:39:02Z'
+  date: '2021-12-17T18:07:37Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 9b91c284e75..ef17ca1d0dc 100644
--- 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
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 25d5d9d7447..97e3a91dd4c 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:33:29Z'
+  date: '2021-12-17T18:07:42Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 5028ee6afdd..85f8735014c 100644
--- 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
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 07b585a60d2..7a210acf713 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:37:19Z'
+  date: '2021-12-17T18:07:46Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index d3605baf750..3869247eeee 100644
--- a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 9aa5d231078..115fd188e69 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:39:23Z'
+  date: '2021-12-17T18:07:51Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 341bdae16d2..ce7e8c05e72 100644
--- a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index f6e1ef29608..813f7baa6c9 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:35:32Z'
+  date: '2021-12-17T18:07:56Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index e65b95eb32f..f26687d7c6b 100644
--- a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 6d11e31a300..a2192f0be00 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:40:52Z'
+  date: '2021-12-17T18:08:01Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 76dccb58fa0..e7ad9119fad 100644
--- a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 7b994447ddc..07c966b094f 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:32:48Z'
+  date: '2021-12-17T18:08:05Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 074c2304426..18034cb5de0 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 2bb8834b1d2..33431da28f2 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:36:39Z'
+  date: '2021-12-17T18:08:11Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 40911d55564..4a1997076c8 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index b69692e5489..88d08c8e77c 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:37:08Z'
+  date: '2021-12-17T18:08:15Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index e0d1d463384..fbd88693091 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index fc380740dc4..af8bcef6cf8 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:38:30Z'
+  date: '2021-12-17T18:08:20Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 076225eb506..d673cd51d07 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 52d0a93016b..8c37ccb78e5 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:34:55Z'
+  date: '2021-12-17T18:08:25Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index dbc58768187..689215d4ba3 100644
--- 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
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 097863c9ae9..7342b20719d 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:36:19Z'
+  date: '2021-12-17T18:08:37Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index d3320f58e52..bd26a04e816 100644
--- 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
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index e7d31c7fb0b..282b7b173f3 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:36:48Z'
+  date: '2021-12-17T18:08:41Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 4f8f8e6273b..c52374eae28 100644
--- 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
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index bf46b7416dc..b4fd5515f70 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:39:12Z'
+  date: '2021-12-17T18:08:46Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 2144e5e88c9..feb1b24f0fd 100644
--- a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index fdd65ea00ce..60d6c08d205 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:35:41Z'
+  date: '2021-12-17T18:08:51Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
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
index 604220f8a79..ae227c9bda5 100644
--- a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 74671c9252a..df799758397 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:39:45Z'
+  date: '2021-12-17T18:08:55Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md b/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
index 04a7e160b8e..3f0226b9b3b 100644
--- a/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index ccf59cfbb6b..acd340714db 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:35:04Z'
+  date: '2021-12-17T18:09:00Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
index b6a41b7fa77..f8bf203b5cf 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 39378cd7d96..a0557a17fd2 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:41:38Z'
+  date: '2021-12-17T18:09:43Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md b/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
index 2e3386bf1d4..15a5f18d3ff 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 492a2c59c72..cfed833a5f7 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:36:59Z'
+  date: '2021-12-17T18:09:48Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
index 9a9b6d6aa53..79b72cb3461 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 0c3af2c7ae3..185659c95af 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:36:29Z'
+  date: '2021-12-17T18:09:53Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
index eb236252b70..af9c326e12c 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 7d0e904d6ce..b8064ac0bcf 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:37:39Z'
+  date: '2021-12-17T18:09:57Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
index d05d26de61a..990e300fb1a 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index a2f9491bfc7..55ec7cb79cf 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:34:20Z'
+  date: '2021-12-17T18:10:21Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
index ca3632c4bd6..eb161b30711 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 58b39578134..4fcdc9e66ac 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:40:18Z'
+  date: '2021-12-17T18:10:25Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
index fe85c15ad7d..9895ac8ce7b 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index e486c12fff4..1dae53d6f6f 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:40:29Z'
+  date: '2021-12-17T18:10:02Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
index 6f15d7073fa..61eb385e74d 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 44f34cb5929..cbce8d43ecc 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:33:53Z'
+  date: '2021-12-17T18:10:07Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
index 28e93f4d348..3ff43018a94 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 2f1c56e8704..8ecd7ce537a 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:36:00Z'
+  date: '2021-12-17T18:10:12Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
index b8f4e06a73e..a3db01c9dec 100644
--- a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 4d8e8758b9d..2595773558a 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:41:26Z'
+  date: '2021-12-17T18:10:30Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md b/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
index 843a53767ba..c9c2959babb 100644
--- a/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index b658ac4a86b..f5c05a5b953 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:39:56Z'
+  date: '2021-12-17T18:10:35Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
index dd4798dfadb..7ddd47b3d62 100644
--- a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 3ae99a8eeff..223799aff1f 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:40:40Z'
+  date: '2021-12-17T18:10:40Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
index 15b33fac4cf..aa44bfc9af6 100644
--- a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 5911ea64de2..121d7cebbb5 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:33:21Z'
+  date: '2021-12-17T18:10:44Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
index 43e2acbc7f3..1518b6b0f6f 100644
--- a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 62fecaca9b5..4142dda87f6 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:33:04Z'
+  date: '2021-12-17T18:10:49Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
index 99eddb005e6..bdff6a18f07 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index dd3341c7163..4833eb96f74 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:38:41Z'
+  date: '2021-12-17T18:09:11Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
index 20e3159326b..b93e514fa38 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index d4c8c65b238..70dfff91768 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:36:10Z'
+  date: '2021-12-17T18:09:15Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
index 635e4dcc84d..652ff003402 100644
--- a/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 53d68f0f691..42f240c92fd 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:35:22Z'
+  date: '2021-12-17T18:09:25Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
index 88543e1d516..18f9bf433f0 100644
--- a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 367ac477abc..fa6883ab6ab 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:34:11Z'
+  date: '2021-12-17T18:09:05Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_hEX_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
index 4fe41721ab2..d92e3e32232 100644
--- a/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 5d0514a4ea6..ebd37f02b18 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:41:15Z'
+  date: '2021-12-17T18:09:20Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
index b713b68fa16..68fce0e7bf9 100644
--- a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index d7844ba87a5..68b49581098 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:33:12Z'
+  date: '2021-12-17T18:09:29Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
index 42127041327..0e92081c188 100644
--- a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 6838b553957..b12bd3c3138 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:38:10Z'
+  date: '2021-12-17T18:09:34Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
index 67ede227c6b..a1544fc7141 100644
--- a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
@@ -52,10 +52,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
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
index 032bd2eca84..ae7ebc7aad9 100644
--- 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
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-11-29T15:39:34Z'
+  date: '2021-12-17T18:09:39Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -18,7 +18,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         MIKROTIK-MIB
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik/mikrotik_snmp/README.md b/templates/net/mikrotik/mikrotik_snmp/README.md
index 0c1ffec88b8..071d2f7ae7c 100644
--- a/templates/net/mikrotik/mikrotik_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -47,10 +47,10 @@ No specific Zabbix configuration is required.
 |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> |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- {#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>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 
 ## Items collected
 
diff --git a/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml b/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
index 7015aa36ae4..f1970d0cfd4 100644
--- a/templates/net/mikrotik/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: '6.0'
-  date: '2021-11-29T15:38:20Z'
+  date: '2021-12-17T08:37:20Z'
   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.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/morningstar_snmp/README.md b/templates/net/morningstar/README.md
index 805d798a3c7..32954d793a4 100644
--- a/templates/net/morningstar_snmp/README.md
+++ b/templates/net/morningstar/README.md
@@ -12,15 +12,15 @@ Zabbix is an open-source product that can be installed on a majority of Unix-lik
 
 3. Supported Morningstar products
 
-| Product           | Readme                                     | Template                                                       |
-|-------------------|--------------------------------------------|----------------------------------------------------------------|
-| Prostar MPPT      | [Readme](prostar_mppt_snmp/README.md)      | [Template](prostar_mppt_snmp/prostar_mppt_snmp.yaml)           |
-| Prostar PWM       | [Readme](prostar_pwm_snmp/README.md)       | [Template](prostar_pwm_snmp/prostar_pwm_snmp.yaml)             |
-| Sunsaver MPPT     | [Readme](sunsaver_mppt_snmp/README.md)     | [Template](sunsaver_mppt_snmp/sunsaver_mppt_snmp.yaml)         |
-| Suresine          | [Readme](suresine_snmp/README.md)          | [Template](suresine_snmp/suresine_snmp.yaml)                   |
-| Tristar MPPT 600V | [Readme](tristar_mppt_600V_snmp/README.md) | [Template](tristar_mppt_600V_snmp/tristar_mppt_600V_snmp.yaml) |
-| Tristar MPPT      | [Readme](tristar_mppt_snmp/README.md)      | [Template](tristar_mppt_snmp/tristar_mppt_snmp.yaml)           |
-| Tristar PWM       | [Readme](tristar_pwm_snmp/README.md)       | [Template](tristar_pwm_snmp/tristar_pwm_snmp.yaml)             |
+| Product | Readme | Template |
+|---|---|---|
+| Prostar MPPT | [Readme](morningstar_prostar_mppt_snmp/README.md) | [Template](morningstar_prostar_mppt_snmp/template_net_morningstar_prostar_mppt_snmp.yaml) |
+| Prostar PWM | [Readme](morningstar_prostar_pwm_snmp/README.md) | [Template](morningstar_prostar_pwm_snmp/template_net_morningstar_prostar_pwm_snmp.yaml) |
+| Sunsaver MPPT | [Readme](morningstar_sunsaver_mppt_snmp/README.md) | [Template](morningstar_sunsaver_mppt_snmp/template_net_morningstar_sunsaver_mppt_snmp.yaml) |
+| Suresine | [Readme](morningstar_suresine_snmp/README.md) | [Template](morningstar_suresine_snmp/template_net_morningstar_suresine_snmp.yaml) |
+| Tristar MPPT 600V | [Readme](morningstar_tristar_mppt_600V_snmp/README.md) | [Template](morningstar_tristar_mppt_600V_snmp/template_net_morningstar_tristar_mppt_600V_snmp.yaml) |
+| Tristar MPPT | [Readme](morningstar_tristar_mppt_snmp/README.md) | [Template](morningstar_tristar_mppt_snmp/template_net_morningstar_tristar_mppt_snmp.yaml) |
+| Tristar PWM | [Readme](morningstar_tristar_pwm_snmp/README.md) | [Template](morningstar_tristar_pwm_snmp/template_net_morningstar_tristar_pwm_snmp.yaml) |
 
 ## Zabbix set up
 
@@ -30,14 +30,14 @@ Zabbix is an open-source product that can be installed on a majority of Unix-lik
 Import the downloaded template into Zabbix by following these steps:
 
 - Press the *Import* button in the top right corner
-- Select the XML file of the required template on your machine
+- Select the YAML file of the required template on your machine
 - Press *Import*
 
 1. Now you need to teach Zabbix how to connect to the device.
 To do so, first create a host to represent your Morningstar device:
 
 - Using a sidebar menu at the left, navigate to the _Configuration -> Hosts_ section
-- Press the *Create host* button in the top right corner
+- Press the *Create host* button in the top right corner
 - In the Host configuration window fill in the required fields:
 
   - *Host name* -  enter any unique name
@@ -45,10 +45,10 @@ To do so, first create a host to represent your Morningstar device:
   - *Interfaces* - press Add and select SNMP from the drop-down list that appears.
 
 - Add an SNMP interface for the host:
-  - Enter the IP address/DNS name and port number
-  - Select the SNMP v2 from the dropdown
+  - Enter the IP address/DNS name and port number
+  - Select the SNMP v2 from the dropdown
   - In the *SNMP community* field enter 'public'
-  - Turn off the *Use bulk requests* checkbox because devices do not work correctly in this mode
+  - Turn off the *Use bulk requests* checkbox because devices do not work correctly in this mode
 - Open the *Templates* tab. In the *Link new templates* field, start typing Morningstar, then select the imported template from the list.
 
 1. Repeat step 3 for each Morningstar device you want to monitor.
diff --git a/templates/net/morningstar/morningstar_prostar_mppt_snmp/README.md b/templates/net/morningstar/morningstar_prostar_mppt_snmp/README.md
new file mode 100644
index 00000000000..cac0322e924
--- /dev/null
+++ b/templates/net/morningstar/morningstar_prostar_mppt_snmp/README.md
@@ -0,0 +1,142 @@
+
+# Morningstar ProStar MPPT SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$BATTERY.TEMP.MAX.CRIT} |<p>Battery high temperature critical value</p> |`60` |
+|{$BATTERY.TEMP.MAX.WARN} |<p>Battery high temperature warning value</p> |`45` |
+|{$BATTERY.TEMP.MIN.CRIT} |<p>Battery low temperature critical value</p> |`-20` |
+|{$BATTERY.TEMP.MIN.WARN} |<p>Battery low temperature warning value</p> |`0` |
+|{$CHARGE.STATE.CRIT} |<p>fault</p> |`4` |
+|{$CHARGE.STATE.WARN} |<p>disconnect</p> |`2` |
+|{$LOAD.STATE.CRIT:"fault"} |<p>fault</p> |`4` |
+|{$LOAD.STATE.CRIT:"lvd"} |<p>lvd</p> |`3` |
+|{$LOAD.STATE.WARN:"disconnect"} |<p>disconnect</p> |`5` |
+|{$LOAD.STATE.WARN:"lvdWarning"} |<p>lvdWarning</p> |`2` |
+|{$LOAD.STATE.WARN:"override"} |<p>override</p> |`7` |
+|{$VOLTAGE.MAX.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MAX.WARN} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.WARN} |<p>-</p> |`` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Battery voltage discovery |<p>Discovery for battery voltage triggers</p> |DEPENDENT |battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Array |Array: Voltage |<p>MIB: PROSTAR-MPPT</p><p>Array Voltage</p><p>  Description:Array Voltage</p><p>  Scaling Factor:1.0</p><p>  Units:V</p><p>  Range:[0, 80]</p><p>  Modbus address:0x0013</p> |SNMP |array.voltage[arrayVoltage.0] |
+|Array |Array: Sweep Vmp |<p>MIB: PROSTAR-MPPT</p><p>Array Vmp</p><p>  Description:Array Max. Power Point Voltage</p><p>  Scaling Factor:1.0</p><p>  Units:V</p><p>  Range:[0.0, 5000.0]</p><p>  Modbus address:0x003D</p> |SNMP |array.sweep_vmp[arrayVmp.0] |
+|Array |Array: Sweep Voc |<p>MIB: PROSTAR-MPPT</p><p>Array Voc</p><p> Description:Array Open Circuit Voltage</p><p> Scaling Factor:1.0</p><p> Units:V</p><p> Range:[0.0, 80.0]</p><p> Modbus address:0x003F</p> |SNMP |array.sweep_voc[arrayVoc.0] |
+|Array |Array: Sweep Pmax |<p>MIB: PROSTAR-MPPT</p><p>Array Max. Power (sweep)</p><p> Description:Array Max. Power (last sweep)</p><p> Scaling Factor:1.0</p><p> Units:W</p><p> Range:[0.0, 500]</p><p> Modbus address:0x003E</p> |SNMP |array.sweep_pmax[arrayMaxPowerSweep.0] |
+|Battery |Battery: Charge State |<p>MIB: PROSTAR-MPPT</p><p>Charge State</p><p>  Description:Control State</p><p>  Modbus address:0x0021</p><p>  0: Start</p><p>  1: NightCheck</p><p>  2: Disconnect</p><p>  3: Night</p><p>  4: Fault</p><p>  5: BulkMppt</p><p>  6: Absorption</p><p>  7: Float</p><p>  8: Equalize</p><p>  9: Slave</p><p>  10: Fixed</p> |SNMP |charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Target Voltage |<p>MIB: PROSTAR-MPPT</p><p>Target Voltage</p><p> Description:Target Regulation Voltage</p><p> Scaling Factor:1.0</p><p> Units:V</p><p> Range:[0.0, 80.0]</p><p> Modbus address:0x0024</p> |SNMP |target.voltage[targetVoltage.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Charge Current |<p>MIB: PROSTAR-MPPT</p><p>Charge Current</p><p>  Description:Charge Current</p><p>  Scaling Factor:1.0</p><p>  Units:A</p><p>  Range:[0, 40]</p><p>  Modbus address:0x0010</p> |SNMP |charge.current[chargeCurrent.0] |
+|Battery |Battery: Voltage{#SINGLETON} |<p>MIB: PROSTAR-MPPT</p><p>Battery Terminal Voltage</p><p>Description:Battery  Terminal Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0012</p> |SNMP |battery.voltage[batteryTerminalVoltage.0{#SINGLETON}] |
+|Counter |Counter: Charge Amp-hours |<p>MIB: PROSTAR-MPPT</p><p>Ah Charge (Resettable)</p><p> Description:Ah Charge (Resettable)</p><p> Scaling Factor:0.1</p><p> Units:Ah</p><p> Range:[0.0, 4294967294]</p><p> Modbus addresses:H=0x0026 L=0x0027</p> |SNMP |counter.charge_amp_hours[ahChargeResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Counter |Counter: Charge KW-hours |<p>MIB: PROSTAR-MPPT</p><p>kWh Charge (Resettable)</p><p>Description:Kilowatt Hours Charge (Resettable)</p><p>Scaling Factor:1.0</p><p>Units:kWh</p><p>Range:[0.0, 65535]</p><p>Modbus address:0x002A</p> |SNMP |counter.charge_kw_hours[kwhChargeResettable.0] |
+|Counter |Counter: Load Amp-hours |<p>MIB: PROSTAR-MPPT</p><p>Description:Ah Load (Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x0032 L=0x0033</p> |SNMP |counter.load_amp_hours[ahLoadResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Load |Load: State |<p>MIB: PROSTAR-MPPT</p><p>Load State</p><p> Description:Load State</p><p> Modbus address:0x002E</p><p> 0: Start</p><p>1: Normal</p><p>2: LvdWarning</p><p>3: Lvd</p><p>4: Fault</p><p>5: Disconnect</p><p>6: NormalOff</p><p>7: Override</p><p>8: NotUsed</p> |SNMP |load.state[loadState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Load |Load: Voltage |<p>MIB: PROSTAR-MPPT</p><p>Load Voltage</p><p> Description:Load Voltage</p><p> Scaling Factor:1.0</p><p> Units:V</p><p> Range:[0, 80]</p><p> Modbus address:0x0014</p> |SNMP |load.voltage[loadVoltage.0] |
+|Load |Load: Current |<p>MIB: PROSTAR-MPPT</p><p>Load Current</p><p> Description:Load Current</p><p> Scaling Factor:1.0</p><p> Units:A</p><p> Range:[0, 60]</p><p> Modbus address:0x0016</p> |SNMP |load.current[loadCurrent.0] |
+|Status |Status: Uptime |<p>Device uptime in seconds</p> |SNMP |status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
+|Status |Status: Array Faults |<p>MIB: PROSTAR-MPPT</p><p>Description:Array Faults</p><p>Modbus address:0x0022</p> |SNMP |status.array_faults[arrayFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Load Faults |<p>MIB: PROSTAR-MPPT</p><p>Description:Array Faults</p><p>Modbus address:0x0022</p> |SNMP |status.load_faults[loadFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Alarms |<p>MIB: PROSTAR-MPPT</p><p>Description:Alarms</p><p>Modbus addresses:H=0x0038 L=0x0039</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Temperature |Temperature: Ambient |<p>MIB: PROSTAR-MPPT</p><p>Ambient Temperature</p><p> Description:Ambient Temperature</p><p> Scaling Factor:1.0</p><p> Units:deg C</p><p> Range:[-128, 127]</p><p> Modbus address:0x001C</p> |SNMP |temp.ambient[ambientTemperature.0] |
+|Temperature |Temperature: Battery |<p>MIB: PROSTAR-MPPT</p><p>Battery Temperature</p><p>  Description:Battery Temperature</p><p>  Scaling Factor:1.0</p><p>  Units:deg C</p><p>  Range:[-128, 127]</p><p>  Modbus address:0x001B</p> |SNMP |temp.battery[batteryTemperature.0] |
+|Temperature |Temperature: Heatsink |<p>MIB: PROSTAR-MPPT</p><p>Heatsink Temperature</p><p> Description:Heatsink Temperature</p><p> Scaling Factor:1.0</p><p> Units:deg C</p><p> Range:[-128, 127]</p><p> Modbus address:0x001A</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
+|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: PROSTAR-MPPT</p> |SNMP |battery.voltage.discovery[batteryTerminalVoltage.0] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Battery: Device charge in warning state |<p>-</p> |`last(/Morningstar ProStar MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Device charge in critical state</p> |
+|Battery: Device charge in critical state |<p>-</p> |`last(/Morningstar ProStar MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}` |HIGH | |
+|Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m) |<p>-</p> |`max(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p> |
+|Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m) |<p>-</p> |`max(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}` |HIGH | |
+|Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m) |<p>-</p> |`min(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p> |
+|Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m) |<p>-</p> |`min(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}` |HIGH | |
+|Load: Device load in warning state |<p>-</p> |`last(/Morningstar ProStar MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar ProStar MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"override"}` |WARNING |<p>**Depends on**:</p><p>- Load: Device load in critical state</p> |
+|Load: Device load in critical state |<p>-</p> |`last(/Morningstar ProStar MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar ProStar MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"fault"}` |HIGH | |
+|Status: Device has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Morningstar ProStar MPPT SNMP/status.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Status: Failed to fetch data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes</p> |`nodata(/Morningstar ProStar MPPT SNMP/status.uptime,5m)=1` |WARNING |<p>Manual close: YES</p> |
+|Status: Device has "overcurrent" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "mosfetSShorted" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","mosfetSShorted")=2` |HIGH | |
+|Status: Device has "software" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","software")=2` |HIGH | |
+|Status: Device has "batteryHvd" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryHvd")=2` |HIGH | |
+|Status: Device has "arrayHvd" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","arrayHvd")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "rtsShorted" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsShorted")=2` |HIGH | |
+|Status: Device has "rtsNoLongerValid" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsNoLongerValid")=2` |HIGH | |
+|Status: Device has "localTempSensorDamaged" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","localTempSensorDamaged")=2` |HIGH | |
+|Status: Device has "batteryLowVoltageDisconnect" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryLowVoltageDisconnect")=2` |HIGH | |
+|Status: Device has "slaveTimeout" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","slaveTimeout")=2` |HIGH | |
+|Status: Device has "dipSwitchChanged" array faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","dipSwitchChanged")=2` |HIGH | |
+|Status: Device has "externalShortCircuit" load faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","externalShortCircuit")=2` |HIGH | |
+|Status: Device has "overcurrent" load faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "mosfetShorted" load faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","mosfetShorted")=2` |HIGH | |
+|Status: Device has "software" load faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","software")=2` |HIGH | |
+|Status: Device has "loadHvd" load faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","loadHvd")=2` |HIGH | |
+|Status: Device has "highTempDisconnect" load faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","highTempDisconnect")=2` |HIGH | |
+|Status: Device has "dipSwitchChanged" load faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","dipSwitchChanged")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" load faults flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "rtsShorted" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2` |WARNING | |
+|Status: Device has "rtsDisconnected" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorOpen" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorShorted" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2` |WARNING | |
+|Status: Device has "heatsinkTempLimit" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempLimit")=2` |WARNING | |
+|Status: Device has "inductorTempSensorOpen" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","inductorTempSensorOpen")=2` |WARNING | |
+|Status: Device has "inductorTempSensorShorted" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","inductorTempSensorShorted")=2` |WARNING | |
+|Status: Device has "inductorTempLimit" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","inductorTempLimit")=2` |WARNING | |
+|Status: Device has "currentLimit" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2` |WARNING | |
+|Status: Device has "currentMeasurementError" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","currentMeasurementError")=2` |WARNING | |
+|Status: Device has "batterySenseOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","batterySenseOutOfRange")=2` |WARNING | |
+|Status: Device has "batterySenseDisconnected" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2` |WARNING | |
+|Status: Device has "uncalibrated" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2` |WARNING | |
+|Status: Device has "tb5v" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","tb5v")=2` |WARNING | |
+|Status: Device has "fp10SupplyOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","fp10SupplyOutOfRange")=2` |WARNING | |
+|Status: Device has "mosfetOpen" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","mosfetOpen")=2` |WARNING | |
+|Status: Device has "arrayCurrentOffset" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","arrayCurrentOffset")=2` |WARNING | |
+|Status: Device has "loadCurrentOffset" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","loadCurrentOffset")=2` |WARNING | |
+|Status: Device has "p33SupplyOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","p33SupplyOutOfRange")=2` |WARNING | |
+|Status: Device has "p12SupplyOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","p12SupplyOutOfRange")=2` |WARNING | |
+|Status: Device has "hightInputVoltageLimit" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","hightInputVoltageLimit")=2` |WARNING | |
+|Status: Device has "controllerReset" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","controllerReset")=2` |WARNING | |
+|Status: Device has "loadLvd" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","loadLvd")=2` |WARNING | |
+|Status: Device has "logTimeout" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","logTimeout")=2` |WARNING | |
+|Status: Device has "eepromAccessFailure" alarm flag |<p>-</p> |`count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","eepromAccessFailure")=2` |WARNING | |
+|Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
+|Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}` |HIGH | |
+|Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m) |<p>-</p> |`min(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
+|Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) |<p>-</p> |`min(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}` |HIGH | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/net/morningstar_snmp/prostar_mppt_snmp/prostar_mppt_snmp.yaml b/templates/net/morningstar/morningstar_prostar_mppt_snmp/template_net_morningstar_prostar_mppt_snmp.yaml
index 3670d3f6a1a..baaa05b5749 100644
--- a/templates/net/morningstar_snmp/prostar_mppt_snmp/prostar_mppt_snmp.yaml
+++ b/templates/net/morningstar/morningstar_prostar_mppt_snmp/template_net_morningstar_prostar_mppt_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:05Z'
+  version: '6.0'
+  date: '2021-12-17T06:31:59Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         PROSTAR-MPPT
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/morningstar/morningstar_prostar_pwm_snmp/README.md b/templates/net/morningstar/morningstar_prostar_pwm_snmp/README.md
new file mode 100644
index 00000000000..a3f7f261c01
--- /dev/null
+++ b/templates/net/morningstar/morningstar_prostar_pwm_snmp/README.md
@@ -0,0 +1,138 @@
+
+# Morningstar ProStar PWM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$BATTERY.TEMP.MAX.CRIT} |<p>Battery high temperature critical value</p> |`60` |
+|{$BATTERY.TEMP.MAX.WARN} |<p>Battery high temperature warning value</p> |`45` |
+|{$BATTERY.TEMP.MIN.CRIT} |<p>Battery low temperature critical value</p> |`-20` |
+|{$BATTERY.TEMP.MIN.WARN} |<p>Battery low temperature warning value</p> |`0` |
+|{$CHARGE.STATE.CRIT} |<p>fault</p> |`4` |
+|{$CHARGE.STATE.WARN} |<p>disconnect</p> |`2` |
+|{$LOAD.STATE.CRIT:"fault"} |<p>fault</p> |`4` |
+|{$LOAD.STATE.CRIT:"lvd"} |<p>lvd</p> |`3` |
+|{$LOAD.STATE.WARN:"disconnect"} |<p>disconnect</p> |`5` |
+|{$LOAD.STATE.WARN:"lvdWarning"} |<p>lvdWarning</p> |`2` |
+|{$LOAD.STATE.WARN:"override"} |<p>override</p> |`7` |
+|{$VOLTAGE.MAX.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MAX.WARN} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.WARN} |<p>-</p> |`` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Battery voltage discovery |<p>Discovery for battery voltage triggers</p> |DEPENDENT |battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Array |Array: Voltage |<p>MIB: PROSTAR-PWM</p><p>Description:Array Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x0013</p> |SNMP |array.voltage[arrayVoltage.0] |
+|Battery |Battery: Charge State |<p>MIB: PROSTAR-PWM</p><p>Description:Control State</p><p>Modbus address:0x0021</p><p>0: Start</p><p>1: NightCheck</p><p>2: Disconnect</p><p>3: Night</p><p>4: Fault</p><p>5: Bulk</p><p>6: Pwm</p><p>7: Float</p><p>8: Equalize</p> |SNMP |charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Target Voltage |<p>MIB: PROSTAR-PWM</p><p>Description:Target Regulation Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0024</p> |SNMP |target.voltage[targetVoltage.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Charge Current |<p>MIB: PROSTAR-PWM</p><p>Description:Charge Current</p><p>Scaling Factor:1.0</p><p>Units:A</p><p>Range:[0, 40]</p><p>Modbus address:0x0011</p> |SNMP |charge.current[chargeCurrent.0] |
+|Battery |Battery: Voltage{#SINGLETON} |<p>MIB: PROSTAR-PWM</p><p>Description:Control State</p><p>Modbus address:0x0021</p> |SNMP |battery.voltage[batteryTerminalVoltage.0{#SINGLETON}] |
+|Counter |Counter: Charge Amp-hours |<p>MIB: PROSTAR-PWM</p><p>Description:Ah Charge (Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x0026 L=0x0027</p> |SNMP |counter.charge_amp_hours[ahChargeResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Counter |Counter: Charge KW-hours |<p>MIB: PROSTAR-PWM</p><p>Description:Kilowatt Hours Charge (Resettable)</p><p>Scaling Factor:1.0</p><p>Units:kWh</p><p>Range:[0.0, 65535]</p><p>Modbus address:0x002A</p> |SNMP |counter.charge_kw_hours[kwhChargeResettable.0] |
+|Counter |Counter: Load Amp-hours |<p>MIB: PROSTAR-PWM</p><p>Description:Ah Load (Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x0032 L=0x0033</p> |SNMP |counter.load_amp_hours[ahLoadResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Load |Load: State |<p>MIB: PROSTAR-PWM</p><p>Description:Load State</p><p>Modbus address:0x002E</p><p>0: Start</p><p>1: Normal</p><p>2: LvdWarning</p><p>3: Lvd</p><p>4: Fault</p><p>5: Disconnect</p><p>6: NormalOff</p><p>7: Override</p><p>8: NotUsed</p> |SNMP |load.state[loadState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Load |Load: Voltage |<p>MIB: PROSTAR-PWM</p><p>Description:Load Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x0014</p> |SNMP |load.voltage[loadVoltage.0] |
+|Load |Load: Current |<p>MIB: PROSTAR-PWM</p><p>Description:Load Current</p><p>Scaling Factor:1.0</p><p>Units:A</p><p>Range:[0, 60]</p><p>Modbus address:0x0016</p> |SNMP |load.current[loadCurrent.0] |
+|Status |Status: Uptime |<p>Device uptime in seconds</p> |SNMP |status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
+|Status |Status: Array Faults |<p>MIB: PROSTAR-PWM</p><p>Description:Array Faults</p><p>Modbus address:0x0022</p> |SNMP |status.array_faults[arrayFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Load Faults |<p>MIB: PROSTAR-PWM</p><p>Description:Load Faults</p><p>Modbus address:0x002F</p> |SNMP |status.load_faults[loadFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Alarms |<p>MIB: PROSTAR-PWM</p><p>Description:Alarms</p><p>Modbus addresses:H=0x0038 L=0x0039</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Temperature |Temperature: Ambient |<p>MIB: PROSTAR-PWM</p><p>Description:Ambient Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001C</p> |SNMP |temp.ambient[ambientTemperature.0] |
+|Temperature |Temperature: Battery |<p>MIB: PROSTAR-PWM</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001B</p> |SNMP |temp.battery[batteryTemperature.0] |
+|Temperature |Temperature: Heatsink |<p>MIB: PROSTAR-PWM</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001A</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
+|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: PROSTAR-PWM</p> |SNMP |battery.voltage.discovery[batteryTerminalVoltage.0] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Battery: Device charge in warning state |<p>-</p> |`last(/Morningstar ProStar PWM SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Device charge in critical state</p> |
+|Battery: Device charge in critical state |<p>-</p> |`last(/Morningstar ProStar PWM SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}` |HIGH | |
+|Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m) |<p>-</p> |`max(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p> |
+|Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m) |<p>-</p> |`max(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}` |HIGH | |
+|Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m) |<p>-</p> |`min(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p> |
+|Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m) |<p>-</p> |`min(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}` |HIGH | |
+|Load: Device load in warning state |<p>-</p> |`last(/Morningstar ProStar PWM SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar ProStar PWM SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"override"}` |WARNING |<p>**Depends on**:</p><p>- Load: Device load in critical state</p> |
+|Load: Device load in critical state |<p>-</p> |`last(/Morningstar ProStar PWM SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar ProStar PWM SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"fault"}` |HIGH | |
+|Status: Device has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Morningstar ProStar PWM SNMP/status.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Status: Failed to fetch data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes</p> |`nodata(/Morningstar ProStar PWM SNMP/status.uptime,5m)=1` |WARNING |<p>Manual close: YES</p> |
+|Status: Device has "overcurrent" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "mosfetSShorted" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","mosfetSShorted")=2` |HIGH | |
+|Status: Device has "software" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","software")=2` |HIGH | |
+|Status: Device has "batteryHvd" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryHvd")=2` |HIGH | |
+|Status: Device has "arrayHvd" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","arrayHvd")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "rtsShorted" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsShorted")=2` |HIGH | |
+|Status: Device has "rtsNoLongerValid" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsNoLongerValid")=2` |HIGH | |
+|Status: Device has "localTempSensorDamaged" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","localTempSensorDamaged")=2` |HIGH | |
+|Status: Device has "batteryLowVoltageDisconnect" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryLowVoltageDisconnect")=2` |HIGH | |
+|Status: Device has "slaveTimeout" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","slaveTimeout")=2` |HIGH | |
+|Status: Device has "dipSwitchChanged" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","dipSwitchChanged")=2` |HIGH | |
+|Status: Device has "p3Fault" array faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","p3Fault")=2` |HIGH | |
+|Status: Device has "externalShortCircuit" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","externalShortCircuit")=2` |HIGH | |
+|Status: Device has "overcurrent" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "mosfetShorted" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","mosfetShorted")=2` |HIGH | |
+|Status: Device has "software" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","software")=2` |HIGH | |
+|Status: Device has "loadHvd" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","loadHvd")=2` |HIGH | |
+|Status: Device has "highTempDisconnect" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","highTempDisconnect")=2` |HIGH | |
+|Status: Device has "dipSwitchChanged" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","dipSwitchChanged")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "p3Fault" load faults flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","p3Fault")=2` |HIGH | |
+|Status: Device has "rtsShorted" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2` |WARNING | |
+|Status: Device has "rtsDisconnected" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorOpen" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorShorted" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2` |WARNING | |
+|Status: Device has "heatsinkTempLimit" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempLimit")=2` |WARNING | |
+|Status: Device has "currentLimit" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2` |WARNING | |
+|Status: Device has "currentMeasurementError" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","currentMeasurementError")=2` |WARNING | |
+|Status: Device has "batterySenseOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","batterySenseOutOfRange")=2` |WARNING | |
+|Status: Device has "batterySenseDisconnected" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2` |WARNING | |
+|Status: Device has "uncalibrated" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2` |WARNING | |
+|Status: Device has "batteryTempOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","batteryTempOutOfRange")=2` |WARNING | |
+|Status: Device has "fp10SupplyOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","fp10SupplyOutOfRange")=2` |WARNING | |
+|Status: Device has "mosfetOpen" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","mosfetOpen")=2` |WARNING | |
+|Status: Device has "arrayCurrentOffset" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","arrayCurrentOffset")=2` |WARNING | |
+|Status: Device has "loadCurrentOffset" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","loadCurrentOffset")=2` |WARNING | |
+|Status: Device has "p33SupplyOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","p33SupplyOutOfRange")=2` |WARNING | |
+|Status: Device has "p12SupplyOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","p12SupplyOutOfRange")=2` |WARNING | |
+|Status: Device has "hightInputVoltageLimit" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","hightInputVoltageLimit")=2` |WARNING | |
+|Status: Device has "controllerReset" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","controllerReset")=2` |WARNING | |
+|Status: Device has "loadLvd" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","loadLvd")=2` |WARNING | |
+|Status: Device has "logTimeout" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","logTimeout")=2` |WARNING | |
+|Status: Device has "eepromAccessFailure" alarm flag |<p>-</p> |`count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","eepromAccessFailure")=2` |WARNING | |
+|Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
+|Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}` |HIGH | |
+|Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m) |<p>-</p> |`min(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
+|Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) |<p>-</p> |`min(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}` |HIGH | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/net/morningstar_snmp/prostar_pwm_snmp/prostar_pwm_snmp.yaml b/templates/net/morningstar/morningstar_prostar_pwm_snmp/template_net_morningstar_prostar_pwm_snmp.yaml
index 994c26d6d5f..7dee3a295c2 100644
--- a/templates/net/morningstar_snmp/prostar_pwm_snmp/prostar_pwm_snmp.yaml
+++ b/templates/net/morningstar/morningstar_prostar_pwm_snmp/template_net_morningstar_prostar_pwm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:07Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:04Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         PROSTAR-PWM
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/README.md b/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/README.md
new file mode 100644
index 00000000000..e8d76dc3c8b
--- /dev/null
+++ b/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/README.md
@@ -0,0 +1,127 @@
+
+# Morningstar SunSaver MPPT SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$BATTERY.TEMP.MAX.CRIT} |<p>Battery high temperature critical value</p> |`60` |
+|{$BATTERY.TEMP.MAX.WARN} |<p>Battery high temperature warning value</p> |`45` |
+|{$BATTERY.TEMP.MIN.CRIT} |<p>Battery low temperature critical value</p> |`-20` |
+|{$BATTERY.TEMP.MIN.WARN} |<p>Battery low temperature warning value</p> |`0` |
+|{$CHARGE.STATE.CRIT} |<p>fault</p> |`4` |
+|{$CHARGE.STATE.WARN} |<p>disconnect</p> |`2` |
+|{$LOAD.STATE.CRIT:"fault"} |<p>fault</p> |`4` |
+|{$LOAD.STATE.CRIT:"lvd"} |<p>lvd</p> |`3` |
+|{$LOAD.STATE.WARN:"disconnect"} |<p>disconnect</p> |`5` |
+|{$LOAD.STATE.WARN:"lvdWarning"} |<p>lvdWarning</p> |`2` |
+|{$LOAD.STATE.WARN:"override"} |<p>override</p> |`7` |
+|{$VOLTAGE.MAX.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MAX.WARN} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.WARN} |<p>-</p> |`` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Battery voltage discovery |<p>Discovery for battery voltage triggers</p> |DEPENDENT |battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Array |Array: Voltage |<p>MIB: SUNSAVER-MPPT</p><p>Description:Array Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x0009</p> |SNMP |array.voltage[arrayVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Array |Array: Sweep Vmp |<p>MIB: SUNSAVER-MPPT</p><p>Description:Array Max. Power Point Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 5000.0]</p><p>Modbus address:0x0028</p> |SNMP |array.sweep_vmp[arrayVmp.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Array |Array: Sweep Voc |<p>MIB: SUNSAVER-MPPT</p><p>Description:Array Open Circuit Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x002A</p> |SNMP |array.sweep_voc[arrayVoc.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Array |Array: Sweep Pmax |<p>MIB: SUNSAVER-MPPT</p><p>Description:Array Open Circuit Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x002A</p> |SNMP |array.sweep_pmax[arrayMaxPowerSweep.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01509857178`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Charge State |<p>MIB: SUNSAVER-MPPT</p><p>Description:Control State</p><p>Modbus address:0x0011</p><p>0: Start</p><p>1: NightCheck</p><p>2: Disconnect</p><p>3: Night</p><p>4: Fault</p><p>5: BulkMppt</p><p>6: Pwm</p><p>7: Float</p><p>8: Equalize</p> |SNMP |charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Target Voltage |<p>MIB: SUNSAVER-MPPT</p><p>Description:Target Regulation Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0014</p> |SNMP |target.voltage[targetVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Charge Current |<p>MIB: SUNSAVER-MPPT</p><p>Description:Target Regulation Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0014</p> |SNMP |charge.current[chargeCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002415771484`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Voltage{#SINGLETON} |<p>MIB: SUNSAVER-MPPT</p><p>Description:Control State</p><p>Modbus address:0x0011</p> |SNMP |battery.voltage[batteryVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Counter |Counter: Charge Amp-hours |<p>MIB: SUNSAVER-MPPT</p><p>Description:Ah Charge(Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x0015 L=0x0016</p> |SNMP |counter.charge_amp_hours[ahChargeResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Counter |Counter: Charge KW-hours |<p>MIB: SUNSAVER-MPPT</p> |SNMP |counter.charge_kw_hours[kwhCharge.0] |
+|Counter |Counter: Load Amp-hours |<p>MIB: SUNSAVER-MPPT</p><p>Description:Ah Load(Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x001D L=0x001E</p> |SNMP |counter.load_amp_hours[ahLoadResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Load |Load: State |<p>MIB: SUNSAVER-MPPT</p><p>Description:Load State</p><p>Modbus address:0x001A</p><p>0: Start</p><p>1: Normal</p><p>2: LvdWarning</p><p>3: Lvd</p><p>4: Fault</p><p>5: Disconnect</p><p>6: NormalOff</p><p>7: Override</p><p>8: NotUsed</p> |SNMP |load.state[loadState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Load |Load: Voltage |<p>MIB: SUNSAVER-MPPT</p><p>Description:Load Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x000A</p> |SNMP |load.voltage[loadVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Load |Load: Current |<p>MIB: SUNSAVER-MPPT</p><p>Description:Load Current</p><p>Scaling Factor:0.002415771484375</p><p>Units:A</p><p>Range:[0, 60]</p><p>Modbus address:0x000C</p> |SNMP |load.current[loadCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002415771484`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Status |Status: Uptime |<p>Device uptime in seconds</p> |SNMP |status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
+|Status |Status: Array Faults |<p>MIB: SUNSAVER-MPPT</p><p>Description:Array Faults</p><p>Modbus address:0x0012</p> |SNMP |status.array_faults[arrayFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Load Faults |<p>MIB: SUNSAVER-MPPT</p><p>Description:Array Faults</p><p>Modbus address:0x0012</p> |SNMP |status.load_faults[loadFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Alarms |<p>MIB: SUNSAVER-MPPT</p><p>Description:Alarms</p><p>Modbus addresses:H=0x0023 L=0x0024</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Temperature |Temperature: Ambient |<p>MIB: SUNSAVER-MPPT</p><p>Description:Ambient Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000F</p> |SNMP |temp.ambient[ambientTemperature.0] |
+|Temperature |Temperature: Battery |<p>MIB: SUNSAVER-MPPT</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000D</p> |SNMP |temp.battery[batteryTemperature.0] |
+|Temperature |Temperature: Heatsink |<p>MIB: SUNSAVER-MPPT</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000E</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
+|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: SUNSAVER-MPPT</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p> |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Battery: Device charge in warning state |<p>-</p> |`last(/Morningstar SunSaver MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Device charge in critical state</p> |
+|Battery: Device charge in critical state |<p>-</p> |`last(/Morningstar SunSaver MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}` |HIGH | |
+|Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m) |<p>-</p> |`max(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p> |
+|Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m) |<p>-</p> |`max(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}` |HIGH | |
+|Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m) |<p>-</p> |`min(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p> |
+|Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m) |<p>-</p> |`min(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}` |HIGH | |
+|Load: Device load in warning state |<p>-</p> |`last(/Morningstar SunSaver MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar SunSaver MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"override"}` |WARNING |<p>**Depends on**:</p><p>- Load: Device load in critical state</p> |
+|Load: Device load in critical state |<p>-</p> |`last(/Morningstar SunSaver MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar SunSaver MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"fault"}` |HIGH | |
+|Status: Device has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Morningstar SunSaver MPPT SNMP/status.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Status: Failed to fetch data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes</p> |`nodata(/Morningstar SunSaver MPPT SNMP/status.uptime,5m)=1` |WARNING |<p>Manual close: YES</p> |
+|Status: Device has "overcurrent" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "mosfetSShorted" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","mosfetSShorted")=2` |HIGH | |
+|Status: Device has "softwareFault" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","softwareFault")=2` |HIGH | |
+|Status: Device has "batteryHvd" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryHvd")=2` |HIGH | |
+|Status: Device has "arrayHvd" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","arrayHvd")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "rtsShorted" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsShorted")=2` |HIGH | |
+|Status: Device has "rtsNoLongerValid" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsNoLongerValid")=2` |HIGH | |
+|Status: Device has "localTempSensorDamaged" array faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","localTempSensorDamaged")=2` |HIGH | |
+|Status: Device has "externalShortCircuit" load faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","externalShortCircuit")=2` |HIGH | |
+|Status: Device has "overcurrent" load faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "mosfetShorted" load faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","mosfetShorted")=2` |HIGH | |
+|Status: Device has "software" load faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","software")=2` |HIGH | |
+|Status: Device has "loadHvd" load faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","loadHvd")=2` |HIGH | |
+|Status: Device has "highTempDisconnect" load faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","highTempDisconnect")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" load faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "unknownLoadFault" load faults flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","unknownLoadFault")=2` |HIGH | |
+|Status: Device has "rtsShorted" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2` |WARNING | |
+|Status: Device has "rtsDisconnected" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorOpen" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorShorted" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2` |WARNING | |
+|Status: Device has "sspptHot" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","sspptHot")=2` |WARNING | |
+|Status: Device has "currentLimit" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2` |WARNING | |
+|Status: Device has "currentOffset" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","currentOffset")=2` |WARNING | |
+|Status: Device has "uncalibrated" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2` |WARNING | |
+|Status: Device has "rtsMiswire" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsMiswire")=2` |WARNING | |
+|Status: Device has "systemMiswire" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","systemMiswire")=2` |WARNING | |
+|Status: Device has "mosfetSOpen" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","mosfetSOpen")=2` |WARNING | |
+|Status: Device has "p12VoltageReferenceOff" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","p12VoltageReferenceOff")=2` |WARNING | |
+|Status: Device has "highVaCurrentLimit" alarm flag |<p>-</p> |`count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","highVaCurrentLimit")=2` |WARNING | |
+|Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
+|Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}` |HIGH | |
+|Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m) |<p>-</p> |`min(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
+|Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) |<p>-</p> |`min(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}` |HIGH | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/net/morningstar_snmp/sunsaver_mppt_snmp/sunsaver_mppt_snmp.yaml b/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/template_net_morningstar_sunsaver_mppt_snmp.yaml
index 8046762ab62..02f648954a1 100644
--- a/templates/net/morningstar_snmp/sunsaver_mppt_snmp/sunsaver_mppt_snmp.yaml
+++ b/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/template_net_morningstar_sunsaver_mppt_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:05Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:09Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         SUNSAVER-MPPT
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/morningstar/morningstar_suresine_snmp/README.md b/templates/net/morningstar/morningstar_suresine_snmp/README.md
new file mode 100644
index 00000000000..1ba8862a15c
--- /dev/null
+++ b/templates/net/morningstar/morningstar_suresine_snmp/README.md
@@ -0,0 +1,89 @@
+
+# Morningstar SureSine SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$BATTERY.TEMP.MAX.CRIT} |<p>Battery high temperature critical value</p> |`60` |
+|{$BATTERY.TEMP.MAX.WARN} |<p>Battery high temperature warning value</p> |`45` |
+|{$BATTERY.TEMP.MIN.CRIT} |<p>Battery low temperature critical value</p> |`-20` |
+|{$BATTERY.TEMP.MIN.WARN} |<p>Battery low temperature warning value</p> |`0` |
+|{$CHARGE.STATE.CRIT} |<p>fault</p> |`4` |
+|{$CHARGE.STATE.WARN} |<p>disconnect</p> |`2` |
+|{$LOAD.STATE.CRIT:"fault"} |<p>fault</p> |`4` |
+|{$LOAD.STATE.CRIT:"lvd"} |<p>lvd</p> |`3` |
+|{$LOAD.STATE.WARN:"disconnect"} |<p>disconnect</p> |`5` |
+|{$LOAD.STATE.WARN:"lvdWarning"} |<p>lvdWarning</p> |`2` |
+|{$LOAD.STATE.WARN:"override"} |<p>override</p> |`7` |
+|{$VOLTAGE.MAX.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MAX.WARN} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.WARN} |<p>-</p> |`` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Battery voltage discovery |<p>Discovery for battery voltage triggers</p> |DEPENDENT |battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Battery |Battery: Voltage{#SINGLETON} |<p>MIB: SURESINE</p><p>Description:Battery Voltage(slow)</p><p>Scaling Factor:0.0002581787109375</p><p>Units:V</p><p>Range:[0.0, 17.0]</p><p>Modbus address:0x0004</p> |SNMP |battery.voltage[batteryVoltageSlow.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `2.581787109375E-4`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Load |Load: State |<p>MIB: SURESINE</p><p>Description:Load State</p><p>Modbus address:0x000B</p><p> 0: Start</p><p>1: LoadOn</p><p>2: LvdWarning</p><p>3: LowVoltageDisconnect</p><p>4: Fault</p><p>5: Disconnect</p><p>6: NormalOff</p><p>7: UnknownState</p><p>8: Standby</p> |SNMP |load.state[loadState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Load |Load: A/C Current |<p>MIB: SURESINE</p><p>Description:AC Output Current</p><p>Scaling Factor:0.0001953125</p><p>Units:A</p><p>Range:[0.0, 17]</p><p>Modbus address:0x0005</p> |SNMP |load.ac_current[acCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1.953125E-4`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Status |Status: Uptime |<p>Device uptime in seconds</p> |SNMP |status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
+|Status |Status: Faults |<p>MIB: SURESINE</p><p>Description:Faults</p><p>Modbus address:0x0007</p> |SNMP |status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Alarms |<p>MIB: SURESINE</p><p>Description:Faults</p><p>Modbus address:0x0007</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Temperature |Temperature: Heatsink |<p>MIB: SURESINE</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1</p><p>Units:C</p><p>Range:[-128, 127]</p><p>Modbus address:0x0006</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
+|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: SURESINE</p> |SNMP |battery.voltage.discovery[batteryVoltageSlow.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `2.581787109375E-4`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m) |<p>-</p> |`max(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p> |
+|Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m) |<p>-</p> |`max(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}` |HIGH | |
+|Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m) |<p>-</p> |`min(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p> |
+|Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m) |<p>-</p> |`min(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}` |HIGH | |
+|Load: Device load in warning state |<p>-</p> |`last(/Morningstar SureSine SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar SureSine SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"override"}` |WARNING |<p>**Depends on**:</p><p>- Load: Device load in critical state</p> |
+|Load: Device load in critical state |<p>-</p> |`last(/Morningstar SureSine SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar SureSine SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"fault"}` |HIGH | |
+|Status: Device has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Morningstar SureSine SNMP/status.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Status: Failed to fetch data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes</p> |`nodata(/Morningstar SureSine SNMP/status.uptime,5m)=1` |WARNING |<p>Manual close: YES</p> |
+|Status: Device has "reset" faults flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","reset")=2` |HIGH | |
+|Status: Device has "overcurrent" faults flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "unknownFault" faults flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","unknownFault")=2` |HIGH | |
+|Status: Device has "software" faults flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","software")=2` |HIGH | |
+|Status: Device has "highVoltageDisconnect" faults flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","highVoltageDisconnect")=2` |HIGH | |
+|Status: Device has "suresineHot" faults flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","suresineHot")=2` |HIGH | |
+|Status: Device has "dipSwitchChanged" faults flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","dipSwitchChanged")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" faults flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "heatsinkTempSensorOpen" alarm flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorShort" alarm flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShort")=2` |WARNING | |
+|Status: Device has "unknownAlarm" alarm flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.alarms[alarms.0],#3,"like","unknownAlarm")=2` |WARNING | |
+|Status: Device has "suresineHot" alarm flag |<p>-</p> |`count(/Morningstar SureSine SNMP/status.alarms[alarms.0],#3,"like","suresineHot")=2` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/net/morningstar_snmp/suresine_snmp/suresine_snmp.yaml b/templates/net/morningstar/morningstar_suresine_snmp/template_net_morningstar_suresine_snmp.yaml
index 916d477764a..371e0035290 100644
--- a/templates/net/morningstar_snmp/suresine_snmp/suresine_snmp.yaml
+++ b/templates/net/morningstar/morningstar_suresine_snmp/template_net_morningstar_suresine_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:07Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:13Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         SURESINE
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/README.md b/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/README.md
new file mode 100644
index 00000000000..32e985aa597
--- /dev/null
+++ b/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/README.md
@@ -0,0 +1,148 @@
+
+# Morningstar TriStar MPPT 600V SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$BATTERY.TEMP.MAX.CRIT} |<p>Battery high temperature critical value</p> |`60` |
+|{$BATTERY.TEMP.MAX.WARN} |<p>Battery high temperature warning value</p> |`45` |
+|{$BATTERY.TEMP.MIN.CRIT} |<p>Battery low temperature critical value</p> |`-20` |
+|{$BATTERY.TEMP.MIN.WARN} |<p>Battery low temperature warning value</p> |`0` |
+|{$CHARGE.STATE.CRIT} |<p>fault</p> |`4` |
+|{$CHARGE.STATE.WARN} |<p>disconnect</p> |`2` |
+|{$LOAD.STATE.CRIT:"fault"} |<p>fault</p> |`4` |
+|{$LOAD.STATE.CRIT:"lvd"} |<p>lvd</p> |`3` |
+|{$LOAD.STATE.WARN:"disconnect"} |<p>disconnect</p> |`5` |
+|{$LOAD.STATE.WARN:"lvdWarning"} |<p>lvdWarning</p> |`2` |
+|{$LOAD.STATE.WARN:"override"} |<p>override</p> |`7` |
+|{$VOLTAGE.MAX.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MAX.WARN} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.WARN} |<p>-</p> |`` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Battery voltage discovery |<p>Discovery for battery voltage triggers</p> |DEPENDENT |battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Array |Array: Voltage |<p>MIB: TRISTAR-MPPT</p><p>Description:Array Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 650]</p><p>Modbus address:0x001b</p> |SNMP |array.voltage[arrayVoltage.0] |
+|Array |Array: Array Current |<p>MIB: TRISTAR-MPPT</p><p>Description:Array Current</p><p>Scaling Factor:1.0</p><p>Units:A</p><p>Range:[-10, 80]</p><p>Modbus address:0x001d</p> |SNMP |array.current[arrayCurrent.0] |
+|Array |Array: Sweep Vmp |<p>MIB: TRISTAR-MPPT</p><p>Description:Vmp (last sweep)</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 650.0]</p><p>Modbus address:0x003d</p> |SNMP |array.sweep_vmp[arrayVmpLastSweep.0] |
+|Array |Array: Sweep Voc |<p>MIB: TRISTAR-MPPT</p><p>Description:Voc (last sweep)</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 650.0]</p><p>Modbus address:0x003e</p> |SNMP |array.sweep_voc[arrayVocLastSweep.0] |
+|Array |Array: Sweep Pmax |<p>MIB: TRISTAR-MPPT</p><p>Description:Pmax (last sweep)</p><p>Scaling Factor:1.0</p><p>Units:W</p><p>Range:[-10, 5000]</p><p>Modbus address:0x003c</p> |SNMP |array.sweep_pmax[arrayPmaxLastSweep.0] |
+|Battery |Battery: Charge State |<p>MIB: TRISTAR-MPPT</p><p>Description:Charge State</p><p>Modbus address:0x0032</p><p>0: Start</p><p>1: NightCheck</p><p>2: Disconnect</p><p>3: Night</p><p>4: Fault</p><p>5: Mppt</p><p>6: Absorption</p><p>7: Float</p><p>8: Equalize</p><p>9: Slave</p><p>10: Fixed</p> |SNMP |charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Target Voltage |<p>MIB: TRISTAR-MPPT</p><p>Description:Target Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 650.0]</p><p>Modbus address:0x0033</p> |SNMP |target.voltage[targetRegulationVoltage.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Charge Current |<p>MIB: TRISTAR-MPPT</p><p>Description:Battery Current</p><p>Scaling Factor:1.0</p><p>Units:A</p><p>Range:[-10, 80]</p><p>Modbus address:0x001c</p> |SNMP |charge.current[batteryCurrent.0] |
+|Battery |Battery: Output Power |<p>MIB: TRISTAR-MPPT</p><p>Description:Output Power</p><p>Scaling Factor:1.0</p><p>Units:W</p><p>Range:[-10, 4000]</p><p>Modbus address:0x003a</p> |SNMP |charge.output_power[ outputPower.0] |
+|Battery |Battery: Voltage{#SINGLETON} |<p>MIB: TRISTAR-MPPT</p><p>Description:Battery voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 80]</p><p>Modbus address:0x0018</p> |SNMP |battery.voltage[batteryVoltage.0{#SINGLETON}] |
+|Counter |Counter: Charge Amp-hours |<p>MIB: TRISTAR-MPPT</p><p>Description:Ah Charge Resettable</p><p>Scaling Factor:1.0</p><p>Units:Ah</p><p>Range:[0.0, 5000]</p><p>Modbus addresses:H=0x0034 L=0x0035</p> |SNMP |counter.charge_amp_hours[ahChargeResetable.0] |
+|Counter |Counter: Charge KW-hours |<p>MIB: TRISTAR-MPPT</p><p>Description:kWh Charge Resettable</p><p>Scaling Factor:1.0</p><p>Units:kWh</p><p>Range:[0.0, 65535.0]</p><p>Modbus address:0x0038</p> |SNMP |counter.charge_kw_hours[kwhChargeResetable.0] |
+|Status |Status: Uptime |<p>Device uptime in seconds</p> |SNMP |status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
+|Status |Status: Faults |<p>MIB: TRISTAR-MPPT</p><p>Description:Faults</p><p>Modbus addresses:H=0x002c L=0x002d</p> |SNMP |status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Alarms |<p>MIB: TRISTAR-MPPT</p><p>Description:Alarms</p><p>Modbus addresses:H=0x002e L=0x002f</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Temperature |Temperature: Battery |<p>MIB: TRISTAR-MPPT</p><p>Description:Batt. Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0025</p> |SNMP |temp.battery[batteryTemperature.0] |
+|Temperature |Temperature: Heatsink |<p>MIB: TRISTAR-MPPT</p><p>Description:HS Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0023</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
+|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR-MPPT</p><p>Description:Battery voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 80]</p><p>Modbus address:0x0018</p> |SNMP |battery.voltage.discovery[batteryVoltage.0] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Battery: Device charge in warning state |<p>-</p> |`last(/Morningstar TriStar MPPT 600V SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Device charge in critical state</p> |
+|Battery: Device charge in critical state |<p>-</p> |`last(/Morningstar TriStar MPPT 600V SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}` |HIGH | |
+|Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m) |<p>-</p> |`max(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p> |
+|Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m) |<p>-</p> |`max(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}` |HIGH | |
+|Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m) |<p>-</p> |`min(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p> |
+|Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m) |<p>-</p> |`min(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}` |HIGH | |
+|Status: Device has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Morningstar TriStar MPPT 600V SNMP/status.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Status: Failed to fetch data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes</p> |`nodata(/Morningstar TriStar MPPT 600V SNMP/status.uptime,5m)=1` |WARNING |<p>Manual close: YES</p> |
+|Status: Device has "overcurrent" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "fetShort" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fetShort")=2` |HIGH | |
+|Status: Device has "softwareFault" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","softwareFault")=2` |HIGH | |
+|Status: Device has "batteryHvd" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","batteryHvd")=2` |HIGH | |
+|Status: Device has "arrayHvd" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","arrayHvd")=2` |HIGH | |
+|Status: Device has "dipSwitchChange" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","dipSwitchChange")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "rtsShorted" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","rtsShorted")=2` |HIGH | |
+|Status: Device has "rtsDisconnected" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","rtsDisconnected")=2` |HIGH | |
+|Status: Device has "eepromRetryLimit" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","eepromRetryLimit")=2` |HIGH | |
+|Status: Device has "controllerWasReset" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","controllerWasReset")=2` |HIGH | |
+|Status: Device has "chargeSlaveControlTimeout" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","chargeSlaveControlTimeout")=2` |HIGH | |
+|Status: Device has "rs232SerialToMeterBridge" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","rs232SerialToMeterBridge")=2` |HIGH | |
+|Status: Device has "batteryLvd" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","batteryLvd")=2` |HIGH | |
+|Status: Device has "powerboardCommunicationFault" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","powerboardCommunicationFault")=2` |HIGH | |
+|Status: Device has "fault16Software" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault16Software")=2` |HIGH | |
+|Status: Device has "fault17Software" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault17Software")=2` |HIGH | |
+|Status: Device has "fault18Software" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault18Software")=2` |HIGH | |
+|Status: Device has "fault19Software" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault19Software")=2` |HIGH | |
+|Status: Device has "fault20Software" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault20Software")=2` |HIGH | |
+|Status: Device has "fault21Software" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault21Software")=2` |HIGH | |
+|Status: Device has "fpgaVersion" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fpgaVersion")=2` |HIGH | |
+|Status: Device has "currentSensorReferenceOutOfRange" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","currentSensorReferenceOutOfRange")=2` |HIGH | |
+|Status: Device has "ia-refSlaveModeTimeout" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","ia-refSlaveModeTimeout")=2` |HIGH | |
+|Status: Device has "blockbusBoot" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","blockbusBoot")=2` |HIGH | |
+|Status: Device has "hscommMaster" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","hscommMaster")=2` |HIGH | |
+|Status: Device has "hscomm" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","hscomm")=2` |HIGH | |
+|Status: Device has "slave" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","slave")=2` |HIGH | |
+|Status: Device has "rtsShorted" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2` |WARNING | |
+|Status: Device has "rtsDisconnected" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorOpen" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorShorted" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2` |WARNING | |
+|Status: Device has "highTemperatureCurrentLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","highTemperatureCurrentLimit")=2` |WARNING | |
+|Status: Device has "currentLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2` |WARNING | |
+|Status: Device has "currentOffset" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","currentOffset")=2` |WARNING | |
+|Status: Device has "batterySense" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","batterySense")=2` |WARNING | |
+|Status: Device has "batterySenseDisconnected" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2` |WARNING | |
+|Status: Device has "uncalibrated" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2` |WARNING | |
+|Status: Device has "rtsMiswire" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","rtsMiswire")=2` |WARNING | |
+|Status: Device has "highVoltageDisconnect" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","highVoltageDisconnect")=2` |WARNING | |
+|Status: Device has "systemMiswire" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","systemMiswire")=2` |WARNING | |
+|Status: Device has "mosfetSOpen" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","mosfetSOpen")=2` |WARNING | |
+|Status: Device has "p12VoltageOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","p12VoltageOutOfRange")=2` |WARNING | |
+|Status: Device has "highArrayVCurrentLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","highArrayVCurrentLimit")=2` |WARNING | |
+|Status: Device has "maxAdcValueReached" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","maxAdcValueReached")=2` |WARNING | |
+|Status: Device has "controllerWasReset" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","controllerWasReset")=2` |WARNING | |
+|Status: Device has "alarm21Internal" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","alarm21Internal")=2` |WARNING | |
+|Status: Device has "p3VoltageOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","p3VoltageOutOfRange")=2` |WARNING | |
+|Status: Device has "derateLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","derateLimit")=2` |WARNING | |
+|Status: Device has "arrayCurrentOffset" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","arrayCurrentOffset")=2` |WARNING | |
+|Status: Device has "ee-i2cRetryLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","ee-i2cRetryLimit")=2` |WARNING | |
+|Status: Device has "ethernetAlarm" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","ethernetAlarm")=2` |WARNING | |
+|Status: Device has "lvd" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","lvd")=2` |WARNING | |
+|Status: Device has "software" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","software")=2` |WARNING | |
+|Status: Device has "fp12VoltageOutOfRange" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","fp12VoltageOutOfRange")=2` |WARNING | |
+|Status: Device has "extflashFault" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","extflashFault")=2` |WARNING | |
+|Status: Device has "slaveControlFault" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","slaveControlFault")=2` |WARNING | |
+|Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
+|Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}` |HIGH | |
+|Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m) |<p>-</p> |`min(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
+|Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) |<p>-</p> |`min(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}` |HIGH | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/net/morningstar_snmp/tristar_mppt_600V_snmp/tristar_mppt_600V_snmp.yaml b/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/template_net_morningstar_tristar_mppt_600V_snmp.yaml
index b30979e2f31..3b0a39e8143 100644
--- a/templates/net/morningstar_snmp/tristar_mppt_600V_snmp/tristar_mppt_600V_snmp.yaml
+++ b/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/template_net_morningstar_tristar_mppt_600V_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:06Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:19Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         TRISTAR-MPPT
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/morningstar/morningstar_tristar_mppt_snmp/README.md b/templates/net/morningstar/morningstar_tristar_mppt_snmp/README.md
new file mode 100644
index 00000000000..7af00476ca2
--- /dev/null
+++ b/templates/net/morningstar/morningstar_tristar_mppt_snmp/README.md
@@ -0,0 +1,120 @@
+
+# Morningstar TriStar MPPT SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$BATTERY.TEMP.MAX.CRIT} |<p>Battery high temperature critical value</p> |`60` |
+|{$BATTERY.TEMP.MAX.WARN} |<p>Battery high temperature warning value</p> |`45` |
+|{$BATTERY.TEMP.MIN.CRIT} |<p>Battery low temperature critical value</p> |`-20` |
+|{$BATTERY.TEMP.MIN.WARN} |<p>Battery low temperature warning value</p> |`0` |
+|{$CHARGE.STATE.CRIT} |<p>fault</p> |`4` |
+|{$CHARGE.STATE.WARN} |<p>disconnect</p> |`2` |
+|{$LOAD.STATE.CRIT:"fault"} |<p>fault</p> |`4` |
+|{$LOAD.STATE.CRIT:"lvd"} |<p>lvd</p> |`3` |
+|{$LOAD.STATE.WARN:"disconnect"} |<p>disconnect</p> |`5` |
+|{$LOAD.STATE.WARN:"lvdWarning"} |<p>lvdWarning</p> |`2` |
+|{$LOAD.STATE.WARN:"override"} |<p>override</p> |`7` |
+|{$VOLTAGE.MAX.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MAX.WARN} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.WARN} |<p>-</p> |`` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Battery voltage discovery |<p>Discovery for battery voltage triggers</p> |DEPENDENT |battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Array |Array: Voltage |<p>MIB: TRISTAR-MPPT</p><p>Description:Array Voltage</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180]</p><p>Modbus address:0x001b</p> |SNMP |array.voltage[arrayVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Array |Array: Array Current |<p>MIB: TRISTAR-MPPT</p><p>Description:Array Current</p><p>Scaling Factor:0.00244140625</p><p>Units:A</p><p>Range:[-10, 80]</p><p>Modbus address:0x001d</p> |SNMP |array.current[arrayCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.00244140625`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Array |Array: Sweep Vmp |<p>MIB: TRISTAR-MPPT</p><p>Description:Vmp (last sweep)</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180.0]</p><p>Modbus address:0x003d</p> |SNMP |array.sweep_vmp[arrayVmpLastSweep.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Array |Array: Sweep Voc |<p>MIB: TRISTAR-MPPT</p><p>Description:Voc (last sweep)</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180.0]</p><p>Modbus address:0x003e</p> |SNMP |array.sweep_voc[arrayVocLastSweep.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Array |Array: Sweep Pmax |<p>MIB: TRISTAR-MPPT</p><p>Description:Pmax (last sweep)</p><p>Scaling Factor:0.10986328125</p><p>Units:W</p><p>Range:[-10, 5000]</p><p>Modbus address:0x003c</p> |SNMP |array.sweep_pmax[arrayPmaxLastSweep.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1098632813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Charge State |<p>MIB: TRISTAR-MPPT</p><p>Description:Charge State</p><p>Modbus address:0x0032</p><p>0: Start</p><p>1: NightCheck</p><p>2: Disconnect</p><p>3: Night</p><p>4: Fault</p><p>5: Mppt</p><p>6: Absorption</p><p>7: Float</p><p>8: Equalize</p><p>9: Slave</p> |SNMP |charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Target Voltage |<p>MIB: TRISTAR-MPPT</p><p>Description:Target Voltage</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180.0]</p><p>Modbus address:0x0033</p> |SNMP |target.voltage[targetRegulationVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Charge Current |<p>MIB: TRISTAR-MPPT</p><p>Description:Battery Current</p><p>Scaling Factor:0.00244140625</p><p>Units:A</p><p>Range:[-10, 80]</p><p>Modbus address:0x001c</p> |SNMP |charge.current[batteryCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.00244140625`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Output Power |<p>MIB: TRISTAR-MPPT</p><p>Description:Output Power</p><p>Scaling Factor:0.10986328125</p><p>Units:W</p><p>Range:[-10, 5000]</p><p>Modbus address:0x003a</p> |SNMP |charge.output_power[ outputPower.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1098632813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Voltage{#SINGLETON} |<p>MIB: TRISTAR-MPPT</p><p>Description:Battery voltage</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180.0]</p><p>Modbus address:0x0018</p> |SNMP |battery.voltage[batteryVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Counter |Counter: Charge Amp-hours |<p>MIB: TRISTAR-MPPT</p><p>Description:Ah Charge Resettable</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 5000]</p><p>Modbus addresses:H=0x0034 L=0x0035</p> |SNMP |counter.charge_amp_hours[ahChargeResetable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Counter |Counter: Charge KW-hours |<p>MIB: TRISTAR-MPPT</p><p>Description:kWh Charge Resettable</p><p>Scaling Factor:0.1</p><p>Units:kWh</p><p>Range:[0.0, 65535.0]</p><p>Modbus address:0x0038</p> |SNMP |counter.charge_kw_hours[kwhChargeResetable.0] |
+|Status |Status: Uptime |<p>Device uptime in seconds</p> |SNMP |status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
+|Status |Status: Faults |<p>MIB: TRISTAR-MPPT</p><p>Description:Faults</p><p>Modbus address:0x002c</p> |SNMP |status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Alarms |<p>MIB: TRISTAR-MPPT</p><p>Description:Faults</p><p>Modbus address:0x002c</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Temperature |Temperature: Battery |<p>MIB: TRISTAR-MPPT</p><p>Description:Batt. Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0025</p> |SNMP |temp.battery[batteryTemperature.0] |
+|Temperature |Temperature: Heatsink |<p>MIB: TRISTAR-MPPT</p><p>Description:HS Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0023</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
+|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR-MPPT</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p> |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Battery: Device charge in warning state |<p>-</p> |`last(/Morningstar TriStar MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Device charge in critical state</p> |
+|Battery: Device charge in critical state |<p>-</p> |`last(/Morningstar TriStar MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}` |HIGH | |
+|Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m) |<p>-</p> |`max(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p> |
+|Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m) |<p>-</p> |`max(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}` |HIGH | |
+|Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m) |<p>-</p> |`min(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p> |
+|Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m) |<p>-</p> |`min(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}` |HIGH | |
+|Status: Device has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Morningstar TriStar MPPT SNMP/status.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Status: Failed to fetch data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes</p> |`nodata(/Morningstar TriStar MPPT SNMP/status.uptime,5m)=1` |WARNING |<p>Manual close: YES</p> |
+|Status: Device has "overcurrent" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "fetShort" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","fetShort")=2` |HIGH | |
+|Status: Device has "softwareFault" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","softwareFault")=2` |HIGH | |
+|Status: Device has "batteryHvd" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","batteryHvd")=2` |HIGH | |
+|Status: Device has "arrayHvd" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","arrayHvd")=2` |HIGH | |
+|Status: Device has "dipSwitchChange" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","dipSwitchChange")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "rtsShorted" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","rtsShorted")=2` |HIGH | |
+|Status: Device has "rtsDisconnected" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","rtsDisconnected")=2` |HIGH | |
+|Status: Device has "eepromRetryLimit" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","eepromRetryLimit")=2` |HIGH | |
+|Status: Device has "slaveControlTimeout" faults flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","slaveControlTimeout")=2` |HIGH | |
+|Status: Device has "rtsShorted" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2` |WARNING | |
+|Status: Device has "rtsDisconnected" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorOpen" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorShorted" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2` |WARNING | |
+|Status: Device has "highTemperatureCurrentLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","highTemperatureCurrentLimit")=2` |WARNING | |
+|Status: Device has "currentLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2` |WARNING | |
+|Status: Device has "currentOffset" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","currentOffset")=2` |WARNING | |
+|Status: Device has "batterySense" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","batterySense")=2` |WARNING | |
+|Status: Device has "batterySenseDisconnected" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2` |WARNING | |
+|Status: Device has "uncalibrated" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2` |WARNING | |
+|Status: Device has "rtsMiswire" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsMiswire")=2` |WARNING | |
+|Status: Device has "highVoltageDisconnect" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","highVoltageDisconnect")=2` |WARNING | |
+|Status: Device has "systemMiswire" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","systemMiswire")=2` |WARNING | |
+|Status: Device has "mosfetSOpen" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","mosfetSOpen")=2` |WARNING | |
+|Status: Device has "p12VoltageReferenceOff" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","p12VoltageReferenceOff")=2` |WARNING | |
+|Status: Device has "highArrayVCurrentLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","highArrayVCurrentLimit")=2` |WARNING | |
+|Status: Device has "maxAdcValueReached" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","maxAdcValueReached")=2` |WARNING | |
+|Status: Device has "controllerWasReset" alarm flag |<p>-</p> |`count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","controllerWasReset")=2` |WARNING | |
+|Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
+|Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}` |HIGH | |
+|Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m) |<p>-</p> |`min(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
+|Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) |<p>-</p> |`min(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}` |HIGH | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/net/morningstar_snmp/tristar_mppt_snmp/tristar_mppt_snmp.yaml b/templates/net/morningstar/morningstar_tristar_mppt_snmp/template_net_morningstar_tristar_mppt_snmp.yaml
index 1ccf41f7252..c0b1b08de1c 100644
--- a/templates/net/morningstar_snmp/tristar_mppt_snmp/tristar_mppt_snmp.yaml
+++ b/templates/net/morningstar/morningstar_tristar_mppt_snmp/template_net_morningstar_tristar_mppt_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:05Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:24Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         TRISTAR-MPPT
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/morningstar/morningstar_tristar_pwm_snmp/README.md b/templates/net/morningstar/morningstar_tristar_pwm_snmp/README.md
new file mode 100644
index 00000000000..488e2163c24
--- /dev/null
+++ b/templates/net/morningstar/morningstar_tristar_pwm_snmp/README.md
@@ -0,0 +1,127 @@
+
+# Morningstar TriStar PWM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$BATTERY.TEMP.MAX.CRIT} |<p>Battery high temperature critical value</p> |`60` |
+|{$BATTERY.TEMP.MAX.WARN} |<p>Battery high temperature warning value</p> |`45` |
+|{$BATTERY.TEMP.MIN.CRIT} |<p>Battery low temperature critical value</p> |`-20` |
+|{$BATTERY.TEMP.MIN.WARN} |<p>Battery low temperature warning value</p> |`0` |
+|{$CHARGE.STATE.CRIT} |<p>fault</p> |`4` |
+|{$CHARGE.STATE.WARN} |<p>disconnect</p> |`2` |
+|{$LOAD.STATE.CRIT:"fault"} |<p>fault</p> |`4` |
+|{$LOAD.STATE.CRIT:"lvd"} |<p>lvd</p> |`3` |
+|{$LOAD.STATE.WARN:"disconnect"} |<p>disconnect</p> |`5` |
+|{$LOAD.STATE.WARN:"lvdWarning"} |<p>lvdWarning</p> |`2` |
+|{$LOAD.STATE.WARN:"override"} |<p>override</p> |`7` |
+|{$VOLTAGE.MAX.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MAX.WARN} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.CRIT} |<p>-</p> |`` |
+|{$VOLTAGE.MIN.WARN} |<p>-</p> |`` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Battery voltage discovery |<p>Discovery for battery voltage triggers</p> |DEPENDENT |battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Charge mode discovery |<p>Discovery for device in charge mode</p> |DEPENDENT |controlmode.charge.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 0 ? [{'{#SINGLETON}': ''}] : []);`</p> |
+|Load mode discovery |<p>Discovery for device in load mode</p> |DEPENDENT |controlmode.load.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 1 ? [{'{#SINGLETON}': ''}] : []);`</p> |
+|Diversion mode discovery |<p>Discovery for device in diversion mode</p> |DEPENDENT |controlmode.diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 2 ? [{'{#SINGLETON}': ''}] : []);`</p> |
+|Charge + Diversion mode discovery |<p>Discovery for device in charge and diversion modes</p> |DEPENDENT |controlmode.charge_diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Load + Diversion mode discovery |<p>Discovery for device in load and diversion modes</p> |DEPENDENT |controlmode.load_diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Array |Array: Voltage{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:Array/Load Voltage</p><p>Scaling Factor:0.00424652099609375</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x000A</p> |SNMP |array.voltage[arrayloadVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.004246520996`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Voltage{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:Battery voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0008</p> |SNMP |battery.voltage[batteryVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002950042725`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Charge Current{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:Charge Current</p><p>Scaling Factor:0.002034515380859375</p><p>Units:A</p><p>Range:[0, 60]</p><p>Modbus address:0x000B</p> |SNMP |charge.current[chargeCurrent.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002034515381`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Battery |Battery: Charge State{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:Control State</p><p>Modbus address:0x001B</p> |SNMP |charge.state[controlState.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Battery |Battery: Target Voltage{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:Target Regulation Voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0010</p> |SNMP |target.voltage[targetVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002950042725`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Counter |Counter: KW-hours |<p>MIB: TRISTAR</p><p>Description:Kilowatt Hours</p><p>Scaling Factor:1.0</p><p>Units:kWh</p><p>Range:[0.0, 5000.0]</p><p>Modbus address:0x001E</p> |SNMP |counter.charge_kw_hours[kilowattHours.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Counter |Counter: Amp-hours |<p>MIB: TRISTAR</p><p>Description:Ah (Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 50000.0]</p><p>Modbus addresses:H=0x0011 L=0x0012</p> |SNMP |counter.charge_amp_hours[ahResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Load |Load: State{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:Load State</p><p>Modbus address:0x001B</p><p>0: Start</p><p>1: Normal</p><p>2: LvdWarning</p><p>3: Lvd</p><p>4: Fault</p><p>5: Disconnect</p><p>6: LvdWarning1</p><p>7: OverrideLvd</p><p>8: Equalize</p> |SNMP |load.state[loadState.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Load |Load: PWM Duty Cycle{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:PWM Duty Cycle</p><p>Scaling Factor:0.392156862745098</p><p>Units:%</p><p>Range:[0.0, 100.0]</p><p>Modbus address:0x001C</p> |SNMP |diversion.pwm_duty_cycle[pwmDutyCycle.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.3921568627`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Load |Load: Current{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:Load Current</p><p>Scaling Factor:0.00966400146484375</p><p>Units:A</p><p>Range:[0, 60]</p><p>Modbus address:0x000C</p> |SNMP |load.current[loadCurrent.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.009664001465`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Load |Load: Voltage{#SINGLETON} |<p>MIB: TRISTAR</p><p>Description:Array/Load Voltage</p><p>Scaling Factor:0.00424652099609375</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x000A</p> |SNMP |load.voltage[arrayloadVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.004246520996`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Status |Status: Uptime |<p>Device uptime in seconds</p> |SNMP |status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
+|Status |Status: Control Mode |<p>MIB: TRISTAR</p><p>Description:Control Mode</p><p>Modbus address:0x001A</p><p>0: charge</p><p>1: loadControl</p><p>2: diversion</p><p>3: lighting</p> |SNMP |control.mode[controlMode.0] |
+|Status |Status: Faults |<p>MIB: TRISTAR</p><p>Description:Battery voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0008</p> |SNMP |status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |Status: Alarms |<p>MIB: TRISTAR</p><p>Description:Alarms</p><p>Modbus addresses:H=0x001D L=0x0017</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Temperature |Temperature: Battery |<p>MIB: TRISTAR</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-40, 120]</p><p>Modbus address:0x000F</p> |SNMP |temp.battery[batteryTemperature.0] |
+|Temperature |Temperature: Heatsink |<p>MIB: TRISTAR</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-40, 120]</p><p>Modbus address:0x000E</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
+|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR</p><p>Description:Battery voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0008</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002950042725`</p> |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m) |<p>-</p> |`max(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p> |
+|Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m) |<p>-</p> |`max(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}` |HIGH | |
+|Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m) |<p>-</p> |`min(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p> |
+|Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m) |<p>-</p> |`min(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}` |HIGH | |
+|Battery: Device charge in warning state |<p>-</p> |`last(/Morningstar TriStar PWM SNMP/charge.state[controlState.0{#SINGLETON}])={$CHARGE.STATE.WARN}` |WARNING |<p>**Depends on**:</p><p>- Battery: Device charge in critical state</p> |
+|Battery: Device charge in critical state |<p>-</p> |`last(/Morningstar TriStar PWM SNMP/charge.state[controlState.0{#SINGLETON}])={$CHARGE.STATE.CRIT}` |HIGH | |
+|Load: Device load in warning state |<p>-</p> |`last(/Morningstar TriStar PWM SNMP/load.state[loadState.0{#SINGLETON}])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar TriStar PWM SNMP/load.state[loadState.0{#SINGLETON}])={$LOAD.STATE.WARN:"override"}` |WARNING |<p>**Depends on**:</p><p>- Load: Device load in critical state</p> |
+|Load: Device load in critical state |<p>-</p> |`last(/Morningstar TriStar PWM SNMP/load.state[loadState.0{#SINGLETON}])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar TriStar PWM SNMP/load.state[loadState.0{#SINGLETON}])={$LOAD.STATE.CRIT:"fault"}` |HIGH | |
+|Status: Device has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Morningstar TriStar PWM SNMP/status.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Status: Failed to fetch data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes</p> |`nodata(/Morningstar TriStar PWM SNMP/status.uptime,5m)=1` |WARNING |<p>Manual close: YES</p> |
+|Status: Device has "externalShort" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","externalShort")=2` |HIGH | |
+|Status: Device has "overcurrent" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","overcurrent")=2` |HIGH | |
+|Status: Device has "mosfetSShorted" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","mosfetSShorted")=2` |HIGH | |
+|Status: Device has "softwareFault" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","softwareFault")=2` |HIGH | |
+|Status: Device has "highVoltageDisconnect" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","highVoltageDisconnect")=2` |HIGH | |
+|Status: Device has "tristarHot" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","tristarHot")=2` |HIGH | |
+|Status: Device has "dipSwitchChange" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","dipSwitchChange")=2` |HIGH | |
+|Status: Device has "customSettingsEdit" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","customSettingsEdit")=2` |HIGH | |
+|Status: Device has "reset" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","reset")=2` |HIGH | |
+|Status: Device has "systemMiswire" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","systemMiswire")=2` |HIGH | |
+|Status: Device has "rtsShorted" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","rtsShorted")=2` |HIGH | |
+|Status: Device has "rtsDisconnected" faults flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","rtsDisconnected")=2` |HIGH | |
+|Status: Device has "rtsShorted" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2` |WARNING | |
+|Status: Device has "rtsDisconnected" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorOpen" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2` |WARNING | |
+|Status: Device has "heatsinkTempSensorShorted" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2` |WARNING | |
+|Status: Device has "tristarHot" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","tristarHot")=2` |WARNING | |
+|Status: Device has "currentLimit" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2` |WARNING | |
+|Status: Device has "currentOffset" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","currentOffset")=2` |WARNING | |
+|Status: Device has "batterySense" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","batterySense")=2` |WARNING | |
+|Status: Device has "batterySenseDisconnected" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2` |WARNING | |
+|Status: Device has "uncalibrated" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2` |WARNING | |
+|Status: Device has "rtsMiswire" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsMiswire")=2` |WARNING | |
+|Status: Device has "highVoltageDisconnect" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","highVoltageDisconnect")=2` |WARNING | |
+|Status: Device has "diversionLoadNearMax" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","diversionLoadNearMax")=2` |WARNING | |
+|Status: Device has "systemMiswire" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","systemMiswire")=2` |WARNING | |
+|Status: Device has "mosfetSOpen" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","mosfetSOpen")=2` |WARNING | |
+|Status: Device has "p12VoltageReferenceOff" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","p12VoltageReferenceOff")=2` |WARNING | |
+|Status: Device has "loadDisconnectState" alarm flag |<p>-</p> |`count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","loadDisconnectState")=2` |WARNING | |
+|Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
+|Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) |<p>-</p> |`max(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}` |HIGH | |
+|Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m) |<p>-</p> |`min(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
+|Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) |<p>-</p> |`min(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}` |HIGH | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/net/morningstar_snmp/tristar_pwm_snmp/tristar_pwm_snmp.yaml b/templates/net/morningstar/morningstar_tristar_pwm_snmp/template_net_morningstar_tristar_pwm_snmp.yaml
index 7138d362183..e0e0b56c4b7 100644
--- a/templates/net/morningstar_snmp/tristar_pwm_snmp/tristar_pwm_snmp.yaml
+++ b/templates/net/morningstar/morningstar_tristar_pwm_snmp/template_net_morningstar_tristar_pwm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:06Z'
+  version: '6.0'
+  date: '2021-12-17T06:32:28Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         TRISTAR
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
diff --git a/templates/net/morningstar_snmp/prostar_mppt_snmp/README.md b/templates/net/morningstar_snmp/prostar_mppt_snmp/README.md
deleted file mode 100644
index c1ebd6a928b..00000000000
--- a/templates/net/morningstar_snmp/prostar_mppt_snmp/README.md
+++ /dev/null
@@ -1,142 +0,0 @@
-
-# Morningstar ProStar MPPT SNMP
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                            | Description                                    | Default |
-|---------------------------------|------------------------------------------------|---------|
-| {$BATTERY.TEMP.MAX.CRIT}        | <p>Battery high temperature critical value</p> | `60`    |
-| {$BATTERY.TEMP.MAX.WARN}        | <p>Battery high temperature warning value</p>  | `45`    |
-| {$BATTERY.TEMP.MIN.CRIT}        | <p>Battery low temperature critical value</p>  | `-20`   |
-| {$BATTERY.TEMP.MIN.WARN}        | <p>Battery low temperature warning value</p>   | `0`     |
-| {$CHARGE.STATE.CRIT}            | <p>fault</p>                                   | `4`     |
-| {$CHARGE.STATE.WARN}            | <p>disconnect</p>                              | `2`     |
-| {$LOAD.STATE.CRIT:"fault"}      | <p>fault</p>                                   | `4`     |
-| {$LOAD.STATE.CRIT:"lvd"}        | <p>lvd</p>                                     | `3`     |
-| {$LOAD.STATE.WARN:"disconnect"} | <p>disconnect</p>                              | `5`     |
-| {$LOAD.STATE.WARN:"lvdWarning"} | <p>lvdWarning</p>                              | `2`     |
-| {$LOAD.STATE.WARN:"override"}   | <p>override</p>                                | `7`     |
-| {$VOLTAGE.MAX.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MAX.WARN}             |                                                | ``      |
-| {$VOLTAGE.MIN.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MIN.WARN}             |                                                | ``      |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-| Name                      | Description                                   | Type      | Key and additional info                                                                                             |
-|---------------------------|-----------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------------|
-| Battery voltage discovery | <p>Discovery for battery voltage triggers</p> | DEPENDENT | battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-
-## Items collected
-
-| Group            | Name                               | Description                                                                                                                                                                                                                                                                                                                  | Type | Key and additional info                                                                                                                                                |
-|------------------|------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Array            | Array: Voltage                     | <p>MIB: PROSTAR-MPPT</p><p>Array Voltage</p><p>  Description:Array Voltage</p><p>  Scaling Factor:1.0</p><p>  Units:V</p><p>  Range:[0, 80]</p><p>  Modbus address:0x0013</p>                                                                                                                                                | SNMP | array.voltage[arrayVoltage.0]                                                                                                                                          |
-| Array            | Array: Sweep Vmp                   | <p>MIB: PROSTAR-MPPT</p><p>Array Vmp</p><p>  Description:Array Max. Power Point Voltage</p><p>  Scaling Factor:1.0</p><p>  Units:V</p><p>  Range:[0.0, 5000.0]</p><p>  Modbus address:0x003D</p>                                                                                                                             | SNMP | array.sweep_vmp[arrayVmp.0]                                                                                                                                            |
-| Array            | Array: Sweep Voc                   | <p>MIB: PROSTAR-MPPT</p><p>Array Voc</p><p> Description:Array Open Circuit Voltage</p><p> Scaling Factor:1.0</p><p> Units:V</p><p> Range:[0.0, 80.0]</p><p> Modbus address:0x003F</p>                                                                                                                                        | SNMP | array.sweep_voc[arrayVoc.0]                                                                                                                                            |
-| Array            | Array: Sweep Pmax                  | <p>MIB: PROSTAR-MPPT</p><p>Array Max. Power (sweep)</p><p> Description:Array Max. Power (last sweep)</p><p> Scaling Factor:1.0</p><p> Units:W</p><p> Range:[0.0, 500]</p><p> Modbus address:0x003E</p>                                                                                                                       | SNMP | array.sweep_pmax[arrayMaxPowerSweep.0]                                                                                                                                 |
-| Battery          | Battery: Charge State              | <p>MIB: PROSTAR-MPPT</p><p>Charge State</p><p>  Description:Control State</p><p>  Modbus address:0x0021</p><p>  0: Start</p><p>  1: NightCheck</p><p>  2: Disconnect</p><p>  3: Night</p><p>  4: Fault</p><p>  5: BulkMppt</p><p>  6: Absorption</p><p>  7: Float</p><p>  8: Equalize</p><p>  9: Slave</p><p>  10: Fixed</p> | SNMP | charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                         |
-| Battery          | Battery: Target Voltage            | <p>MIB: PROSTAR-MPPT</p><p>Target Voltage</p><p> Description:Target Regulation Voltage</p><p> Scaling Factor:1.0</p><p> Units:V</p><p> Range:[0.0, 80.0]</p><p> Modbus address:0x0024</p>                                                                                                                                    | SNMP | target.voltage[targetVoltage.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                     |
-| Battery          | Battery: Charge Current            | <p>MIB: PROSTAR-MPPT</p><p>Charge Current</p><p>  Description:Charge Current</p><p>  Scaling Factor:1.0</p><p>  Units:A</p><p>  Range:[0, 40]</p><p>  Modbus address:0x0010</p>                                                                                                                                              | SNMP | charge.current[chargeCurrent.0]                                                                                                                                        |
-| Battery          | Battery: Voltage{#SINGLETON}       | <p>MIB: PROSTAR-MPPT</p><p>Battery Terminal Voltage</p><p>Description:Battery  Terminal Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0012</p>                                                                                                                               | SNMP | battery.voltage[batteryTerminalVoltage.0{#SINGLETON}]                                                                                                                  |
-| Counter          | Counter: Charge Amp-hours          | <p>MIB: PROSTAR-MPPT</p><p>Ah Charge (Resettable)</p><p> Description:Ah Charge (Resettable)</p><p> Scaling Factor:0.1</p><p> Units:Ah</p><p> Range:[0.0, 4294967294]</p><p> Modbus addresses:H=0x0026 L=0x0027</p>                                                                                                           | SNMP | counter.charge_amp_hours[ahChargeResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                                      |
-| Counter          | Counter: Charge KW-hours           | <p>MIB: PROSTAR-MPPT</p><p>kWh Charge (Resettable)</p><p>Description:Kilowatt Hours Charge (Resettable)</p><p>Scaling Factor:1.0</p><p>Units:kWh</p><p>Range:[0.0, 65535]</p><p>Modbus address:0x002A</p>                                                                                                                    | SNMP | counter.charge_kw_hours[kwhChargeResettable.0]                                                                                                                         |
-| Counter          | Counter: Load Amp-hours            | <p>MIB: PROSTAR-MPPT</p><p>Description:Ah Load (Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x0032 L=0x0033</p>                                                                                                                                               | SNMP | counter.load_amp_hours[ahLoadResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                                          |
-| Load             | Load: State                        | <p>MIB: PROSTAR-MPPT</p><p>Load State</p><p> Description:Load State</p><p> Modbus address:0x002E</p><p> 0: Start</p><p>1: Normal</p><p>2: LvdWarning</p><p>3: Lvd</p><p>4: Fault</p><p>5: Disconnect</p><p>6: NormalOff</p><p>7: Override</p><p>8: NotUsed</p>                                                               | SNMP | load.state[loadState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                             |
-| Load             | Load: Voltage                      | <p>MIB: PROSTAR-MPPT</p><p>Load Voltage</p><p> Description:Load Voltage</p><p> Scaling Factor:1.0</p><p> Units:V</p><p> Range:[0, 80]</p><p> Modbus address:0x0014</p>                                                                                                                                                       | SNMP | load.voltage[loadVoltage.0]                                                                                                                                            |
-| Load             | Load: Current                      | <p>MIB: PROSTAR-MPPT</p><p>Load Current</p><p> Description:Load Current</p><p> Scaling Factor:1.0</p><p> Units:A</p><p> Range:[0, 60]</p><p> Modbus address:0x0016</p>                                                                                                                                                       | SNMP | load.current[loadCurrent.0]                                                                                                                                            |
-| Status           | Status: Uptime                     | <p>Device uptime in seconds</p>                                                                                                                                                                                                                                                                                              | SNMP | status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p>                                                                                                      |
-| Status           | Status: Array Faults               | <p>MIB: PROSTAR-MPPT</p><p>Description:Array Faults</p><p>Modbus address:0x0022</p>                                                                                                                                                                                                                                          | SNMP | status.array_faults[arrayFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Status           | Status: Load Faults                | <p>MIB: PROSTAR-MPPT</p><p>Description:Array Faults</p><p>Modbus address:0x0022</p>                                                                                                                                                                                                                                          | SNMP | status.load_faults[loadFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>   |
-| Status           | Status: Alarms                     | <p>MIB: PROSTAR-MPPT</p><p>Description:Alarms</p><p>Modbus addresses:H=0x0038 L=0x0039</p>                                                                                                                                                                                                                                   | SNMP | status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>            |
-| Temperature      | Temperature: Ambient               | <p>MIB: PROSTAR-MPPT</p><p>Ambient Temperature</p><p> Description:Ambient Temperature</p><p> Scaling Factor:1.0</p><p> Units:deg C</p><p> Range:[-128, 127]</p><p> Modbus address:0x001C</p>                                                                                                                                 | SNMP | temp.ambient[ambientTemperature.0]                                                                                                                                     |
-| Temperature      | Temperature: Battery               | <p>MIB: PROSTAR-MPPT</p><p>Battery Temperature</p><p>  Description:Battery Temperature</p><p>  Scaling Factor:1.0</p><p>  Units:deg C</p><p>  Range:[-128, 127]</p><p>  Modbus address:0x001B</p>                                                                                                                            | SNMP | temp.battery[batteryTemperature.0]                                                                                                                                     |
-| Temperature      | Temperature: Heatsink              | <p>MIB: PROSTAR-MPPT</p><p>Heatsink Temperature</p><p> Description:Heatsink Temperature</p><p> Scaling Factor:1.0</p><p> Units:deg C</p><p> Range:[-128, 127]</p><p> Modbus address:0x001A</p>                                                                                                                               | SNMP | temp.heatsink[heatsinkTemperature.0]                                                                                                                                   |
-| Zabbix_raw_items | Battery: Battery Voltage discovery | <p>MIB: PROSTAR-MPPT</p>                                                                                                                                                                                                                                                                                                     | SNMP | battery.voltage.discovery[batteryTerminalVoltage.0]                                                                                                                    |
-
-## Triggers
-
-| Name                                                                                     | Description                                                          | Expression                                                                                                                                                        | Severity | Dependencies and additional info                                                                                        |
-|------------------------------------------------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------|
-| Battery: Device charge in warning state                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.WARN}`                                                                                         | WARNING  | <p>**Depends on**:</p><p>- Battery: Device charge in critical state</p>                                                 |
-| Battery: Device charge in critical state                                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.CRIT}`                                                                                         | HIGH     |                                                                                                                         |
-| Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryTerminalVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.WARN}`                                                               | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p>              |
-| Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryTerminalVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.CRIT}`                                                               | HIGH     |                                                                                                                         |
-| Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryTerminalVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.WARN}`                                                               | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p>              |
-| Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryTerminalVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.CRIT}`                                                               | HIGH     |                                                                                                                         |
-| Load: Device load in warning state                                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.WARN:"lvdWarning"}  or {TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.WARN:"override"}` | WARNING  | <p>**Depends on**:</p><p>- Load: Device load in critical state</p>                                                      |
-| Load: Device load in critical state                                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.CRIT:"lvd"} or {TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.CRIT:"fault"}`            | HIGH     |                                                                                                                         |
-| Status: Device has been restarted (uptime < 10m)                                         | <p>Uptime is less than 10 minutes</p>                                | `{TEMPLATE_NAME:status.uptime.last()}<10m`                                                                                                                        | INFO     | <p>Manual close: YES</p>                                                                                                |
-| Status: Failed to fetch data (or no data for 5m)                                         | <p>Zabbix has not received data for items for the last 5 minutes</p> | `{TEMPLATE_NAME:status.uptime.nodata(5m)}=1`                                                                                                                      | WARNING  | <p>Manual close: YES</p>                                                                                                |
-| Status: Device has "overcurrent" array faults flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"overcurrent","like")}=2`                                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "mosfetSShorted" array faults flag                                    | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"mosfetSShorted","like")}=2`                                                                          | HIGH     |                                                                                                                         |
-| Status: Device has "software" array faults flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"software","like")}=2`                                                                                | HIGH     |                                                                                                                         |
-| Status: Device has "batteryHvd" array faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"batteryHvd","like")}=2`                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "arrayHvd" array faults flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"arrayHvd","like")}=2`                                                                                | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" array faults flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"customSettingsEdit","like")}=2`                                                                      | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" array faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"rtsShorted","like")}=2`                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "rtsNoLongerValid" array faults flag                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"rtsNoLongerValid","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "localTempSensorDamaged" array faults flag                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"localTempSensorDamaged","like")}=2`                                                                  | HIGH     |                                                                                                                         |
-| Status: Device has "batteryLowVoltageDisconnect" array faults flag                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"batteryLowVoltageDisconnect","like")}=2`                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "slaveTimeout" array faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"slaveTimeout","like")}=2`                                                                            | HIGH     |                                                                                                                         |
-| Status: Device has "dipSwitchChanged" array faults flag                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"dipSwitchChanged","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "externalShortCircuit" load faults flag                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"externalShortCircuit","like")}=2`                                                                      | HIGH     |                                                                                                                         |
-| Status: Device has "overcurrent" load faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"overcurrent","like")}=2`                                                                               | HIGH     |                                                                                                                         |
-| Status: Device has "mosfetShorted" load faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"mosfetShorted","like")}=2`                                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "software" load faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"software","like")}=2`                                                                                  | HIGH     |                                                                                                                         |
-| Status: Device has "loadHvd" load faults flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"loadHvd","like")}=2`                                                                                   | HIGH     |                                                                                                                         |
-| Status: Device has "highTempDisconnect" load faults flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"highTempDisconnect","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "dipSwitchChanged" load faults flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"dipSwitchChanged","like")}=2`                                                                          | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" load faults flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"customSettingsEdit","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsShorted","like")}=2`                                                                                         | WARNING  |                                                                                                                         |
-| Status: Device has "rtsDisconnected" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsDisconnected","like")}=2`                                                                                    | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorOpen" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorOpen","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorShorted" alarm flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorShorted","like")}=2`                                                                          | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempLimit" alarm flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempLimit","like")}=2`                                                                                  | WARNING  |                                                                                                                         |
-| Status: Device has "inductorTempSensorOpen" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"inductorTempSensorOpen","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "inductorTempSensorShorted" alarm flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"inductorTempSensorShorted","like")}=2`                                                                          | WARNING  |                                                                                                                         |
-| Status: Device has "inductorTempLimit" alarm flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"inductorTempLimit","like")}=2`                                                                                  | WARNING  |                                                                                                                         |
-| Status: Device has "currentLimit" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentLimit","like")}=2`                                                                                       | WARNING  |                                                                                                                         |
-| Status: Device has "currentMeasurementError" alarm flag                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentMeasurementError","like")}=2`                                                                            | WARNING  |                                                                                                                         |
-| Status: Device has "batterySenseOutOfRange" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySenseOutOfRange","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "batterySenseDisconnected" alarm flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySenseDisconnected","like")}=2`                                                                           | WARNING  |                                                                                                                         |
-| Status: Device has "uncalibrated" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"uncalibrated","like")}=2`                                                                                       | WARNING  |                                                                                                                         |
-| Status: Device has "tb5v" alarm flag                                                     | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"tb5v","like")}=2`                                                                                               | WARNING  |                                                                                                                         |
-| Status: Device has "fp10SupplyOutOfRange" alarm flag                                     | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"fp10SupplyOutOfRange","like")}=2`                                                                               | WARNING  |                                                                                                                         |
-| Status: Device has "mosfetOpen" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"mosfetOpen","like")}=2`                                                                                         | WARNING  |                                                                                                                         |
-| Status: Device has "arrayCurrentOffset" alarm flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"arrayCurrentOffset","like")}=2`                                                                                 | WARNING  |                                                                                                                         |
-| Status: Device has "loadCurrentOffset" alarm flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"loadCurrentOffset","like")}=2`                                                                                  | WARNING  |                                                                                                                         |
-| Status: Device has "p33SupplyOutOfRange" alarm flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p33SupplyOutOfRange","like")}=2`                                                                                | WARNING  |                                                                                                                         |
-| Status: Device has "p12SupplyOutOfRange" alarm flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p12SupplyOutOfRange","like")}=2`                                                                                | WARNING  |                                                                                                                         |
-| Status: Device has "hightInputVoltageLimit" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"hightInputVoltageLimit","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "controllerReset" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"controllerReset","like")}=2`                                                                                    | WARNING  |                                                                                                                         |
-| Status: Device has "loadLvd" alarm flag                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"loadLvd","like")}=2`                                                                                            | WARNING  |                                                                                                                         |
-| Status: Device has "logTimeout" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"logTimeout","like")}=2`                                                                                         | WARNING  |                                                                                                                         |
-| Status: Device has "eepromAccessFailure" alarm flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"eepromAccessFailure","like")}=2`                                                                                | WARNING  |                                                                                                                         |
-| Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.WARN}`                                                                             | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
-| Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.CRIT}`                                                                             | HIGH     |                                                                                                                         |
-| Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.WARN}`                                                                             | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
-| Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.CRIT}`                                                                             | HIGH     |                                                                                                                         |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/net/morningstar_snmp/prostar_pwm_snmp/README.md b/templates/net/morningstar_snmp/prostar_pwm_snmp/README.md
deleted file mode 100644
index b8159c36760..00000000000
--- a/templates/net/morningstar_snmp/prostar_pwm_snmp/README.md
+++ /dev/null
@@ -1,138 +0,0 @@
-
-# Morningstar ProStar PWM SNMP
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                            | Description                                    | Default |
-|---------------------------------|------------------------------------------------|---------|
-| {$BATTERY.TEMP.MAX.CRIT}        | <p>Battery high temperature critical value</p> | `60`    |
-| {$BATTERY.TEMP.MAX.WARN}        | <p>Battery high temperature warning value</p>  | `45`    |
-| {$BATTERY.TEMP.MIN.CRIT}        | <p>Battery low temperature critical value</p>  | `-20`   |
-| {$BATTERY.TEMP.MIN.WARN}        | <p>Battery low temperature warning value</p>   | `0`     |
-| {$CHARGE.STATE.CRIT}            | <p>fault</p>                                   | `4`     |
-| {$CHARGE.STATE.WARN}            | <p>disconnect</p>                              | `2`     |
-| {$LOAD.STATE.CRIT:"fault"}      | <p>fault</p>                                   | `4`     |
-| {$LOAD.STATE.CRIT:"lvd"}        | <p>lvd</p>                                     | `3`     |
-| {$LOAD.STATE.WARN:"disconnect"} | <p>disconnect</p>                              | `5`     |
-| {$LOAD.STATE.WARN:"lvdWarning"} | <p>lvdWarning</p>                              | `2`     |
-| {$LOAD.STATE.WARN:"override"}   | <p>override</p>                                | `7`     |
-| {$VOLTAGE.MAX.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MAX.WARN}             |                                                | ``      |
-| {$VOLTAGE.MIN.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MIN.WARN}             |                                                | ``      |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-| Name                      | Description                                   | Type      | Key and additional info                                                                                             |
-|---------------------------|-----------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------------|
-| Battery voltage discovery | <p>Discovery for battery voltage triggers</p> | DEPENDENT | battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-
-## Items collected
-
-| Group            | Name                               | Description                                                                                                                                                                                                                               | Type | Key and additional info                                                                                                                                                |
-|------------------|------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Array            | Array: Voltage                     | <p>MIB: PROSTAR-PWM</p><p>Description:Array Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x0013</p>                                                                                            | SNMP | array.voltage[arrayVoltage.0]                                                                                                                                          |
-| Battery          | Battery: Charge State              | <p>MIB: PROSTAR-PWM</p><p>Description:Control State</p><p>Modbus address:0x0021</p><p>0: Start</p><p>1: NightCheck</p><p>2: Disconnect</p><p>3: Night</p><p>4: Fault</p><p>5: Bulk</p><p>6: Pwm</p><p>7: Float</p><p>8: Equalize</p>      | SNMP | charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                         |
-| Battery          | Battery: Target Voltage            | <p>MIB: PROSTAR-PWM</p><p>Description:Target Regulation Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0024</p>                                                                            | SNMP | target.voltage[targetVoltage.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                     |
-| Battery          | Battery: Charge Current            | <p>MIB: PROSTAR-PWM</p><p>Description:Charge Current</p><p>Scaling Factor:1.0</p><p>Units:A</p><p>Range:[0, 40]</p><p>Modbus address:0x0011</p>                                                                                           | SNMP | charge.current[chargeCurrent.0]                                                                                                                                        |
-| Battery          | Battery: Voltage{#SINGLETON}       | <p>MIB: PROSTAR-PWM</p><p>Description:Control State</p><p>Modbus address:0x0021</p>                                                                                                                                                       | SNMP | battery.voltage[batteryTerminalVoltage.0{#SINGLETON}]                                                                                                                  |
-| Counter          | Counter: Charge Amp-hours          | <p>MIB: PROSTAR-PWM</p><p>Description:Ah Charge (Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x0026 L=0x0027</p>                                                           | SNMP | counter.charge_amp_hours[ahChargeResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                                      |
-| Counter          | Counter: Charge KW-hours           | <p>MIB: PROSTAR-PWM</p><p>Description:Kilowatt Hours Charge (Resettable)</p><p>Scaling Factor:1.0</p><p>Units:kWh</p><p>Range:[0.0, 65535]</p><p>Modbus address:0x002A</p>                                                                | SNMP | counter.charge_kw_hours[kwhChargeResettable.0]                                                                                                                         |
-| Counter          | Counter: Load Amp-hours            | <p>MIB: PROSTAR-PWM</p><p>Description:Ah Load (Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x0032 L=0x0033</p>                                                             | SNMP | counter.load_amp_hours[ahLoadResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                                          |
-| Load             | Load: State                        | <p>MIB: PROSTAR-PWM</p><p>Description:Load State</p><p>Modbus address:0x002E</p><p>0: Start</p><p>1: Normal</p><p>2: LvdWarning</p><p>3: Lvd</p><p>4: Fault</p><p>5: Disconnect</p><p>6: NormalOff</p><p>7: Override</p><p>8: NotUsed</p> | SNMP | load.state[loadState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                             |
-| Load             | Load: Voltage                      | <p>MIB: PROSTAR-PWM</p><p>Description:Load Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x0014</p>                                                                                             | SNMP | load.voltage[loadVoltage.0]                                                                                                                                            |
-| Load             | Load: Current                      | <p>MIB: PROSTAR-PWM</p><p>Description:Load Current</p><p>Scaling Factor:1.0</p><p>Units:A</p><p>Range:[0, 60]</p><p>Modbus address:0x0016</p>                                                                                             | SNMP | load.current[loadCurrent.0]                                                                                                                                            |
-| Status           | Status: Uptime                     | <p>Device uptime in seconds</p>                                                                                                                                                                                                           | SNMP | status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p>                                                                                                      |
-| Status           | Status: Array Faults               | <p>MIB: PROSTAR-PWM</p><p>Description:Array Faults</p><p>Modbus address:0x0022</p>                                                                                                                                                        | SNMP | status.array_faults[arrayFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Status           | Status: Load Faults                | <p>MIB: PROSTAR-PWM</p><p>Description:Load Faults</p><p>Modbus address:0x002F</p>                                                                                                                                                         | SNMP | status.load_faults[loadFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>   |
-| Status           | Status: Alarms                     | <p>MIB: PROSTAR-PWM</p><p>Description:Alarms</p><p>Modbus addresses:H=0x0038 L=0x0039</p>                                                                                                                                                 | SNMP | status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>            |
-| Temperature      | Temperature: Ambient               | <p>MIB: PROSTAR-PWM</p><p>Description:Ambient Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001C</p>                                                                              | SNMP | temp.ambient[ambientTemperature.0]                                                                                                                                     |
-| Temperature      | Temperature: Battery               | <p>MIB: PROSTAR-PWM</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001B</p>                                                                              | SNMP | temp.battery[batteryTemperature.0]                                                                                                                                     |
-| Temperature      | Temperature: Heatsink              | <p>MIB: PROSTAR-PWM</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001A</p>                                                                             | SNMP | temp.heatsink[heatsinkTemperature.0]                                                                                                                                   |
-| Zabbix_raw_items | Battery: Battery Voltage discovery | <p>MIB: PROSTAR-PWM</p>                                                                                                                                                                                                                   | SNMP | battery.voltage.discovery[batteryTerminalVoltage.0]                                                                                                                    |
-
-## Triggers
-
-| Name                                                                                     | Description                                                          | Expression                                                                                                                                                        | Severity | Dependencies and additional info                                                                                        |
-|------------------------------------------------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------|
-| Battery: Device charge in warning state                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.WARN}`                                                                                         | WARNING  | <p>**Depends on**:</p><p>- Battery: Device charge in critical state</p>                                                 |
-| Battery: Device charge in critical state                                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.CRIT}`                                                                                         | HIGH     |                                                                                                                         |
-| Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryTerminalVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.WARN}`                                                               | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p>              |
-| Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryTerminalVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.CRIT}`                                                               | HIGH     |                                                                                                                         |
-| Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryTerminalVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.WARN}`                                                               | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p>              |
-| Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryTerminalVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.CRIT}`                                                               | HIGH     |                                                                                                                         |
-| Load: Device load in warning state                                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.WARN:"lvdWarning"}  or {TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.WARN:"override"}` | WARNING  | <p>**Depends on**:</p><p>- Load: Device load in critical state</p>                                                      |
-| Load: Device load in critical state                                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.CRIT:"lvd"} or {TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.CRIT:"fault"}`            | HIGH     |                                                                                                                         |
-| Status: Device has been restarted (uptime < 10m)                                         | <p>Uptime is less than 10 minutes</p>                                | `{TEMPLATE_NAME:status.uptime.last()}<10m`                                                                                                                        | INFO     | <p>Manual close: YES</p>                                                                                                |
-| Status: Failed to fetch data (or no data for 5m)                                         | <p>Zabbix has not received data for items for the last 5 minutes</p> | `{TEMPLATE_NAME:status.uptime.nodata(5m)}=1`                                                                                                                      | WARNING  | <p>Manual close: YES</p>                                                                                                |
-| Status: Device has "overcurrent" array faults flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"overcurrent","like")}=2`                                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "mosfetSShorted" array faults flag                                    | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"mosfetSShorted","like")}=2`                                                                          | HIGH     |                                                                                                                         |
-| Status: Device has "software" array faults flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"software","like")}=2`                                                                                | HIGH     |                                                                                                                         |
-| Status: Device has "batteryHvd" array faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"batteryHvd","like")}=2`                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "arrayHvd" array faults flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"arrayHvd","like")}=2`                                                                                | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" array faults flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"customSettingsEdit","like")}=2`                                                                      | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" array faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"rtsShorted","like")}=2`                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "rtsNoLongerValid" array faults flag                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"rtsNoLongerValid","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "localTempSensorDamaged" array faults flag                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"localTempSensorDamaged","like")}=2`                                                                  | HIGH     |                                                                                                                         |
-| Status: Device has "batteryLowVoltageDisconnect" array faults flag                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"batteryLowVoltageDisconnect","like")}=2`                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "slaveTimeout" array faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"slaveTimeout","like")}=2`                                                                            | HIGH     |                                                                                                                         |
-| Status: Device has "dipSwitchChanged" array faults flag                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"dipSwitchChanged","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "p3Fault" array faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"p3Fault","like")}=2`                                                                                 | HIGH     |                                                                                                                         |
-| Status: Device has "externalShortCircuit" load faults flag                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"externalShortCircuit","like")}=2`                                                                      | HIGH     |                                                                                                                         |
-| Status: Device has "overcurrent" load faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"overcurrent","like")}=2`                                                                               | HIGH     |                                                                                                                         |
-| Status: Device has "mosfetShorted" load faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"mosfetShorted","like")}=2`                                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "software" load faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"software","like")}=2`                                                                                  | HIGH     |                                                                                                                         |
-| Status: Device has "loadHvd" load faults flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"loadHvd","like")}=2`                                                                                   | HIGH     |                                                                                                                         |
-| Status: Device has "highTempDisconnect" load faults flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"highTempDisconnect","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "dipSwitchChanged" load faults flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"dipSwitchChanged","like")}=2`                                                                          | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" load faults flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"customSettingsEdit","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "p3Fault" load faults flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"p3Fault","like")}=2`                                                                                   | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsShorted","like")}=2`                                                                                         | WARNING  |                                                                                                                         |
-| Status: Device has "rtsDisconnected" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsDisconnected","like")}=2`                                                                                    | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorOpen" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorOpen","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorShorted" alarm flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorShorted","like")}=2`                                                                          | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempLimit" alarm flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempLimit","like")}=2`                                                                                  | WARNING  |                                                                                                                         |
-| Status: Device has "currentLimit" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentLimit","like")}=2`                                                                                       | WARNING  |                                                                                                                         |
-| Status: Device has "currentMeasurementError" alarm flag                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentMeasurementError","like")}=2`                                                                            | WARNING  |                                                                                                                         |
-| Status: Device has "batterySenseOutOfRange" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySenseOutOfRange","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "batterySenseDisconnected" alarm flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySenseDisconnected","like")}=2`                                                                           | WARNING  |                                                                                                                         |
-| Status: Device has "uncalibrated" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"uncalibrated","like")}=2`                                                                                       | WARNING  |                                                                                                                         |
-| Status: Device has "batteryTempOutOfRange" alarm flag                                    | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batteryTempOutOfRange","like")}=2`                                                                              | WARNING  |                                                                                                                         |
-| Status: Device has "fp10SupplyOutOfRange" alarm flag                                     | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"fp10SupplyOutOfRange","like")}=2`                                                                               | WARNING  |                                                                                                                         |
-| Status: Device has "mosfetOpen" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"mosfetOpen","like")}=2`                                                                                         | WARNING  |                                                                                                                         |
-| Status: Device has "arrayCurrentOffset" alarm flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"arrayCurrentOffset","like")}=2`                                                                                 | WARNING  |                                                                                                                         |
-| Status: Device has "loadCurrentOffset" alarm flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"loadCurrentOffset","like")}=2`                                                                                  | WARNING  |                                                                                                                         |
-| Status: Device has "p33SupplyOutOfRange" alarm flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p33SupplyOutOfRange","like")}=2`                                                                                | WARNING  |                                                                                                                         |
-| Status: Device has "p12SupplyOutOfRange" alarm flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p12SupplyOutOfRange","like")}=2`                                                                                | WARNING  |                                                                                                                         |
-| Status: Device has "hightInputVoltageLimit" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"hightInputVoltageLimit","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "controllerReset" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"controllerReset","like")}=2`                                                                                    | WARNING  |                                                                                                                         |
-| Status: Device has "loadLvd" alarm flag                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"loadLvd","like")}=2`                                                                                            | WARNING  |                                                                                                                         |
-| Status: Device has "logTimeout" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"logTimeout","like")}=2`                                                                                         | WARNING  |                                                                                                                         |
-| Status: Device has "eepromAccessFailure" alarm flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"eepromAccessFailure","like")}=2`                                                                                | WARNING  |                                                                                                                         |
-| Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.WARN}`                                                                             | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
-| Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.CRIT}`                                                                             | HIGH     |                                                                                                                         |
-| Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.WARN}`                                                                             | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
-| Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.CRIT}`                                                                             | HIGH     |                                                                                                                         |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/net/morningstar_snmp/sunsaver_mppt_snmp/README.md b/templates/net/morningstar_snmp/sunsaver_mppt_snmp/README.md
deleted file mode 100644
index 8e649d6d26c..00000000000
--- a/templates/net/morningstar_snmp/sunsaver_mppt_snmp/README.md
+++ /dev/null
@@ -1,127 +0,0 @@
-
-# Morningstar SunSaver MPPT SNMP
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                            | Description                                    | Default |
-|---------------------------------|------------------------------------------------|---------|
-| {$BATTERY.TEMP.MAX.CRIT}        | <p>Battery high temperature critical value</p> | `60`    |
-| {$BATTERY.TEMP.MAX.WARN}        | <p>Battery high temperature warning value</p>  | `45`    |
-| {$BATTERY.TEMP.MIN.CRIT}        | <p>Battery low temperature critical value</p>  | `-20`   |
-| {$BATTERY.TEMP.MIN.WARN}        | <p>Battery low temperature warning value</p>   | `0`     |
-| {$CHARGE.STATE.CRIT}            | <p>fault</p>                                   | `4`     |
-| {$CHARGE.STATE.WARN}            | <p>disconnect</p>                              | `2`     |
-| {$LOAD.STATE.CRIT:"fault"}      | <p>fault</p>                                   | `4`     |
-| {$LOAD.STATE.CRIT:"lvd"}        | <p>lvd</p>                                     | `3`     |
-| {$LOAD.STATE.WARN:"disconnect"} | <p>disconnect</p>                              | `5`     |
-| {$LOAD.STATE.WARN:"lvdWarning"} | <p>lvdWarning</p>                              | `2`     |
-| {$LOAD.STATE.WARN:"override"}   | <p>override</p>                                | `7`     |
-| {$VOLTAGE.MAX.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MAX.WARN}             |                                                | ``      |
-| {$VOLTAGE.MIN.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MIN.WARN}             |                                                | ``      |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-| Name                      | Description                                   | Type      | Key and additional info                                                                                             |
-|---------------------------|-----------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------------|
-| Battery voltage discovery | <p>Discovery for battery voltage triggers</p> | DEPENDENT | battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-
-## Items collected
-
-| Group            | Name                               | Description                                                                                                                                                                                                                                 | Type | Key and additional info                                                                                                                                                |
-|------------------|------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Array            | Array: Voltage                     | <p>MIB: SUNSAVER-MPPT</p><p>Description:Array Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x0009</p>                                                                                | SNMP | array.voltage[arrayVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                                   |
-| Array            | Array: Sweep Vmp                   | <p>MIB: SUNSAVER-MPPT</p><p>Description:Array Max. Power Point Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 5000.0]</p><p>Modbus address:0x0028</p>                                                         | SNMP | array.sweep_vmp[arrayVmp.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                                     |
-| Array            | Array: Sweep Voc                   | <p>MIB: SUNSAVER-MPPT</p><p>Description:Array Open Circuit Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x002A</p>                                                               | SNMP | array.sweep_voc[arrayVoc.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                                     |
-| Array            | Array: Sweep Pmax                  | <p>MIB: SUNSAVER-MPPT</p><p>Description:Array Open Circuit Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x002A</p>                                                               | SNMP | array.sweep_pmax[arrayMaxPowerSweep.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01509857178`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                           |
-| Battery          | Battery: Charge State              | <p>MIB: SUNSAVER-MPPT</p><p>Description:Control State</p><p>Modbus address:0x0011</p><p>0: Start</p><p>1: NightCheck</p><p>2: Disconnect</p><p>3: Night</p><p>4: Fault</p><p>5: BulkMppt</p><p>6: Pwm</p><p>7: Float</p><p>8: Equalize</p>  | SNMP | charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                         |
-| Battery          | Battery: Target Voltage            | <p>MIB: SUNSAVER-MPPT</p><p>Description:Target Regulation Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0014</p>                                                                | SNMP | target.voltage[targetVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                                 |
-| Battery          | Battery: Charge Current            | <p>MIB: SUNSAVER-MPPT</p><p>Description:Target Regulation Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0014</p>                                                                | SNMP | charge.current[chargeCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002415771484`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                                 |
-| Battery          | Battery: Voltage{#SINGLETON}       | <p>MIB: SUNSAVER-MPPT</p><p>Description:Control State</p><p>Modbus address:0x0011</p>                                                                                                                                                       | SNMP | battery.voltage[batteryVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                   |
-| Counter          | Counter: Charge Amp-hours          | <p>MIB: SUNSAVER-MPPT</p><p>Description:Ah Charge(Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x0015 L=0x0016</p>                                                            | SNMP | counter.charge_amp_hours[ahChargeResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                                      |
-| Counter          | Counter: Charge KW-hours           | <p>MIB: SUNSAVER-MPPT</p>                                                                                                                                                                                                                   | SNMP | counter.charge_kw_hours[kwhCharge.0]                                                                                                                                   |
-| Counter          | Counter: Load Amp-hours            | <p>MIB: SUNSAVER-MPPT</p><p>Description:Ah Load(Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 4294967294]</p><p>Modbus addresses:H=0x001D L=0x001E</p>                                                              | SNMP | counter.load_amp_hours[ahLoadResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                                          |
-| Load             | Load: State                        | <p>MIB: SUNSAVER-MPPT</p><p>Description:Load State</p><p>Modbus address:0x001A</p><p>0: Start</p><p>1: Normal</p><p>2: LvdWarning</p><p>3: Lvd</p><p>4: Fault</p><p>5: Disconnect</p><p>6: NormalOff</p><p>7: Override</p><p>8: NotUsed</p> | SNMP | load.state[loadState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                             |
-| Load             | Load: Voltage                      | <p>MIB: SUNSAVER-MPPT</p><p>Description:Load Voltage</p><p>Scaling Factor:0.0030517578125</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x000A</p>                                                                                 | SNMP | load.voltage[loadVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                                     |
-| Load             | Load: Current                      | <p>MIB: SUNSAVER-MPPT</p><p>Description:Load Current</p><p>Scaling Factor:0.002415771484375</p><p>Units:A</p><p>Range:[0, 60]</p><p>Modbus address:0x000C</p>                                                                               | SNMP | load.current[loadCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002415771484`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                                     |
-| Status           | Status: Uptime                     | <p>Device uptime in seconds</p>                                                                                                                                                                                                             | SNMP | status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p>                                                                                                      |
-| Status           | Status: Array Faults               | <p>MIB: SUNSAVER-MPPT</p><p>Description:Array Faults</p><p>Modbus address:0x0012</p>                                                                                                                                                        | SNMP | status.array_faults[arrayFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Status           | Status: Load Faults                | <p>MIB: SUNSAVER-MPPT</p><p>Description:Array Faults</p><p>Modbus address:0x0012</p>                                                                                                                                                        | SNMP | status.load_faults[loadFaults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>   |
-| Status           | Status: Alarms                     | <p>MIB: SUNSAVER-MPPT</p><p>Description:Alarms</p><p>Modbus addresses:H=0x0023 L=0x0024</p>                                                                                                                                                 | SNMP | status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>            |
-| Temperature      | Temperature: Ambient               | <p>MIB: SUNSAVER-MPPT</p><p>Description:Ambient Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000F</p>                                                                              | SNMP | temp.ambient[ambientTemperature.0]                                                                                                                                     |
-| Temperature      | Temperature: Battery               | <p>MIB: SUNSAVER-MPPT</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000D</p>                                                                             | SNMP | temp.battery[batteryTemperature.0]                                                                                                                                     |
-| Temperature      | Temperature: Heatsink              | <p>MIB: SUNSAVER-MPPT</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000E</p>                                                                              | SNMP | temp.heatsink[heatsinkTemperature.0]                                                                                                                                   |
-| Zabbix_raw_items | Battery: Battery Voltage discovery | <p>MIB: SUNSAVER-MPPT</p>                                                                                                                                                                                                                   | SNMP | battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p>                                                              |
-
-## Triggers
-
-| Name                                                                                     | Description                                                          | Expression                                                                                                                                                        | Severity | Dependencies and additional info                                                                                        |
-|------------------------------------------------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------|
-| Battery: Device charge in warning state                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.WARN}`                                                                                         | WARNING  | <p>**Depends on**:</p><p>- Battery: Device charge in critical state</p>                                                 |
-| Battery: Device charge in critical state                                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.CRIT}`                                                                                         | HIGH     |                                                                                                                         |
-| Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.WARN}`                                                                       | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p>              |
-| Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.CRIT}`                                                                       | HIGH     |                                                                                                                         |
-| Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.WARN}`                                                                       | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p>              |
-| Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.CRIT}`                                                                       | HIGH     |                                                                                                                         |
-| Load: Device load in warning state                                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.WARN:"lvdWarning"}  or {TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.WARN:"override"}` | WARNING  | <p>**Depends on**:</p><p>- Load: Device load in critical state</p>                                                      |
-| Load: Device load in critical state                                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.CRIT:"lvd"} or {TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.CRIT:"fault"}`            | HIGH     |                                                                                                                         |
-| Status: Device has been restarted (uptime < 10m)                                         | <p>Uptime is less than 10 minutes</p>                                | `{TEMPLATE_NAME:status.uptime.last()}<10m`                                                                                                                        | INFO     | <p>Manual close: YES</p>                                                                                                |
-| Status: Failed to fetch data (or no data for 5m)                                         | <p>Zabbix has not received data for items for the last 5 minutes</p> | `{TEMPLATE_NAME:status.uptime.nodata(5m)}=1`                                                                                                                      | WARNING  | <p>Manual close: YES</p>                                                                                                |
-| Status: Device has "overcurrent" array faults flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"overcurrent","like")}=2`                                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "mosfetSShorted" array faults flag                                    | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"mosfetSShorted","like")}=2`                                                                          | HIGH     |                                                                                                                         |
-| Status: Device has "softwareFault" array faults flag                                     | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"softwareFault","like")}=2`                                                                           | HIGH     |                                                                                                                         |
-| Status: Device has "batteryHvd" array faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"batteryHvd","like")}=2`                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "arrayHvd" array faults flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"arrayHvd","like")}=2`                                                                                | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" array faults flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"customSettingsEdit","like")}=2`                                                                      | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" array faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"rtsShorted","like")}=2`                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "rtsNoLongerValid" array faults flag                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"rtsNoLongerValid","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "localTempSensorDamaged" array faults flag                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.array_faults[arrayFaults.0].count(#3,"localTempSensorDamaged","like")}=2`                                                                  | HIGH     |                                                                                                                         |
-| Status: Device has "externalShortCircuit" load faults flag                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"externalShortCircuit","like")}=2`                                                                      | HIGH     |                                                                                                                         |
-| Status: Device has "overcurrent" load faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"overcurrent","like")}=2`                                                                               | HIGH     |                                                                                                                         |
-| Status: Device has "mosfetShorted" load faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"mosfetShorted","like")}=2`                                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "software" load faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"software","like")}=2`                                                                                  | HIGH     |                                                                                                                         |
-| Status: Device has "loadHvd" load faults flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"loadHvd","like")}=2`                                                                                   | HIGH     |                                                                                                                         |
-| Status: Device has "highTempDisconnect" load faults flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"highTempDisconnect","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" load faults flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"customSettingsEdit","like")}=2`                                                                        | HIGH     |                                                                                                                         |
-| Status: Device has "unknownLoadFault" load faults flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.load_faults[loadFaults.0].count(#3,"unknownLoadFault","like")}=2`                                                                          | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsShorted","like")}=2`                                                                                         | WARNING  |                                                                                                                         |
-| Status: Device has "rtsDisconnected" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsDisconnected","like")}=2`                                                                                    | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorOpen" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorOpen","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorShorted" alarm flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorShorted","like")}=2`                                                                          | WARNING  |                                                                                                                         |
-| Status: Device has "sspptHot" alarm flag                                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"sspptHot","like")}=2`                                                                                           | WARNING  |                                                                                                                         |
-| Status: Device has "currentLimit" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentLimit","like")}=2`                                                                                       | WARNING  |                                                                                                                         |
-| Status: Device has "currentOffset" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentOffset","like")}=2`                                                                                      | WARNING  |                                                                                                                         |
-| Status: Device has "uncalibrated" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"uncalibrated","like")}=2`                                                                                       | WARNING  |                                                                                                                         |
-| Status: Device has "rtsMiswire" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsMiswire","like")}=2`                                                                                         | WARNING  |                                                                                                                         |
-| Status: Device has "systemMiswire" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"systemMiswire","like")}=2`                                                                                      | WARNING  |                                                                                                                         |
-| Status: Device has "mosfetSOpen" alarm flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"mosfetSOpen","like")}=2`                                                                                        | WARNING  |                                                                                                                         |
-| Status: Device has "p12VoltageReferenceOff" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p12VoltageReferenceOff","like")}=2`                                                                             | WARNING  |                                                                                                                         |
-| Status: Device has "highVaCurrentLimit" alarm flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"highVaCurrentLimit","like")}=2`                                                                                 | WARNING  |                                                                                                                         |
-| Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.WARN}`                                                                             | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
-| Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.CRIT}`                                                                             | HIGH     |                                                                                                                         |
-| Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.WARN}`                                                                             | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
-| Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.CRIT}`                                                                             | HIGH     |                                                                                                                         |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/net/morningstar_snmp/suresine_snmp/README.md b/templates/net/morningstar_snmp/suresine_snmp/README.md
deleted file mode 100644
index 6030392c7f4..00000000000
--- a/templates/net/morningstar_snmp/suresine_snmp/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-
-# Morningstar SureSine SNMP
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                            | Description                                    | Default |
-|---------------------------------|------------------------------------------------|---------|
-| {$BATTERY.TEMP.MAX.CRIT}        | <p>Battery high temperature critical value</p> | `60`    |
-| {$BATTERY.TEMP.MAX.WARN}        | <p>Battery high temperature warning value</p>  | `45`    |
-| {$BATTERY.TEMP.MIN.CRIT}        | <p>Battery low temperature critical value</p>  | `-20`   |
-| {$BATTERY.TEMP.MIN.WARN}        | <p>Battery low temperature warning value</p>   | `0`     |
-| {$CHARGE.STATE.CRIT}            | <p>fault</p>                                   | `4`     |
-| {$CHARGE.STATE.WARN}            | <p>disconnect</p>                              | `2`     |
-| {$LOAD.STATE.CRIT:"fault"}      | <p>fault</p>                                   | `4`     |
-| {$LOAD.STATE.CRIT:"lvd"}        | <p>lvd</p>                                     | `3`     |
-| {$LOAD.STATE.WARN:"disconnect"} | <p>disconnect</p>                              | `5`     |
-| {$LOAD.STATE.WARN:"lvdWarning"} | <p>lvdWarning</p>                              | `2`     |
-| {$LOAD.STATE.WARN:"override"}   | <p>override</p>                                | `7`     |
-| {$VOLTAGE.MAX.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MAX.WARN}             |                                                | ``      |
-| {$VOLTAGE.MIN.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MIN.WARN}             |                                                | ``      |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-| Name                      | Description                                   | Type      | Key and additional info                                                                                             |
-|---------------------------|-----------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------------|
-| Battery voltage discovery | <p>Discovery for battery voltage triggers</p> | DEPENDENT | battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-
-## Items collected
-
-| Group            | Name                               | Description                                                                                                                                                                                                                                                  | Type | Key and additional info                                                                                                                                     |
-|------------------|------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Battery          | Battery: Voltage{#SINGLETON}       | <p>MIB: SURESINE</p><p>Description:Battery Voltage(slow)</p><p>Scaling Factor:0.0002581787109375</p><p>Units:V</p><p>Range:[0.0, 17.0]</p><p>Modbus address:0x0004</p>                                                                                       | SNMP | battery.voltage[batteryVoltageSlow.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `2.581787109375E-4`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
-| Load             | Load: State                        | <p>MIB: SURESINE</p><p>Description:Load State</p><p>Modbus address:0x000B</p><p> 0: Start</p><p>1: LoadOn</p><p>2: LvdWarning</p><p>3: LowVoltageDisconnect</p><p>4: Fault</p><p>5: Disconnect</p><p>6: NormalOff</p><p>7: UnknownState</p><p>8: Standby</p> | SNMP | load.state[loadState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                  |
-| Load             | Load: A/C Current                  | <p>MIB: SURESINE</p><p>Description:AC Output Current</p><p>Scaling Factor:0.0001953125</p><p>Units:A</p><p>Range:[0.0, 17]</p><p>Modbus address:0x0005</p>                                                                                                   | SNMP | load.ac_current[acCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1.953125E-4`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                            |
-| Status           | Status: Uptime                     | <p>Device uptime in seconds</p>                                                                                                                                                                                                                              | SNMP | status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p>                                                                                           |
-| Status           | Status: Faults                     | <p>MIB: SURESINE</p><p>Description:Faults</p><p>Modbus address:0x0007</p>                                                                                                                                                                                    | SNMP | status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Status           | Status: Alarms                     | <p>MIB: SURESINE</p><p>Description:Faults</p><p>Modbus address:0x0007</p>                                                                                                                                                                                    | SNMP | status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Temperature      | Temperature: Heatsink              | <p>MIB: SURESINE</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1</p><p>Units:C</p><p>Range:[-128, 127]</p><p>Modbus address:0x0006</p>                                                                                                         | SNMP | temp.heatsink[heatsinkTemperature.0]                                                                                                                        |
-| Zabbix_raw_items | Battery: Battery Voltage discovery | <p>MIB: SURESINE</p>                                                                                                                                                                                                                                         | SNMP | battery.voltage.discovery[batteryVoltageSlow.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `2.581787109375E-4`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>   |
-
-## Triggers
-
-| Name                                                                        | Description                                                          | Expression                                                                                                                                                        | Severity | Dependencies and additional info                                                                           |
-|-----------------------------------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|------------------------------------------------------------------------------------------------------------|
-| Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltageSlow.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.WARN}`                                                                   | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p> |
-| Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltageSlow.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.CRIT}`                                                                   | HIGH     |                                                                                                            |
-| Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltageSlow.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.WARN}`                                                                   | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p> |
-| Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltageSlow.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.CRIT}`                                                                   | HIGH     |                                                                                                            |
-| Load: Device load in warning state                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.WARN:"lvdWarning"}  or {TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.WARN:"override"}` | WARNING  | <p>**Depends on**:</p><p>- Load: Device load in critical state</p>                                         |
-| Load: Device load in critical state                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.CRIT:"lvd"} or {TEMPLATE_NAME:load.state[loadState.0].last()}={$LOAD.STATE.CRIT:"fault"}`            | HIGH     |                                                                                                            |
-| Status: Device has been restarted (uptime < 10m)                            | <p>Uptime is less than 10 minutes</p>                                | `{TEMPLATE_NAME:status.uptime.last()}<10m`                                                                                                                        | INFO     | <p>Manual close: YES</p>                                                                                   |
-| Status: Failed to fetch data (or no data for 5m)                            | <p>Zabbix has not received data for items for the last 5 minutes</p> | `{TEMPLATE_NAME:status.uptime.nodata(5m)}=1`                                                                                                                      | WARNING  | <p>Manual close: YES</p>                                                                                   |
-| Status: Device has "reset" faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"reset","like")}=2`                                                                                              | HIGH     |                                                                                                            |
-| Status: Device has "overcurrent" faults flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"overcurrent","like")}=2`                                                                                        | HIGH     |                                                                                                            |
-| Status: Device has "unknownFault" faults flag                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"unknownFault","like")}=2`                                                                                       | HIGH     |                                                                                                            |
-| Status: Device has "software" faults flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"software","like")}=2`                                                                                           | HIGH     |                                                                                                            |
-| Status: Device has "highVoltageDisconnect" faults flag                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"highVoltageDisconnect","like")}=2`                                                                              | HIGH     |                                                                                                            |
-| Status: Device has "suresineHot" faults flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"suresineHot","like")}=2`                                                                                        | HIGH     |                                                                                                            |
-| Status: Device has "dipSwitchChanged" faults flag                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"dipSwitchChanged","like")}=2`                                                                                   | HIGH     |                                                                                                            |
-| Status: Device has "customSettingsEdit" faults flag                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"customSettingsEdit","like")}=2`                                                                                 | HIGH     |                                                                                                            |
-| Status: Device has "heatsinkTempSensorOpen" alarm flag                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorOpen","like")}=2`                                                                             | WARNING  |                                                                                                            |
-| Status: Device has "heatsinkTempSensorShort" alarm flag                     | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorShort","like")}=2`                                                                            | WARNING  |                                                                                                            |
-| Status: Device has "unknownAlarm" alarm flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"unknownAlarm","like")}=2`                                                                                       | WARNING  |                                                                                                            |
-| Status: Device has "suresineHot" alarm flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"suresineHot","like")}=2`                                                                                        | WARNING  |                                                                                                            |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/net/morningstar_snmp/tristar_mppt_600V_snmp/README.md b/templates/net/morningstar_snmp/tristar_mppt_600V_snmp/README.md
deleted file mode 100644
index 2c6771fb6eb..00000000000
--- a/templates/net/morningstar_snmp/tristar_mppt_600V_snmp/README.md
+++ /dev/null
@@ -1,148 +0,0 @@
-
-# Morningstar TriStar MPPT 600V SNMP
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                            | Description                                    | Default |
-|---------------------------------|------------------------------------------------|---------|
-| {$BATTERY.TEMP.MAX.CRIT}        | <p>Battery high temperature critical value</p> | `60`    |
-| {$BATTERY.TEMP.MAX.WARN}        | <p>Battery high temperature warning value</p>  | `45`    |
-| {$BATTERY.TEMP.MIN.CRIT}        | <p>Battery low temperature critical value</p>  | `-20`   |
-| {$BATTERY.TEMP.MIN.WARN}        | <p>Battery low temperature warning value</p>   | `0`     |
-| {$CHARGE.STATE.CRIT}            | <p>fault</p>                                   | `4`     |
-| {$CHARGE.STATE.WARN}            | <p>disconnect</p>                              | `2`     |
-| {$LOAD.STATE.CRIT:"fault"}      | <p>fault</p>                                   | `4`     |
-| {$LOAD.STATE.CRIT:"lvd"}        | <p>lvd</p>                                     | `3`     |
-| {$LOAD.STATE.WARN:"disconnect"} | <p>disconnect</p>                              | `5`     |
-| {$LOAD.STATE.WARN:"lvdWarning"} | <p>lvdWarning</p>                              | `2`     |
-| {$LOAD.STATE.WARN:"override"}   | <p>override</p>                                | `7`     |
-| {$VOLTAGE.MAX.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MAX.WARN}             |                                                | ``      |
-| {$VOLTAGE.MIN.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MIN.WARN}             |                                                | ``      |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-| Name                      | Description                                   | Type      | Key and additional info                                                                                             |
-|---------------------------|-----------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------------|
-| Battery voltage discovery | <p>Discovery for battery voltage triggers</p> | DEPENDENT | battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-
-## Items collected
-
-| Group            | Name                               | Description                                                                                                                                                                                                                                                                | Type | Key and additional info                                                                                                                                     |
-|------------------|------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Array            | Array: Voltage                     | <p>MIB: TRISTAR-MPPT</p><p>Description:Array Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 650]</p><p>Modbus address:0x001b</p>                                                                                                                         | SNMP | array.voltage[arrayVoltage.0]                                                                                                                               |
-| Array            | Array: Array Current               | <p>MIB: TRISTAR-MPPT</p><p>Description:Array Current</p><p>Scaling Factor:1.0</p><p>Units:A</p><p>Range:[-10, 80]</p><p>Modbus address:0x001d</p>                                                                                                                          | SNMP | array.current[arrayCurrent.0]                                                                                                                               |
-| Array            | Array: Sweep Vmp                   | <p>MIB: TRISTAR-MPPT</p><p>Description:Vmp (last sweep)</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 650.0]</p><p>Modbus address:0x003d</p>                                                                                                                    | SNMP | array.sweep_vmp[arrayVmpLastSweep.0]                                                                                                                        |
-| Array            | Array: Sweep Voc                   | <p>MIB: TRISTAR-MPPT</p><p>Description:Voc (last sweep)</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 650.0]</p><p>Modbus address:0x003e</p>                                                                                                                    | SNMP | array.sweep_voc[arrayVocLastSweep.0]                                                                                                                        |
-| Array            | Array: Sweep Pmax                  | <p>MIB: TRISTAR-MPPT</p><p>Description:Pmax (last sweep)</p><p>Scaling Factor:1.0</p><p>Units:W</p><p>Range:[-10, 5000]</p><p>Modbus address:0x003c</p>                                                                                                                    | SNMP | array.sweep_pmax[arrayPmaxLastSweep.0]                                                                                                                      |
-| Battery          | Battery: Charge State              | <p>MIB: TRISTAR-MPPT</p><p>Description:Charge State</p><p>Modbus address:0x0032</p><p>0: Start</p><p>1: NightCheck</p><p>2: Disconnect</p><p>3: Night</p><p>4: Fault</p><p>5: Mppt</p><p>6: Absorption</p><p>7: Float</p><p>8: Equalize</p><p>9: Slave</p><p>10: Fixed</p> | SNMP | charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                              |
-| Battery          | Battery: Target Voltage            | <p>MIB: TRISTAR-MPPT</p><p>Description:Target Voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 650.0]</p><p>Modbus address:0x0033</p>                                                                                                                      | SNMP | target.voltage[targetRegulationVoltage.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                |
-| Battery          | Battery: Charge Current            | <p>MIB: TRISTAR-MPPT</p><p>Description:Battery Current</p><p>Scaling Factor:1.0</p><p>Units:A</p><p>Range:[-10, 80]</p><p>Modbus address:0x001c</p>                                                                                                                        | SNMP | charge.current[batteryCurrent.0]                                                                                                                            |
-| Battery          | Battery: Output Power              | <p>MIB: TRISTAR-MPPT</p><p>Description:Output Power</p><p>Scaling Factor:1.0</p><p>Units:W</p><p>Range:[-10, 4000]</p><p>Modbus address:0x003a</p>                                                                                                                         | SNMP | charge.output_power[ outputPower.0]                                                                                                                         |
-| Battery          | Battery: Voltage{#SINGLETON}       | <p>MIB: TRISTAR-MPPT</p><p>Description:Battery voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 80]</p><p>Modbus address:0x0018</p>                                                                                                                        | SNMP | battery.voltage[batteryVoltage.0{#SINGLETON}]                                                                                                               |
-| Counter          | Counter: Charge Amp-hours          | <p>MIB: TRISTAR-MPPT</p><p>Description:Ah Charge Resettable</p><p>Scaling Factor:1.0</p><p>Units:Ah</p><p>Range:[0.0, 5000]</p><p>Modbus addresses:H=0x0034 L=0x0035</p>                                                                                                   | SNMP | counter.charge_amp_hours[ahChargeResetable.0]                                                                                                               |
-| Counter          | Counter: Charge KW-hours           | <p>MIB: TRISTAR-MPPT</p><p>Description:kWh Charge Resettable</p><p>Scaling Factor:1.0</p><p>Units:kWh</p><p>Range:[0.0, 65535.0]</p><p>Modbus address:0x0038</p>                                                                                                           | SNMP | counter.charge_kw_hours[kwhChargeResetable.0]                                                                                                               |
-| Status           | Status: Uptime                     | <p>Device uptime in seconds</p>                                                                                                                                                                                                                                            | SNMP | status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p>                                                                                           |
-| Status           | Status: Faults                     | <p>MIB: TRISTAR-MPPT</p><p>Description:Faults</p><p>Modbus addresses:H=0x002c L=0x002d</p>                                                                                                                                                                                 | SNMP | status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Status           | Status: Alarms                     | <p>MIB: TRISTAR-MPPT</p><p>Description:Alarms</p><p>Modbus addresses:H=0x002e L=0x002f</p>                                                                                                                                                                                 | SNMP | status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Temperature      | Temperature: Battery               | <p>MIB: TRISTAR-MPPT</p><p>Description:Batt. Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0025</p>                                                                                                                             | SNMP | temp.battery[batteryTemperature.0]                                                                                                                          |
-| Temperature      | Temperature: Heatsink              | <p>MIB: TRISTAR-MPPT</p><p>Description:HS Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0023</p>                                                                                                                                | SNMP | temp.heatsink[heatsinkTemperature.0]                                                                                                                        |
-| Zabbix_raw_items | Battery: Battery Voltage discovery | <p>MIB: TRISTAR-MPPT</p><p>Description:Battery voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 80]</p><p>Modbus address:0x0018</p>                                                                                                                        | SNMP | battery.voltage.discovery[batteryVoltage.0]                                                                                                                 |
-
-## Triggers
-
-| Name                                                                                     | Description                                                          | Expression                                                                                      | Severity | Dependencies and additional info                                                                                        |
-|------------------------------------------------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------|
-| Battery: Device charge in warning state                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.WARN}`                       | WARNING  | <p>**Depends on**:</p><p>- Battery: Device charge in critical state</p>                                                 |
-| Battery: Device charge in critical state                                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.CRIT}`                       | HIGH     |                                                                                                                         |
-| Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.WARN}`     | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p>              |
-| Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.CRIT}`     | HIGH     |                                                                                                                         |
-| Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.WARN}`     | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p>              |
-| Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.CRIT}`     | HIGH     |                                                                                                                         |
-| Status: Device has been restarted (uptime < 10m)                                         | <p>Uptime is less than 10 minutes</p>                                | `{TEMPLATE_NAME:status.uptime.last()}<10m`                                                      | INFO     | <p>Manual close: YES</p>                                                                                                |
-| Status: Failed to fetch data (or no data for 5m)                                         | <p>Zabbix has not received data for items for the last 5 minutes</p> | `{TEMPLATE_NAME:status.uptime.nodata(5m)}=1`                                                    | WARNING  | <p>Manual close: YES</p>                                                                                                |
-| Status: Device has "overcurrent" faults flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"overcurrent","like")}=2`                      | HIGH     |                                                                                                                         |
-| Status: Device has "fetShort" faults flag                                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fetShort","like")}=2`                         | HIGH     |                                                                                                                         |
-| Status: Device has "softwareFault" faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"softwareFault","like")}=2`                    | HIGH     |                                                                                                                         |
-| Status: Device has "batteryHvd" faults flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"batteryHvd","like")}=2`                       | HIGH     |                                                                                                                         |
-| Status: Device has "arrayHvd" faults flag                                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"arrayHvd","like")}=2`                         | HIGH     |                                                                                                                         |
-| Status: Device has "dipSwitchChange" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"dipSwitchChange","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"customSettingsEdit","like")}=2`               | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" faults flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"rtsShorted","like")}=2`                       | HIGH     |                                                                                                                         |
-| Status: Device has "rtsDisconnected" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"rtsDisconnected","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "eepromRetryLimit" faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"eepromRetryLimit","like")}=2`                 | HIGH     |                                                                                                                         |
-| Status: Device has "controllerWasReset" faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"controllerWasReset","like")}=2`               | HIGH     |                                                                                                                         |
-| Status: Device has "chargeSlaveControlTimeout" faults flag                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"chargeSlaveControlTimeout","like")}=2`        | HIGH     |                                                                                                                         |
-| Status: Device has "rs232SerialToMeterBridge" faults flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"rs232SerialToMeterBridge","like")}=2`         | HIGH     |                                                                                                                         |
-| Status: Device has "batteryLvd" faults flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"batteryLvd","like")}=2`                       | HIGH     |                                                                                                                         |
-| Status: Device has "powerboardCommunicationFault" faults flag                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"powerboardCommunicationFault","like")}=2`     | HIGH     |                                                                                                                         |
-| Status: Device has "fault16Software" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fault16Software","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "fault17Software" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fault17Software","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "fault18Software" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fault18Software","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "fault19Software" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fault19Software","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "fault20Software" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fault20Software","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "fault21Software" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fault21Software","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "fpgaVersion" faults flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fpgaVersion","like")}=2`                      | HIGH     |                                                                                                                         |
-| Status: Device has "currentSensorReferenceOutOfRange" faults flag                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"currentSensorReferenceOutOfRange","like")}=2` | HIGH     |                                                                                                                         |
-| Status: Device has "ia-refSlaveModeTimeout" faults flag                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"ia-refSlaveModeTimeout","like")}=2`           | HIGH     |                                                                                                                         |
-| Status: Device has "blockbusBoot" faults flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"blockbusBoot","like")}=2`                     | HIGH     |                                                                                                                         |
-| Status: Device has "hscommMaster" faults flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"hscommMaster","like")}=2`                     | HIGH     |                                                                                                                         |
-| Status: Device has "hscomm" faults flag                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"hscomm","like")}=2`                           | HIGH     |                                                                                                                         |
-| Status: Device has "slave" faults flag                                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"slave","like")}=2`                            | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsShorted","like")}=2`                       | WARNING  |                                                                                                                         |
-| Status: Device has "rtsDisconnected" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsDisconnected","like")}=2`                  | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorOpen" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorOpen","like")}=2`           | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorShorted" alarm flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorShorted","like")}=2`        | WARNING  |                                                                                                                         |
-| Status: Device has "highTemperatureCurrentLimit" alarm flag                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"highTemperatureCurrentLimit","like")}=2`      | WARNING  |                                                                                                                         |
-| Status: Device has "currentLimit" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentLimit","like")}=2`                     | WARNING  |                                                                                                                         |
-| Status: Device has "currentOffset" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentOffset","like")}=2`                    | WARNING  |                                                                                                                         |
-| Status: Device has "batterySense" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySense","like")}=2`                     | WARNING  |                                                                                                                         |
-| Status: Device has "batterySenseDisconnected" alarm flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySenseDisconnected","like")}=2`         | WARNING  |                                                                                                                         |
-| Status: Device has "uncalibrated" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"uncalibrated","like")}=2`                     | WARNING  |                                                                                                                         |
-| Status: Device has "rtsMiswire" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsMiswire","like")}=2`                       | WARNING  |                                                                                                                         |
-| Status: Device has "highVoltageDisconnect" alarm flag                                    | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"highVoltageDisconnect","like")}=2`            | WARNING  |                                                                                                                         |
-| Status: Device has "systemMiswire" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"systemMiswire","like")}=2`                    | WARNING  |                                                                                                                         |
-| Status: Device has "mosfetSOpen" alarm flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"mosfetSOpen","like")}=2`                      | WARNING  |                                                                                                                         |
-| Status: Device has "p12VoltageOutOfRange" alarm flag                                     | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p12VoltageOutOfRange","like")}=2`             | WARNING  |                                                                                                                         |
-| Status: Device has "highArrayVCurrentLimit" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"highArrayVCurrentLimit","like")}=2`           | WARNING  |                                                                                                                         |
-| Status: Device has "maxAdcValueReached" alarm flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"maxAdcValueReached","like")}=2`               | WARNING  |                                                                                                                         |
-| Status: Device has "controllerWasReset" alarm flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"controllerWasReset","like")}=2`               | WARNING  |                                                                                                                         |
-| Status: Device has "alarm21Internal" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"alarm21Internal","like")}=2`                  | WARNING  |                                                                                                                         |
-| Status: Device has "p3VoltageOutOfRange" alarm flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p3VoltageOutOfRange","like")}=2`              | WARNING  |                                                                                                                         |
-| Status: Device has "derateLimit" alarm flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"derateLimit","like")}=2`                      | WARNING  |                                                                                                                         |
-| Status: Device has "arrayCurrentOffset" alarm flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"arrayCurrentOffset","like")}=2`               | WARNING  |                                                                                                                         |
-| Status: Device has "ee-i2cRetryLimit" alarm flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"ee-i2cRetryLimit","like")}=2`                 | WARNING  |                                                                                                                         |
-| Status: Device has "ethernetAlarm" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"ethernetAlarm","like")}=2`                    | WARNING  |                                                                                                                         |
-| Status: Device has "lvd" alarm flag                                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"lvd","like")}=2`                              | WARNING  |                                                                                                                         |
-| Status: Device has "software" alarm flag                                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"software","like")}=2`                         | WARNING  |                                                                                                                         |
-| Status: Device has "fp12VoltageOutOfRange" alarm flag                                    | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"fp12VoltageOutOfRange","like")}=2`            | WARNING  |                                                                                                                         |
-| Status: Device has "extflashFault" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"extflashFault","like")}=2`                    | WARNING  |                                                                                                                         |
-| Status: Device has "slaveControlFault" alarm flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"slaveControlFault","like")}=2`                | WARNING  |                                                                                                                         |
-| Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.WARN}`           | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
-| Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.CRIT}`           | HIGH     |                                                                                                                         |
-| Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.WARN}`           | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
-| Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.CRIT}`           | HIGH     |                                                                                                                         |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/net/morningstar_snmp/tristar_mppt_snmp/README.md b/templates/net/morningstar_snmp/tristar_mppt_snmp/README.md
deleted file mode 100644
index 029e6625181..00000000000
--- a/templates/net/morningstar_snmp/tristar_mppt_snmp/README.md
+++ /dev/null
@@ -1,120 +0,0 @@
-
-# Morningstar TriStar MPPT SNMP
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                            | Description                                    | Default |
-|---------------------------------|------------------------------------------------|---------|
-| {$BATTERY.TEMP.MAX.CRIT}        | <p>Battery high temperature critical value</p> | `60`    |
-| {$BATTERY.TEMP.MAX.WARN}        | <p>Battery high temperature warning value</p>  | `45`    |
-| {$BATTERY.TEMP.MIN.CRIT}        | <p>Battery low temperature critical value</p>  | `-20`   |
-| {$BATTERY.TEMP.MIN.WARN}        | <p>Battery low temperature warning value</p>   | `0`     |
-| {$CHARGE.STATE.CRIT}            | <p>fault</p>                                   | `4`     |
-| {$CHARGE.STATE.WARN}            | <p>disconnect</p>                              | `2`     |
-| {$LOAD.STATE.CRIT:"fault"}      | <p>fault</p>                                   | `4`     |
-| {$LOAD.STATE.CRIT:"lvd"}        | <p>lvd</p>                                     | `3`     |
-| {$LOAD.STATE.WARN:"disconnect"} | <p>disconnect</p>                              | `5`     |
-| {$LOAD.STATE.WARN:"lvdWarning"} | <p>lvdWarning</p>                              | `2`     |
-| {$LOAD.STATE.WARN:"override"}   | <p>override</p>                                | `7`     |
-| {$VOLTAGE.MAX.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MAX.WARN}             |                                                | ``      |
-| {$VOLTAGE.MIN.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MIN.WARN}             |                                                | ``      |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-| Name                      | Description                                   | Type      | Key and additional info                                                                                             |
-|---------------------------|-----------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------------|
-| Battery voltage discovery | <p>Discovery for battery voltage triggers</p> | DEPENDENT | battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-
-## Items collected
-
-| Group            | Name                               | Description                                                                                                                                                                                                                                                | Type | Key and additional info                                                                                                                                     |
-|------------------|------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Array            | Array: Voltage                     | <p>MIB: TRISTAR-MPPT</p><p>Description:Array Voltage</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180]</p><p>Modbus address:0x001b</p>                                                                                             | SNMP | array.voltage[arrayVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                        |
-| Array            | Array: Array Current               | <p>MIB: TRISTAR-MPPT</p><p>Description:Array Current</p><p>Scaling Factor:0.00244140625</p><p>Units:A</p><p>Range:[-10, 80]</p><p>Modbus address:0x001d</p>                                                                                                | SNMP | array.current[arrayCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.00244140625`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                         |
-| Array            | Array: Sweep Vmp                   | <p>MIB: TRISTAR-MPPT</p><p>Description:Vmp (last sweep)</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180.0]</p><p>Modbus address:0x003d</p>                                                                                        | SNMP | array.sweep_vmp[arrayVmpLastSweep.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                 |
-| Array            | Array: Sweep Voc                   | <p>MIB: TRISTAR-MPPT</p><p>Description:Voc (last sweep)</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180.0]</p><p>Modbus address:0x003e</p>                                                                                        | SNMP | array.sweep_voc[arrayVocLastSweep.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                 |
-| Array            | Array: Sweep Pmax                  | <p>MIB: TRISTAR-MPPT</p><p>Description:Pmax (last sweep)</p><p>Scaling Factor:0.10986328125</p><p>Units:W</p><p>Range:[-10, 5000]</p><p>Modbus address:0x003c</p>                                                                                          | SNMP | array.sweep_pmax[arrayPmaxLastSweep.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1098632813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                 |
-| Battery          | Battery: Charge State              | <p>MIB: TRISTAR-MPPT</p><p>Description:Charge State</p><p>Modbus address:0x0032</p><p>0: Start</p><p>1: NightCheck</p><p>2: Disconnect</p><p>3: Night</p><p>4: Fault</p><p>5: Mppt</p><p>6: Absorption</p><p>7: Float</p><p>8: Equalize</p><p>9: Slave</p> | SNMP | charge.state[chargeState.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                              |
-| Battery          | Battery: Target Voltage            | <p>MIB: TRISTAR-MPPT</p><p>Description:Target Voltage</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180.0]</p><p>Modbus address:0x0033</p>                                                                                          | SNMP | target.voltage[targetRegulationVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>            |
-| Battery          | Battery: Charge Current            | <p>MIB: TRISTAR-MPPT</p><p>Description:Battery Current</p><p>Scaling Factor:0.00244140625</p><p>Units:A</p><p>Range:[-10, 80]</p><p>Modbus address:0x001c</p>                                                                                              | SNMP | charge.current[batteryCurrent.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.00244140625`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                      |
-| Battery          | Battery: Output Power              | <p>MIB: TRISTAR-MPPT</p><p>Description:Output Power</p><p>Scaling Factor:0.10986328125</p><p>Units:W</p><p>Range:[-10, 5000]</p><p>Modbus address:0x003a</p>                                                                                               | SNMP | charge.output_power[ outputPower.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1098632813`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                    |
-| Battery          | Battery: Voltage{#SINGLETON}       | <p>MIB: TRISTAR-MPPT</p><p>Description:Battery voltage</p><p>Scaling Factor:0.0054931640625</p><p>Units:V</p><p>Range:[-10, 180.0]</p><p>Modbus address:0x0018</p>                                                                                         | SNMP | battery.voltage[batteryVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>        |
-| Counter          | Counter: Charge Amp-hours          | <p>MIB: TRISTAR-MPPT</p><p>Description:Ah Charge Resettable</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 5000]</p><p>Modbus addresses:H=0x0034 L=0x0035</p>                                                                                   | SNMP | counter.charge_amp_hours[ahChargeResetable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                            |
-| Counter          | Counter: Charge KW-hours           | <p>MIB: TRISTAR-MPPT</p><p>Description:kWh Charge Resettable</p><p>Scaling Factor:0.1</p><p>Units:kWh</p><p>Range:[0.0, 65535.0]</p><p>Modbus address:0x0038</p>                                                                                           | SNMP | counter.charge_kw_hours[kwhChargeResetable.0]                                                                                                               |
-| Status           | Status: Uptime                     | <p>Device uptime in seconds</p>                                                                                                                                                                                                                            | SNMP | status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p>                                                                                           |
-| Status           | Status: Faults                     | <p>MIB: TRISTAR-MPPT</p><p>Description:Faults</p><p>Modbus address:0x002c</p>                                                                                                                                                                              | SNMP | status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Status           | Status: Alarms                     | <p>MIB: TRISTAR-MPPT</p><p>Description:Faults</p><p>Modbus address:0x002c</p>                                                                                                                                                                              | SNMP | status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Temperature      | Temperature: Battery               | <p>MIB: TRISTAR-MPPT</p><p>Description:Batt. Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0025</p>                                                                                                             | SNMP | temp.battery[batteryTemperature.0]                                                                                                                          |
-| Temperature      | Temperature: Heatsink              | <p>MIB: TRISTAR-MPPT</p><p>Description:HS Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0023</p>                                                                                                                | SNMP | temp.heatsink[heatsinkTemperature.0]                                                                                                                        |
-| Zabbix_raw_items | Battery: Battery Voltage discovery | <p>MIB: TRISTAR-MPPT</p>                                                                                                                                                                                                                                   | SNMP | battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p>                                                   |
-
-## Triggers
-
-| Name                                                                                     | Description                                                          | Expression                                                                                  | Severity | Dependencies and additional info                                                                                        |
-|------------------------------------------------------------------------------------------|----------------------------------------------------------------------|---------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------|
-| Battery: Device charge in warning state                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.WARN}`                   | WARNING  | <p>**Depends on**:</p><p>- Battery: Device charge in critical state</p>                                                 |
-| Battery: Device charge in critical state                                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[chargeState.0].last()}={$CHARGE.STATE.CRIT}`                   | HIGH     |                                                                                                                         |
-| Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.WARN}` | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p>              |
-| Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.CRIT}` | HIGH     |                                                                                                                         |
-| Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.WARN}` | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p>              |
-| Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.CRIT}` | HIGH     |                                                                                                                         |
-| Status: Device has been restarted (uptime < 10m)                                         | <p>Uptime is less than 10 minutes</p>                                | `{TEMPLATE_NAME:status.uptime.last()}<10m`                                                  | INFO     | <p>Manual close: YES</p>                                                                                                |
-| Status: Failed to fetch data (or no data for 5m)                                         | <p>Zabbix has not received data for items for the last 5 minutes</p> | `{TEMPLATE_NAME:status.uptime.nodata(5m)}=1`                                                | WARNING  | <p>Manual close: YES</p>                                                                                                |
-| Status: Device has "overcurrent" faults flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"overcurrent","like")}=2`                  | HIGH     |                                                                                                                         |
-| Status: Device has "fetShort" faults flag                                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"fetShort","like")}=2`                     | HIGH     |                                                                                                                         |
-| Status: Device has "softwareFault" faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"softwareFault","like")}=2`                | HIGH     |                                                                                                                         |
-| Status: Device has "batteryHvd" faults flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"batteryHvd","like")}=2`                   | HIGH     |                                                                                                                         |
-| Status: Device has "arrayHvd" faults flag                                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"arrayHvd","like")}=2`                     | HIGH     |                                                                                                                         |
-| Status: Device has "dipSwitchChange" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"dipSwitchChange","like")}=2`              | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"customSettingsEdit","like")}=2`           | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" faults flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"rtsShorted","like")}=2`                   | HIGH     |                                                                                                                         |
-| Status: Device has "rtsDisconnected" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"rtsDisconnected","like")}=2`              | HIGH     |                                                                                                                         |
-| Status: Device has "eepromRetryLimit" faults flag                                        | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"eepromRetryLimit","like")}=2`             | HIGH     |                                                                                                                         |
-| Status: Device has "slaveControlTimeout" faults flag                                     | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"slaveControlTimeout","like")}=2`          | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsShorted","like")}=2`                   | WARNING  |                                                                                                                         |
-| Status: Device has "rtsDisconnected" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsDisconnected","like")}=2`              | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorOpen" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorOpen","like")}=2`       | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorShorted" alarm flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorShorted","like")}=2`    | WARNING  |                                                                                                                         |
-| Status: Device has "highTemperatureCurrentLimit" alarm flag                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"highTemperatureCurrentLimit","like")}=2`  | WARNING  |                                                                                                                         |
-| Status: Device has "currentLimit" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentLimit","like")}=2`                 | WARNING  |                                                                                                                         |
-| Status: Device has "currentOffset" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentOffset","like")}=2`                | WARNING  |                                                                                                                         |
-| Status: Device has "batterySense" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySense","like")}=2`                 | WARNING  |                                                                                                                         |
-| Status: Device has "batterySenseDisconnected" alarm flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySenseDisconnected","like")}=2`     | WARNING  |                                                                                                                         |
-| Status: Device has "uncalibrated" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"uncalibrated","like")}=2`                 | WARNING  |                                                                                                                         |
-| Status: Device has "rtsMiswire" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsMiswire","like")}=2`                   | WARNING  |                                                                                                                         |
-| Status: Device has "highVoltageDisconnect" alarm flag                                    | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"highVoltageDisconnect","like")}=2`        | WARNING  |                                                                                                                         |
-| Status: Device has "systemMiswire" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"systemMiswire","like")}=2`                | WARNING  |                                                                                                                         |
-| Status: Device has "mosfetSOpen" alarm flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"mosfetSOpen","like")}=2`                  | WARNING  |                                                                                                                         |
-| Status: Device has "p12VoltageReferenceOff" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p12VoltageReferenceOff","like")}=2`       | WARNING  |                                                                                                                         |
-| Status: Device has "highArrayVCurrentLimit" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"highArrayVCurrentLimit","like")}=2`       | WARNING  |                                                                                                                         |
-| Status: Device has "maxAdcValueReached" alarm flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"maxAdcValueReached","like")}=2`           | WARNING  |                                                                                                                         |
-| Status: Device has "controllerWasReset" alarm flag                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"controllerWasReset","like")}=2`           | WARNING  |                                                                                                                         |
-| Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.WARN}`       | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
-| Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.CRIT}`       | HIGH     |                                                                                                                         |
-| Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.WARN}`       | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
-| Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.CRIT}`       | HIGH     |                                                                                                                         |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/net/morningstar_snmp/tristar_pwm_snmp/README.md b/templates/net/morningstar_snmp/tristar_pwm_snmp/README.md
deleted file mode 100644
index d05949fa042..00000000000
--- a/templates/net/morningstar_snmp/tristar_pwm_snmp/README.md
+++ /dev/null
@@ -1,127 +0,0 @@
-
-# Morningstar TriStar PWM SNMP
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/zabbix_agent) for basic instructions.
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                            | Description                                    | Default |
-|---------------------------------|------------------------------------------------|---------|
-| {$BATTERY.TEMP.MAX.CRIT}        | <p>Battery high temperature critical value</p> | `60`    |
-| {$BATTERY.TEMP.MAX.WARN}        | <p>Battery high temperature warning value</p>  | `45`    |
-| {$BATTERY.TEMP.MIN.CRIT}        | <p>Battery low temperature critical value</p>  | `-20`   |
-| {$BATTERY.TEMP.MIN.WARN}        | <p>Battery low temperature warning value</p>   | `0`     |
-| {$CHARGE.STATE.CRIT}            | <p>fault</p>                                   | `4`     |
-| {$CHARGE.STATE.WARN}            | <p>disconnect</p>                              | `2`     |
-| {$LOAD.STATE.CRIT:"fault"}      | <p>fault</p>                                   | `4`     |
-| {$LOAD.STATE.CRIT:"lvd"}        | <p>lvd</p>                                     | `3`     |
-| {$LOAD.STATE.WARN:"disconnect"} | <p>disconnect</p>                              | `5`     |
-| {$LOAD.STATE.WARN:"lvdWarning"} | <p>lvdWarning</p>                              | `2`     |
-| {$LOAD.STATE.WARN:"override"}   | <p>override</p>                                | `7`     |
-| {$VOLTAGE.MAX.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MAX.WARN}             |                                                | ``      |
-| {$VOLTAGE.MIN.CRIT}             |                                                | ``      |
-| {$VOLTAGE.MIN.WARN}             |                                                | ``      |
-
-## Template links
-
-There are no template links in this template.
-
-## Discovery rules
-
-| Name                              | Description                                               | Type      | Key and additional info                                                                                                                                    |
-|-----------------------------------|-----------------------------------------------------------|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Battery voltage discovery         | <p>Discovery for battery voltage triggers</p>             | DEPENDENT | battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                                        |
-| Charge mode discovery             | <p>Discovery for device in charge mode</p>                | DEPENDENT | controlmode.charge.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 0 ? [{'{#SINGLETON}': ''}] : []);`</p>    |
-| Load mode discovery               | <p>Discovery for device in load mode</p>                  | DEPENDENT | controlmode.load.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 1 ? [{'{#SINGLETON}': ''}] : []);`</p>      |
-| Diversion mode discovery          | <p>Discovery for device in diversion mode</p>             | DEPENDENT | controlmode.diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 2 ? [{'{#SINGLETON}': ''}] : []);`</p> |
-| Charge + Diversion mode discovery | <p>Discovery for device in charge and diversion modes</p> | DEPENDENT | controlmode.charge_diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                           |
-| Load + Diversion mode discovery   | <p>Discovery for device in load and diversion modes</p>   | DEPENDENT | controlmode.load_diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p>                             |
-
-## Items collected
-
-| Group            | Name                                | Description                                                                                                                                                                                                                                 | Type | Key and additional info                                                                                                                                     |
-|------------------|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Array            | Array: Voltage{#SINGLETON}          | <p>MIB: TRISTAR</p><p>Description:Array/Load Voltage</p><p>Scaling Factor:0.00424652099609375</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x000A</p>                                                                             | SNMP | array.voltage[arrayloadVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.004246520996`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>        |
-| Battery          | Battery: Voltage{#SINGLETON}        | <p>MIB: TRISTAR</p><p>Description:Battery voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0008</p>                                                                           | SNMP | battery.voltage[batteryVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002950042725`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>        |
-| Battery          | Battery: Charge Current{#SINGLETON} | <p>MIB: TRISTAR</p><p>Description:Charge Current</p><p>Scaling Factor:0.002034515380859375</p><p>Units:A</p><p>Range:[0, 60]</p><p>Modbus address:0x000B</p>                                                                                | SNMP | charge.current[chargeCurrent.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002034515381`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>          |
-| Battery          | Battery: Charge State{#SINGLETON}   | <p>MIB: TRISTAR</p><p>Description:Control State</p><p>Modbus address:0x001B</p>                                                                                                                                                             | SNMP | charge.state[controlState.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                 |
-| Battery          | Battery: Target Voltage{#SINGLETON} | <p>MIB: TRISTAR</p><p>Description:Target Regulation Voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0010</p>                                                                 | SNMP | target.voltage[targetVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002950042725`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>          |
-| Counter          | Counter: KW-hours                   | <p>MIB: TRISTAR</p><p>Description:Kilowatt Hours</p><p>Scaling Factor:1.0</p><p>Units:kWh</p><p>Range:[0.0, 5000.0]</p><p>Modbus address:0x001E</p>                                                                                         | SNMP | counter.charge_kw_hours[kilowattHours.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>                      |
-| Counter          | Counter: Amp-hours                  | <p>MIB: TRISTAR</p><p>Description:Ah (Resettable)</p><p>Scaling Factor:0.1</p><p>Units:Ah</p><p>Range:[0.0, 50000.0]</p><p>Modbus addresses:H=0x0011 L=0x0012</p>                                                                           | SNMP | counter.charge_amp_hours[ahResettable.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                                 |
-| Load             | Load: State{#SINGLETON}             | <p>MIB: TRISTAR</p><p>Description:Load State</p><p>Modbus address:0x001B</p><p>0: Start</p><p>1: Normal</p><p>2: LvdWarning</p><p>3: Lvd</p><p>4: Fault</p><p>5: Disconnect</p><p>6: LvdWarning1</p><p>7: OverrideLvd</p><p>8: Equalize</p> | SNMP | load.state[loadState.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                      |
-| Load             | Load: PWM Duty Cycle{#SINGLETON}    | <p>MIB: TRISTAR</p><p>Description:PWM Duty Cycle</p><p>Scaling Factor:0.392156862745098</p><p>Units:%</p><p>Range:[0.0, 100.0]</p><p>Modbus address:0x001C</p>                                                                              | SNMP | diversion.pwm_duty_cycle[pwmDutyCycle.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.3921568627`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>   |
-| Load             | Load: Current{#SINGLETON}           | <p>MIB: TRISTAR</p><p>Description:Load Current</p><p>Scaling Factor:0.00966400146484375</p><p>Units:A</p><p>Range:[0, 60]</p><p>Modbus address:0x000C</p>                                                                                   | SNMP | load.current[loadCurrent.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.009664001465`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>              |
-| Load             | Load: Voltage{#SINGLETON}           | <p>MIB: TRISTAR</p><p>Description:Array/Load Voltage</p><p>Scaling Factor:0.00424652099609375</p><p>Units:V</p><p>Range:[0, 80]</p><p>Modbus address:0x000A</p>                                                                             | SNMP | load.voltage[arrayloadVoltage.0{#SINGLETON}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.004246520996`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p>         |
-| Status           | Status: Uptime                      | <p>Device uptime in seconds</p>                                                                                                                                                                                                             | SNMP | status.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p>                                                                                           |
-| Status           | Status: Control Mode                | <p>MIB: TRISTAR</p><p>Description:Control Mode</p><p>Modbus address:0x001A</p><p>0: charge</p><p>1: loadControl</p><p>2: diversion</p><p>3: lighting</p>                                                                                    | SNMP | control.mode[controlMode.0]                                                                                                                                 |
-| Status           | Status: Faults                      | <p>MIB: TRISTAR</p><p>Description:Battery voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0008</p>                                                                           | SNMP | status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Status           | Status: Alarms                      | <p>MIB: TRISTAR</p><p>Description:Alarms</p><p>Modbus addresses:H=0x001D L=0x0017</p>                                                                                                                                                       | SNMP | status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
-| Temperature      | Temperature: Battery                | <p>MIB: TRISTAR</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-40, 120]</p><p>Modbus address:0x000F</p>                                                                                     | SNMP | temp.battery[batteryTemperature.0]                                                                                                                          |
-| Temperature      | Temperature: Heatsink               | <p>MIB: TRISTAR</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-40, 120]</p><p>Modbus address:0x000E</p>                                                                                    | SNMP | temp.heatsink[heatsinkTemperature.0]                                                                                                                        |
-| Zabbix_raw_items | Battery: Battery Voltage discovery  | <p>MIB: TRISTAR</p><p>Description:Battery voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0008</p>                                                                           | SNMP | battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002950042725`</p>                                                   |
-
-## Triggers
-
-| Name                                                                                     | Description                                                          | Expression                                                                                                                                                                                | Severity | Dependencies and additional info                                                                                        |
-|------------------------------------------------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------|
-| Battery: Low battery voltage (below {#VOLTAGE.MIN.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.WARN}`                                                                                               | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)</p>              |
-| Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].max(5m)}<{#VOLTAGE.MIN.CRIT}`                                                                                               | HIGH     |                                                                                                                         |
-| Battery: High battery voltage (over {#VOLTAGE.MAX.WARN}V for 5m)                         | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.WARN}`                                                                                               | WARNING  | <p>**Depends on**:</p><p>- Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)</p>              |
-| Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)              | <p>-</p>                                                             | `{TEMPLATE_NAME:battery.voltage[batteryVoltage.0{#SINGLETON}].min(5m)}>{#VOLTAGE.MAX.CRIT}`                                                                                               | HIGH     |                                                                                                                         |
-| Battery: Device charge in warning state                                                  | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[controlState.0{#SINGLETON}].last()}={$CHARGE.STATE.WARN}`                                                                                                    | WARNING  | <p>**Depends on**:</p><p>- Battery: Device charge in critical state</p>                                                 |
-| Battery: Device charge in critical state                                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:charge.state[controlState.0{#SINGLETON}].last()}={$CHARGE.STATE.CRIT}`                                                                                                    | HIGH     |                                                                                                                         |
-| Load: Device load in warning state                                                       | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0{#SINGLETON}].last()}={$LOAD.STATE.WARN:"lvdWarning"}  or {TEMPLATE_NAME:load.state[loadState.0{#SINGLETON}].last()}={$LOAD.STATE.WARN:"override"}` | WARNING  | <p>**Depends on**:</p><p>- Load: Device load in critical state</p>                                                      |
-| Load: Device load in critical state                                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:load.state[loadState.0{#SINGLETON}].last()}={$LOAD.STATE.CRIT:"lvd"} or {TEMPLATE_NAME:load.state[loadState.0{#SINGLETON}].last()}={$LOAD.STATE.CRIT:"fault"}`            | HIGH     |                                                                                                                         |
-| Status: Device has been restarted (uptime < 10m)                                         | <p>Uptime is less than 10 minutes</p>                                | `{TEMPLATE_NAME:status.uptime.last()}<10m`                                                                                                                                                | INFO     | <p>Manual close: YES</p>                                                                                                |
-| Status: Failed to fetch data (or no data for 5m)                                         | <p>Zabbix has not received data for items for the last 5 minutes</p> | `{TEMPLATE_NAME:status.uptime.nodata(5m)}=1`                                                                                                                                              | WARNING  | <p>Manual close: YES</p>                                                                                                |
-| Status: Device has "externalShort" faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"externalShort","like")}=2`                                                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "overcurrent" faults flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"overcurrent","like")}=2`                                                                                                                | HIGH     |                                                                                                                         |
-| Status: Device has "mosfetSShorted" faults flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"mosfetSShorted","like")}=2`                                                                                                             | HIGH     |                                                                                                                         |
-| Status: Device has "softwareFault" faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"softwareFault","like")}=2`                                                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "highVoltageDisconnect" faults flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"highVoltageDisconnect","like")}=2`                                                                                                      | HIGH     |                                                                                                                         |
-| Status: Device has "tristarHot" faults flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"tristarHot","like")}=2`                                                                                                                 | HIGH     |                                                                                                                         |
-| Status: Device has "dipSwitchChange" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"dipSwitchChange","like")}=2`                                                                                                            | HIGH     |                                                                                                                         |
-| Status: Device has "customSettingsEdit" faults flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"customSettingsEdit","like")}=2`                                                                                                         | HIGH     |                                                                                                                         |
-| Status: Device has "reset" faults flag                                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"reset","like")}=2`                                                                                                                      | HIGH     |                                                                                                                         |
-| Status: Device has "systemMiswire" faults flag                                           | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"systemMiswire","like")}=2`                                                                                                              | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" faults flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"rtsShorted","like")}=2`                                                                                                                 | HIGH     |                                                                                                                         |
-| Status: Device has "rtsDisconnected" faults flag                                         | <p>-</p>                                                             | `{TEMPLATE_NAME:status.faults[faults.0].count(#3,"rtsDisconnected","like")}=2`                                                                                                            | HIGH     |                                                                                                                         |
-| Status: Device has "rtsShorted" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsShorted","like")}=2`                                                                                                                 | WARNING  |                                                                                                                         |
-| Status: Device has "rtsDisconnected" alarm flag                                          | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsDisconnected","like")}=2`                                                                                                            | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorOpen" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorOpen","like")}=2`                                                                                                     | WARNING  |                                                                                                                         |
-| Status: Device has "heatsinkTempSensorShorted" alarm flag                                | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"heatsinkTempSensorShorted","like")}=2`                                                                                                  | WARNING  |                                                                                                                         |
-| Status: Device has "tristarHot" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"tristarHot","like")}=2`                                                                                                                 | WARNING  |                                                                                                                         |
-| Status: Device has "currentLimit" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentLimit","like")}=2`                                                                                                               | WARNING  |                                                                                                                         |
-| Status: Device has "currentOffset" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"currentOffset","like")}=2`                                                                                                              | WARNING  |                                                                                                                         |
-| Status: Device has "batterySense" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySense","like")}=2`                                                                                                               | WARNING  |                                                                                                                         |
-| Status: Device has "batterySenseDisconnected" alarm flag                                 | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"batterySenseDisconnected","like")}=2`                                                                                                   | WARNING  |                                                                                                                         |
-| Status: Device has "uncalibrated" alarm flag                                             | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"uncalibrated","like")}=2`                                                                                                               | WARNING  |                                                                                                                         |
-| Status: Device has "rtsMiswire" alarm flag                                               | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"rtsMiswire","like")}=2`                                                                                                                 | WARNING  |                                                                                                                         |
-| Status: Device has "highVoltageDisconnect" alarm flag                                    | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"highVoltageDisconnect","like")}=2`                                                                                                      | WARNING  |                                                                                                                         |
-| Status: Device has "diversionLoadNearMax" alarm flag                                     | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"diversionLoadNearMax","like")}=2`                                                                                                       | WARNING  |                                                                                                                         |
-| Status: Device has "systemMiswire" alarm flag                                            | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"systemMiswire","like")}=2`                                                                                                              | WARNING  |                                                                                                                         |
-| Status: Device has "mosfetSOpen" alarm flag                                              | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"mosfetSOpen","like")}=2`                                                                                                                | WARNING  |                                                                                                                         |
-| Status: Device has "p12VoltageReferenceOff" alarm flag                                   | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"p12VoltageReferenceOff","like")}=2`                                                                                                     | WARNING  |                                                                                                                         |
-| Status: Device has "loadDisconnectState" alarm flag                                      | <p>-</p>                                                             | `{TEMPLATE_NAME:status.alarms[alarms.0].count(#3,"loadDisconnectState","like")}=2`                                                                                                        | WARNING  |                                                                                                                         |
-| Temperature: Low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.WARN}`                                                                                                     | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)</p> |
-| Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].max(5m)}<{$BATTERY.TEMP.MIN.CRIT}`                                                                                                     | HIGH     |                                                                                                                         |
-| Temperature: High battery temperature (over {$BATTERY.TEMP.MAX.WARN}C for 5m)            | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.WARN}`                                                                                                     | WARNING  | <p>**Depends on**:</p><p>- Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)</p> |
-| Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m) | <p>-</p>                                                             | `{TEMPLATE_NAME:temp.battery[batteryTemperature.0].min(5m)}>{$BATTERY.TEMP.MAX.CRIT}`                                                                                                     | HIGH     |                                                                                                                         |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
diff --git a/templates/net/netgear_snmp/README.md b/templates/net/netgear_snmp/README.md
index 2464f839235..37e01682ee3 100644
--- a/templates/net/netgear_snmp/README.md
+++ b/templates/net/netgear_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://kb.netgear.com/24352/MIBs-for-Smart-switches
 
 This template was tested on:
@@ -20,62 +20,62 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                        | Description | Default |
-|-----------------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}            | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS:"failed"} | <p>-</p>    | `2`     |
-| {$MEMORY.UTIL.MAX}          | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS:"failed"} | <p>-</p>    | `2`     |
-| {$TEMP_CRIT_LOW}            | <p>-</p>    | `5`     |
-| {$TEMP_CRIT_STATUS}         | <p>-</p>    | `3`     |
-| {$TEMP_CRIT}                | <p>-</p>    | `60`    |
-| {$TEMP_WARN_STATUS}         | <p>-</p>    | `2`     |
-| {$TEMP_WARN}                | <p>-</p>    | `50`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS:"failed"} |<p>-</p> |`2` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS:"failed"} |<p>-</p> |`2` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT_STATUS} |<p>-</p> |`3` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN_STATUS} |<p>-</p> |`2` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
-| Name            |
-|-----------------|
-| Generic SNMP    |
-| Interfaces SNMP |
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name                  | Description                                                             | Type | Key and additional info |
-|-----------------------|-------------------------------------------------------------------------|------|-------------------------|
-| Temperature Discovery | <p>FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsTable</p>    | SNMP | temp.discovery          |
-| FAN Discovery         | <p>FASTPATH-BOXSERVICES-PRIVATE-MIB::1.3.6.1.4.1.4526.10.43.1.6.1.1</p> | SNMP | fan.discovery           |
-| PSU Discovery         | <p>FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesPowSupplyIndex</p>      | SNMP | psu.discovery           |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature Discovery |<p>FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorsTable</p> |SNMP |temp.discovery |
+|FAN Discovery |<p>FASTPATH-BOXSERVICES-PRIVATE-MIB::1.3.6.1.4.1.4526.10.43.1.6.1.1</p> |SNMP |fan.discovery |
+|PSU Discovery |<p>FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesPowSupplyIndex</p> |SNMP |psu.discovery |
 
 ## Items collected
 
-| Group        | Name                               | Description                                                                                 | Type       | Key and additional info                                                                                                                                                                                                                                   |
-|--------------|------------------------------------|---------------------------------------------------------------------------------------------|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU          | CPU utilization                    | <p>MIB: FASTPATH-SWITCHING-MIB</p><p>CPU utilization in %</p>                               | SNMP       | system.cpu.util[agentSwitchCpuProcessTotalUtilization.0]<p>**Preprocessing**:</p><p>- REGEX: `60 Secs \( ([0-9\.]+)%\).+300 Secs \1`</p>                                                                                                                  |
-| Fans         | #{#SNMPVALUE}: Fan status          | <p>MIB: FASTPATH-BOXSERVICES-PRIVATE-MIB</p><p>The status of fan</p>                        | SNMP       | sensor.fan.status[boxServicesFanItemState.{#SNMPINDEX}]                                                                                                                                                                                                   |
-| Inventory    | Operating system                   | <p>MIB: FASTPATH-SWITCHING-MIB</p><p>Operating System running on this unit</p>              | SNMP       | system.sw.os[agentInventoryOperatingSystem.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                          |
-| Inventory    | Hardware model name                | <p>MIB: FASTPATH-SWITCHING-MIB</p>                                                          | SNMP       | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                        |
-| Inventory    | Hardware serial number             | <p>MIB: FASTPATH-SWITCHING-MIB</p><p>Serial number of the switch</p>                        | SNMP       | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                 |
-| Memory       | Available memory                   | <p>MIB: FASTPATH-SWITCHING-MIB</p><p>The total memory freed for utilization.</p>            | SNMP       | vm.memory.available[agentSwitchCpuProcessMemFree.0]                                                                                                                                                                                                       |
-| Memory       | Total memory                       | <p>MIB: FASTPATH-SWITCHING-MIB</p><p>The total Memory allocated for the tasks</p>           | SNMP       | vm.memory.total[agentSwitchCpuProcessMemAvailable.0]                                                                                                                                                                                                      |
-| Memory       | Memory utilization                 | <p>Memory utilization in %</p>                                                              | CALCULATED | vm.memory.util[memoryUsedPercentage.0]<p>**Expression**:</p>`(last("vm.memory.total[agentSwitchCpuProcessMemAvailable.0]")-last("vm.memory.available[agentSwitchCpuProcessMemFree.0]"))/last("vm.memory.total[agentSwitchCpuProcessMemAvailable.0]")*100` |
-| Power_supply | #{#SNMPVALUE}: Power supply status | <p>MIB: FASTPATH-BOXSERVICES-PRIVATE-MIB</p><p>The status of power supply</p>               | SNMP       | sensor.psu.status[boxServicesPowSupplyItemState.{#SNMPINDEX}]                                                                                                                                                                                             |
-| Temperature  | #{#SNMPVALUE}: Temperature         | <p>MIB: FASTPATH-BOXSERVICES-PRIVATE-MIB</p><p>The temperature value reported by sensor</p> | SNMP       | sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}]                                                                                                                                                                                          |
-| Temperature  | #{#SNMPVALUE}: Temperature status  | <p>MIB: FASTPATH-BOXSERVICES-PRIVATE-MIB</p><p>The state of temperature sensor</p>          | SNMP       | sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}]                                                                                                                                                                                               |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: FASTPATH-SWITCHING-MIB</p><p>CPU utilization in %</p> |SNMP |system.cpu.util[agentSwitchCpuProcessTotalUtilization.0]<p>**Preprocessing**:</p><p>- REGEX: `60 Secs \( ([0-9\.]+)%\).+300 Secs \1`</p> |
+|Fans |#{#SNMPVALUE}: Fan status |<p>MIB: FASTPATH-BOXSERVICES-PRIVATE-MIB</p><p>The status of fan</p> |SNMP |sensor.fan.status[boxServicesFanItemState.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: FASTPATH-SWITCHING-MIB</p><p>Operating System running on this unit</p> |SNMP |system.sw.os[agentInventoryOperatingSystem.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>MIB: FASTPATH-SWITCHING-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: FASTPATH-SWITCHING-MIB</p><p>Serial number of the switch</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Available memory |<p>MIB: FASTPATH-SWITCHING-MIB</p><p>The total memory freed for utilization.</p> |SNMP |vm.memory.available[agentSwitchCpuProcessMemFree.0] |
+|Memory |Total memory |<p>MIB: FASTPATH-SWITCHING-MIB</p><p>The total Memory allocated for the tasks</p> |SNMP |vm.memory.total[agentSwitchCpuProcessMemAvailable.0] |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.0]<p>**Expression**:</p>`(last(//vm.memory.total[agentSwitchCpuProcessMemAvailable.0])-last(//vm.memory.available[agentSwitchCpuProcessMemFree.0]))/last(//vm.memory.total[agentSwitchCpuProcessMemAvailable.0])*100` |
+|Power_supply |#{#SNMPVALUE}: Power supply status |<p>MIB: FASTPATH-BOXSERVICES-PRIVATE-MIB</p><p>The status of power supply</p> |SNMP |sensor.psu.status[boxServicesPowSupplyItemState.{#SNMPINDEX}] |
+|Temperature |#{#SNMPVALUE}: Temperature |<p>MIB: FASTPATH-BOXSERVICES-PRIVATE-MIB</p><p>The temperature value reported by sensor</p> |SNMP |sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}] |
+|Temperature |#{#SNMPVALUE}: Temperature status |<p>MIB: FASTPATH-BOXSERVICES-PRIVATE-MIB</p><p>The state of temperature sensor</p> |SNMP |sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                     | Description                                                                                                               | Expression                                                                                                                                                                                                                                                                                                                                                          | Severity | Dependencies and additional info                                                                        |
-|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------------|
-| 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[agentSwitchCpuProcessTotalUtilization.0].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                                                 | WARNING  |                                                                                                         |
-| #{#SNMPVALUE}: Fan is in critical state                                  | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[boxServicesFanItemState.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"failed"},eq)}=1`                                                                                                                                                                                                                                                | AVERAGE  |                                                                                                         |
-| 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[agentInventoryOperatingSystem.0].diff()}=1 and {TEMPLATE_NAME:system.sw.os[agentInventoryOperatingSystem.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>                                                                                |
-| High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)                    | <p>The system is running out of free memory.</p>                                                                          | `{TEMPLATE_NAME:vm.memory.util[memoryUsedPercentage.0].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                                                                 | AVERAGE  |                                                                                                         |
-| #{#SNMPVALUE}: Power supply is in critical state                         | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[boxServicesPowSupplyItemState.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS:"failed"},eq)}=1`                                                                                                                                                                                                                                          | AVERAGE  |                                                                                                         |
-| #{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""} or {Netgear Fastpath SNMP:sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3` | WARNING  | <p>**Depends on**:</p><p>- #{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| #{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""} or {Netgear Fastpath SNMP:sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3` | HIGH     |                                                                                                         |
-| #{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3`                                                                                                           | AVERAGE  |                                                                                                         |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Netgear Fastpath SNMP/system.cpu.util[agentSwitchCpuProcessTotalUtilization.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|#{#SNMPVALUE}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Netgear Fastpath SNMP/sensor.fan.status[boxServicesFanItemState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"failed\"}")=1` |AVERAGE | |
+|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(/Netgear Fastpath SNMP/system.sw.os[agentInventoryOperatingSystem.0],#1)<>last(/Netgear Fastpath SNMP/system.sw.os[agentInventoryOperatingSystem.0],#2) and length(last(/Netgear Fastpath SNMP/system.sw.os[agentInventoryOperatingSystem.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(/Netgear Fastpath SNMP/system.hw.serialnumber,#1)<>last(/Netgear Fastpath SNMP/system.hw.serialnumber,#2) and length(last(/Netgear Fastpath SNMP/system.hw.serialnumber))>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(/Netgear Fastpath SNMP/vm.memory.util[memoryUsedPercentage.0],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|#{#SNMPVALUE}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Netgear Fastpath SNMP/sensor.psu.status[boxServicesPowSupplyItemState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"failed\"}")=1` |AVERAGE | |
+|#{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Netgear Fastpath SNMP/sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:""} or last(/Netgear Fastpath SNMP/sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}])={$TEMP_WARN_STATUS} `<p>Recovery expression:</p>`max(/Netgear Fastpath SNMP/sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- #{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|#{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Netgear Fastpath SNMP/sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""} or last(/Netgear Fastpath SNMP/sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}])={$TEMP_CRIT_STATUS} `<p>Recovery expression:</p>`max(/Netgear Fastpath SNMP/sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|#{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Netgear Fastpath SNMP/sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Netgear Fastpath SNMP/sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/netgear_snmp/template_net_netgear_snmp.yaml b/templates/net/netgear_snmp/template_net_netgear_snmp.yaml
index d13caa752cd..6ea76e8809b 100644
--- a/templates/net/netgear_snmp/template_net_netgear_snmp.yaml
+++ b/templates/net/netgear_snmp/template_net_netgear_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:03Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:24Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -17,7 +17,7 @@ zabbix_export:
         FASTPATH-SWITCHING-MIB
         FASTPATH-BOXSERVICES-PRIVATE-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/qtech_snmp/README.md b/templates/net/qtech_snmp/README.md
index a00f2ef227c..e81fc31cb37 100644
--- a/templates/net/qtech_snmp/README.md
+++ b/templates/net/qtech_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,62 +15,62 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$FAN_CRIT_STATUS} | <p>-</p>    | `1`     |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
-| {$PSU_CRIT_STATUS} | <p>-</p>    | `1`     |
-| {$TEMP_CRIT_LOW}   | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}       | <p>-</p>    | `75`    |
-| {$TEMP_WARN}       | <p>-</p>    | `65`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$FAN_CRIT_STATUS} |<p>-</p> |`1` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$PSU_CRIT_STATUS} |<p>-</p> |`1` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`75` |
+|{$TEMP_WARN} |<p>-</p> |`65` |
 
 ## Template links
 
-| Name               |
-|--------------------|
-| EtherLike-MIB SNMP |
-| Generic SNMP       |
-| Interfaces SNMP    |
+|Name|
+|----|
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
-| Name          | Description | Type | Key and additional info |
-|---------------|-------------|------|-------------------------|
-| PSU Discovery | <p>-</p>    | SNMP | psu.discovery           |
-| FAN Discovery | <p>-</p>    | SNMP | fan.discovery           |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|PSU Discovery |<p>-</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>-</p> |SNMP |fan.discovery |
 
 ## Items collected
 
-| Group        | Name                              | Description                                                                 | Type       | Key and additional info                                                                                                                            |
-|--------------|-----------------------------------|-----------------------------------------------------------------------------|------------|----------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU          | CPU utilization                   | <p>MIB: QTECH-MIB</p><p>CPU utilization in %</p>                            | SNMP       | system.cpu.util[switchCpuUsage.0]                                                                                                                  |
-| Fans         | {#SNMPINDEX}: Fan status          | <p>MIB: QTECH-MIB</p>                                                       | SNMP       | sensor.fan.status[sysFanStatus.{#SNMPINDEX}]                                                                                                       |
-| Inventory    | Hardware model name               | <p>MIB: ENTITY-MIB</p>                                                      | SNMP       | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                 |
-| Inventory    | Hardware serial number            | <p>MIB: ENTITY-MIB</p>                                                      | SNMP       | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                          |
-| Inventory    | Firmware version                  | <p>MIB: ENTITY-MIB</p>                                                      | SNMP       | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                              |
-| Inventory    | Hardware version(revision)        | <p>MIB: ENTITY-MIB</p>                                                      | SNMP       | system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                               |
-| Inventory    | Operating system                  | <p>MIB: QTECH-MIB</p>                                                       | SNMP       | system.sw.os[sysSoftwareVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                              |
-| Memory       | Used memory                       | <p>MIB: QTECH-MIB</p><p>Used memory in Bytes</p>                            | SNMP       | vm.memory.used[switchMemoryBusy.0]                                                                                                                 |
-| Memory       | Total memory                      | <p>MIB: QTECH-MIB</p><p>Total memory in Bytes</p>                           | SNMP       | vm.memory.total[switchMemorySize.0]                                                                                                                |
-| Memory       | Memory utilization                | <p>Memory utilization in %</p>                                              | CALCULATED | vm.memory.util[vm.memory.util.0]<p>**Expression**:</p>`last("vm.memory.used[switchMemoryBusy.0]")/last("vm.memory.total[switchMemorySize.0]")*100` |
-| Power_supply | {#SNMPINDEX}: Power supply status | <p>MIB: QTECH-MIB</p>                                                       | SNMP       | sensor.psu.status[sysPowerStatus.{#SNMPINDEX}]                                                                                                     |
-| Temperature  | Temperature                       | <p>MIB: QTECH-MIB</p><p>Temperature readings of testpoint: __RESOURCE__</p> | SNMP       | sensor.temp.value[switchTemperature.0]                                                                                                             |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: QTECH-MIB</p><p>CPU utilization in %</p> |SNMP |system.cpu.util[switchCpuUsage.0] |
+|Fans |{#SNMPINDEX}: Fan status |<p>MIB: QTECH-MIB</p> |SNMP |sensor.fan.status[sysFanStatus.{#SNMPINDEX}] |
+|Inventory |Hardware model name |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware version(revision) |<p>MIB: ENTITY-MIB</p> |SNMP |system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: QTECH-MIB</p> |SNMP |system.sw.os[sysSoftwareVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: QTECH-MIB</p><p>Used memory in Bytes</p> |SNMP |vm.memory.used[switchMemoryBusy.0] |
+|Memory |Total memory |<p>MIB: QTECH-MIB</p><p>Total memory in Bytes</p> |SNMP |vm.memory.total[switchMemorySize.0] |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[vm.memory.util.0]<p>**Expression**:</p>`last(//vm.memory.used[switchMemoryBusy.0])/last(//vm.memory.total[switchMemorySize.0])*100` |
+|Power_supply |{#SNMPINDEX}: Power supply status |<p>MIB: QTECH-MIB</p> |SNMP |sensor.psu.status[sysPowerStatus.{#SNMPINDEX}] |
+|Temperature |Temperature |<p>MIB: QTECH-MIB</p><p>Temperature readings of testpoint: __RESOURCE__</p> |SNMP |sensor.temp.value[switchTemperature.0] |
 
 ## Triggers
 
-| Name                                                      | Description                                                                                                               | Expression                                                                                                                                                                                            | Severity | Dependencies and additional info                                                         |
-|-----------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|------------------------------------------------------------------------------------------|
-| 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[switchCpuUsage.0].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                          | WARNING  |                                                                                          |
-| {#SNMPINDEX}: Fan is in critical state                    | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[sysFanStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1`                                                                                                      | AVERAGE  |                                                                                          |
-| 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>                                                                 |
-| 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[sysSoftwareVersion.0].diff()}=1 and {TEMPLATE_NAME:system.sw.os[sysSoftwareVersion.0].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[vm.memory.util.0].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                         | AVERAGE  |                                                                                          |
-| {#SNMPINDEX}: Power supply is in critical state           | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[sysPowerStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1`                                                                                                    | AVERAGE  |                                                                                          |
-| Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[switchTemperature.0].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[switchTemperature.0].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[switchTemperature.0].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[switchTemperature.0].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                          |
-| Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[switchTemperature.0].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[switchTemperature.0].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                          |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/QTech QSW SNMP/system.cpu.util[switchCpuUsage.0],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|{#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/QTech QSW SNMP/sensor.fan.status[sysFanStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/QTech QSW SNMP/system.hw.serialnumber,#1)<>last(/QTech QSW SNMP/system.hw.serialnumber,#2) and length(last(/QTech QSW SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/QTech QSW SNMP/system.hw.firmware,#1)<>last(/QTech QSW SNMP/system.hw.firmware,#2) and length(last(/QTech QSW SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|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(/QTech QSW SNMP/system.sw.os[sysSoftwareVersion.0],#1)<>last(/QTech QSW SNMP/system.sw.os[sysSoftwareVersion.0],#2) and length(last(/QTech QSW SNMP/system.sw.os[sysSoftwareVersion.0]))>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(/QTech QSW SNMP/vm.memory.util[vm.memory.util.0],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|{#SNMPINDEX}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/QTech QSW SNMP/sensor.psu.status[sysPowerStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/qtech_snmp/template_net_qtech_snmp.yaml b/templates/net/qtech_snmp/template_net_qtech_snmp.yaml
index 59626600453..ef25c13599f 100644
--- a/templates/net/qtech_snmp/template_net_qtech_snmp.yaml
+++ b/templates/net/qtech_snmp/template_net_qtech_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:14Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:29Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -17,7 +17,7 @@ zabbix_export:
         QTECH-MIB
         ENTITY-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
diff --git a/templates/net/tplink_snmp/README.md b/templates/net/tplink_snmp/README.md
index 5f6e5d82ce0..fc44868ac00 100644
--- a/templates/net/tplink_snmp/README.md
+++ b/templates/net/tplink_snmp/README.md
@@ -3,10 +3,10 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
-Link to MIBs: https://www.tp-link.com/en/support/download/t2600g-28ts/#MIBs_Files  
-Sample device overview page: https://www.tp-link.com/en/business-networking/managed-switch/t2600g-28ts/#overview  
-Emulation page (web): https://emulator.tp-link.com/T2600G-28TS(UN)_1.0/Index.htm  
+For Zabbix version: 6.0 and higher  
+Link to MIBs: https://www.tp-link.com/en/support/download/t2600g-28ts/#MIBs_Files
+Sample device overview page: https://www.tp-link.com/en/business-networking/managed-switch/t2600g-28ts/#overview
+Emulation page (web): https://emulator.tp-link.com/T2600G-28TS(UN)_1.0/Index.htm
 
 
 This template was tested on:
@@ -23,44 +23,44 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
 
 ## Template links
 
-| Name                   |
-|------------------------|
-| Generic SNMP           |
-| Interfaces Simple SNMP |
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces Simple SNMP |
 
 ## Discovery rules
 
-| Name             | Description                                                                                                      | Type | Key and additional info |
-|------------------|------------------------------------------------------------------------------------------------------------------|------|-------------------------|
-| CPU Discovery    | <p>Discovering TPLINK-SYSMONITOR-MIB::tpSysMonitorCpuTable, displays the CPU utilization of all UNITs.</p>       | SNMP | cpu.discovery           |
-| Memory Discovery | <p>Discovering TPLINK-SYSMONITOR-MIB::tpSysMonitorMemoryTable, displays the memory utilization of all UNITs.</p> | SNMP | memory.discovery        |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU Discovery |<p>Discovering TPLINK-SYSMONITOR-MIB::tpSysMonitorCpuTable, displays the CPU utilization of all UNITs.</p> |SNMP |cpu.discovery |
+|Memory Discovery |<p>Discovering TPLINK-SYSMONITOR-MIB::tpSysMonitorMemoryTable, displays the memory utilization of all UNITs.</p> |SNMP |memory.discovery |
 
 ## Items collected
 
-| Group     | Name                              | Description                                                                                                                             | Type | Key and additional info                                                                   |
-|-----------|-----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|------|-------------------------------------------------------------------------------------------|
-| CPU       | #{#SNMPVALUE}: CPU utilization    | <p>MIB: TPLINK-SYSMONITOR-MIB</p><p>Displays the CPU utilization in 1 minute.</p><p>Reference: http://www.tp-link.com/faq-1330.html</p> | SNMP | system.cpu.util[tpSysMonitorCpu1Minute.{#SNMPINDEX}]                                      |
-| Inventory | Hardware model name               | <p>MIB: TPLINK-SYSINFO-MIB</p><p>The hardware version of the product.</p>                                                               | SNMP | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>        |
-| Inventory | Hardware serial number            | <p>MIB: TPLINK-SYSINFO-MIB</p><p>The Serial number of the product.</p>                                                                  | SNMP | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Inventory | Firmware version                  | <p>MIB: TPLINK-SYSINFO-MIB</p><p>The software version of the product.</p>                                                               | SNMP | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>     |
-| Inventory | Hardware version(revision)        | <p>MIB: TPLINK-SYSINFO-MIB</p><p>The hardware version of the product.</p>                                                               | SNMP | system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>      |
-| Memory    | #{#SNMPVALUE}: Memory utilization | <p>MIB: TPLINK-SYSMONITOR-MIB</p><p>Displays the memory utilization.</p><p>Reference: http://www.tp-link.com/faq-1330.html</p>          | SNMP | vm.memory.util[tpSysMonitorMemoryUtilization.{#SNMPINDEX}]                                |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPVALUE}: CPU utilization |<p>MIB: TPLINK-SYSMONITOR-MIB</p><p>Displays the CPU utilization in 1 minute.</p><p>Reference: http://www.tp-link.com/faq-1330.html</p> |SNMP |system.cpu.util[tpSysMonitorCpu1Minute.{#SNMPINDEX}] |
+|Inventory |Hardware model name |<p>MIB: TPLINK-SYSINFO-MIB</p><p>The hardware version of the product.</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: TPLINK-SYSINFO-MIB</p><p>The Serial number of the product.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: TPLINK-SYSINFO-MIB</p><p>The software version of the product.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware version(revision) |<p>MIB: TPLINK-SYSINFO-MIB</p><p>The hardware version of the product.</p> |SNMP |system.hw.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |#{#SNMPVALUE}: Memory utilization |<p>MIB: TPLINK-SYSMONITOR-MIB</p><p>Displays the memory utilization.</p><p>Reference: http://www.tp-link.com/faq-1330.html</p> |SNMP |vm.memory.util[tpSysMonitorMemoryUtilization.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                 | Description                                                              | Expression                                                                                              | Severity | Dependencies and additional info |
-|----------------------------------------------------------------------|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| #{#SNMPVALUE}: 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[tpSysMonitorCpu1Minute.{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`         | WARNING  |                                  |
-| 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>         |
-| #{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) | <p>The system is running out of free memory.</p>                         | `{TEMPLATE_NAME:vm.memory.util[tpSysMonitorMemoryUtilization.{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}` | AVERAGE  |                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPVALUE}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/TP-LINK SNMP/system.cpu.util[tpSysMonitorCpu1Minute.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/TP-LINK SNMP/system.hw.serialnumber,#1)<>last(/TP-LINK SNMP/system.hw.serialnumber,#2) and length(last(/TP-LINK SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/TP-LINK SNMP/system.hw.firmware,#1)<>last(/TP-LINK SNMP/system.hw.firmware,#2) and length(last(/TP-LINK SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|#{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/TP-LINK SNMP/vm.memory.util[tpSysMonitorMemoryUtilization.{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/tplink_snmp/template_net_tplink_snmp.yaml b/templates/net/tplink_snmp/template_net_tplink_snmp.yaml
index 299a82f3fdb..be48a5dee9b 100644
--- a/templates/net/tplink_snmp/template_net_tplink_snmp.yaml
+++ b/templates/net/tplink_snmp/template_net_tplink_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:09Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:41Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
           Version: Prior to version V2_170323
           Device: T2600G-28TS 2.0
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/ubiquiti_airos_snmp/README.md b/templates/net/ubiquiti_airos_snmp/README.md
index 180ed47f2d1..560a3e8a140 100644
--- a/templates/net/ubiquiti_airos_snmp/README.md
+++ b/templates/net/ubiquiti_airos_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,41 +15,41 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name               | Description | Default |
-|--------------------|-------------|---------|
-| {$CPU.UTIL.CRIT}   | <p>-</p>    | `90`    |
-| {$MEMORY.UTIL.MAX} | <p>-</p>    | `90`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
 
 ## Template links
 
-| Name                   |
-|------------------------|
-| Generic SNMP           |
-| Interfaces Simple SNMP |
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces Simple SNMP |
 
 ## Discovery rules
 
 
 ## Items collected
 
-| Group     | Name                | Description                                                                                                                                                   | Type       | Key and additional info                                                                                                                                                                                                                                   |
-|-----------|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU       | CPU utilization     | <p>MIB: FROGFOOT-RESOURCES-MIB</p><p>5 minute load average of processor load.</p>                                                                             | SNMP       | system.cpu.util[loadValue.2]                                                                                                                                                                                                                              |
-| Inventory | Hardware model name | <p>MIB: IEEE802dot11-MIB</p><p>A printable string used to identify the manufacturer's product name of the resource. Maximum string length is 128 octets.</p>  | SNMP       | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                        |
-| Inventory | Firmware version    | <p>MIB: IEEE802dot11-MIB</p><p>Printable string used to identify the manufacturer's product version of the resource. Maximum string length is 128 octets.</p> | SNMP       | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                                                                                                     |
-| Memory    | Free memory         | <p>MIB: FROGFOOT-RESOURCES-MIB</p>                                                                                                                            | SNMP       | vm.memory.free[memFree.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                             |
-| Memory    | Total memory        | <p>MIB: FROGFOOT-RESOURCES-MIB</p><p>Total memory in Bytes</p>                                                                                                | SNMP       | vm.memory.total[memTotal.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                           |
-| Memory    | Memory (buffers)    | <p>MIB: FROGFOOT-RESOURCES-MIB</p><p>Memory used by kernel buffers (Buffers in /proc/meminfo)</p>                                                             | SNMP       | vm.memory.buffers[memBuffer.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                        |
-| Memory    | Memory (cached)     | <p>MIB: FROGFOOT-RESOURCES-MIB</p><p>Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)</p>                                           | SNMP       | vm.memory.cached[memCache.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                          |
-| Memory    | Memory utilization  | <p>Memory utilization in %</p>                                                                                                                                | CALCULATED | vm.memory.util[memoryUsedPercentage]<p>**Expression**:</p>`(last("vm.memory.total[memTotal.0]")-(last("vm.memory.free[memFree.0]")+last("vm.memory.buffers[memBuffer.0]")+last("vm.memory.cached[memCache.0]")))/last("vm.memory.total[memTotal.0]")*100` |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |CPU utilization |<p>MIB: FROGFOOT-RESOURCES-MIB</p><p>5 minute load average of processor load.</p> |SNMP |system.cpu.util[loadValue.2] |
+|Inventory |Hardware model name |<p>MIB: IEEE802dot11-MIB</p><p>A printable string used to identify the manufacturer's product name of the resource. Maximum string length is 128 octets.</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: IEEE802dot11-MIB</p><p>Printable string used to identify the manufacturer's product version of the resource. Maximum string length is 128 octets.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Free memory |<p>MIB: FROGFOOT-RESOURCES-MIB</p> |SNMP |vm.memory.free[memFree.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: FROGFOOT-RESOURCES-MIB</p><p>Total memory in Bytes</p> |SNMP |vm.memory.total[memTotal.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory (buffers) |<p>MIB: FROGFOOT-RESOURCES-MIB</p><p>Memory used by kernel buffers (Buffers in /proc/meminfo)</p> |SNMP |vm.memory.buffers[memBuffer.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory (cached) |<p>MIB: FROGFOOT-RESOURCES-MIB</p><p>Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)</p> |SNMP |vm.memory.cached[memCache.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage]<p>**Expression**:</p>`(last(//vm.memory.total[memTotal.0])-(last(//vm.memory.free[memFree.0])+last(//vm.memory.buffers[memBuffer.0])+last(//vm.memory.cached[memCache.0])))/last(//vm.memory.total[memTotal.0])*100` |
 
 ## Triggers
 
-| Name                                                  | Description                                                              | Expression                                                                                      | Severity | Dependencies and additional info |
-|-------------------------------------------------------|--------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| 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[loadValue.2].min(5m)}>{$CPU.UTIL.CRIT}`                         | WARNING  |                                  |
-| 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].min(5m)}>{$MEMORY.UTIL.MAX}`               | AVERAGE  |                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Ubiquiti AirOS SNMP/system.cpu.util[loadValue.2],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/Ubiquiti AirOS SNMP/system.hw.firmware,#1)<>last(/Ubiquiti AirOS SNMP/system.hw.firmware,#2) and length(last(/Ubiquiti AirOS 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(/Ubiquiti AirOS SNMP/vm.memory.util[memoryUsedPercentage],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml b/templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml
index 8855e7997e7..06b4d14a9ac 100644
--- a/templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml
+++ b/templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:13Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:46Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,7 +35,7 @@ zabbix_export:
           Version: all above
           Device: NanoStation, UAP-LR
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/velocloud_http/README.md b/templates/net/velocloud_http/README.md
index c54090e1eaf..0257a9013c3 100644
--- a/templates/net/velocloud_http/README.md
+++ b/templates/net/velocloud_http/README.md
@@ -49,9 +49,9 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Edges metrics discovery |<p>Metrics for edges statistics.</p> |DEPENDENT |velocloud.edges.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.edges`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- A: {#NAME} NOT_MATCHES_REGEX `{$VELOCLOUD.LLD.EDGES.FILTER.NOT_MATCHES}`</p><p>- B: {#NAME} MATCHES_REGEX `{$VELOCLOUD.LLD.EDGES.FILTER.MATCHES}`</p> |
-|Gateways metrics discovery |<p>Metrics for gateways statistics.</p> |DEPENDENT |velocloud.gateways.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.gateways`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- A: {#NAME} NOT_MATCHES_REGEX `{$VELOCLOUD.LLD.GATEWAYS.FILTER.NOT_MATCHES}`</p><p>- B: {#NAME} MATCHES_REGEX `{$VELOCLOUD.LLD.GATEWAYS.FILTER.MATCHES}`</p> |
-|Links metrics discovery |<p>Metrics for links statistics.</p> |DEPENDENT |velocloud.links.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.links`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- A: {#ID} NOT_MATCHES_REGEX `{$VELOCLOUD.LLD.LINKS.FILTER.NOT_MATCHES}`</p><p>- B: {#ID} MATCHES_REGEX `{$VELOCLOUD.LLD.LINKS.FILTER.MATCHES}`</p> |
+|Edges metrics discovery |<p>Metrics for edges statistics.</p> |DEPENDENT |velocloud.edges.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.edges`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- {#NAME} NOT_MATCHES_REGEX `{$VELOCLOUD.LLD.EDGES.FILTER.NOT_MATCHES}`</p><p>- {#NAME} MATCHES_REGEX `{$VELOCLOUD.LLD.EDGES.FILTER.MATCHES}`</p> |
+|Gateways metrics discovery |<p>Metrics for gateways statistics.</p> |DEPENDENT |velocloud.gateways.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.gateways`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- {#NAME} NOT_MATCHES_REGEX `{$VELOCLOUD.LLD.GATEWAYS.FILTER.NOT_MATCHES}`</p><p>- {#NAME} MATCHES_REGEX `{$VELOCLOUD.LLD.GATEWAYS.FILTER.MATCHES}`</p> |
+|Links metrics discovery |<p>Metrics for links statistics.</p> |DEPENDENT |velocloud.links.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.links`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- {#ID} NOT_MATCHES_REGEX `{$VELOCLOUD.LLD.LINKS.FILTER.NOT_MATCHES}`</p><p>- {#ID} MATCHES_REGEX `{$VELOCLOUD.LLD.LINKS.FILTER.MATCHES}`</p> |
 |SDWAN peers metrics discovery |<p>Metrics for SDWAN peers.</p> |DEPENDENT |velocloud.sdwanpeers.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.edgeSDWan`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |SDWAN peers path metrics discovery |<p>Metrics for SDWAN peers path.</p> |DEPENDENT |velocloud.sdwanpath.discovery<p>**Preprocessing**:</p><p>- JSONPATH: `$.edgeSDWanPath`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 
@@ -59,7 +59,7 @@ There are no template links in this template.
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Velocloud |Velocloud: Clear metrics for aggregated data |<p>Clear metrics for aggregated data without errors.</p> |DEPENDENT |velocloud.get.clear_metrics<p>**Preprocessing**:</p><p>- CHECK_JSON_ERROR: `$.error`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Velocloud |Velocloud: Clear data |<p>Clear metrics for data without errors.</p> |DEPENDENT |velocloud.get.clear_metrics<p>**Preprocessing**:</p><p>- CHECK_JSON_ERROR: `$.error`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
 |Velocloud |Velocloud: Orchestrator API version |<p>Version of VMware SD-WAN Orchestrator API.</p> |DEPENDENT |velocloud.orchestrator.api_version<p>**Preprocessing**:</p><p>- JSONPATH: `$.info.apiVersion`</p> |
 |Velocloud |Velocloud: Orchestrator build |<p>Build of VMware SD-WAN Orchestrator API.</p> |DEPENDENT |velocloud.orchestrator.build<p>**Preprocessing**:</p><p>- JSONPATH: `$.info.build`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
 |Velocloud |Velocloud: Orchestrator version |<p>Version of VMware SD-WAN Orchestrator API.</p> |DEPENDENT |velocloud.orchestrator.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.info.version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
@@ -108,7 +108,7 @@ There are no template links in this template.
 |Velocloud |Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Total packets |<p>Total packets of SDWAN peer path.</p> |DEPENDENT |velocloud.sdwanpath.total_packets[{#NAME}/{#SOURCE}/{#DESTINATION}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.edgeSDWanPath[?(@.source.linkName=='{#NAME}' && @.source.deviceName=='{#SOURCE}' && @.destination.deviceName=='{#DESTINATION}')].metrics.totalPackets.first()`</p> |
 |Velocloud |Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Packet Loss in |<p>Received packet loss of SDWAN peer path.</p> |DEPENDENT |velocloud.sdwanpath.packet_loss_rx[{#NAME}/{#SOURCE}/{#DESTINATION}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.edgeSDWanPath[?(@.source.linkName=='{#NAME}' && @.source.deviceName=='{#SOURCE}' && @.destination.deviceName=='{#DESTINATION}')].metrics.packetLossRx.first()`</p> |
 |Velocloud |Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Packet Loss out |<p>Transmitted packet loss of SDWAN peer path.</p> |DEPENDENT |velocloud.sdwanpath.packet_loss_tx[{#NAME}/{#SOURCE}/{#DESTINATION}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.edgeSDWanPath[?(@.source.linkName=='{#NAME}' && @.source.deviceName=='{#SOURCE}' && @.destination.deviceName=='{#DESTINATION}')].metrics.packetLossTx.first()`</p> |
-|Zabbix_raw_items |Velocloud: Get aggregated data |<p>The JSON with result of Velocloud API requests.</p> |SCRIPT |velocloud.get<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Velocloud: Get data |<p>The JSON with result of Velocloud API requests.</p> |SCRIPT |velocloud.get<p>**Expression**:</p>`The text is too long. Please see the template.` |
 
 ## Triggers
 
@@ -120,10 +120,10 @@ There are no template links in this template.
 |Velocloud: There are errors in aggregate script item |<p>There are errors in aggregate script item.</p> |`length(last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.get.error))>0` |WARNING | |
 |Velocloud: System properties have changed |<p>System properties have changed.</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.system.properties,#1)<>last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.system.properties,#2)` |INFO |<p>Manual close: YES</p> |
 |Edge [{#NAME}]: HA state is in "FAILED" state |<p>High availability state is "FAILED".</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.edge.ha_state[{#ID}])=3` |WARNING | |
-|Edge [{#NAME}]: Edge is in "OFFLINE" state |<p>Edge state is "OFFLINE".</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.edge.state[{#ID}])=0` |AVERAGE | |
-|Edge [{#NAME}]: Edge uptime is less than 10m |<p>Edge was restarted.</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.edge.system_uptime[{#ID}])>0 and last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.edge.system_uptime[{#ID}])<600` |WARNING | |
+|Edge [{#NAME}]: Edge is in "OFFLINE" state |<p>Edge state is "OFFLINE".</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.edge.state[{#ID}])=0` |WARNING | |
+|Edge [{#NAME}]: Edge has been restarted (uptime < 10m) |<p>Edge was restarted.</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.edge.system_uptime[{#ID}])>0 and last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.edge.system_uptime[{#ID}])<600` |WARNING | |
 |Gateway [{#NAME}]: The number of connected edges is changed |<p>The number of connected edges is changed.</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.gateway.connected_edges[{#ID}],#1)<>last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.gateway.connected_edges[{#ID}],#2)` |WARNING |<p>Manual close: YES</p> |
-|Gateway [{#NAME}]: Gateway uptime is less that 10m |<p>Gateway was restarted.</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.gateway.system_uptime[{#ID}])>0 and last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.gateway.system_uptime[{#ID}])<600` |WARNING | |
+|Gateway [{#NAME}]: Gateway has been restarted (uptime < 10m) |<p>Gateway was restarted.</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.gateway.system_uptime[{#ID}])>0 and last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.gateway.system_uptime[{#ID}])<600` |WARNING | |
 |Link [{#NAME}]:[{#IP}]: Link state is not "STABLE" |<p>Link state is not "STABLE".</p> |`last(/VMWare SD-WAN VeloCloud by HTTP/velocloud.link.state[{#ID}])<>1` |WARNING | |
 
 ## Feedback
diff --git a/templates/net/velocloud_http/template_net_velocloud_http.yaml b/templates/net/velocloud_http/template_net_velocloud_http.yaml
index 66ff59796b2..2faf2a5666b 100644
--- a/templates/net/velocloud_http/template_net_velocloud_http.yaml
+++ b/templates/net/velocloud_http/template_net_velocloud_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-10-19T19:19:20Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:51Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -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/
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
diff --git a/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/README.md b/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/README.md
index cdccc9a8c95..8e844f846d6 100644
--- a/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 http://origin-eu.zyxel.com/products_services/ies_1248_51v.shtml?t=p
 
 This template was tested on:
@@ -41,8 +41,8 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.aam1212.temp.discovery |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.aam1212.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.aam1212.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- B: {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p> |
-|ADSL interface discovery |<p>-</p> |SNMP |zyxel.aam1212.net.adsl.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- B: {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p> |
+|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.aam1212.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|ADSL interface discovery |<p>-</p> |SNMP |zyxel.aam1212.net.adsl.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -58,19 +58,19 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.aam1212.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.aam1212.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.aam1212.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.aam1212.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.aam1212.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.aam1212.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.aam1212.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.aam1212.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.aam1212.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.aam1212.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Power_supply |ZYXEL AAM1212-51 / IES-612: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.aam1212.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL AAM1212-51 / IES-612: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL AAM1212-51 / IES-612: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.aam1212.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
@@ -81,20 +81,20 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL AAM1212-51 / IES-612: Template does not match hardware |<p>This template is for Zyxel AAM1212-51 / IES-612, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.aam1212.model.last()}<>"AAM1212-51 / IES-612"` |INFO | |
-|ZYXEL AAM1212-51 / IES-612: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.aam1212.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.aam1212.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL AAM1212-51 / IES-612: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.aam1212.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.aam1212.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL AAM1212-51 / IES-612: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`{TEMPLATE_NAME:zyxel.aam1212.net.adsl.atuc.snrmgn[{#SNMPINDEX}].min(5m)}<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
-|ZYXEL AAM1212-51 / IES-612: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`{TEMPLATE_NAME:zyxel.aam1212.net.adsl.atuc.atn[{#SNMPINDEX}].min(5m)}>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
-|ZYXEL AAM1212-51 / IES-612: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`{TEMPLATE_NAME:zyxel.aam1212.net.adsl.atur.snrmgn[{#SNMPINDEX}].min(5m)}<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
-|ZYXEL AAM1212-51 / IES-612: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`{TEMPLATE_NAME:zyxel.aam1212.net.adsl.atur.atn[{#SNMPINDEX}].min(5m)}>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
-|ZYXEL AAM1212-51 / IES-612: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.aam1212.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL AAM1212-51 / IES-612: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL AAM1212-51 / IES-612: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.aam1212.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX} alarm |<p>The slot reported an error.</p> |`{TEMPLATE_NAME:zyxel.aam1212.slot.alarm.str("moduleNoDefect")}=0` |AVERAGE | |
-|ZYXEL AAM1212-51 / IES-612: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.aam1212.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL AAM1212-51 / IES-612: Template does not match hardware |<p>This template is for Zyxel AAM1212-51 / IES-612, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.model)<>"AAM1212-51 / IES-612"` |INFO | |
+|ZYXEL AAM1212-51 / IES-612: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.fwversion,#1)<>last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.fwversion,#2) and length(last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL AAM1212-51 / IES-612: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.serialnumber,#1)<>last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.serialnumber,#2) and length(last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL AAM1212-51 / IES-612: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`min(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.adsl.atuc.snrmgn[{#SNMPINDEX}],5m)<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
+|ZYXEL AAM1212-51 / IES-612: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`min(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.adsl.atuc.atn[{#SNMPINDEX}],5m)>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
+|ZYXEL AAM1212-51 / IES-612: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`min(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.adsl.atur.snrmgn[{#SNMPINDEX}],5m)<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
+|ZYXEL AAM1212-51 / IES-612: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`min(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.net.adsl.atur.atn[{#SNMPINDEX}],5m)>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
+|ZYXEL AAM1212-51 / IES-612: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL AAM1212-51 / IES-612: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL AAM1212-51 IES-612 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL AAM1212-51 / IES-612: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX} alarm |<p>The slot reported an error.</p> |`find(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.slot.alarm,,"like","moduleNoDefect")=0` |AVERAGE | |
+|ZYXEL AAM1212-51 / IES-612: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL AAM1212-51 IES-612 SNMP/zyxel.aam1212.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/template_net_zyxel_aam1212-51_snmp.yaml b/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/template_net_zyxel_aam1212-51_snmp.yaml
index 907885d9bc7..9b8a3b11870 100644
--- a/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/template_net_zyxel_aam1212-51_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/template_net_zyxel_aam1212-51_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:48:21Z'
+  version: '6.0'
+  date: '2021-12-17T06:33:55Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -420,7 +420,7 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Measured difference in the total power transmitted by
-                the peer ATU and the total power received by this ATU. 
+                the peer ATU and the total power received by this ATU.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -453,7 +453,7 @@ zabbix_export:
               units: dB
               description: |
                 MIB: ADSL-LINE-MIB
-                Measured total output power transmitted by this ATU. 
+                Measured total output power transmitted by this ATU.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -480,7 +480,7 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Noise Margin as seen by this ATU with respect to its
-                received signal in tenth dB. 
+                received signal in tenth dB.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -514,8 +514,8 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Measured difference in the total power transmitted by
-                the peer ATU and the total power received by this ATU. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                the peer ATU and the total power received by this ATU.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -547,8 +547,8 @@ zabbix_export:
               units: dB
               description: |
                 MIB: ADSL-LINE-MIB
-                Measured total output power transmitted by this ATU. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                Measured total output power transmitted by this ATU.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -574,8 +574,8 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Noise Margin as seen by this ATU with respect to its
-                received signal in tenth dB. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                received signal in tenth dB.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -1063,7 +1063,7 @@ zabbix_export:
           description: 'Type the minimum signal to noise margin (0-31 dB)'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}'
diff --git a/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/README.md b/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/README.md
index c5d4dcc4568..75dc6cb1e38 100644
--- a/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/emea/en/products/carrier-and-access-switches/access-switches/mes3500-series
 
 This template was tested on:
@@ -48,16 +48,16 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_8pd.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_8pd.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3500_8pd.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_8pd.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_8pd.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.3500_8pd.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_8pd.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_8pd.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 |Memory pool discovery |<p>-</p> |SNMP |zyxel.3500_8pd.memory.discovery |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL ES3500-8PD: CPU utilization |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.3500_8pd.cpuusage |
+|CPU |ZYXEL ES3500-8PD: CPU utilization |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.3500_8pd.cpuusage |
 |Inventory |ZYXEL ES3500-8PD: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.3500_8pd.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL ES3500-8PD: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.3500_8pd.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL ES3500-8PD: Host name |<p>MIB: RFC1213-MIB</p><p>An administratively-assigned name for this</p><p>managed node.  By convention, this is the node's</p><p>fully-qualified domain name.</p> |SNMP |zyxel.3500_8pd.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -72,17 +72,17 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_8pd.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_8pd.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_8pd.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_8pd.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_8pd.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_8pd.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_8pd.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_8pd.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_8pd.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_8pd.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_8pd.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_8pd.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_8pd.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_8pd.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_8pd.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_8pd.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_8pd.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_8pd.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_8pd.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3500_8pd.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_8pd.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3500_8pd.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_8pd.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_8pd.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_8pd.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_8pd.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_8pd.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_8pd.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_8pd.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -100,19 +100,19 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL ES3500-8PD: 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:zyxel.3500_8pd.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL ES3500-8PD: Template does not match hardware |<p>This template is for Zyxel ES3500-8PD, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.model.last()}<>"ES3500-8PD"` |INFO | |
-|ZYXEL ES3500-8PD: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.3500_8pd.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL ES3500-8PD: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.3500_8pd.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL ES3500-8PD: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.memory[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}` |AVERAGE | |
-|ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL ES3500-8PD: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.3500_8pd.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL ES3500-8PD: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL ES3500-8PD: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL ES3500-8PD: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL ES3500-8PD: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL ES3500-8PD: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL ES3500-8PD: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.3500_8pd.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL ES3500-8PD: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL ES3500-8PD: Template does not match hardware |<p>This template is for Zyxel ES3500-8PD, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.model)<>"ES3500-8PD"` |INFO | |
+|ZYXEL ES3500-8PD: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.fwversion,#1)<>last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.fwversion,#2) and length(last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL ES3500-8PD: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.serialnumber,#1)<>last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.serialnumber,#2) and length(last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL ES3500-8PD: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.memory[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL ES3500-8PD: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL ES3500-8PD: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL ES3500-8PD: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL ES3500-8PD: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL ES3500-8PD: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL ES3500-8PD SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL ES3500-8PD: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL ES3500-8PD: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/template_net_zyxel_es3500-8pd_snmp.yaml b/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/template_net_zyxel_es3500-8pd_snmp.yaml
index b66c3f9bbb7..ba4d76a1542 100644
--- a/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/template_net_zyxel_es3500-8pd_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/template_net_zyxel_es3500-8pd_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:49:14Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:00Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -93,7 +93,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-ES3500-8PD-MIB
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -130,7 +130,7 @@ zabbix_export:
                     tmpObj[item["{#SNMPINDEX}"]] = item["{#SNMP.ARRAY}"]
                   });
                   var strOut = 'V' + tmpObj["1.0"] + '.' + tmpObj["2.0"]
-                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_' 
+                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_'
                     + tmpObj["7.0"] + '.' + tmpObj["6.0"] + '.' + tmpObj["5.0"];
                   return strOut;
             -
@@ -388,7 +388,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 91a0a38a0f60464cb97c65f375e8fbb7
@@ -1221,7 +1220,7 @@ zabbix_export:
                   var nameMap = {"1":"MAC", "2":"CPU", "3":"PHY"};
                   var outArr = [];
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]] 
+                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]]
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1286,7 +1285,7 @@ zabbix_export:
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
                   item["{#ZYXEL.VOLT.NOMINAL}"] = "+" + item["{#ZYXEL.VOLT.NOMINAL}"] / 1000 + "V";
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1303,12 +1302,16 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1324,7 +1327,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/README.md b/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/README.md
index e595a0ac2b2..923ca43d4ea 100644
--- a/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/global/en/products/carrier-and-access-switches/access-switches/mgs-3712f
 
 This template was tested on:
@@ -43,13 +43,13 @@ There are no template links in this template.
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.4012f.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.4012f.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.4012f.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.4012f.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.4012f.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL GS-4012F: CPU utilization |<p>MIB: ZYXEL-GS4012F-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.4012f.cpuusage |
+|CPU |ZYXEL GS-4012F: CPU utilization |<p>MIB: ZYXEL-GS4012F-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.4012f.cpuusage |
 |Fans |ZYXEL GS-4012F: Fan #{#SNMPINDEX} |<p>MIB: ZYXEL-GS4012F-MIB</p><p>Current speed in Revolutions Per Minute (RPM) on the fan.</p> |SNMP |zyxel.4012f.fan[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |ZYXEL GS-4012F: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.4012f.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL GS-4012F: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.4012f.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -64,17 +64,17 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4012f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4012f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4012f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.4012f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.4012f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4012f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.4012f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.4012f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.4012f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4012f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.4012f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.4012f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.4012f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4012f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.4012f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.4012f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.4012f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4012f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.4012f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4012f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.4012f.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4012f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.4012f.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4012f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4012f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4012f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4012f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Power_supply |ZYXEL GS-4012F: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-GS4012F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.4012f.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL GS-4012F: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL GS-4012F: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.4012f.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
@@ -84,16 +84,16 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL GS-4012F: 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:zyxel.4012f.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL GS-4012F: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.4012f.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
-|ZYXEL GS-4012F: Template does not match hardware |<p>This template is for Zyxel GS-4012F, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.4012f.model.last()}<>"GS-4012F"` |INFO | |
-|ZYXEL GS-4012F: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.4012f.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.4012f.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL GS-4012F: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.4012f.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.4012f.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL GS-4012F: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.4012f.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.4012f.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.4012f.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL GS-4012F: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.4012f.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL GS-4012F: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL GS-4012F: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.4012f.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL GS-4012F: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.4012f.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL GS-4012F: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL GS-4012F SNMP/zyxel.4012f.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL GS-4012F: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
+|ZYXEL GS-4012F: Template does not match hardware |<p>This template is for Zyxel GS-4012F, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.model)<>"GS-4012F"` |INFO | |
+|ZYXEL GS-4012F: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.fwversion,#1)<>last(/ZYXEL GS-4012F SNMP/zyxel.4012f.fwversion,#2) and length(last(/ZYXEL GS-4012F SNMP/zyxel.4012f.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL GS-4012F: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.serialnumber,#1)<>last(/ZYXEL GS-4012F SNMP/zyxel.4012f.serialnumber,#2) and length(last(/ZYXEL GS-4012F SNMP/zyxel.4012f.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL GS-4012F: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL GS-4012F SNMP/zyxel.4012f.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL GS-4012F SNMP/zyxel.4012f.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL GS-4012F: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL GS-4012F: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL GS-4012F SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL GS-4012F: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL GS-4012F: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL GS-4012F SNMP/zyxel.4012f.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/template_net_zyxel_gs4012f_snmp.yaml b/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/template_net_zyxel_gs4012f_snmp.yaml
index 131af0a6928..fbca99a95fd 100644
--- a/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/template_net_zyxel_gs4012f_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/template_net_zyxel_gs4012f_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:49:52Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:05Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -92,7 +92,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-GS4012F-MIB
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -129,7 +129,7 @@ zabbix_export:
                     tmpObj[item["{#SNMPINDEX}"]] = item["{#SNMP.ARRAY}"]
                   });
                   var strOut = 'V' + tmpObj["1.0"] + '.' + tmpObj["2.0"]
-                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_' 
+                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_'
                     + tmpObj["7.0"] + '.' + tmpObj["6.0"] + '.' + tmpObj["5.0"];
                   return strOut;
             -
@@ -399,7 +399,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 2b87dc4104704d3891ac061aaa81c629
@@ -957,7 +956,7 @@ zabbix_export:
                   var nameMap = {"1":"MAC", "2":"CPU", "3":"PHY"};
                   var outArr = [];
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]] 
+                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]]
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1022,7 +1021,7 @@ zabbix_export:
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
                   item["{#ZYXEL.VOLT.NOMINAL}"] = "+" + item["{#ZYXEL.VOLT.NOMINAL}"] / 1000 + "V";
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1036,12 +1035,16 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/README.md b/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/README.md
index 99d0dc6d9fd..217bb958f5e 100644
--- a/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/global/en/products/msansdslams/central-msans/chassis-msans/ies-5000-series
 
 This template was tested on:
@@ -27,13 +27,13 @@ No specific Zabbix configuration is required.
 |{$SNMP.TIMEOUT} |<p>The time interval for SNMP agent availability trigger expression.</p> |`5m` |
 |{$ZYXEL.ADSL.ATN.MAX} |<p>Type the maximum signal attenuation</p> |`40` |
 |{$ZYXEL.ADSL.SNR.MIN} |<p>Type the minimum signal to noise margin (0-31 dB)</p> |`8` |
-|{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES} |<p>Filter to exclude discovered slots by status.</p> |`1` |
 |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES} |<p>Triggers will be created only for interfaces whose description contains the value of this macro</p> |`CHANGE_IF_NEEDED` |
 |{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES} |<p>Filter by discoverable interface names.</p> |`.*` |
 |{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES} |<p>Filter to exclude discovered interfaces by name.</p> |`CHANGE_IF_NEEDED` |
 |{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES} |<p>Filter of discoverable link types.</p> |`.*` |
 |{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES} |<p>Filter to exclude discovered by link types.</p> |`2` |
 |{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES} |<p>Filter by discoverable slot status.</p> |`.*` |
+|{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES} |<p>Filter to exclude discovered slots by status.</p> |`1` |
 
 ## Template links
 
@@ -43,15 +43,15 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Slot discovery |<p>The table which contains the slot information in a chassis.</p> |SNMP |zyxel.ies500x.slot.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SLOTSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SLOTSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}`</p> |
+|Slot discovery |<p>The table which contains the slot information in a chassis.</p> |SNMP |zyxel.ies500x.slot.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SLOTSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}`</p><p>- {#ZYXEL.SLOTSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}`</p> |
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.ies500x.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.ies500x.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.ies500x.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |CPU discovery |<p>A table that contains CPU utilization information.</p><p>This table is supported by R1.03 and later versions.</p> |SNMP |zyxel.ies500x.cpu.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Memory discovery |<p>A table that contains memory usage information.</p> |SNMP |zyxel.ies500x.memory.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Packet buffer discovery |<p>A table that contains packet buffer usage information.</p> |SNMP |zyxel.ies500x.buffer.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies500x.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- B: {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- E: {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p> |
-|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies500x.net.adsl.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- B: {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- E: {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p> |
+|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies500x.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies500x.net.adsl.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -82,35 +82,35 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies500x.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies500x.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies500x.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies500x.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies500x.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies500x.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies500x.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies500x.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies500x.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.ies500x.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies500x.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.ies500x.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies500x.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies500x.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies500x.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies500x.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.adsl.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies500x.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies500x.net.adsl.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.adsl.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies500x.net.adsl.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies500x.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.adsl.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.adsl.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.adsl.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies500x.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies500x.net.adsl.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.adsl.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies500x.net.adsl.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies500x.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.adsl.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.adsl.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.adsl.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Power_supply |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IES5000-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies500x.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES-500x: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES-500x: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.ies500x.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
@@ -120,28 +120,28 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} high CPU utilization (over {#ZYXEL.CPU.THRESH.HIGH}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`{TEMPLATE_NAME:zyxel.ies500x.cpu[{#SNMPINDEX}].min(5m)}>{#ZYXEL.CPU.THRESH.HIGH}` |WARNING | |
-|ZYXEL IES-500x: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.ies500x.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW} or {TEMPLATE_NAME:zyxel.ies500x.fan[{#SNMPINDEX}].last()}>{#ZYXEL.FANRPM.THRESH.HIGH}` |AVERAGE | |
-|ZYXEL IES-500x: Template does not match hardware |<p>This template is for Zyxel IES-500x, but connected to {ITEM.VALUE}</p> |`not({TEMPLATE_NAME:zyxel.ies500x.model.last()}="IES-5000" or {TEMPLATE_NAME:zyxel.ies500x.model.last()}="IES-5005")` |INFO | |
-|ZYXEL IES-500x: High memory utilization in Slot {#ZYXEL.SLOT.ID} pool (>{#ZYXEL.MEMORYHIGHTHRESH}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:zyxel.ies500x.memory[{#SNMPINDEX}].min(5m)}>{#ZYXEL.MEMORYHIGHTHRESH}` |AVERAGE | |
-|ZYXEL IES-500x: High Packet buffer utilization in Slot {#ZYXEL.SLOT.ID} (>{#ZYXEL.BUFFERHIGHTHRESH}% for 5m) |<p>The system is running out of free buffer.</p> |`{TEMPLATE_NAME:zyxel.ies500x.buffer[{#SNMPINDEX}].min(5m)}>{#ZYXEL.BUFFERHIGHTHRESH}` |AVERAGE | |
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies500x.slot.fw.ver[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies500x.slot.fw.ver[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Driver has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies500x.slot.dv.ver[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies500x.slot.dv.ver[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: DSL modem code has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies500x.slot.cv.ver[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies500x.slot.cv.ver[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} alarm |<p>The slot reported an error.</p> |`{TEMPLATE_NAME:zyxel.ies500x.slot.alarm[{#SNMPINDEX}].str("moduleNoDefect")}=0` |AVERAGE | |
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Hardware version has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies500x.slot.hw.ver[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies500x.slot.hw.ver[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} has been replaced (new serial number received) |<p>Slot {#ZYXEL.SLOT.ID} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies500x.slot.serial[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies500x.slot.serial[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.ies500x.slot.uptime[{#SNMPINDEX}].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`{TEMPLATE_NAME:zyxel.ies500x.net.adsl.atuc.snrmgn[{#SNMPINDEX}].min(5m)}<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
-|ZYXEL IES-500x: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`{TEMPLATE_NAME:zyxel.ies500x.net.adsl.atuc.atn[{#SNMPINDEX}].min(5m)}>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
-|ZYXEL IES-500x: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`{TEMPLATE_NAME:zyxel.ies500x.net.adsl.atur.snrmgn[{#SNMPINDEX}].min(5m)}<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
-|ZYXEL IES-500x: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`{TEMPLATE_NAME:zyxel.ies500x.net.adsl.atur.atn[{#SNMPINDEX}].min(5m)}>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
-|ZYXEL IES-500x: Voltage Slot {#ZYXEL.SLOT.ID} {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.ies500x.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW} or {TEMPLATE_NAME:zyxel.ies500x.volt[{#SNMPINDEX}].last()}>{#ZYXEL.VOLT.THRESH.HIGH}` |AVERAGE | |
-|ZYXEL IES-500x: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL IES-500x: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.ies500x.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-500x: Temperature Slot {#ZYXEL.SLOT.ID} Sensor: {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.ies500x.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH} or {TEMPLATE_NAME:zyxel.ies500x.temp[{#SNMPINDEX}].last()}<{#ZYXEL.TEMP.THRESH.LOW}` |AVERAGE | |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} high CPU utilization (over {#ZYXEL.CPU.THRESH.HIGH}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL IES-500x SNMP/zyxel.ies500x.cpu[{#SNMPINDEX}],5m)>{#ZYXEL.CPU.THRESH.HIGH}` |WARNING | |
+|ZYXEL IES-500x: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW} or last(/ZYXEL IES-500x SNMP/zyxel.ies500x.fan[{#SNMPINDEX}])>{#ZYXEL.FANRPM.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL IES-500x: Template does not match hardware |<p>This template is for Zyxel IES-500x, but connected to {ITEM.VALUE}</p> |`not(last(/ZYXEL IES-500x SNMP/zyxel.ies500x.model)="IES-5000" or last(/ZYXEL IES-500x SNMP/zyxel.ies500x.model)="IES-5005")` |INFO | |
+|ZYXEL IES-500x: High memory utilization in Slot {#ZYXEL.SLOT.ID} pool (>{#ZYXEL.MEMORYHIGHTHRESH}% for 5m) |<p>The system is running out of free memory.</p> |`min(/ZYXEL IES-500x SNMP/zyxel.ies500x.memory[{#SNMPINDEX}],5m)>{#ZYXEL.MEMORYHIGHTHRESH}` |AVERAGE | |
+|ZYXEL IES-500x: High Packet buffer utilization in Slot {#ZYXEL.SLOT.ID} (>{#ZYXEL.BUFFERHIGHTHRESH}% for 5m) |<p>The system is running out of free buffer.</p> |`min(/ZYXEL IES-500x SNMP/zyxel.ies500x.buffer[{#SNMPINDEX}],5m)>{#ZYXEL.BUFFERHIGHTHRESH}` |AVERAGE | |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.fw.ver[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.fw.ver[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.fw.ver[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Driver has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.dv.ver[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.dv.ver[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.dv.ver[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: DSL modem code has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.cv.ver[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.cv.ver[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.cv.ver[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} alarm |<p>The slot reported an error.</p> |`find(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.alarm[{#SNMPINDEX}],,"like","moduleNoDefect")=0` |AVERAGE | |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Hardware version has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.hw.ver[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.hw.ver[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.hw.ver[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} has been replaced (new serial number received) |<p>Slot {#ZYXEL.SLOT.ID} serial number has changed. Ack to close</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.serial[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.serial[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.serial[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.slot.uptime[{#SNMPINDEX}])<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`min(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.adsl.atuc.snrmgn[{#SNMPINDEX}],5m)<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
+|ZYXEL IES-500x: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`min(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.adsl.atuc.atn[{#SNMPINDEX}],5m)>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
+|ZYXEL IES-500x: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`min(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.adsl.atur.snrmgn[{#SNMPINDEX}],5m)<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
+|ZYXEL IES-500x: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`min(/ZYXEL IES-500x SNMP/zyxel.ies500x.net.adsl.atur.atn[{#SNMPINDEX}],5m)>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
+|ZYXEL IES-500x: Voltage Slot {#ZYXEL.SLOT.ID} {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW} or last(/ZYXEL IES-500x SNMP/zyxel.ies500x.volt[{#SNMPINDEX}])>{#ZYXEL.VOLT.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL IES-500x: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL IES-500x SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL IES-500x: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-500x: Temperature Slot {#ZYXEL.SLOT.ID} Sensor: {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL IES-500x SNMP/zyxel.ies500x.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH} or last(/ZYXEL IES-500x SNMP/zyxel.ies500x.temp[{#SNMPINDEX}])<{#ZYXEL.TEMP.THRESH.LOW}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/template_net_zyxel_ies-500x_snmp.yaml b/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/template_net_zyxel_ies-500x_snmp.yaml
index 08d3764d070..7d44e57e5b0 100644
--- a/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/template_net_zyxel_ies-500x_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/template_net_zyxel_ies-500x_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:50:06Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:10Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -521,7 +521,7 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Measured difference in the total power transmitted by
-                the peer ATU and the total power received by this ATU. 
+                the peer ATU and the total power received by this ATU.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -554,7 +554,7 @@ zabbix_export:
               units: dB
               description: |
                 MIB: ADSL-LINE-MIB
-                Measured total output power transmitted by this ATU. 
+                Measured total output power transmitted by this ATU.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -581,7 +581,7 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Noise Margin as seen by this ATU with respect to its
-                received signal in tenth dB. 
+                received signal in tenth dB.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -615,8 +615,8 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Measured difference in the total power transmitted by
-                the peer ATU and the total power received by this ATU. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                the peer ATU and the total power received by this ATU.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -648,8 +648,8 @@ zabbix_export:
               units: dB
               description: |
                 MIB: ADSL-LINE-MIB
-                Measured total output power transmitted by this ATU. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                Measured total output power transmitted by this ATU.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -675,8 +675,8 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Noise Margin as seen by this ATU with respect to its
-                received signal in tenth dB. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                received signal in tenth dB.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -2059,12 +2059,8 @@ zabbix_export:
           value: '8'
           description: 'Type the minimum signal to noise margin (0-31 dB)'
         -
-          macro: '{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}'
-          value: '1'
-          description: 'Filter to exclude discovered slots by status.'
-        -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}'
@@ -2086,6 +2082,10 @@ zabbix_export:
           macro: '{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}'
           value: '.*'
           description: 'Filter by discoverable slot status.'
+        -
+          macro: '{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}'
+          value: '1'
+          description: 'Filter to exclude discovered slots by status.'
       valuemaps:
         -
           uuid: 10dd3d9951014a38bc3517df54381a66
diff --git a/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/README.md b/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/README.md
index bbd5dbff56a..05632931027 100644
--- a/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/global/en/products/msansdslams/central-msans/chassis-msans/ies-6000-series
 
 This template was tested on:
@@ -27,13 +27,13 @@ No specific Zabbix configuration is required.
 |{$SNMP.TIMEOUT} |<p>The time interval for SNMP agent availability trigger expression.</p> |`5m` |
 |{$ZYXEL.ADSL.ATN.MAX} |<p>Type the maximum signal attenuation</p> |`40` |
 |{$ZYXEL.ADSL.SNR.MIN} |<p>Type the minimum signal to noise margin (0-31 dB)</p> |`8` |
-|{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES} |<p>Filter to exclude discovered slots by status.</p> |`1` |
 |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES} |<p>Triggers will be created only for interfaces whose description contains the value of this macro</p> |`CHANGE_IF_NEEDED` |
 |{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES} |<p>Filter by discoverable interface names.</p> |`.*` |
 |{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES} |<p>Filter to exclude discovered interfaces by name.</p> |`CHANGE_IF_NEEDED` |
 |{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES} |<p>Filter of discoverable link types.</p> |`.*` |
 |{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES} |<p>Filter to exclude discovered by link types.</p> |`2` |
 |{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES} |<p>Filter by discoverable slot status.</p> |`.*` |
+|{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES} |<p>Filter to exclude discovered slots by status.</p> |`1` |
 
 ## Template links
 
@@ -43,15 +43,15 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Slot discovery |<p>The table which contains the slot information in a chassis.</p> |SNMP |zyxel.ies6000.slot.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SLOTSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SLOTSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}`</p> |
+|Slot discovery |<p>The table which contains the slot information in a chassis.</p> |SNMP |zyxel.ies6000.slot.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SLOTSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}`</p><p>- {#ZYXEL.SLOTSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}`</p> |
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.ies6000.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.ies6000.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.ies6000.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |CPU discovery |<p>A table that contains CPU utilization information.</p><p>This table is supported by R1.03 and later versions.</p> |SNMP |zyxel.ies6000.cpu.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Memory discovery |<p>A table that contains memory usage information.</p> |SNMP |zyxel.ies6000.memory.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Packet buffer discovery |<p>A table that contains packet buffer usage information.</p> |SNMP |zyxel.ies6000.buffer.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies6000.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- B: {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- E: {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p> |
-|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies6000.net.adsl.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- B: {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- E: {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p> |
+|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies6000.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies6000.net.adsl.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -82,35 +82,35 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies6000.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies6000.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies6000.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies6000.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies6000.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies6000.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies6000.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies6000.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies6000.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.ies6000.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies6000.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.ies6000.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies6000.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies6000.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies6000.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies6000.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.adsl.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies6000.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies6000.net.adsl.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.adsl.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies6000.net.adsl.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies6000.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.adsl.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.adsl.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.adsl.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies6000.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies6000.net.adsl.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.adsl.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies6000.net.adsl.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies6000.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.adsl.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.adsl.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.adsl.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Power_supply |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IES5000-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies6000.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES-6000: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES-6000: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.ies6000.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
@@ -120,28 +120,28 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} high CPU utilization (over {#ZYXEL.CPU.THRESH.HIGH}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`{TEMPLATE_NAME:zyxel.ies6000.cpu[{#SNMPINDEX}].min(5m)}>{#ZYXEL.CPU.THRESH.HIGH}` |WARNING | |
-|ZYXEL IES-6000: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.ies6000.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW} or {TEMPLATE_NAME:zyxel.ies6000.fan[{#SNMPINDEX}].last()}>{#ZYXEL.FANRPM.THRESH.HIGH}` |AVERAGE | |
-|ZYXEL IES-6000: Template does not match hardware |<p>This template is for Zyxel IES-6000, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.ies6000.model.last()}<>"IES-6000"` |INFO | |
-|ZYXEL IES-6000: High memory utilization in Slot {#ZYXEL.SLOT.ID} pool (>{#ZYXEL.MEMORYHIGHTHRESH}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:zyxel.ies6000.memory[{#SNMPINDEX}].min(5m)}>{#ZYXEL.MEMORYHIGHTHRESH}` |AVERAGE | |
-|ZYXEL IES-6000: High Packet buffer utilization in Slot {#ZYXEL.SLOT.ID} (>{#ZYXEL.BUFFERHIGHTHRESH}% for 5m) |<p>The system is running out of free buffer.</p> |`{TEMPLATE_NAME:zyxel.ies6000.buffer[{#SNMPINDEX}].min(5m)}>{#ZYXEL.BUFFERHIGHTHRESH}` |AVERAGE | |
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies6000.slot.fw.ver[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies6000.slot.fw.ver[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Driver has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies6000.slot.dv.ver[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies6000.slot.dv.ver[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: DSL modem code has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies6000.slot.cv.ver[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies6000.slot.cv.ver[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} alarm |<p>The slot reported an error.</p> |`{TEMPLATE_NAME:zyxel.ies6000.slot.alarm[{#SNMPINDEX}].str("moduleNoDefect")}=0` |AVERAGE | |
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Hardware version has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies6000.slot.hw.ver[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies6000.slot.hw.ver[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} has been replaced (new serial number received) |<p>Slot {#ZYXEL.SLOT.ID} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies6000.slot.serial[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.ies6000.slot.serial[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.ies6000.slot.uptime[{#SNMPINDEX}].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`{TEMPLATE_NAME:zyxel.ies6000.net.adsl.atuc.snrmgn[{#SNMPINDEX}].min(5m)}<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
-|ZYXEL IES-6000: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`{TEMPLATE_NAME:zyxel.ies6000.net.adsl.atuc.atn[{#SNMPINDEX}].min(5m)}>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
-|ZYXEL IES-6000: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`{TEMPLATE_NAME:zyxel.ies6000.net.adsl.atur.snrmgn[{#SNMPINDEX}].min(5m)}<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
-|ZYXEL IES-6000: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`{TEMPLATE_NAME:zyxel.ies6000.net.adsl.atur.atn[{#SNMPINDEX}].min(5m)}>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
-|ZYXEL IES-6000: Voltage Slot {#ZYXEL.SLOT.ID} {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.ies6000.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW} or {TEMPLATE_NAME:zyxel.ies6000.volt[{#SNMPINDEX}].last()}>{#ZYXEL.VOLT.THRESH.HIGH}` |AVERAGE | |
-|ZYXEL IES-6000: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL IES-6000: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.ies6000.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES-6000: Temperature Slot {#ZYXEL.SLOT.ID} Sensor: {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.ies6000.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH} or {TEMPLATE_NAME:zyxel.ies6000.temp[{#SNMPINDEX}].last()}<{#ZYXEL.TEMP.THRESH.LOW}` |AVERAGE | |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} high CPU utilization (over {#ZYXEL.CPU.THRESH.HIGH}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL IES-6000 SNMP/zyxel.ies6000.cpu[{#SNMPINDEX}],5m)>{#ZYXEL.CPU.THRESH.HIGH}` |WARNING | |
+|ZYXEL IES-6000: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW} or last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.fan[{#SNMPINDEX}])>{#ZYXEL.FANRPM.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL IES-6000: Template does not match hardware |<p>This template is for Zyxel IES-6000, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.model)<>"IES-6000"` |INFO | |
+|ZYXEL IES-6000: High memory utilization in Slot {#ZYXEL.SLOT.ID} pool (>{#ZYXEL.MEMORYHIGHTHRESH}% for 5m) |<p>The system is running out of free memory.</p> |`min(/ZYXEL IES-6000 SNMP/zyxel.ies6000.memory[{#SNMPINDEX}],5m)>{#ZYXEL.MEMORYHIGHTHRESH}` |AVERAGE | |
+|ZYXEL IES-6000: High Packet buffer utilization in Slot {#ZYXEL.SLOT.ID} (>{#ZYXEL.BUFFERHIGHTHRESH}% for 5m) |<p>The system is running out of free buffer.</p> |`min(/ZYXEL IES-6000 SNMP/zyxel.ies6000.buffer[{#SNMPINDEX}],5m)>{#ZYXEL.BUFFERHIGHTHRESH}` |AVERAGE | |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.fw.ver[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.fw.ver[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.fw.ver[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Driver has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.dv.ver[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.dv.ver[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.dv.ver[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: DSL modem code has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.cv.ver[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.cv.ver[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.cv.ver[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} alarm |<p>The slot reported an error.</p> |`find(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.alarm[{#SNMPINDEX}],,"like","moduleNoDefect")=0` |AVERAGE | |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Hardware version has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.hw.ver[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.hw.ver[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.hw.ver[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} has been replaced (new serial number received) |<p>Slot {#ZYXEL.SLOT.ID} serial number has changed. Ack to close</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.serial[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.serial[{#SNMPINDEX}],#2) and length(last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.serial[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.slot.uptime[{#SNMPINDEX}])<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}])=2 and (last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}],#2))=1`<p>Recovery expression:</p>`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`min(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.adsl.atuc.snrmgn[{#SNMPINDEX}],5m)<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
+|ZYXEL IES-6000: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`min(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.adsl.atuc.atn[{#SNMPINDEX}],5m)>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
+|ZYXEL IES-6000: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`min(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.adsl.atur.snrmgn[{#SNMPINDEX}],5m)<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
+|ZYXEL IES-6000: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`min(/ZYXEL IES-6000 SNMP/zyxel.ies6000.net.adsl.atur.atn[{#SNMPINDEX}],5m)>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
+|ZYXEL IES-6000: Voltage Slot {#ZYXEL.SLOT.ID} {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW} or last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.volt[{#SNMPINDEX}])>{#ZYXEL.VOLT.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL IES-6000: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL IES-6000 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL IES-6000: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES-6000: Temperature Slot {#ZYXEL.SLOT.ID} Sensor: {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH} or last(/ZYXEL IES-6000 SNMP/zyxel.ies6000.temp[{#SNMPINDEX}])<{#ZYXEL.TEMP.THRESH.LOW}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/template_net_zyxel_ies-6000_snmp.yaml b/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/template_net_zyxel_ies-6000_snmp.yaml
index 3c6986c1a17..160c76fb9f9 100644
--- a/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/template_net_zyxel_ies-6000_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/template_net_zyxel_ies-6000_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:50:17Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:14Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -521,7 +521,7 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Measured difference in the total power transmitted by
-                the peer ATU and the total power received by this ATU. 
+                the peer ATU and the total power received by this ATU.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -554,7 +554,7 @@ zabbix_export:
               units: dB
               description: |
                 MIB: ADSL-LINE-MIB
-                Measured total output power transmitted by this ATU. 
+                Measured total output power transmitted by this ATU.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -581,7 +581,7 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Noise Margin as seen by this ATU with respect to its
-                received signal in tenth dB. 
+                received signal in tenth dB.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -615,8 +615,8 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Measured difference in the total power transmitted by
-                the peer ATU and the total power received by this ATU. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                the peer ATU and the total power received by this ATU.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -648,8 +648,8 @@ zabbix_export:
               units: dB
               description: |
                 MIB: ADSL-LINE-MIB
-                Measured total output power transmitted by this ATU. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                Measured total output power transmitted by this ATU.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -675,8 +675,8 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Noise Margin as seen by this ATU with respect to its
-                received signal in tenth dB. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                received signal in tenth dB.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -2059,12 +2059,8 @@ zabbix_export:
           value: '8'
           description: 'Type the minimum signal to noise margin (0-31 dB)'
         -
-          macro: '{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}'
-          value: '1'
-          description: 'Filter to exclude discovered slots by status.'
-        -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}'
@@ -2086,6 +2082,10 @@ zabbix_export:
           macro: '{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}'
           value: '.*'
           description: 'Filter by discoverable slot status.'
+        -
+          macro: '{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}'
+          value: '1'
+          description: 'Filter to exclude discovered slots by status.'
       valuemaps:
         -
           uuid: 5247e9e5efcd4b29b864e336619eafcf
diff --git a/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/README.md b/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/README.md
index af8565e6657..133feb92cd4 100644
--- a/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 http://origin-eu.zyxel.com/products_services/ies_1248_51v.shtml?t=p
 
 This template was tested on:
@@ -42,8 +42,8 @@ There are no template links in this template.
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.ies1248.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.ies1248.temp.discovery |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.ies1248.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies1248.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- B: {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p> |
-|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies1248.net.adsl.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- B: {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p> |
+|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies1248.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Trigger disabled<br> - {#ZYXEL.IF.NAME} MATCHES_REGEX `.*`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p><p>Trigger enabled<br> - {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - DISCOVER</p> |
+|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies1248.net.adsl.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -60,19 +60,19 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies1248.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies1248.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies1248.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies1248.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies1248.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies1248.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies1248.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies1248.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU. </p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU. </p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies1248.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies1248.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Power_supply |ZYXEL IES1248-51: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies1248.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES1248-51: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES1248-51: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.ies1248.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
@@ -83,21 +83,21 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL IES1248-51: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.ies1248.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
-|ZYXEL IES1248-51: Template does not match hardware |<p>This template is for Zyxel IES1248-51, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.ies1248.model.last()}<>"IES1248-51"` |INFO | |
-|ZYXEL IES1248-51: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies1248.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.ies1248.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES1248-51: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.ies1248.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.ies1248.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL IES1248-51: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL IES1248-51: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`{TEMPLATE_NAME:zyxel.ies1248.net.adsl.atuc.snrmgn[{#SNMPINDEX}].min(5m)}<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
-|ZYXEL IES1248-51: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`{TEMPLATE_NAME:zyxel.ies1248.net.adsl.atuc.atn[{#SNMPINDEX}].min(5m)}>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
-|ZYXEL IES1248-51: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`{TEMPLATE_NAME:zyxel.ies1248.net.adsl.atur.snrmgn[{#SNMPINDEX}].min(5m)}<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
-|ZYXEL IES1248-51: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`{TEMPLATE_NAME:zyxel.ies1248.net.adsl.atur.atn[{#SNMPINDEX}].min(5m)}>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
-|ZYXEL IES1248-51: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.ies1248.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL IES1248-51: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL IES1248-51: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.ies1248.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL IES1248-51: Port {#SNMPINDEX} alarm |<p>The slot reported an error.</p> |`{TEMPLATE_NAME:zyxel.ies1248.slot.alarm.str("moduleNoDefect")}=0` |AVERAGE | |
-|ZYXEL IES1248-51: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.ies1248.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL IES1248-51: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
+|ZYXEL IES1248-51: Template does not match hardware |<p>This template is for Zyxel IES1248-51, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.model)<>"IES1248-51"` |INFO | |
+|ZYXEL IES1248-51: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.fwversion,#1)<>last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.fwversion,#2) and length(last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES1248-51: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.serialnumber,#1)<>last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.serialnumber,#2) and length(last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL IES1248-51: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL IES1248-51: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`min(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.adsl.atuc.snrmgn[{#SNMPINDEX}],5m)<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
+|ZYXEL IES1248-51: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`min(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.adsl.atuc.atn[{#SNMPINDEX}],5m)>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
+|ZYXEL IES1248-51: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m) |<p>Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed</p> |`min(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.adsl.atur.snrmgn[{#SNMPINDEX}],5m)<{$ZYXEL.ADSL.SNR.MIN}` |WARNING | |
+|ZYXEL IES1248-51: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m) |<p>The reductions in amplitude of the downstream and upstream DSL signals.</p> |`min(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.net.adsl.atur.atn[{#SNMPINDEX}],5m)>{$ZYXEL.ADSL.ATN.MAX}` |WARNING | |
+|ZYXEL IES1248-51: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL IES1248-51: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL IES1248-51 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL IES1248-51: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL IES1248-51: Port {#SNMPINDEX} alarm |<p>The slot reported an error.</p> |`find(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.slot.alarm,,"like","moduleNoDefect")=0` |AVERAGE | |
+|ZYXEL IES1248-51: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL IES1248-51 SNMP/zyxel.ies1248.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/template_net_zyxel_ies1248-51_snmp.yaml b/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/template_net_zyxel_ies1248-51_snmp.yaml
index 1d6296cc562..a4c20a3c53c 100644
--- a/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/template_net_zyxel_ies1248-51_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/template_net_zyxel_ies1248-51_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:51:12Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:19Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -467,7 +467,7 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Measured difference in the total power transmitted by
-                the peer ATU and the total power received by this ATU. 
+                the peer ATU and the total power received by this ATU.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -500,7 +500,7 @@ zabbix_export:
               units: dB
               description: |
                 MIB: ADSL-LINE-MIB
-                Measured total output power transmitted by this ATU. 
+                Measured total output power transmitted by this ATU.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -527,7 +527,7 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Noise Margin as seen by this ATU with respect to its
-                received signal in tenth dB. 
+                received signal in tenth dB.
                 The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
@@ -561,8 +561,8 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Measured difference in the total power transmitted by
-                the peer ATU and the total power received by this ATU. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                the peer ATU and the total power received by this ATU.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -594,8 +594,8 @@ zabbix_export:
               units: dB
               description: |
                 MIB: ADSL-LINE-MIB
-                Measured total output power transmitted by this ATU. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                Measured total output power transmitted by this ATU.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -621,8 +621,8 @@ zabbix_export:
               description: |
                 MIB: ADSL-LINE-MIB
                 Noise Margin as seen by this ATU with respect to its
-                received signal in tenth dB. 
-                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber’s ADSL modem or router, during negotiation/provisioning message interchanges.
+                received signal in tenth dB.
+                The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -1125,7 +1125,7 @@ zabbix_export:
           description: 'Type the minimum signal to noise margin (0-31 dB)'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}'
diff --git a/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/README.md
index 983fd144f90..52b0a8a85e1 100644
--- a/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/emea/en/products/carrier-and-access-switches/access-switches/mes3500-series
 
 This template was tested on:
@@ -45,15 +45,15 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3528.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3528.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3528.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.3528.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3528.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3528.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL MES-3528: CPU utilization |<p>MIB: ZYXEL-MES3528-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.3528.cpuusage |
+|CPU |ZYXEL MES-3528: CPU utilization |<p>MIB: ZYXEL-MES3528-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.3528.cpuusage |
 |Inventory |ZYXEL MES-3528: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.3528.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES-3528: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.3528.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES-3528: Host name |<p>MIB: RFC1213-MIB</p><p>An administratively-assigned name for this</p><p>managed node.  By convention, this is the node's</p><p>fully-qualified domain name.</p> |SNMP |zyxel.3528.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -67,17 +67,17 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3528.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3528.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3528.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3528.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3528.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3528.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3528.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3528.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3528.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3528.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3528.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3528.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3528.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3528.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3528.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3528.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3528.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3528.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3528.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3528.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3528.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3528.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3528.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3528.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3528.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3528.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3528.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3528.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3528.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3528.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3528-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3528.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -93,16 +93,16 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL MES-3528: 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:zyxel.3528.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL MES-3528: Template does not match hardware |<p>This template is for Zyxel MES-3528, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.3528.model.last()}<>"MES-3528"` |INFO | |
-|ZYXEL MES-3528: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3528.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.3528.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES-3528: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3528.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.3528.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES-3528: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.3528.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.3528.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.3528.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL MES-3528: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3528.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.3528.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES-3528: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.3528.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL MES-3528: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.3528.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL MES-3528: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL MES-3528: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.3528.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES-3528: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL MES-3528 SNMP/zyxel.3528.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL MES-3528: Template does not match hardware |<p>This template is for Zyxel MES-3528, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL MES-3528 SNMP/zyxel.3528.model)<>"MES-3528"` |INFO | |
+|ZYXEL MES-3528: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL MES-3528 SNMP/zyxel.3528.fwversion,#1)<>last(/ZYXEL MES-3528 SNMP/zyxel.3528.fwversion,#2) and length(last(/ZYXEL MES-3528 SNMP/zyxel.3528.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES-3528: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL MES-3528 SNMP/zyxel.3528.serialnumber,#1)<>last(/ZYXEL MES-3528 SNMP/zyxel.3528.serialnumber,#2) and length(last(/ZYXEL MES-3528 SNMP/zyxel.3528.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES-3528: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL MES-3528 SNMP/zyxel.3528.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL MES-3528 SNMP/zyxel.3528.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL MES-3528 SNMP/zyxel.3528.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL MES-3528 SNMP/zyxel.3528.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL MES-3528: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL MES-3528 SNMP/zyxel.3528.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL MES-3528 SNMP/zyxel.3528.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL MES-3528 SNMP/zyxel.3528.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES-3528: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL MES-3528 SNMP/zyxel.3528.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL MES-3528: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL MES-3528 SNMP/zyxel.3528.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL MES-3528: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL MES-3528 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL MES-3528: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL MES-3528 SNMP/zyxel.3528.uptime)<10m` |INFO |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/template_net_zyxel_mes-3528_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/template_net_zyxel_mes-3528_snmp.yaml
index 438cb81b2f1..0f1ea6b51a0 100644
--- a/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/template_net_zyxel_mes-3528_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/template_net_zyxel_mes-3528_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:51:28Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:24Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -93,7 +93,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-MES3528-MIB
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -130,7 +130,7 @@ zabbix_export:
                     tmpObj[item["{#SNMPINDEX}"]] = item["{#SNMP.ARRAY}"]
                   });
                   var strOut = 'V' + tmpObj["1.0"] + '.' + tmpObj["2.0"]
-                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_' 
+                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_'
                     + tmpObj["7.0"] + '.' + tmpObj["6.0"] + '.' + tmpObj["5.0"];
                   return strOut;
             -
@@ -353,7 +353,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 6dc0efb31738415a884d15020d9e30a9
@@ -1138,12 +1137,16 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1159,7 +1162,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/README.md
index 5bd6f17c41b..907ebef5bab 100644
--- a/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/emea/en/products/carrier-and-access-switches/access-switches/mes3500-series
 
 This template was tested on:
@@ -48,16 +48,16 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_10.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_10.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3500_10.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_10.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_10.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.3500_10.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_10.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_10.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 |Memory pool discovery |<p>-</p> |SNMP |zyxel.3500_10.memory.discovery |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL MES3500-10: CPU utilization |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.3500_10.cpuusage |
+|CPU |ZYXEL MES3500-10: CPU utilization |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.3500_10.cpuusage |
 |Inventory |ZYXEL MES3500-10: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.3500_10.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES3500-10: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.3500_10.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES3500-10: Host name |<p>MIB: RFC1213-MIB</p><p>An administratively-assigned name for this</p><p>managed node.  By convention, this is the node's</p><p>fully-qualified domain name.</p> |SNMP |zyxel.3500_10.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -72,17 +72,17 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_10.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_10.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_10.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_10.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_10.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_10.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_10.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_10.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_10.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_10.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_10.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_10.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_10.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_10.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_10.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_10.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_10.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_10.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_10.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3500_10.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_10.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3500_10.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_10.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_10.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_10.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_10.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_10.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_10.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_10.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -100,19 +100,19 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL MES3500-10: 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:zyxel.3500_10.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL MES3500-10: Template does not match hardware |<p>This template is for Zyxel MES3500-10, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.3500_10.model.last()}<>"MES3500-10"` |INFO | |
-|ZYXEL MES3500-10: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_10.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.3500_10.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-10: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_10.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.3500_10.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-10: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:zyxel.3500_10.memory[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}` |AVERAGE | |
-|ZYXEL MES3500-10: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL MES3500-10: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_10.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.3500_10.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-10: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.3500_10.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL MES3500-10: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.3500_10.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL MES3500-10: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.3500_10.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MES3500-10: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL MES3500-10: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.3500_10.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-10: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.3500_10.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL MES3500-10: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL MES3500-10: Template does not match hardware |<p>This template is for Zyxel MES3500-10, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.model)<>"MES3500-10"` |INFO | |
+|ZYXEL MES3500-10: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.fwversion,#1)<>last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.fwversion,#2) and length(last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-10: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.serialnumber,#1)<>last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.serialnumber,#2) and length(last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-10: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.memory[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|ZYXEL MES3500-10: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL MES3500-10: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-10: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL MES3500-10: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL MES3500-10: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MES3500-10: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL MES3500-10 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL MES3500-10: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-10: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/template_net_zyxel_mes3500-10_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/template_net_zyxel_mes3500-10_snmp.yaml
index d917a0e4ef0..ef3220940c9 100644
--- a/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/template_net_zyxel_mes3500-10_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/template_net_zyxel_mes3500-10_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:51:39Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:29Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -93,7 +93,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-MES3500-10-MIB
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -130,7 +130,7 @@ zabbix_export:
                     tmpObj[item["{#SNMPINDEX}"]] = item["{#SNMP.ARRAY}"]
                   });
                   var strOut = 'V' + tmpObj["1.0"] + '.' + tmpObj["2.0"]
-                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_' 
+                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_'
                     + tmpObj["7.0"] + '.' + tmpObj["6.0"] + '.' + tmpObj["5.0"];
                   return strOut;
             -
@@ -388,7 +388,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: d300b380e4bc44f89ac7a40083d424ed
@@ -1221,7 +1220,7 @@ zabbix_export:
                   var nameMap = {"1":"MAC", "2":"CPU", "3":"PHY"};
                   var outArr = [];
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]] 
+                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]]
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1286,7 +1285,7 @@ zabbix_export:
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
                   item["{#ZYXEL.VOLT.NOMINAL}"] = "+" + item["{#ZYXEL.VOLT.NOMINAL}"] / 1000 + "V";
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1303,12 +1302,16 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1324,7 +1327,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/README.md
index 218721cee20..ba1f3f25617 100644
--- a/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/emea/en/products/carrier-and-access-switches/access-switches/mes3500-series
 
 This template was tested on:
@@ -48,16 +48,16 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_24.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_24.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3500_24.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_24.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_24.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.3500_24.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_24.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_24.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 |Memory pool discovery |<p>-</p> |SNMP |zyxel.3500_24.memory.discovery |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL MES3500-24: CPU utilization |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.3500_24.cpuusage |
+|CPU |ZYXEL MES3500-24: CPU utilization |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.3500_24.cpuusage |
 |Inventory |ZYXEL MES3500-24: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.3500_24.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES3500-24: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.3500_24.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES3500-24: Host name |<p>MIB: RFC1213-MIB</p><p>An administratively-assigned name for this</p><p>managed node.  By convention, this is the node's</p><p>fully-qualified domain name.</p> |SNMP |zyxel.3500_24.name<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -72,17 +72,17 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_24.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_24.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_24.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_24.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_24.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_24.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_24.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_24.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_24.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_24.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_24.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_24.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_24.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3500_24.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3500_24.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_24.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_24.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -100,19 +100,19 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL MES3500-24: 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:zyxel.3500_24.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL MES3500-24: Template does not match hardware |<p>This template is for Zyxel MES3500-24, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.3500_24.model.last()}<>"MES3500-24"` |INFO | |
-|ZYXEL MES3500-24: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_24.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.3500_24.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_24.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.3500_24.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:zyxel.3500_24.memory[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}` |AVERAGE | |
-|ZYXEL MES3500-24: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_24.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.3500_24.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.3500_24.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL MES3500-24: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.3500_24.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL MES3500-24: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.3500_24.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MES3500-24: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL MES3500-24: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.3500_24.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.3500_24.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL MES3500-24: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL MES3500-24: Template does not match hardware |<p>This template is for Zyxel MES3500-24, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.model)<>"MES3500-24"` |INFO | |
+|ZYXEL MES3500-24: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.fwversion,#1)<>last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.fwversion,#2) and length(last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.serialnumber,#1)<>last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.serialnumber,#2) and length(last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.memory[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|ZYXEL MES3500-24: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL MES3500-24: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL MES3500-24: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MES3500-24: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL MES3500-24 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL MES3500-24: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/template_net_zyxel_mes3500-24_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/template_net_zyxel_mes3500-24_snmp.yaml
index bfce26897d1..c483845006e 100644
--- a/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/template_net_zyxel_mes3500-24_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/template_net_zyxel_mes3500-24_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:51:53Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:33Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -93,7 +93,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-MES3500-24-MIB
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -130,7 +130,7 @@ zabbix_export:
                     tmpObj[item["{#SNMPINDEX}"]] = item["{#SNMP.ARRAY}"]
                   });
                   var strOut = 'V' + tmpObj["1.0"] + '.' + tmpObj["2.0"]
-                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_' 
+                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_'
                     + tmpObj["7.0"] + '.' + tmpObj["6.0"] + '.' + tmpObj["5.0"];
                   return strOut;
             -
@@ -388,7 +388,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 8320028ac1ca4ef8b0dce4817281887a
@@ -1221,7 +1220,7 @@ zabbix_export:
                   var nameMap = {"1":"MAC", "2":"CPU", "3":"PHY"};
                   var outArr = [];
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]] 
+                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]]
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1286,7 +1285,7 @@ zabbix_export:
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
                   item["{#ZYXEL.VOLT.NOMINAL}"] = "+" + item["{#ZYXEL.VOLT.NOMINAL}"] / 1000 + "V";
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1303,12 +1302,16 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1324,7 +1327,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/README.md
index 5d998de13ca..a1fe3d83bf7 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/global/en/products/carrier-and-access-switches/access-switches/MGS-3712f
 
 This template was tested on:
@@ -48,15 +48,15 @@ There are no template links in this template.
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3712.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3712.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3712.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3712.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3712.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3712.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.3712.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3712.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3712.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL MGS-3712: CPU utilization |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.3712.cpuusage |
+|CPU |ZYXEL MGS-3712: CPU utilization |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.3712.cpuusage |
 |Fans |ZYXEL MGS-3712: Fan #{#SNMPINDEX} |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Current speed in Revolutions Per Minute (RPM) on the fan.</p> |SNMP |zyxel.3712.fan[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |ZYXEL MGS-3712: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.3712.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MGS-3712: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.3712.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -71,17 +71,17 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3712.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3712.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3712.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3712.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3712.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3712.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3712.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3712.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3712.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3712.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3712.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3712.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3712.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3712.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3712.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3712.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3712.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -99,19 +99,19 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL MGS-3712: 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:zyxel.3712.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL MGS-3712: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.3712.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MGS-3712: Template does not match hardware |<p>This template is for Zyxel MGS-3712, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.3712.model.last()}<>"MGS-3712"` |INFO | |
-|ZYXEL MGS-3712: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3712.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.3712.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3712.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.3712.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.3712.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.3712.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.3712.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3712.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.3712.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.3712.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL MGS-3712: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.3712.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL MGS-3712: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.3712.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MGS-3712: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL MGS-3712: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.3712.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.3712.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL MGS-3712: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL MGS-3712 SNMP/zyxel.3712.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL MGS-3712: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MGS-3712: Template does not match hardware |<p>This template is for Zyxel MGS-3712, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.model)<>"MGS-3712"` |INFO | |
+|ZYXEL MGS-3712: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.fwversion,#1)<>last(/ZYXEL MGS-3712 SNMP/zyxel.3712.fwversion,#2) and length(last(/ZYXEL MGS-3712 SNMP/zyxel.3712.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.serialnumber,#1)<>last(/ZYXEL MGS-3712 SNMP/zyxel.3712.serialnumber,#2) and length(last(/ZYXEL MGS-3712 SNMP/zyxel.3712.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL MGS-3712 SNMP/zyxel.3712.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL MGS-3712 SNMP/zyxel.3712.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL MGS-3712 SNMP/zyxel.3712.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL MGS-3712 SNMP/zyxel.3712.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL MGS-3712: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL MGS-3712: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MGS-3712: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL MGS-3712 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL MGS-3712: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL MGS-3712 SNMP/zyxel.3712.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/template_net_zyxel_mgs-3712_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/template_net_zyxel_mgs-3712_snmp.yaml
index 7b46c90cee5..de9138df6b3 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/template_net_zyxel_mgs-3712_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/template_net_zyxel_mgs-3712_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:52:27Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:42Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -92,7 +92,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-MGS3712F-MIB
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -129,7 +129,7 @@ zabbix_export:
                     tmpObj[item["{#SNMPINDEX}"]] = item["{#SNMP.ARRAY}"]
                   });
                   var strOut = 'V' + tmpObj["1.0"] + '.' + tmpObj["2.0"]
-                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_' 
+                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_'
                     + tmpObj["7.0"] + '.' + tmpObj["6.0"] + '.' + tmpObj["5.0"];
                   return strOut;
             -
@@ -399,7 +399,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 9a97d9e95dba4ba88e08ccbd48acce07
@@ -1232,7 +1231,7 @@ zabbix_export:
                   var nameMap = {"1":"MAC", "2":"CPU", "3":"PHY"};
                   var outArr = [];
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]] 
+                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]]
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1297,7 +1296,7 @@ zabbix_export:
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
                   item["{#ZYXEL.VOLT.NOMINAL}"] = "+" + item["{#ZYXEL.VOLT.NOMINAL}"] / 1000 + "V";
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1311,12 +1310,16 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1332,7 +1335,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/README.md
index 83481253f11..bf4a87e4a3e 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/global/en/products/carrier-and-access-switches/access-switches/mgs-3712f
 
 This template was tested on:
@@ -48,15 +48,15 @@ There are no template links in this template.
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3712f.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3712f.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3712f.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3712f.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3712f.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3712f.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.3712f.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3712f.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3712f.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL MGS-3712F: CPU utilization |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.3712f.cpuusage |
+|CPU |ZYXEL MGS-3712F: CPU utilization |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.3712f.cpuusage |
 |Fans |ZYXEL MGS-3712F: Fan #{#SNMPINDEX} |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Current speed in Revolutions Per Minute (RPM) on the fan.</p> |SNMP |zyxel.3712f.fan[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |ZYXEL MGS-3712F: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.3712f.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MGS-3712F: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.3712f.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -71,17 +71,17 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3712f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3712f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3712f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3712f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3712f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3712f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3712f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3712f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3712f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3712f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3712f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3712f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3712f.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3712f.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3712f.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3712f.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712f.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -99,19 +99,19 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL MGS-3712F: 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:zyxel.3712f.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL MGS-3712F: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.3712f.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MGS-3712F: Template does not match hardware |<p>This template is for Zyxel MGS-3712F, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.3712f.model.last()}<>"MGS-3712F"` |INFO | |
-|ZYXEL MGS-3712F: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3712f.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.3712f.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712F: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3712f.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.3712f.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.3712f.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.3712f.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.3712f.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712F: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3712f.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.3712f.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712F: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.3712f.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL MGS-3712F: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.3712f.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL MGS-3712F: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.3712f.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MGS-3712F: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL MGS-3712F: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.3712f.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS-3712F: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.3712f.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL MGS-3712F: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL MGS-3712F SNMP/zyxel.3712f.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL MGS-3712F: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MGS-3712F: Template does not match hardware |<p>This template is for Zyxel MGS-3712F, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.model)<>"MGS-3712F"` |INFO | |
+|ZYXEL MGS-3712F: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.fwversion,#1)<>last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.fwversion,#2) and length(last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712F: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.serialnumber,#1)<>last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.serialnumber,#2) and length(last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712F: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712F: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL MGS-3712F: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL MGS-3712F: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MGS-3712F: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL MGS-3712F SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL MGS-3712F: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS-3712F: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/template_net_zyxel_mgs-3712f_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/template_net_zyxel_mgs-3712f_snmp.yaml
index e8cd6efa493..ae2352cee13 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/template_net_zyxel_mgs-3712f_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/template_net_zyxel_mgs-3712f_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:52:40Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:38Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -92,7 +92,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-MGS3712F-MIB
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -129,7 +129,7 @@ zabbix_export:
                     tmpObj[item["{#SNMPINDEX}"]] = item["{#SNMP.ARRAY}"]
                   });
                   var strOut = 'V' + tmpObj["1.0"] + '.' + tmpObj["2.0"]
-                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_' 
+                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_'
                     + tmpObj["7.0"] + '.' + tmpObj["6.0"] + '.' + tmpObj["5.0"];
                   return strOut;
             -
@@ -399,7 +399,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 84b7463fd2ff40f4b854ad5331fbf0da
@@ -1232,7 +1231,7 @@ zabbix_export:
                   var nameMap = {"1":"MAC", "2":"CPU", "3":"PHY"};
                   var outArr = [];
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]] 
+                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]]
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1297,7 +1296,7 @@ zabbix_export:
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
                   item["{#ZYXEL.VOLT.NOMINAL}"] = "+" + item["{#ZYXEL.VOLT.NOMINAL}"] / 1000 + "V";
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1311,12 +1310,16 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1332,7 +1335,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/README.md
index 83f641b1a37..3c03bbc3367 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 hhttps://service-provider.zyxel.com/emea/en/products/carrier-and-access-switches/access-switches/mes3500-series
 
 This template was tested on:
@@ -49,15 +49,15 @@ There are no template links in this template.
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3500_24s.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.3500_24s.temp.discovery |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_24s.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3500_24s.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_24s.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_24s.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.3500_24s.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_24s.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_24s.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL MES3500-24S: CPU utilization |<p>MIB: ZYXEL-ES-COMMON</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.3500_24s.cpuusage |
+|CPU |ZYXEL MES3500-24S: CPU utilization |<p>MIB: ZYXEL-ES-COMMON</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.3500_24s.cpuusage |
 |Fans |ZYXEL MES3500-24S: {#ZYXEL.FAN.DESCRIPTION} |<p>MIB: ZYXEL-HW-MONITOR-MIB</p><p>Current speed in Revolutions Per Minute (RPM) on the fan.</p> |SNMP |zyxel.3500_24s.fan[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |ZYXEL MES3500-24S: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.3500_24s.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES3500-24S: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.3500_24s.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -67,23 +67,23 @@ There are no template links in this template.
 |Inventory |ZYXEL MES3500-24S: ZyNOS F/W Version |<p>MIB: ZYXEL-ES-COMMON</p> |SNMP |zyxel.3500_24s.fwversion<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES3500-24S: Hardware serial number |<p>MIB: ZYXEL-ES-COMMON</p><p>Serial number</p> |SNMP |zyxel.3500_24s.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL MES3500-24S: Memory utilization |<p>MIB: ZYXEL-ES-COMMON</p><p>Show device memory usage in %.</p> |SNMP |zyxel.3500_24s.memusage |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-PORT-MIB</p><p>Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto </p><p>(auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the </p><p>connection speed and duplex mode that both ends support. When auto-negotiation is turned on, </p><p>a port on the Switch negotiates with the peer automatically to determine the connection speed </p><p>and duplex mode. If the peer port does not support auto-negotiation or turns off this feature, </p><p>the Switch determines the connection speed by detecting the signal on the cable and using half </p><p>duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in </p><p>order to connect.</p> |SNMP |zyxel.3500_24s.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-PORT-MIB</p><p>Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto</p><p>(auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the</p><p>connection speed and duplex mode that both ends support. When auto-negotiation is turned on,</p><p>a port on the Switch negotiates with the peer automatically to determine the connection speed</p><p>and duplex mode. If the peer port does not support auto-negotiation or turns off this feature,</p><p>the Switch determines the connection speed by detecting the signal on the cable and using half</p><p>duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in</p><p>order to connect.</p> |SNMP |zyxel.3500_24s.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-PORT-MIB</p><p>Descriptive name that identifies this port.</p> |SNMP |zyxel.3500_24s.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-PORT-MIB</p><p>The entry shows the linkUp cable type (copper, fiber, xfp or cx4) for the combo ports.</p> |SNMP |zyxel.3500_24s.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_24s.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24s.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_24s.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_24s.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24s.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_24s.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_24s.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_24s.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24s.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_24s.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_24s.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_24s.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24s.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_24s.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_24s.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_24s.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24s.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_24s.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24s.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3500_24s.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24s.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3500_24s.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24s.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24s.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24s.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24s.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type.</p> |SNMP |zyxel.3500_24s.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_24s.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24s.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -101,20 +101,20 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL MES3500-24S: 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:zyxel.3500_24s.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL MES3500-24S: {#ZYXEL.FAN.DESCRIPTION} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.3500_24s.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MES3500-24S: Template does not match hardware |<p>This template is for Zyxel MES3500-24S series, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.3500_24s.model.last()}<>"MES3500-24S"` |INFO | |
-|ZYXEL MES3500-24S: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_24s.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.3500_24s.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24S: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_24s.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.3500_24s.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24S: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:zyxel.3500_24s.memusage.min(5m)}>{$MEMORY.UTIL.MAX}` |AVERAGE | |
-|ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24S: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3500_24s.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.3500_24s.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24S: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.3500_24s.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL MES3500-24S: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.3500_24s.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL MES3500-24S: Voltage {#ZYXEL.DESCRIPTION} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.3500_24s.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MES3500-24S: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL MES3500-24S: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.3500_24s.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MES3500-24S: Temperature {#ZYXEL.TEMPDESCRIPTION} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.3500_24s.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL MES3500-24S: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL MES3500-24S: {#ZYXEL.FAN.DESCRIPTION} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MES3500-24S: Template does not match hardware |<p>This template is for Zyxel MES3500-24S series, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.model)<>"MES3500-24S"` |INFO | |
+|ZYXEL MES3500-24S: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.fwversion,#1)<>last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.fwversion,#2) and length(last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24S: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.serialnumber,#1)<>last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.serialnumber,#2) and length(last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24S: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.memusage,5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24S: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24S: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL MES3500-24S: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL MES3500-24S: Voltage {#ZYXEL.DESCRIPTION} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MES3500-24S: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL MES3500-24S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL MES3500-24S: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MES3500-24S: Temperature {#ZYXEL.TEMPDESCRIPTION} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/template_net_zyxel_mgs3500-24s_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/template_net_zyxel_mgs3500-24s_snmp.yaml
index 1de30e867ed..59cba439213 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/template_net_zyxel_mgs3500-24s_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/template_net_zyxel_mgs3500-24s_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:52:14Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:47Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -29,7 +29,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -95,7 +95,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-ES-COMMON
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -410,7 +410,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 40967a08563e4f62b56d0f3983a5b76a
@@ -808,13 +807,13 @@ zabbix_export:
               history: 7d
               description: |
                 MIB: ZYXEL-PORT-MIB
-                Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto 
-                (auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the 
-                connection speed and duplex mode that both ends support. When auto-negotiation is turned on, 
-                a port on the Switch negotiates with the peer automatically to determine the connection speed 
-                and duplex mode. If the peer port does not support auto-negotiation or turns off this feature, 
-                the Switch determines the connection speed by detecting the signal on the cable and using half 
-                duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in 
+                Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto
+                (auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the
+                connection speed and duplex mode that both ends support. When auto-negotiation is turned on,
+                a port on the Switch negotiates with the peer automatically to determine the connection speed
+                and duplex mode. If the peer port does not support auto-negotiation or turns off this feature,
+                the Switch determines the connection speed by detecting the signal on the cable and using half
+                duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in
                 order to connect.
               valuemap:
                 name: 'ZYXEL MES3500-24S operational mode port speed duplex'
@@ -1299,7 +1298,7 @@ zabbix_export:
                   var inArray = JSON.parse(value);
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] /= 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] /= 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1316,12 +1315,18 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2|3|4
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link 3 - XFP 4 - CX4'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
+            3 - XFP
+            4 - CX4
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1337,7 +1342,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/README.md
index 53942017533..1834ce1a117 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://service-provider.zyxel.com/emea/en/products/carrier-and-access-switches/access-switches/mgs3520-series
 
 This template was tested on:
@@ -50,15 +50,15 @@ There are no template links in this template.
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3520_28.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.3520_28.temp.discovery |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3520_28.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3520_28.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3520_28.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3520_28.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.3520_28.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3520_28.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3520_28.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL MGS3520-28x: CPU utilization |<p>MIB: ZYXEL-ES-COMMON</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.3520_28.cpuusage |
+|CPU |ZYXEL MGS3520-28x: CPU utilization |<p>MIB: ZYXEL-ES-COMMON</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.3520_28.cpuusage |
 |Fans |ZYXEL MGS3520-28x: {#ZYXEL.FAN.DESCRIPTION} |<p>MIB: ZYXEL-HW-MONITOR-MIB</p><p>Current speed in Revolutions Per Minute (RPM) on the fan.</p> |SNMP |zyxel.3520_28.fan[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |ZYXEL MGS3520-28x: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.3520_28.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MGS3520-28x: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.3520_28.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -68,23 +68,23 @@ There are no template links in this template.
 |Inventory |ZYXEL MGS3520-28x: ZyNOS F/W Version |<p>MIB: ZYXEL-ES-COMMON</p> |SNMP |zyxel.3520_28.fwversion<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MGS3520-28x: Hardware serial number |<p>MIB: ZYXEL-ES-COMMON</p><p>Serial number</p> |SNMP |zyxel.3520_28.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL MGS3520-28x: Memory utilization |<p>MIB: ZYXEL-ES-COMMON</p><p>Show device memory usage in %.</p> |SNMP |zyxel.3520_28.memusage |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-PORT-MIB</p><p>Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto </p><p>(auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the </p><p>connection speed and duplex mode that both ends support. When auto-negotiation is turned on, </p><p>a port on the Switch negotiates with the peer automatically to determine the connection speed </p><p>and duplex mode. If the peer port does not support auto-negotiation or turns off this feature, </p><p>the Switch determines the connection speed by detecting the signal on the cable and using half </p><p>duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in </p><p>order to connect.</p> |SNMP |zyxel.3520_28.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-PORT-MIB</p><p>Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto</p><p>(auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the</p><p>connection speed and duplex mode that both ends support. When auto-negotiation is turned on,</p><p>a port on the Switch negotiates with the peer automatically to determine the connection speed</p><p>and duplex mode. If the peer port does not support auto-negotiation or turns off this feature,</p><p>the Switch determines the connection speed by detecting the signal on the cable and using half</p><p>duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in</p><p>order to connect.</p> |SNMP |zyxel.3520_28.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-PORT-MIB</p><p>Descriptive name that identifies this port.</p> |SNMP |zyxel.3520_28.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-PORT-MIB</p><p>The entry shows the linkUp cable type (copper, fiber, xfp or cx4) for the combo ports.</p> |SNMP |zyxel.3520_28.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3520_28.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3520_28.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3520_28.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3520_28.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3520_28.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3520_28.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3520_28.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3520_28.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3520_28.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3520_28.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3520_28.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3520_28.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3520_28.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3520_28.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3520_28.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3520_28.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3520_28.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3520_28.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3520_28.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3520_28.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3520_28.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.3520_28.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3520_28.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3520_28.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3520_28.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3520_28.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type.</p> |SNMP |zyxel.3520_28.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3520_28.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3520_28.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -102,20 +102,20 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL MGS3520-28x: 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:zyxel.3520_28.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL MGS3520-28x: {#ZYXEL.FAN.DESCRIPTION} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.3520_28.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MGS3520-28x: Template does not match hardware |<p>This template is for Zyxel MGS3520-28x series, but connected to {ITEM.VALUE}</p> |`not({TEMPLATE_NAME:zyxel.3520_28.model.last()}="MGS3520-28" or {TEMPLATE_NAME:zyxel.3520_28.model.last()}="MGS3520-28F")` |INFO | |
-|ZYXEL MGS3520-28x: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3520_28.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.3520_28.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS3520-28x: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3520_28.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.3520_28.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS3520-28x: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:zyxel.3520_28.memusage.min(5m)}>{$MEMORY.UTIL.MAX}` |AVERAGE | |
-|ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL MGS3520-28x: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.3520_28.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.3520_28.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS3520-28x: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.3520_28.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL MGS3520-28x: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.3520_28.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL MGS3520-28x: Voltage {#ZYXEL.DESCRIPTION} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.3520_28.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL MGS3520-28x: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL MGS3520-28x: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.3520_28.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL MGS3520-28x: Temperature {#ZYXEL.TEMPDESCRIPTION} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.3520_28.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL MGS3520-28x: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL MGS3520-28x: {#ZYXEL.FAN.DESCRIPTION} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MGS3520-28x: Template does not match hardware |<p>This template is for Zyxel MGS3520-28x series, but connected to {ITEM.VALUE}</p> |`not(last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.model)="MGS3520-28" or last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.model)="MGS3520-28F")` |INFO | |
+|ZYXEL MGS3520-28x: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.fwversion,#1)<>last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.fwversion,#2) and length(last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS3520-28x: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.serialnumber,#1)<>last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.serialnumber,#2) and length(last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS3520-28x: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.memusage,5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL MGS3520-28x: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS3520-28x: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL MGS3520-28x: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL MGS3520-28x: Voltage {#ZYXEL.DESCRIPTION} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL MGS3520-28x: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL MGS3520-28x SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL MGS3520-28x: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL MGS3520-28x: Temperature {#ZYXEL.TEMPDESCRIPTION} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/template_net_zyxel_mgs3520-28x_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/template_net_zyxel_mgs3520-28x_snmp.yaml
index cb5e97463b2..293e210d1a4 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/template_net_zyxel_mgs3520-28x_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/template_net_zyxel_mgs3520-28x_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:52:56Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:52Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -29,7 +29,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -95,7 +95,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-ES-COMMON
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -410,7 +410,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 43cf7ba65c39475b9614ed4b95e9b398
@@ -808,13 +807,13 @@ zabbix_export:
               history: 7d
               description: |
                 MIB: ZYXEL-PORT-MIB
-                Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto 
-                (auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the 
-                connection speed and duplex mode that both ends support. When auto-negotiation is turned on, 
-                a port on the Switch negotiates with the peer automatically to determine the connection speed 
-                and duplex mode. If the peer port does not support auto-negotiation or turns off this feature, 
-                the Switch determines the connection speed by detecting the signal on the cable and using half 
-                duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in 
+                Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto
+                (auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the
+                connection speed and duplex mode that both ends support. When auto-negotiation is turned on,
+                a port on the Switch negotiates with the peer automatically to determine the connection speed
+                and duplex mode. If the peer port does not support auto-negotiation or turns off this feature,
+                the Switch determines the connection speed by detecting the signal on the cable and using half
+                duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in
                 order to connect.
               valuemap:
                 name: 'ZYXEL MGS3520-28x operational mode port speed duplex'
@@ -1299,7 +1298,7 @@ zabbix_export:
                   var inArray = JSON.parse(value);
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] /= 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] /= 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1316,12 +1315,18 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2|3|4
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link 3 - XFP 4 - CX4'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
+            3 - XFP
+            4 - CX4
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1337,7 +1342,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/README.md b/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/README.md
index 3945ea4f6f6..15216804d0f 100644
--- a/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 https://www.zyxel.com/products_services/xgs_4728f.shtml
 
 This template was tested on:
@@ -49,16 +49,16 @@ There are no template links in this template.
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.4728f.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.4728f.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.4728f.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.4728f.net.if.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- B: {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- C: {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- D: {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.4728f.sfp.discovery<p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- B: {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.4728f.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- B: {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|Interface discovery |<p>-</p> |SNMP |zyxel.4728f.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.4728f.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.4728f.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 |Memory pool discovery |<p>-</p> |SNMP |zyxel.4728f.memory.discovery |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |ZYXEL XGS-4728F: CPU utilization |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when </p><p>getting the values.</p> |SNMP |zyxel.4728f.cpuusage |
+|CPU |ZYXEL XGS-4728F: CPU utilization |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Show device CPU load in %, it's the snapshot of CPU load when</p><p>getting the values.</p> |SNMP |zyxel.4728f.cpuusage |
 |Fans |ZYXEL XGS-4728F: Fan #{#SNMPINDEX} |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Current speed in Revolutions Per Minute (RPM) on the fan.</p> |SNMP |zyxel.4728f.fan[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Inventory |ZYXEL XGS-4728F: Hardware model name |<p>MIB: RFC1213-MIB</p><p>A textual description of the entity.  This value</p><p>should include the full name and version</p><p>identification of the system's hardware type,</p><p>software operating-system, and networking</p><p>software.  It is mandatory that this only contain</p><p>printable ASCII characters.</p> |SNMP |zyxel.4728f.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL XGS-4728F: Contact |<p>MIB: RFC1213-MIB</p><p>The textual identification of the contact person</p><p>for this managed node, together with information</p><p>on how to contact this person.</p> |SNMP |zyxel.4728f.contact<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -74,17 +74,17 @@ There are no template links in this template.
 |Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4728f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4728f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4728f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.4728f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.4728f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4728f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.4728f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.4728f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.4728f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4728f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.4728f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.4728f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.4728f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4728f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.4728f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.4728f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.4728f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4728f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.4728f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4728f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.4728f.net.if.in.traffic[{#SNMPINDEX}]) * (last(zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4728f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(zyxel.4728f.net.if.out.traffic[{#SNMPINDEX}]) * (last(zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) <> 0) /  ( last(zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) + (last(zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100 ` |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4728f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4728f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4728f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4728f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
 |Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.4728f.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.4728f.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.4728f.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -102,20 +102,20 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|ZYXEL XGS-4728F: 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:zyxel.4728f.cpuusage.min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|ZYXEL XGS-4728F: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:zyxel.4728f.fan[{#SNMPINDEX}].last()}<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
-|ZYXEL XGS-4728F: Template does not match hardware |<p>This template is for Zyxel XGS-4728F, but connected to {ITEM.VALUE}</p> |`{TEMPLATE_NAME:zyxel.4728f.model.last()}<>"XGS-4728F"` |INFO | |
-|ZYXEL XGS-4728F: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.4728f.fwversion.diff()}=1 and {TEMPLATE_NAME:zyxel.4728f.fwversion.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL XGS-4728F: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.4728f.serialnumber.diff()}=1 and {TEMPLATE_NAME:zyxel.4728f.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL XGS-4728F: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:zyxel.4728f.memory[{#SNMPINDEX}].min(5m)}>{$MEMORY.UTIL.MAX}` |AVERAGE | |
-|ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{TEMPLATE_NAME:zyxel.4728f.net.if.operstatus[{#SNMPINDEX}].last()}=2 and {TEMPLATE_NAME:zyxel.4728f.net.if.operstatus[{#SNMPINDEX}].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:zyxel.4728f.net.if.operstatus[{#SNMPINDEX}].last()}<>2` |AVERAGE |<p>Manual close: YES</p> |
-|ZYXEL XGS-4728F: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:zyxel.4728f.sfp.serialnumber[{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:zyxel.4728f.sfp.serialnumber[{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|ZYXEL XGS-4728F: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`{TEMPLATE_NAME:zyxel.4728f.sfp.ddm[{#SNMPINDEX}].last()} > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
-|ZYXEL XGS-4728F: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`{TEMPLATE_NAME:zyxel.4728f.sfp.ddm[{#SNMPINDEX}].last()} < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
-|ZYXEL XGS-4728F: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`{TEMPLATE_NAME:zyxel.4728f.volt[{#SNMPINDEX}].last()}<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
-|ZYXEL XGS-4728F: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|ZYXEL XGS-4728F: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:zyxel.4728f.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|ZYXEL XGS-4728F: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`{TEMPLATE_NAME:zyxel.4728f.temp[{#SNMPINDEX}].last()}>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
+|ZYXEL XGS-4728F: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/ZYXEL XGS-4728F SNMP/zyxel.4728f.cpuusage,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|ZYXEL XGS-4728F: FAN{#SNMPINDEX} is in critical state |<p>Please check the fan unit</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.fan[{#SNMPINDEX}])<{#ZYXEL.FANRPM.THRESH.LOW}` |AVERAGE | |
+|ZYXEL XGS-4728F: Template does not match hardware |<p>This template is for Zyxel XGS-4728F, but connected to {ITEM.VALUE}</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.model)<>"XGS-4728F"` |INFO | |
+|ZYXEL XGS-4728F: Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.fwversion,#1)<>last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.fwversion,#2) and length(last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.fwversion))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL XGS-4728F: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.serialnumber,#1)<>last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.serialnumber,#2) and length(last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL XGS-4728F: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/ZYXEL XGS-4728F SNMP/zyxel.4728f.memory[{#SNMPINDEX}],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.net.if.operstatus[{#SNMPINDEX}])=2 and last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.net.if.operstatus[{#SNMPINDEX}],#1)<>last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.net.if.operstatus[{#SNMPINDEX}],#2)`<p>Recovery expression:</p>`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.net.if.operstatus[{#SNMPINDEX}])<>2` |AVERAGE |<p>Manual close: YES</p> |
+|ZYXEL XGS-4728F: SFP {#SNMPINDEX} has been replaced (new serial number received) |<p>SFP {#SNMPINDEX} serial number has changed. Ack to close</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.sfp.serialnumber[{#SNMPINDEX}],#1)<>last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.sfp.serialnumber[{#SNMPINDEX}],#2) and length(last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.sfp.serialnumber[{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|ZYXEL XGS-4728F: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT}) |<p>The upper threshold value of the parameter is exceeded</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.sfp.ddm[{#SNMPINDEX}]) > {#ZYXEL.SFP.WARN.MAX}` |WARNING | |
+|ZYXEL XGS-4728F: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT}) |<p>The parameter values are less than the lower threshold</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}` |WARNING | |
+|ZYXEL XGS-4728F: Voltage {#ZYXEL.VOLT.NOMINAL} is in critical state |<p>Please check the power supply</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.volt[{#SNMPINDEX}])<{#ZYXEL.VOLT.THRESH.LOW}` |AVERAGE | |
+|ZYXEL XGS-4728F: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/ZYXEL XGS-4728F SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|ZYXEL XGS-4728F: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|ZYXEL XGS-4728F: Temperature {#ZYXEL.TEMP.ID} is in critical state |<p>Please check the temperature</p> |`last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.temp[{#SNMPINDEX}])>{#ZYXEL.TEMP.THRESH.HIGH}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/template_net_zyxel_xgs-4728f_snmp.yaml b/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/template_net_zyxel_xgs-4728f_snmp.yaml
index e96a50e00f3..22c803ff7f1 100644
--- a/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/template_net_zyxel_xgs-4728f_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/template_net_zyxel_xgs-4728f_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-07-22T14:53:12Z'
+  version: '6.0'
+  date: '2021-12-17T06:34:56Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Network devices'
@@ -93,7 +93,7 @@ zabbix_export:
           units: '%'
           description: |
             MIB: ZYXEL-XGS4728F-MIB
-            Show device CPU load in %, it's the snapshot of CPU load when 
+            Show device CPU load in %, it's the snapshot of CPU load when
             getting the values.
           tags:
             -
@@ -130,7 +130,7 @@ zabbix_export:
                     tmpObj[item["{#SNMPINDEX}"]] = item["{#SNMP.ARRAY}"]
                   });
                   var strOut = 'V' + tmpObj["1.0"] + '.' + tmpObj["2.0"]
-                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_' 
+                    + '(' + tmpObj["3.0"] + '.' + tmpObj["4.0"] + ')_'
                     + tmpObj["7.0"] + '.' + tmpObj["6.0"] + '.' + tmpObj["5.0"];
                   return strOut;
             -
@@ -435,7 +435,6 @@ zabbix_export:
                 value: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
                 operator: NOT_MATCHES_REGEX
                 formulaid: B
-          description: 'An entry in fanRpmTable.'
           item_prototypes:
             -
               uuid: 36f7fdbfa4164677ad91351be394f050
@@ -1268,7 +1267,7 @@ zabbix_export:
                   var nameMap = {"1":"MAC", "2":"CPU", "3":"PHY"};
                   var outArr = [];
                   inArray.forEach(function(item, i, arr) {
-                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]] 
+                  item["{#ZYXEL.TEMP.ID}"] = nameMap[item["{#SNMPINDEX}"]]
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1333,7 +1332,7 @@ zabbix_export:
                   var outArr = []
                   inArray.forEach(function(item, i, arr) {
                   item["{#ZYXEL.VOLT.NOMINAL}"] = "+" + item["{#ZYXEL.VOLT.NOMINAL}"] / 1000 + "V";
-                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000; 
+                  item["{#ZYXEL.VOLT.THRESH.LOW}"] = item["{#ZYXEL.VOLT.THRESH.LOW}"] / 1000;
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
@@ -1350,12 +1349,16 @@ zabbix_export:
           description: 'The time interval for SNMP agent availability trigger expression.'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}'
-          value: 'CHANGE_IF_NEEDED'
+          value: CHANGE_IF_NEEDED
           description: 'Triggers will be created only for interfaces whose description contains the value of this macro'
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable link types. 0 - Down link 1 - Cooper link 2 - Fiber link'
+          description: |
+            Filter of discoverable link types.
+            0 - Down link
+            1 - Cooper link
+            2 - Fiber link
         -
           macro: '{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
@@ -1371,7 +1374,11 @@ zabbix_export:
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}'
           value: 1|2
-          description: 'Filter of discoverable status. 0 - OK with DDM 1 - OK without DDM 2 - nonoperational'
+          description: |
+            Filter of discoverable status.
+            0 - OK with DDM
+            1 - OK without DDM
+            2 - nonoperational
         -
           macro: '{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}'
           value: CHANGE_IF_NEEDED
diff --git a/templates/os/linux/README.md b/templates/os/linux/README.md
index 9f674f85d79..1007d216362 100644
--- a/templates/os/linux/README.md
+++ b/templates/os/linux/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -46,8 +46,8 @@ There are no template links in this template.
 |CPU |CPU softirq time |<p>The amount of time the CPU has been servicing software interrupts.</p> |ZABBIX_PASSIVE |system.cpu.util[,softirq] |
 |CPU |CPU guest time |<p>Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)</p> |ZABBIX_PASSIVE |system.cpu.util[,guest] |
 |CPU |CPU guest nice time |<p>Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)</p> |ZABBIX_PASSIVE |system.cpu.util[,guest_nice] |
-|CPU |Context switches per second |<p>-</p> |ZABBIX_PASSIVE |system.cpu.switches<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|CPU |Interrupts per second |<p>-</p> |ZABBIX_PASSIVE |system.cpu.intr<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|CPU |Context switches per second |<p>-</p> |ZABBIX_PASSIVE |system.cpu.switches<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|CPU |Interrupts per second |<p>-</p> |ZABBIX_PASSIVE |system.cpu.intr<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
@@ -64,7 +64,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -95,7 +95,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |ZABBIX_PASSIVE |vfs.fs.discovery<p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
+|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |ZABBIX_PASSIVE |vfs.fs.discovery<p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -123,7 +123,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -176,7 +176,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -203,21 +203,21 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Block devices discovery |<p>-</p> |ZABBIX_PASSIVE |vfs.dev.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- A: {#DEVTYPE} MATCHES_REGEX `disk`</p><p>- B: {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- C: {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
+|Block devices discovery |<p>-</p> |ZABBIX_PASSIVE |vfs.dev.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- {#DEVTYPE} MATCHES_REGEX `disk`</p><p>- {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Storage |{#DEVNAME}: Disk read rate |<p>r/s. The number (after merges) of read requests completed per second for the device.</p> |DEPENDENT |vfs.dev.read.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[0]`</p><p>- CHANGE_PER_SECOND |
-|Storage |{#DEVNAME}: Disk write rate |<p>w/s. The number (after merges) of write requests completed per second for the device.</p> |DEPENDENT |vfs.dev.write.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[4]`</p><p>- CHANGE_PER_SECOND |
+|Storage |{#DEVNAME}: Disk read rate |<p>r/s. The number (after merges) of read requests completed per second for the device.</p> |DEPENDENT |vfs.dev.read.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[0]`</p><p>- CHANGE_PER_SECOND</p> |
+|Storage |{#DEVNAME}: Disk write rate |<p>w/s. The number (after merges) of write requests completed per second for the device.</p> |DEPENDENT |vfs.dev.write.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[4]`</p><p>- CHANGE_PER_SECOND</p> |
 |Storage |{#DEVNAME}: Disk read request avg waiting time (r_await) |<p>This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.</p> |CALCULATED |vfs.dev.read.await[{#DEVNAME}]<p>**Expression**:</p>`(last(//vfs.dev.read.time.rate[{#DEVNAME}])/(last(//vfs.dev.read.rate[{#DEVNAME}])+(last(//vfs.dev.read.rate[{#DEVNAME}])=0)))*1000*(last(//vfs.dev.read.rate[{#DEVNAME}]) > 0)` |
 |Storage |{#DEVNAME}: Disk write request avg waiting time (w_await) |<p>This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.</p> |CALCULATED |vfs.dev.write.await[{#DEVNAME}]<p>**Expression**:</p>`(last(//vfs.dev.write.time.rate[{#DEVNAME}])/(last(//vfs.dev.write.rate[{#DEVNAME}])+(last(//vfs.dev.write.rate[{#DEVNAME}])=0)))*1000*(last(//vfs.dev.write.rate[{#DEVNAME}]) > 0)` |
-|Storage |{#DEVNAME}: Disk average queue size (avgqu-sz) |<p>Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |DEPENDENT |vfs.dev.queue_size[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[10]`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `0.001`</p> |
-|Storage |{#DEVNAME}: Disk utilization |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests.</p> |DEPENDENT |vfs.dev.util[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[9]`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `0.1`</p> |
+|Storage |{#DEVNAME}: Disk average queue size (avgqu-sz) |<p>Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |DEPENDENT |vfs.dev.queue_size[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[10]`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `0.001`</p> |
+|Storage |{#DEVNAME}: Disk utilization |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests.</p> |DEPENDENT |vfs.dev.util[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[9]`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `0.1`</p> |
 |Zabbix_raw_items |{#DEVNAME}: Get stats |<p>Get contents of /sys/block/{#DEVNAME}/stat for disk stats.</p> |ZABBIX_PASSIVE |vfs.file.contents[/sys/block/{#DEVNAME}/stat]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value.trim().split(/ +/));`</p> |
-|Zabbix_raw_items |{#DEVNAME}: Disk read time (rate) |<p>Rate of total read time counter. Used in r_await calculation</p> |DEPENDENT |vfs.dev.read.time.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[3]`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `0.001`</p> |
-|Zabbix_raw_items |{#DEVNAME}: Disk write time (rate) |<p>Rate of total write time counter. Used in w_await calculation</p> |DEPENDENT |vfs.dev.write.time.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[7]`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `0.001`</p> |
+|Zabbix_raw_items |{#DEVNAME}: Disk read time (rate) |<p>Rate of total read time counter. Used in r_await calculation</p> |DEPENDENT |vfs.dev.read.time.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[3]`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `0.001`</p> |
+|Zabbix_raw_items |{#DEVNAME}: Disk write time (rate) |<p>Rate of total write time counter. Used in w_await calculation</p> |DEPENDENT |vfs.dev.write.time.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[7]`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `0.001`</p> |
 
 ## Triggers
 
@@ -233,7 +233,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -260,18 +260,18 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Network interface discovery |<p>Discovery of network interfaces.</p> |ZABBIX_PASSIVE |net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- B: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p> |
+|Network interface discovery |<p>Discovery of network interfaces.</p> |ZABBIX_PASSIVE |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Network_interfaces |Interface {#IFNAME}: Bits received | |ZABBIX_PASSIVE |net.if.in["{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}: Bits sent | |ZABBIX_PASSIVE |net.if.out["{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}: Outbound packets with errors | |ZABBIX_PASSIVE |net.if.out["{#IFNAME}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}: Inbound packets with errors | |ZABBIX_PASSIVE |net.if.in["{#IFNAME}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}: Outbound packets discarded | |ZABBIX_PASSIVE |net.if.out["{#IFNAME}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}: Inbound packets discarded | |ZABBIX_PASSIVE |net.if.in["{#IFNAME}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |Interface {#IFNAME}: Bits received |<p>-</p> |ZABBIX_PASSIVE |net.if.in["{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}: Bits sent |<p>-</p> |ZABBIX_PASSIVE |net.if.out["{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}: Outbound packets with errors |<p>-</p> |ZABBIX_PASSIVE |net.if.out["{#IFNAME}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}: Inbound packets with errors |<p>-</p> |ZABBIX_PASSIVE |net.if.in["{#IFNAME}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}: Outbound packets discarded |<p>-</p> |ZABBIX_PASSIVE |net.if.out["{#IFNAME}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}: Inbound packets discarded |<p>-</p> |ZABBIX_PASSIVE |net.if.in["{#IFNAME}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |Interface {#IFNAME}: Operational status |<p>Reference: https://www.kernel.org/doc/Documentation/networking/operstates.txt</p> |ZABBIX_PASSIVE |vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Network_interfaces |Interface {#IFNAME}: Interface type |<p>Indicates the interface protocol type as a decimal value.</p><p>See include/uapi/linux/if_arp.h for all possible values.</p><p>Reference: https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-class-net</p> |ZABBIX_PASSIVE |vfs.file.contents["/sys/class/net/{#IFNAME}/type"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 
@@ -360,7 +360,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 New official Linux template. Requires agent of Zabbix 3.0.14, 3.4.5 and 4.0.0 or newer.
 
 ## Setup
diff --git a/templates/os/linux/template_os_linux.yaml b/templates/os/linux/template_os_linux.yaml
index a4fbf588350..825d2747c43 100644
--- a/templates/os/linux/template_os_linux.yaml
+++ b/templates/os/linux/template_os_linux.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-27T15:21:05Z'
+  date: '2021-12-14T17:44:10Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -13,7 +13,7 @@ zabbix_export:
       uuid: 45486dbbf5bf49f28866fcb212731cf0
       template: 'Linux block devices by Zabbix agent'
       name: 'Linux block devices by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -341,7 +341,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387225-discussion-thread-for-official-zabbix-template-for-linux
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Linux block devices by Zabbix agent'
@@ -555,7 +555,7 @@ zabbix_export:
       uuid: d4e080814aad467dbf6b95c46b862c28
       template: 'Linux CPU by Zabbix agent'
       name: 'Linux CPU by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -804,7 +804,7 @@ zabbix_export:
       uuid: fdcdd5810fba49928922a683d32aa76f
       template: 'Linux filesystems by Zabbix agent'
       name: 'Linux filesystems by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -996,7 +996,7 @@ zabbix_export:
       uuid: 38f973ee1556494fadeacb2f6b1ec987
       template: 'Linux generic by Zabbix agent'
       name: 'Linux generic by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1288,7 +1288,7 @@ zabbix_export:
       uuid: 06c211e947414638bd00e555e206d03d
       template: 'Linux memory by Zabbix agent'
       name: 'Linux memory by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1414,7 +1414,7 @@ zabbix_export:
         
           Description: High interface utilization trigger is removed since currently it is not possible to retrieve interface speed to determine the max bandwidth.
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -1554,7 +1554,7 @@ zabbix_export:
                     - |
                       var newvalue;
                       switch(value) {
-                        case "unkonwn":
+                        case "unknown":
                           newvalue = 0;
                           break;
                         case "notpresent":
diff --git a/templates/os/linux_active/README.md b/templates/os/linux_active/README.md
index b3e8b2632d7..aa197538a4c 100644
--- a/templates/os/linux_active/README.md
+++ b/templates/os/linux_active/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -46,8 +46,8 @@ There are no template links in this template.
 |CPU |CPU softirq time |<p>The amount of time the CPU has been servicing software interrupts.</p> |ZABBIX_ACTIVE |system.cpu.util[,softirq] |
 |CPU |CPU guest time |<p>Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)</p> |ZABBIX_ACTIVE |system.cpu.util[,guest] |
 |CPU |CPU guest nice time |<p>Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)</p> |ZABBIX_ACTIVE |system.cpu.util[,guest_nice] |
-|CPU |Context switches per second |<p>-</p> |ZABBIX_ACTIVE |system.cpu.switches<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|CPU |Interrupts per second |<p>-</p> |ZABBIX_ACTIVE |system.cpu.intr<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|CPU |Context switches per second |<p>-</p> |ZABBIX_ACTIVE |system.cpu.switches<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|CPU |Interrupts per second |<p>-</p> |ZABBIX_ACTIVE |system.cpu.intr<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
@@ -64,7 +64,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -95,7 +95,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |ZABBIX_ACTIVE |vfs.fs.discovery<p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
+|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |ZABBIX_ACTIVE |vfs.fs.discovery<p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -123,7 +123,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -176,7 +176,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -203,21 +203,21 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Block devices discovery |<p>-</p> |ZABBIX_ACTIVE |vfs.dev.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- A: {#DEVTYPE} MATCHES_REGEX `disk`</p><p>- B: {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- C: {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
+|Block devices discovery |<p>-</p> |ZABBIX_ACTIVE |vfs.dev.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- {#DEVTYPE} MATCHES_REGEX `disk`</p><p>- {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Storage |{#DEVNAME}: Disk read rate |<p>r/s. The number (after merges) of read requests completed per second for the device.</p> |DEPENDENT |vfs.dev.read.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[0]`</p><p>- CHANGE_PER_SECOND |
-|Storage |{#DEVNAME}: Disk write rate |<p>w/s. The number (after merges) of write requests completed per second for the device.</p> |DEPENDENT |vfs.dev.write.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[4]`</p><p>- CHANGE_PER_SECOND |
+|Storage |{#DEVNAME}: Disk read rate |<p>r/s. The number (after merges) of read requests completed per second for the device.</p> |DEPENDENT |vfs.dev.read.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[0]`</p><p>- CHANGE_PER_SECOND</p> |
+|Storage |{#DEVNAME}: Disk write rate |<p>w/s. The number (after merges) of write requests completed per second for the device.</p> |DEPENDENT |vfs.dev.write.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[4]`</p><p>- CHANGE_PER_SECOND</p> |
 |Storage |{#DEVNAME}: Disk read request avg waiting time (r_await) |<p>This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.</p> |CALCULATED |vfs.dev.read.await[{#DEVNAME}]<p>**Expression**:</p>`(last(//vfs.dev.read.time.rate[{#DEVNAME}])/(last(//vfs.dev.read.rate[{#DEVNAME}])+(last(//vfs.dev.read.rate[{#DEVNAME}])=0)))*1000*(last(//vfs.dev.read.rate[{#DEVNAME}]) > 0)` |
 |Storage |{#DEVNAME}: Disk write request avg waiting time (w_await) |<p>This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.</p> |CALCULATED |vfs.dev.write.await[{#DEVNAME}]<p>**Expression**:</p>`(last(//vfs.dev.write.time.rate[{#DEVNAME}])/(last(//vfs.dev.write.rate[{#DEVNAME}])+(last(//vfs.dev.write.rate[{#DEVNAME}])=0)))*1000*(last(//vfs.dev.write.rate[{#DEVNAME}]) > 0)` |
-|Storage |{#DEVNAME}: Disk average queue size (avgqu-sz) |<p>Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |DEPENDENT |vfs.dev.queue_size[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[10]`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `0.001`</p> |
-|Storage |{#DEVNAME}: Disk utilization |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests.</p> |DEPENDENT |vfs.dev.util[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[9]`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `0.1`</p> |
+|Storage |{#DEVNAME}: Disk average queue size (avgqu-sz) |<p>Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |DEPENDENT |vfs.dev.queue_size[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[10]`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `0.001`</p> |
+|Storage |{#DEVNAME}: Disk utilization |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests.</p> |DEPENDENT |vfs.dev.util[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[9]`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `0.1`</p> |
 |Zabbix_raw_items |{#DEVNAME}: Get stats |<p>Get contents of /sys/block/{#DEVNAME}/stat for disk stats.</p> |ZABBIX_ACTIVE |vfs.file.contents[/sys/block/{#DEVNAME}/stat]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(value.trim().split(/ +/));`</p> |
-|Zabbix_raw_items |{#DEVNAME}: Disk read time (rate) |<p>Rate of total read time counter. Used in r_await calculation</p> |DEPENDENT |vfs.dev.read.time.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[3]`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `0.001`</p> |
-|Zabbix_raw_items |{#DEVNAME}: Disk write time (rate) |<p>Rate of total write time counter. Used in w_await calculation</p> |DEPENDENT |vfs.dev.write.time.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[7]`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `0.001`</p> |
+|Zabbix_raw_items |{#DEVNAME}: Disk read time (rate) |<p>Rate of total read time counter. Used in r_await calculation</p> |DEPENDENT |vfs.dev.read.time.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[3]`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `0.001`</p> |
+|Zabbix_raw_items |{#DEVNAME}: Disk write time (rate) |<p>Rate of total write time counter. Used in w_await calculation</p> |DEPENDENT |vfs.dev.write.time.rate[{#DEVNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[7]`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `0.001`</p> |
 
 ## Triggers
 
@@ -233,7 +233,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -260,18 +260,18 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Network interface discovery |<p>Discovery of network interfaces.</p> |ZABBIX_ACTIVE |net.if.discovery<p>**Filter**:</p>AND <p>- A: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- B: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p> |
+|Network interface discovery |<p>Discovery of network interfaces.</p> |ZABBIX_ACTIVE |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Network_interfaces |Interface {#IFNAME}: Bits received | |ZABBIX_ACTIVE |net.if.in["{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}: Bits sent | |ZABBIX_ACTIVE |net.if.out["{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}: Outbound packets with errors | |ZABBIX_ACTIVE |net.if.out["{#IFNAME}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}: Inbound packets with errors | |ZABBIX_ACTIVE |net.if.in["{#IFNAME}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}: Outbound packets discarded | |ZABBIX_ACTIVE |net.if.out["{#IFNAME}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}: Inbound packets discarded | |ZABBIX_ACTIVE |net.if.in["{#IFNAME}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |Interface {#IFNAME}: Bits received |<p>-</p> |ZABBIX_ACTIVE |net.if.in["{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}: Bits sent |<p>-</p> |ZABBIX_ACTIVE |net.if.out["{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}: Outbound packets with errors |<p>-</p> |ZABBIX_ACTIVE |net.if.out["{#IFNAME}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}: Inbound packets with errors |<p>-</p> |ZABBIX_ACTIVE |net.if.in["{#IFNAME}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}: Outbound packets discarded |<p>-</p> |ZABBIX_ACTIVE |net.if.out["{#IFNAME}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}: Inbound packets discarded |<p>-</p> |ZABBIX_ACTIVE |net.if.in["{#IFNAME}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |Interface {#IFNAME}: Operational status |<p>Reference: https://www.kernel.org/doc/Documentation/networking/operstates.txt</p> |ZABBIX_ACTIVE |vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Network_interfaces |Interface {#IFNAME}: Interface type |<p>Indicates the interface protocol type as a decimal value.</p><p>See include/uapi/linux/if_arp.h for all possible values.</p><p>Reference: https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-class-net</p> |ZABBIX_ACTIVE |vfs.file.contents["/sys/class/net/{#IFNAME}/type"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 
@@ -360,7 +360,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 New official Linux template. Requires agent of Zabbix 3.0.14, 3.4.5 and 4.0.0 or newer.
 
 ## Setup
diff --git a/templates/os/linux_active/template_os_linux_active.yaml b/templates/os/linux_active/template_os_linux_active.yaml
index 1be083f2d5b..df8340e0474 100644
--- a/templates/os/linux_active/template_os_linux_active.yaml
+++ b/templates/os/linux_active/template_os_linux_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-27T15:21:13Z'
+  date: '2021-12-14T17:44:15Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -13,7 +13,7 @@ zabbix_export:
       uuid: aa226119d3e94f53b9a2809f1d4ebaee
       template: 'Linux block devices by Zabbix agent active'
       name: 'Linux block devices by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -343,7 +343,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387225-discussion-thread-for-official-zabbix-template-for-linux
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Linux block devices by Zabbix agent active'
@@ -557,7 +557,7 @@ zabbix_export:
       uuid: da53e44145304098b4c3ff749996e3e7
       template: 'Linux CPU by Zabbix agent active'
       name: 'Linux CPU by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -822,7 +822,7 @@ zabbix_export:
       uuid: c626d864a2894d29a9d661d6025536ff
       template: 'Linux filesystems by Zabbix agent active'
       name: 'Linux filesystems by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1019,7 +1019,7 @@ zabbix_export:
       uuid: 7e4dc41320fd48bd97549025f4c3bcc6
       template: 'Linux generic by Zabbix agent active'
       name: 'Linux generic by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1142,6 +1142,7 @@ zabbix_export:
         -
           uuid: 510ed427b1284906824df3123b94a0bc
           name: 'System local time'
+          type: ZABBIX_ACTIVE
           key: system.localtime
           history: 7d
           status: DISABLED
@@ -1325,7 +1326,7 @@ zabbix_export:
       uuid: 5f577b9e34a8444c920e8199170f7fe6
       template: 'Linux memory by Zabbix agent active'
       name: 'Linux memory by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1457,7 +1458,7 @@ zabbix_export:
         
           Description: High interface utilization trigger is removed since currently it is not possible to retrieve interface speed to determine the max bandwidth.
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -1605,7 +1606,7 @@ zabbix_export:
                     - |
                       var newvalue;
                       switch(value) {
-                        case "unkonwn":
+                        case "unknown":
                           newvalue = 0;
                           break;
                         case "notpresent":
diff --git a/templates/os/linux_prom/README.md b/templates/os/linux_prom/README.md
index 447c98804a9..202b91d88d6 100644
--- a/templates/os/linux_prom/README.md
+++ b/templates/os/linux_prom/README.md
@@ -34,22 +34,22 @@ No specific Zabbix configuration is required.
 |{$NET.IF.IFALIAS.MATCHES} |<p>-</p> |`^.*$` |
 |{$NET.IF.IFALIAS.NOT_MATCHES} |<p>-</p> |`CHANGE_IF_NEEDED` |
 |{$NET.IF.IFNAME.MATCHES} |<p>-</p> |`^.*$` |
-|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9A-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
+|{$NET.IF.IFNAME.NOT_MATCHES} |<p>Filter out loopbacks, nulls, docker veth links and docker0 bridge by default.</p> |`(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9A-z]+$|docker[0-9]+|br-[a-z0-9]{12})` |
 |{$NET.IF.IFOPERSTATUS.MATCHES} |<p>-</p> |`^.*$` |
-|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(7)</p> |`^7$` |
+|{$NET.IF.IFOPERSTATUS.NOT_MATCHES} |<p>Ignore notPresent(7).</p> |`^7$` |
 |{$NODE_EXPORTER_PORT} |<p>TCP Port node_exporter is listening on.</p> |`9100` |
 |{$SWAP.PFREE.MIN.WARN} |<p>-</p> |`50` |
 |{$SYSTEM.FUZZYTIME.MAX} |<p>-</p> |`60` |
-|{$VFS.DEV.DEVNAME.MATCHES} |<p>This macro is used in block devices discovery. Can be overridden on the host or linked template level</p> |`.+` |
-|{$VFS.DEV.DEVNAME.NOT_MATCHES} |<p>This macro is used in block devices discovery. Can be overridden on the host or linked template level</p> |`^(loop[0-9]*|sd[a-z][0-9]+|nbd[0-9]+|sr[0-9]+|fd[0-9]+|dm-[0-9]+|ram[0-9]+|ploop[a-z0-9]+|md[0-9]*|hcp[0-9]*|zram[0-9]*)` |
-|{$VFS.DEV.READ.AWAIT.WARN} |<p>Disk read average response time (in ms) before the trigger would fire</p> |`20` |
-|{$VFS.DEV.WRITE.AWAIT.WARN} |<p>Disk write average response time (in ms) before the trigger would fire</p> |`20` |
-|{$VFS.FS.FSDEVICE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^.+$` |
-|{$VFS.FS.FSDEVICE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^\s$` |
-|{$VFS.FS.FSNAME.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`.+` |
-|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^(/dev|/sys|/run|/proc|.+/shm$)` |
-|{$VFS.FS.FSTYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^(btrfs|ext2|ext3|ext4|reiser|xfs|ffs|ufs|jfs|jfs2|vxfs|hfs|apfs|refs|ntfs|fat32|zfs)$` |
-|{$VFS.FS.FSTYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^\s$` |
+|{$VFS.DEV.DEVNAME.MATCHES} |<p>This macro is used in block devices discovery. Can be overridden on the host or linked template level.</p> |`.+` |
+|{$VFS.DEV.DEVNAME.NOT_MATCHES} |<p>This macro is used in block devices discovery. Can be overridden on the host or linked template level.</p> |`^(loop[0-9]*|sd[a-z][0-9]+|nbd[0-9]+|sr[0-9]+|fd[0-9]+|dm-[0-9]+|ram[0-9]+|ploop[a-z0-9]+|md[0-9]*|hcp[0-9]*|zram[0-9]*)` |
+|{$VFS.DEV.READ.AWAIT.WARN} |<p>Disk read average response time (in ms) before the trigger would fire.</p> |`20` |
+|{$VFS.DEV.WRITE.AWAIT.WARN} |<p>Disk write average response time (in ms) before the trigger would fire.</p> |`20` |
+|{$VFS.FS.FSDEVICE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^.+$` |
+|{$VFS.FS.FSDEVICE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^\s$` |
+|{$VFS.FS.FSNAME.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`.+` |
+|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^(/dev|/sys|/run|/proc|.+/shm$)` |
+|{$VFS.FS.FSTYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^(btrfs|ext2|ext3|ext4|reiser|xfs|ffs|ufs|jfs|jfs2|vxfs|hfs|apfs|refs|ntfs|fat32|zfs)$` |
+|{$VFS.FS.FSTYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^\s$` |
 |{$VFS.FS.INODE.PFREE.MIN.CRIT} |<p>-</p> |`10` |
 |{$VFS.FS.INODE.PFREE.MIN.WARN} |<p>-</p> |`20` |
 |{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
@@ -63,70 +63,70 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Network interface discovery |<p>Discovery of network interfaces. Requires node_exporter v0.18 and up.</p> |DEPENDENT |net.if.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_network_info$"}`</p><p>**Filter**:</p>AND <p>- A: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- B: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- C: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- D: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- E: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- F: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p> |
-|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |DEPENDENT |vfs.fs.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_filesystem_size(?:_bytes)?$", mountpoint=~".+"}`</p><p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p><p>- E: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSDEVICE.MATCHES}`</p><p>- F: {#FSDEVICE} NOT_MATCHES_REGEX `{$VFS.FS.FSDEVICE.NOT_MATCHES}`</p> |
-|Block devices discovery |<p>-</p> |DEPENDENT |vfs.dev.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `node_disk_io_now{device=~".+"}`</p><p>**Filter**:</p>AND <p>- A: {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- B: {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
+|Network interface discovery |<p>Discovery of network interfaces. Requires node_exporter v0.18 and up.</p> |DEPENDENT |net.if.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_network_info$"}`</p><p>**Filter**:</p>AND <p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p> |
+|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |DEPENDENT |vfs.fs.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_filesystem_size(?:_bytes)?$", mountpoint=~".+"}`</p><p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSDEVICE.MATCHES}`</p><p>- {#FSDEVICE} NOT_MATCHES_REGEX `{$VFS.FS.FSDEVICE.NOT_MATCHES}`</p> |
+|Block devices discovery |<p>-</p> |DEPENDENT |vfs.dev.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `node_disk_io_now{device=~".+"}`</p><p>**Filter**:</p>AND <p>- {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|CPU |Load average (1m avg) |<p>-</p> |DEPENDENT |system.cpu.load.avg1[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_load1 `</p> |
-|CPU |Load average (5m avg) |<p>-</p> |DEPENDENT |system.cpu.load.avg5[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_load5 `</p> |
-|CPU |Load average (15m avg) |<p>-</p> |DEPENDENT |system.cpu.load.avg15[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_load15 `</p> |
+|CPU |Load average (1m avg) |<p>-</p> |DEPENDENT |system.cpu.load.avg1[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_load1`</p> |
+|CPU |Load average (5m avg) |<p>-</p> |DEPENDENT |system.cpu.load.avg5[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_load5`</p> |
+|CPU |Load average (15m avg) |<p>-</p> |DEPENDENT |system.cpu.load.avg15[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_load15`</p> |
 |CPU |Number of CPUs |<p>-</p> |DEPENDENT |system.cpu.num[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="idle"}`</p><p>- JAVASCRIPT: `//count the number of cores return JSON.parse(value).length `</p> |
-|CPU |CPU utilization |<p>CPU utilization in %</p> |DEPENDENT |system.cpu.util[node_exporter]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `//Calculate utilization return (100 - value)`</p> |
-|CPU |CPU idle time |<p>The time the CPU has spent doing nothing.</p> |DEPENDENT |system.cpu.idle[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="idle"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU system time |<p>The time the CPU has spent running the kernel and its processes.</p> |DEPENDENT |system.cpu.system[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="system"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU user time |<p>The time the CPU has spent running users' processes that are not niced.</p> |DEPENDENT |system.cpu.user[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="user"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU steal time |<p>The amount of CPU 'stolen' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).</p> |DEPENDENT |system.cpu.steal[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="steal"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU softirq time |<p>The amount of time the CPU has been servicing software interrupts.</p> |DEPENDENT |system.cpu.softirq[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="softirq"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU nice time |<p>The time the CPU has spent running users' processes that have been niced.</p> |DEPENDENT |system.cpu.nice[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="nice"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU iowait time |<p>Amount of time the CPU has been waiting for I/O to complete.</p> |DEPENDENT |system.cpu.iowait[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="iowait"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU interrupt time |<p>The amount of time the CPU has been servicing hardware interrupts.</p> |DEPENDENT |system.cpu.interrupt[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="irq"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU guest time |<p>Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)</p> |DEPENDENT |system.cpu.guest[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_guest_seconds_total)?$",cpu=~".+",mode=~"^(?:user|guest)$"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |CPU guest nice time |<p>Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)</p> |DEPENDENT |system.cpu.guest_nice[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_guest_seconds_total)?$",cpu=~".+",mode=~"^(?:nice|guest_nice)$"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
-|CPU |Interrupts per second |<p>-</p> |DEPENDENT |system.cpu.intr[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_intr"} `</p><p>- CHANGE_PER_SECOND |
-|CPU |Context switches per second |<p>-</p> |DEPENDENT |system.cpu.switches[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_context_switches"} `</p><p>- CHANGE_PER_SECOND |
-|General |System boot time |<p>-</p> |DEPENDENT |system.boottime[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_boot_time(?:_seconds)?$"} `</p> |
-|General |System local time |<p>System local time of the host.</p> |DEPENDENT |system.localtime[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_time(?:_seconds)?$"} `</p> |
-|General |System name |<p>System host name.</p> |DEPENDENT |system.name[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_uname_info nodename`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|CPU |CPU utilization |<p>CPU utilization in %</p> |DEPENDENT |system.cpu.util[node_exporter]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `//Calculate utilization return (100 - value) `</p> |
+|CPU |CPU idle time |<p>The time the CPU has spent doing nothing.</p> |DEPENDENT |system.cpu.idle[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="idle"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU system time |<p>The time the CPU has spent running the kernel and its processes.</p> |DEPENDENT |system.cpu.system[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="system"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU user time |<p>The time the CPU has spent running users' processes that are not niced.</p> |DEPENDENT |system.cpu.user[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="user"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU steal time |<p>The amount of CPU 'stolen' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).</p> |DEPENDENT |system.cpu.steal[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="steal"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU softirq time |<p>The amount of time the CPU has been servicing software interrupts.</p> |DEPENDENT |system.cpu.softirq[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="softirq"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU nice time |<p>The time the CPU has spent running users' processes that have been niced.</p> |DEPENDENT |system.cpu.nice[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="nice"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU iowait time |<p>Amount of time the CPU has been waiting for I/O to complete.</p> |DEPENDENT |system.cpu.iowait[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="iowait"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU interrupt time |<p>The amount of time the CPU has been servicing hardware interrupts.</p> |DEPENDENT |system.cpu.interrupt[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_seconds_total)?$",cpu=~".+",mode="irq"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU guest time |<p>Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)</p> |DEPENDENT |system.cpu.guest[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_guest_seconds_total)?$",cpu=~".+",mode=~"^(?:user|guest)$"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |CPU guest nice time |<p>Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)</p> |DEPENDENT |system.cpu.guest_nice[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_cpu(?:_guest_seconds_total)?$",cpu=~".+",mode=~"^(?:nice|guest_nice)$"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
+|CPU |Interrupts per second |<p>-</p> |DEPENDENT |system.cpu.intr[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_intr"}`</p><p>- CHANGE_PER_SECOND</p> |
+|CPU |Context switches per second |<p>-</p> |DEPENDENT |system.cpu.switches[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_context_switches"}`</p><p>- CHANGE_PER_SECOND</p> |
+|General |System boot time |<p>-</p> |DEPENDENT |system.boottime[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_boot_time(?:_seconds)?$"}`</p> |
+|General |System local time |<p>System local time of the host.</p> |DEPENDENT |system.localtime[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_time(?:_seconds)?$"}`</p> |
+|General |System name |<p>System host name.</p> |DEPENDENT |system.name[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_uname_info`: `label`: `nodename`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |General |System description |<p>Labeled system information as provided by the uname system call.</p> |DEPENDENT |system.descr[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `node_uname_info`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|General |Maximum number of open file descriptors |<p>It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.</p> |DEPENDENT |kernel.maxfiles[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_filefd_maximum `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|General |Number of open file descriptors |<p>-</p> |DEPENDENT |fd.open[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_filefd_allocated `</p> |
+|General |Maximum number of open file descriptors |<p>It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.</p> |DEPENDENT |kernel.maxfiles[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_filefd_maximum`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|General |Number of open file descriptors |<p>-</p> |DEPENDENT |fd.open[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_filefd_allocated`</p> |
 |Inventory |Operating system |<p>-</p> |DEPENDENT |system.sw.os[node_exporter]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Inventory |Operating system architecture |<p>Operating system architecture of the host.</p> |DEPENDENT |system.sw.arch[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_uname_info machine`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Memory |Memory utilization |<p>Memory used percentage is calculated as (total-available)/total*100</p> |CALCULATED |vm.memory.util[node_exporter]<p>**Expression**:</p>`(last(//vm.memory.total[node_exporter])-last(//vm.memory.available[node_exporter]))/last(//vm.memory.total[node_exporter])*100` |
-|Memory |Total memory |<p>Total memory in Bytes</p> |DEPENDENT |vm.memory.total[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_MemTotal"} `</p> |
-|Memory |Available memory |<p>Available memory, in Linux, available = free + buffers + cache. On other platforms calculation may vary. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.</p> |DEPENDENT |vm.memory.available[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_MemAvailable"} `</p> |
-|Memory |Total swap space |<p>The total space of swap volume/file in bytes.</p> |DEPENDENT |system.swap.total[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_SwapTotal"} `</p> |
-|Memory |Free swap space |<p>The free space of swap volume/file in bytes.</p> |DEPENDENT |system.swap.free[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_SwapFree"} `</p> |
+|Inventory |Operating system architecture |<p>Operating system architecture of the host.</p> |DEPENDENT |system.sw.arch[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_uname_info`: `label`: `machine`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Memory utilization |<p>Memory used percentage is calculated as (total-available)/total*100.</p> |CALCULATED |vm.memory.util[node_exporter]<p>**Expression**:</p>`(last(//vm.memory.total[node_exporter])-last(//vm.memory.available[node_exporter]))/last(//vm.memory.total[node_exporter])*100` |
+|Memory |Total memory |<p>Total memory in Bytes</p> |DEPENDENT |vm.memory.total[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_MemTotal"}`</p> |
+|Memory |Available memory |<p>Available memory, in Linux, available = free + buffers + cache. On other platforms calculation may vary. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.</p> |DEPENDENT |vm.memory.available[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_MemAvailable"}`</p> |
+|Memory |Total swap space |<p>The total space of swap volume/file in bytes.</p> |DEPENDENT |system.swap.total[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_SwapTotal"}`</p> |
+|Memory |Free swap space |<p>The free space of swap volume/file in bytes.</p> |DEPENDENT |system.swap.free[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_SwapFree"}`</p> |
 |Memory |Free swap space in % |<p>The free space of swap volume/file in percent.</p> |CALCULATED |system.swap.pfree[node_exporter]<p>**Expression**:</p>`last(//system.swap.free[node_exporter])/last(//system.swap.total[node_exporter])*100` |
-|Monitoring_agent |Version of node_exporter running |<p>-</p> |DEPENDENT |agent.version[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_exporter_build_info version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received | |DEPENDENT |net.if.in[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_bytes_total{device="{#IFNAME}"} `</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent | |DEPENDENT |net.if.out[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_bytes_total{device="{#IFNAME}"} `</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors | |DEPENDENT |net.if.out.errors[node_exporter"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_errs_total{device="{#IFNAME}"} `</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors | |DEPENDENT |net.if.in.errors[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_errs_total{device="{#IFNAME}"} `</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded | |DEPENDENT |net.if.in.discards[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_drop_total{device="{#IFNAME}"} `</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded | |DEPENDENT |net.if.out.discards[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_drop_total{device="{#IFNAME}"} `</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>Sets value to 0 if metric is missing in node_exporter output.</p> |DEPENDENT |net.if.speed[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_speed_bytes{device="{#IFNAME}"} `</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>node_network_protocol_type protocol_type value of /sys/class/net/<iface>.</p> |DEPENDENT |net.if.type[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_protocol_type{device="{#IFNAME}"} `</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>Reference: https://www.kernel.org/doc/Documentation/networking/operstates.txt</p> |DEPENDENT |net.if.status[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_info{device="{#IFNAME}"} operstate`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Status |System uptime |<p>System uptime in 'N days, hh:mm:ss' format.</p> |DEPENDENT |system.uptime[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_boot_time(?:_seconds)?$"} `</p><p>- JAVASCRIPT: `//use boottime to calculate uptime return (Math.floor(Date.now()/1000)-Number(value));`</p> |
-|Storage |{#FSNAME}: Free space |<p>-</p> |DEPENDENT |vfs.fs.free[node_exporter,"{#FSNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_filesystem_avail(?:_bytes)?$", mountpoint="{#FSNAME}"} `</p> |
-|Storage |{#FSNAME}: Total space |<p>Total space in Bytes</p> |DEPENDENT |vfs.fs.total[node_exporter,"{#FSNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_filesystem_size(?:_bytes)?$", mountpoint="{#FSNAME}"} `</p> |
+|Monitoring_agent |Version of node_exporter running |<p>-</p> |DEPENDENT |agent.version[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_exporter_build_info`: `label`: `version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>-</p> |DEPENDENT |net.if.in[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_bytes_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>-</p> |DEPENDENT |net.if.out[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_bytes_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>-</p> |DEPENDENT |net.if.out.errors[node_exporter"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_errs_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>-</p> |DEPENDENT |net.if.in.errors[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_errs_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>-</p> |DEPENDENT |net.if.in.discards[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_drop_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>-</p> |DEPENDENT |net.if.out.discards[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_drop_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>Sets value to 0 if metric is missing in node_exporter output.</p> |DEPENDENT |net.if.speed[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_speed_bytes{device="{#IFNAME}"}`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>node_network_protocol_type protocol_type value of /sys/class/net/<iface>.</p> |DEPENDENT |net.if.type[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_protocol_type{device="{#IFNAME}"}`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>Reference: https://www.kernel.org/doc/Documentation/networking/operstates.txt</p> |DEPENDENT |net.if.status[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_info{device="{#IFNAME}"}`: `label`: `operstate`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Status |System uptime |<p>System uptime in 'N days, hh:mm:ss' format.</p> |DEPENDENT |system.uptime[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_boot_time(?:_seconds)?$"}`</p><p>- JAVASCRIPT: `//use boottime to calculate uptime return (Math.floor(Date.now()/1000)-Number(value)); `</p> |
+|Storage |{#FSNAME}: Free space |<p>-</p> |DEPENDENT |vfs.fs.free[node_exporter,"{#FSNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_filesystem_avail(?:_bytes)?$", mountpoint="{#FSNAME}"}`</p> |
+|Storage |{#FSNAME}: Total space |<p>Total space in Bytes</p> |DEPENDENT |vfs.fs.total[node_exporter,"{#FSNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_filesystem_size(?:_bytes)?$", mountpoint="{#FSNAME}"}`</p> |
 |Storage |{#FSNAME}: Used space |<p>Used storage in Bytes</p> |CALCULATED |vfs.fs.used[node_exporter,"{#FSNAME}"]<p>**Expression**:</p>`(last(//vfs.fs.total[node_exporter,"{#FSNAME}"])-last(//vfs.fs.free[node_exporter,"{#FSNAME}"]))` |
 |Storage |{#FSNAME}: Space utilization |<p>Space utilization in % for {#FSNAME}</p> |CALCULATED |vfs.fs.pused[node_exporter,"{#FSNAME}"]<p>**Expression**:</p>`(last(//vfs.fs.used[node_exporter,"{#FSNAME}"])/last(//vfs.fs.total[node_exporter,"{#FSNAME}"]))*100` |
 |Storage |{#FSNAME}: Free inodes in % |<p>-</p> |DEPENDENT |vfs.fs.inode.pfree[node_exporter,"{#FSNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"node_filesystem_files.*",mountpoint="{#FSNAME}"}`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Storage |{#DEVNAME}: Disk read rate |<p>r/s. The number (after merges) of read requests completed per second for the device.</p> |DEPENDENT |vfs.dev.read.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_reads_completed_total{device="{#DEVNAME}"} `</p><p>- CHANGE_PER_SECOND |
-|Storage |{#DEVNAME}: Disk write rate |<p>w/s. The number (after merges) of write requests completed per second for the device.</p> |DEPENDENT |vfs.dev.write.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_writes_completed_total{device="{#DEVNAME}"} `</p><p>- CHANGE_PER_SECOND |
+|Storage |{#DEVNAME}: Disk read rate |<p>r/s. The number (after merges) of read requests completed per second for the device.</p> |DEPENDENT |vfs.dev.read.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_reads_completed_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Storage |{#DEVNAME}: Disk write rate |<p>w/s. The number (after merges) of write requests completed per second for the device.</p> |DEPENDENT |vfs.dev.write.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_writes_completed_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
 |Storage |{#DEVNAME}: Disk read request avg waiting time (r_await) |<p>This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.</p> |CALCULATED |vfs.dev.read.await[node_exporter,"{#DEVNAME}"]<p>**Expression**:</p>`(last(//vfs.dev.read.time.rate[node_exporter,"{#DEVNAME}"])/(last(//vfs.dev.read.rate[node_exporter,"{#DEVNAME}"])+(last(//vfs.dev.read.rate[node_exporter,"{#DEVNAME}"])=0)))*1000*(last(//vfs.dev.read.rate[node_exporter,"{#DEVNAME}"]) > 0)` |
 |Storage |{#DEVNAME}: Disk write request avg waiting time (w_await) |<p>This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.</p> |CALCULATED |vfs.dev.write.await[node_exporter,"{#DEVNAME}"]<p>**Expression**:</p>`(last(//vfs.dev.write.time.rate[node_exporter,"{#DEVNAME}"])/(last(//vfs.dev.write.rate[node_exporter,"{#DEVNAME}"])+(last(//vfs.dev.write.rate[node_exporter,"{#DEVNAME}"])=0)))*1000*(last(//vfs.dev.write.rate[node_exporter,"{#DEVNAME}"]) > 0)` |
-|Storage |{#DEVNAME}: Disk average queue size (avgqu-sz) |<p>Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |DEPENDENT |vfs.dev.queue_size[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_io_time_weighted_seconds_total{device="{#DEVNAME}"} `</p><p>- CHANGE_PER_SECOND |
-|Storage |{#DEVNAME}: Disk utilization |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests.</p> |DEPENDENT |vfs.dev.util[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_io_time_seconds_total{device="{#DEVNAME}"} `</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `100`</p> |
+|Storage |{#DEVNAME}: Disk average queue size (avgqu-sz) |<p>Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |DEPENDENT |vfs.dev.queue_size[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_io_time_weighted_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Storage |{#DEVNAME}: Disk utilization |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests.</p> |DEPENDENT |vfs.dev.util[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_io_time_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
 |Zabbix_raw_items |Get node_exporter metrics |<p>-</p> |HTTP_AGENT |node_exporter.get |
-|Zabbix_raw_items |{#DEVNAME}: Disk read time (rate) |<p>Rate of total read time counter. Used in r_await calculation</p> |DEPENDENT |vfs.dev.read.time.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_read_time_seconds_total{device="{#DEVNAME}"} `</p><p>- CHANGE_PER_SECOND |
-|Zabbix_raw_items |{#DEVNAME}: Disk write time (rate) |<p>Rate of total write time counter. Used in w_await calculation</p> |DEPENDENT |vfs.dev.write.time.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_write_time_seconds_total{device="{#DEVNAME}"} `</p><p>- CHANGE_PER_SECOND |
+|Zabbix_raw_items |{#DEVNAME}: Disk read time (rate) |<p>Rate of total read time counter. Used in r_await calculation.</p> |DEPENDENT |vfs.dev.read.time.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_read_time_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix_raw_items |{#DEVNAME}: Disk write time (rate) |<p>Rate of total write time counter. Used in w_await calculation.</p> |DEPENDENT |vfs.dev.write.time.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_write_time_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
@@ -141,13 +141,13 @@ There are no template links in this template.
 |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(/Linux by Prom/system.sw.os[node_exporter],#1)<>last(/Linux by Prom/system.sw.os[node_exporter],#2) and length(last(/Linux by Prom/system.sw.os[node_exporter]))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
 |High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux by Prom/vm.memory.util[node_exporter],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 |Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0` |AVERAGE | |
-|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/Linux by Prom/system.swap.pfree[node_exporter],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Prom/system.swap.total[node_exporter])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured.</p> |`min(/Linux by Prom/system.swap.pfree[node_exporter],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Prom/system.swap.total[node_exporter])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Linux by Prom/net.if.in[node_exporter,"{#IFNAME}"],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"]) or avg(/Linux by Prom/net.if.out[node_exporter,"{#IFNAME}"],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])) and last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])>0`<p>Recovery expression:</p>`avg(/Linux by Prom/net.if.in[node_exporter,"{#IFNAME}"],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"]) and avg(/Linux by Prom/net.if.out[node_exporter,"{#IFNAME}"],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Linux by Prom/net.if.in.errors[node_exporter,"{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Linux by Prom/net.if.out.errors[node_exporter"{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Linux by Prom/net.if.in.errors[node_exporter,"{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Linux by Prom/net.if.out.errors[node_exporter"{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold.</p> |`min(/Linux by Prom/net.if.in.errors[node_exporter,"{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Linux by Prom/net.if.out.errors[node_exporter"{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Linux by Prom/net.if.in.errors[node_exporter,"{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Linux by Prom/net.if.out.errors[node_exporter"{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])<0 and last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])>0 and ( last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=6 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=7 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=11 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=62 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=69 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=117 ) and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2) `<p>Recovery expression:</p>`(change(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])>0 and last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"],#2)>0) or (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])<0 and last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])>0 and (last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=6 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=1) and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2) `<p>Recovery expression:</p>`(change(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])>0 and last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"],#2)>0) or (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2 and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#1)<>last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#2))`<p>Recovery expression:</p>`last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
-|{HOST.NAME} has been restarted (uptime < 10m) |<p>The device uptime is less than 10 minutes</p> |`last(/Linux by Prom/system.uptime[node_exporter])<10m` |WARNING |<p>Manual close: YES</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>The device uptime is less than 10 minutes.</p> |`last(/Linux by Prom/system.uptime[node_exporter])<10m` |WARNING |<p>Manual close: YES</p> |
 |{#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}.</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(/Linux by Prom/vfs.fs.pused[node_exporter,"{#FSNAME}"])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and ((last(/Linux by Prom/vfs.fs.total[node_exporter,"{#FSNAME}"])-last(/Linux by Prom/vfs.fs.used[node_exporter,"{#FSNAME}"]))<5G or timeleft(/Linux by Prom/vfs.fs.pused[node_exporter,"{#FSNAME}"],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
 |{#FSNAME}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}.</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(/Linux by Prom/vfs.fs.pused[node_exporter,"{#FSNAME}"])>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and ((last(/Linux by Prom/vfs.fs.total[node_exporter,"{#FSNAME}"])-last(/Linux by Prom/vfs.fs.used[node_exporter,"{#FSNAME}"]))<10G or timeleft(/Linux by Prom/vfs.fs.pused[node_exporter,"{#FSNAME}"],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%)</p> |
 |{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%) |<p>It may become impossible to write to disk if there are no index nodes left.</p><p>As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.</p> |`min(/Linux by Prom/vfs.fs.inode.pfree[node_exporter,"{#FSNAME}"],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}` |AVERAGE | |
@@ -163,8 +163,8 @@ You can also provide a feedback, discuss the template or ask for help with it at
 
 ## Known Issues
 
-- Description: node_exporter v0.16.0 renamed many metrics. CPU utilization for 'guest' and 'guest_nice' metrics are not supported in this template with node_exporter < 0.16. Disk IO metrics are not supported. Other metrics provided as 'best effort'.  
- See https://github.com/prometheus/node_exporter/releases/tag/v0.16.0 for details.
+- Description: node_exporter v0.16.0 renamed many metrics. CPU utilization for 'guest' and 'guest_nice' metrics are not supported in this template with node_exporter < 0.16. Disk IO metrics are not supported. Other metrics provided as 'best effort'.
+See https://github.com/prometheus/node_exporter/releases/tag/v0.16.0 for details.
   - Version: below 0.16.0
 
 - Description: metric node_network_info with label 'device' cannot be found, so network discovery is not possible.
diff --git a/templates/os/linux_prom/template_os_linux_prom.yaml b/templates/os/linux_prom/template_os_linux_prom.yaml
index f1155c56266..8a7486df70e 100644
--- a/templates/os/linux_prom/template_os_linux_prom.yaml
+++ b/templates/os/linux_prom/template_os_linux_prom.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-13T12:28:09Z'
+  date: '2021-12-14T17:44:19Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -15,8 +15,8 @@ zabbix_export:
         
         Known Issues:
         
-          Description: node_exporter v0.16.0 renamed many metrics. CPU utilization for 'guest' and 'guest_nice' metrics are not supported in this template with node_exporter < 0.16. Disk IO metrics are not supported. Other metrics provided as 'best effort'.  
-         See https://github.com/prometheus/node_exporter/releases/tag/v0.16.0 for details.
+          Description: node_exporter v0.16.0 renamed many metrics. CPU utilization for 'guest' and 'guest_nice' metrics are not supported in this template with node_exporter < 0.16. Disk IO metrics are not supported. Other metrics provided as 'best effort'.
+        See https://github.com/prometheus/node_exporter/releases/tag/v0.16.0 for details.
           Version: below 0.16.0
         
           Description: metric node_network_info with label 'device' cannot be found, so network discovery is not possible.
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387225-discussion-thread-for-official-zabbix-template-for-linux
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Operating systems'
@@ -730,7 +730,7 @@ zabbix_export:
               parameters:
                 - |
                   var info = JSON.parse(value)[0];
-                     return info.labels.sysname+' version: '+info.labels.release+' '+info.labels.version
+                  return info.labels.sysname+' version: '+info.labels.release+' '+info.labels.version
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -963,7 +963,7 @@ zabbix_export:
               expression: 'last(/Linux by Prom/system.uptime[node_exporter])<10m'
               name: '{HOST.NAME} has been restarted (uptime < 10m)'
               priority: WARNING
-              description: 'The device uptime is less than 10 minutes'
+              description: 'The device uptime is less than 10 minutes.'
               manual_close: 'YES'
         -
           uuid: 70a75efafbc84cbebd1bb262ec797523
@@ -1020,7 +1020,7 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           params: '(last(//vm.memory.total[node_exporter])-last(//vm.memory.available[node_exporter]))/last(//vm.memory.total[node_exporter])*100'
-          description: 'Memory used percentage is calculated as (total-available)/total*100'
+          description: 'Memory used percentage is calculated as (total-available)/total*100.'
           tags:
             -
               tag: Application
@@ -1288,7 +1288,7 @@ zabbix_export:
                     - |
                       var newvalue;
                       switch(value) {
-                        case "unkonwn":
+                        case "unknown":
                           newvalue = 0;
                           break;
                         case "notpresent":
@@ -1443,7 +1443,7 @@ zabbix_export:
               name: 'Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)'
               opdata: 'errors in: {ITEM.LASTVALUE1}, errors out: {ITEM.LASTVALUE2}'
               priority: WARNING
-              description: 'Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold'
+              description: 'Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold.'
               manual_close: 'YES'
               dependencies:
                 -
@@ -1610,7 +1610,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Rate of total read time counter. Used in r_await calculation'
+              description: 'Rate of total read time counter. Used in r_await calculation.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -1708,7 +1708,7 @@ zabbix_export:
               delay: '0'
               history: 7d
               value_type: FLOAT
-              description: 'Rate of total write time counter. Used in w_await calculation'
+              description: 'Rate of total write time counter. Used in w_await calculation.'
               preprocessing:
                 -
                   type: PROMETHEUS_PATTERN
@@ -2083,14 +2083,14 @@ zabbix_export:
         -
           macro: '{$NET.IF.IFNAME.NOT_MATCHES}'
           value: '(^Software Loopback Interface|^NULL[0-9.]*$|^[Ll]o[0-9.]*$|^[Ss]ystem$|^Nu[0-9.]*$|^veth[0-9A-z]+$|docker[0-9]+|br-[a-z0-9]{12})'
-          description: 'Filter out loopbacks, nulls, docker veth links and docker0 bridge by default'
+          description: 'Filter out loopbacks, nulls, docker veth links and docker0 bridge by default.'
         -
           macro: '{$NET.IF.IFOPERSTATUS.MATCHES}'
           value: '^.*$'
         -
           macro: '{$NET.IF.IFOPERSTATUS.NOT_MATCHES}'
           value: ^7$
-          description: 'Ignore notPresent(7)'
+          description: 'Ignore notPresent(7).'
         -
           macro: '{$NODE_EXPORTER_PORT}'
           value: '9100'
@@ -2104,43 +2104,43 @@ zabbix_export:
         -
           macro: '{$VFS.DEV.DEVNAME.MATCHES}'
           value: .+
-          description: 'This macro is used in block devices discovery. Can be overridden on the host or linked template level'
+          description: 'This macro is used in block devices discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.DEV.DEVNAME.NOT_MATCHES}'
           value: '^(loop[0-9]*|sd[a-z][0-9]+|nbd[0-9]+|sr[0-9]+|fd[0-9]+|dm-[0-9]+|ram[0-9]+|ploop[a-z0-9]+|md[0-9]*|hcp[0-9]*|zram[0-9]*)'
-          description: 'This macro is used in block devices discovery. Can be overridden on the host or linked template level'
+          description: 'This macro is used in block devices discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.DEV.READ.AWAIT.WARN}'
           value: '20'
-          description: 'Disk read average response time (in ms) before the trigger would fire'
+          description: 'Disk read average response time (in ms) before the trigger would fire.'
         -
           macro: '{$VFS.DEV.WRITE.AWAIT.WARN}'
           value: '20'
-          description: 'Disk write average response time (in ms) before the trigger would fire'
+          description: 'Disk write average response time (in ms) before the trigger would fire.'
         -
           macro: '{$VFS.FS.FSDEVICE.MATCHES}'
           value: ^.+$
-          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSDEVICE.NOT_MATCHES}'
           value: ^\s$
-          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSNAME.MATCHES}'
           value: .+
-          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSNAME.NOT_MATCHES}'
           value: ^(/dev|/sys|/run|/proc|.+/shm$)
-          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSTYPE.MATCHES}'
           value: ^(btrfs|ext2|ext3|ext4|reiser|xfs|ffs|ufs|jfs|jfs2|vxfs|hfs|apfs|refs|ntfs|fat32|zfs)$
-          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSTYPE.NOT_MATCHES}'
           value: ^\s$
-          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level'
+          description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.INODE.PFREE.MIN.CRIT}'
           value: '10'
@@ -2602,7 +2602,7 @@ zabbix_export:
       name: 'High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
       opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: WARNING
-      description: 'This trigger is ignored, if there is no swap configured'
+      description: 'This trigger is ignored, if there is no swap configured.'
       dependencies:
         -
           name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
diff --git a/templates/os/linux_snmp_snmp/README.md b/templates/os/linux_snmp_snmp/README.md
index 9e5cc8d4a4d..4afe935cf4d 100644
--- a/templates/os/linux_snmp_snmp/README.md
+++ b/templates/os/linux_snmp_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -15,11 +15,11 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                    | Description | Default |
-|-------------------------|-------------|---------|
-| {$MEMORY.AVAILABLE.MIN} | <p>-</p>    | `20M`   |
-| {$MEMORY.UTIL.MAX}      | <p>-</p>    | `90`    |
-| {$SWAP.PFREE.MIN.WARN}  | <p>-</p>    | `50`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$MEMORY.AVAILABLE.MIN} |<p>-</p> |`20M` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$SWAP.PFREE.MIN.WARN} |<p>-</p> |`50` |
 
 ## Template links
 
@@ -30,25 +30,25 @@ There are no template links in this template.
 
 ## Items collected
 
-| Group  | Name                 | Description                                                                                                                                                                                  | Type       | Key and additional info                                                                                                                                                                                                                                 |
-|--------|----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Memory | Memory utilization   | <p>Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.</p> | CALCULATED | vm.memory.util[snmp]<p>**Expression**:</p>`(last("vm.memory.total[memTotalReal.0]")-(last("vm.memory.free[memAvailReal.0]")+last("vm.memory.buffers[memBuffer.0]")+last("vm.memory.cached[memCached.0]")))/last("vm.memory.total[memTotalReal.0]")*100` |
-| Memory | Free memory          | <p>MIB: UCD-SNMP-MIB</p>                                                                                                                                                                     | SNMP       | vm.memory.free[memAvailReal.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                      |
-| Memory | Memory (buffers)     | <p>MIB: UCD-SNMP-MIB</p><p>Memory used by kernel buffers (Buffers in /proc/meminfo)</p>                                                                                                      | SNMP       | vm.memory.buffers[memBuffer.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                      |
-| Memory | Memory (cached)      | <p>MIB: UCD-SNMP-MIB</p><p>Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)</p>                                                                                    | SNMP       | vm.memory.cached[memCached.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                       |
-| Memory | Total memory         | <p>MIB: UCD-SNMP-MIB</p><p>Total memory in Bytes</p>                                                                                                                                         | SNMP       | vm.memory.total[memTotalReal.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                     |
-| Memory | Available memory     | <p>Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.</p> | CALCULATED | vm.memory.available[snmp]<p>**Expression**:</p>`last("vm.memory.free[memAvailReal.0]")+last("vm.memory.buffers[memBuffer.0]")+last("vm.memory.cached[memCached.0]")`                                                                                    |
-| Memory | Total swap space     | <p>MIB: UCD-SNMP-MIB</p><p>The total amount of swap space configured for this host.</p>                                                                                                      | SNMP       | system.swap.total[memTotalSwap.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                   |
-| Memory | Free swap space      | <p>MIB: UCD-SNMP-MIB</p><p>The amount of swap space currently unused or available.</p>                                                                                                       | SNMP       | system.swap.free[memAvailSwap.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                                                                                                                    |
-| Memory | Free swap space in % | <p>The free space of swap volume/file in percent.</p>                                                                                                                                        | CALCULATED | system.swap.pfree[snmp]<p>**Expression**:</p>`last("system.swap.free[memAvailSwap.0]")/last("system.swap.total[memTotalSwap.0]")*100`                                                                                                                   |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Memory |Memory utilization |<p>Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.</p> |CALCULATED |vm.memory.util[snmp]<p>**Expression**:</p>`(last(//vm.memory.total[memTotalReal.0])-(last(//vm.memory.free[memAvailReal.0])+last(//vm.memory.buffers[memBuffer.0])+last(//vm.memory.cached[memCached.0])))/last(//vm.memory.total[memTotalReal.0])*100` |
+|Memory |Free memory |<p>MIB: UCD-SNMP-MIB</p> |SNMP |vm.memory.free[memAvailReal.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory (buffers) |<p>MIB: UCD-SNMP-MIB</p><p>Memory used by kernel buffers (Buffers in /proc/meminfo)</p> |SNMP |vm.memory.buffers[memBuffer.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory (cached) |<p>MIB: UCD-SNMP-MIB</p><p>Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)</p> |SNMP |vm.memory.cached[memCached.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: UCD-SNMP-MIB</p><p>Total memory in Bytes</p> |SNMP |vm.memory.total[memTotalReal.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Available memory |<p>Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.</p> |CALCULATED |vm.memory.available[snmp]<p>**Expression**:</p>`last(//vm.memory.free[memAvailReal.0])+last(//vm.memory.buffers[memBuffer.0])+last(//vm.memory.cached[memCached.0])` |
+|Memory |Total swap space |<p>MIB: UCD-SNMP-MIB</p><p>The total amount of swap space configured for this host.</p> |SNMP |system.swap.total[memTotalSwap.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Free swap space |<p>MIB: UCD-SNMP-MIB</p><p>The amount of swap space currently unused or available.</p> |SNMP |system.swap.free[memAvailSwap.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Free swap space in % |<p>The free space of swap volume/file in percent.</p> |CALCULATED |system.swap.pfree[snmp]<p>**Expression**:</p>`last(//system.swap.free[memAvailSwap.0])/last(//system.swap.total[memTotalSwap.0])*100` |
 
 ## Triggers
 
-| Name                                                                  | Description                                                    | Expression                                                                                                                                   | Severity | Dependencies and additional info                                                                                                                                   |
-|-----------------------------------------------------------------------|----------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)                 | <p>The system is running out of free memory.</p>               | `{TEMPLATE_NAME:vm.memory.util[snmp].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                            | AVERAGE  | <p>**Depends on**:</p><p>- Lack of available memory (< {$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p>                                                               |
-| Lack of available memory (< {$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) | <p>-</p>                                                       | `{TEMPLATE_NAME:vm.memory.available[snmp].min(5m)}<{$MEMORY.AVAILABLE.MIN} and {Linux memory SNMP:vm.memory.total[memTotalReal.0].last()}>0` | AVERAGE  |                                                                                                                                                                    |
-| High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)        | <p>This trigger is ignored, if there is no swap configured</p> | `{TEMPLATE_NAME:system.swap.pfree[snmp].min(5m)}<{$SWAP.PFREE.MIN.WARN} and {Linux memory SNMP:system.swap.total[memTotalSwap.0].last()}>0`  | WARNING  | <p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (< {$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux memory SNMP/vm.memory.util[snmp],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0` |AVERAGE | |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/Linux memory SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory SNMP/system.swap.total[memTotalSwap.0])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 
 ## Feedback
 
@@ -62,7 +62,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -74,10 +74,10 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                           | Description                                                                                                  | Default                                                                                                                    |
-|--------------------------------|--------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------|
-| {$VFS.DEV.DEVNAME.MATCHES}     | <p>This macro is used in block devices discovery. Can be overridden on the host or linked template level</p> | `.+`                                                                                                                       |
-| {$VFS.DEV.DEVNAME.NOT_MATCHES} | <p>This macro is used in block devices discovery. Can be overridden on the host or linked template level</p> | `^(loop[0-9]*|sd[a-z][0-9]+|nbd[0-9]+|sr[0-9]+|fd[0-9]+|dm-[0-9]+|ram[0-9]+|ploop[a-z0-9]+|md[0-9]*|hcp[0-9]*|zram[0-9]*)` |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$VFS.DEV.DEVNAME.MATCHES} |<p>This macro is used in block devices discovery. Can be overridden on the host or linked template level</p> |`.+` |
+|{$VFS.DEV.DEVNAME.NOT_MATCHES} |<p>This macro is used in block devices discovery. Can be overridden on the host or linked template level</p> |`^(loop[0-9]*|sd[a-z][0-9]+|nbd[0-9]+|sr[0-9]+|fd[0-9]+|dm-[0-9]+|ram[0-9]+|ploop[a-z0-9]+|md[0-9]*|hcp[0-9]*|zram[0-9]*)` |
 
 ## Template links
 
@@ -85,17 +85,17 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                    | Description                                                                                                                                    | Type | Key and additional info                                                                                                                                                                 |
-|-------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Block devices discovery | <p>Block devices are discovered from UCD-DISKIO-MIB::diskIOTable (http://net-snmp.sourceforge.net/docs/mibs/ucdDiskIOMIB.html#diskIOTable)</p> | SNMP | vfs.dev.discovery[snmp]<p>**Filter**:</p>AND <p>- A: {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- B: {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Block devices discovery |<p>Block devices are discovered from UCD-DISKIO-MIB::diskIOTable (http://net-snmp.sourceforge.net/docs/mibs/ucdDiskIOMIB.html#diskIOTable)</p> |SNMP |vfs.dev.discovery[snmp]<p>**Filter**:</p>AND <p>- {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group   | Name                         | Description                                                                                | Type | Key and additional info                                                                      |
-|---------|------------------------------|--------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------|
-| Storage | {#DEVNAME}: Disk read rate   | <p>MIB: UCD-DISKIO-MIB</p><p>The number of read accesses from this device since boot.</p>  | SNMP | vfs.dev.read.rate[diskIOReads.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND   |
-| Storage | {#DEVNAME}: Disk write rate  | <p>MIB: UCD-DISKIO-MIB</p><p>The number of write accesses from this device since boot.</p> | SNMP | vfs.dev.write.rate[diskIOWrites.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-| Storage | {#DEVNAME}: Disk utilization | <p>MIB: UCD-DISKIO-MIB</p><p>The 1 minute average load of disk (%)</p>                     | SNMP | vfs.dev.util[diskIOLA1.{#SNMPINDEX}]                                                         |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Storage |{#DEVNAME}: Disk read rate |<p>MIB: UCD-DISKIO-MIB</p><p>The number of read accesses from this device since boot.</p> |SNMP |vfs.dev.read.rate[diskIOReads.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Storage |{#DEVNAME}: Disk write rate |<p>MIB: UCD-DISKIO-MIB</p><p>The number of write accesses from this device since boot.</p> |SNMP |vfs.dev.write.rate[diskIOWrites.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Storage |{#DEVNAME}: Disk utilization |<p>MIB: UCD-DISKIO-MIB</p><p>The 1 minute average load of disk (%)</p> |SNMP |vfs.dev.util[diskIOLA1.{#SNMPINDEX}] |
 
 ## Triggers
 
@@ -110,7 +110,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -122,10 +122,10 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                         | Description                                                 | Default |
-|------------------------------|-------------------------------------------------------------|---------|
-| {$CPU.UTIL.CRIT}             | <p>-</p>                                                    | `90`    |
-| {$LOAD_AVG_PER_CPU.MAX.WARN} | <p>Load per CPU considered sustainable. Tune if needed.</p> | `1.5`   |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$LOAD_AVG_PER_CPU.MAX.WARN} |<p>Load per CPU considered sustainable. Tune if needed.</p> |`1.5` |
 
 ## Template links
 
@@ -133,38 +133,38 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name          | Description                                                                                                                                                   | Type      | Key and additional info                                                                                       |
-|---------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------|
-| CPU discovery | <p>This discovery will create set of per core CPU metrics from UCD-SNMP-MIB, using {#CPU.COUNT} in preprocessing. That's the only reason why LLD is used.</p> | DEPENDENT | cpu.discovery[snmp]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `Text is too long. Please see the template.`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>This discovery will create set of per core CPU metrics from UCD-SNMP-MIB, using {#CPU.COUNT} in preprocessing. That's the only reason why LLD is used.</p> |DEPENDENT |cpu.discovery[snmp]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
-| Group | Name                        | Description                                                                                                                                                      | Type      | Key and additional info                                                                                                                                                                                                   |
-|-------|-----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU   | Load average (1m avg)       | <p>MIB: UCD-SNMP-MIB</p>                                                                                                                                         | SNMP      | system.cpu.load.avg1[laLoad.1]                                                                                                                                                                                            |
-| CPU   | Load average (5m avg)       | <p>MIB: UCD-SNMP-MIB</p>                                                                                                                                         | SNMP      | system.cpu.load.avg5[laLoad.2]                                                                                                                                                                                            |
-| CPU   | Load average (15m avg)      | <p>MIB: UCD-SNMP-MIB</p>                                                                                                                                         | SNMP      | system.cpu.load.avg15[laLoad.3]                                                                                                                                                                                           |
-| CPU   | Number of CPUs              | <p>MIB: HOST-RESOURCES-MIB</p><p>Count the number of CPU cores by counting number of cores discovered in hrProcessorTable using LLD</p>                          | SNMP      | system.cpu.num[snmp]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `//count the number of cores return JSON.parse(value).length; `</p>                                                                                         |
-| CPU   | Interrupts per second       | <p>-</p>                                                                                                                                                         | SNMP      | system.cpu.intr[ssRawInterrupts.0]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                                                                                                         |
-| CPU   | Context switches per second | <p>-</p>                                                                                                                                                         | SNMP      | system.cpu.switches[ssRawContexts.0]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND                                                                                                                                       |
-| CPU   | CPU idle time               | <p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent doing nothing.</p>                                                                                         | SNMP      | system.cpu.idle[ssCpuRawIdle.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>            |
-| CPU   | CPU system time             | <p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running the kernel and its processes.</p>                                                                  | SNMP      | system.cpu.system[ssCpuRawSystem.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>        |
-| CPU   | CPU user time               | <p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running users' processes that are not niced.</p>                                                           | SNMP      | system.cpu.user[ssCpuRawUser.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>            |
-| CPU   | CPU steal time              | <p>MIB: UCD-SNMP-MIB</p><p>The amount of CPU 'stolen' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).</p> | SNMP      | system.cpu.steal[ssCpuRawSteal.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>          |
-| CPU   | CPU softirq time            | <p>MIB: UCD-SNMP-MIB</p><p>The amount of time the CPU has been servicing software interrupts.</p>                                                                | SNMP      | system.cpu.softirq[ssCpuRawSoftIRQ.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>      |
-| CPU   | CPU nice time               | <p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running users' processes that have been niced.</p>                                                         | SNMP      | system.cpu.nice[ssCpuRawNice.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>            |
-| CPU   | CPU iowait time             | <p>MIB: UCD-SNMP-MIB</p><p>Amount of time the CPU has been waiting for I/O to complete.</p>                                                                      | SNMP      | system.cpu.iowait[ssCpuRawWait.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>          |
-| CPU   | CPU interrupt time          | <p>MIB: UCD-SNMP-MIB</p><p>The amount of time the CPU has been servicing hardware interrupts.</p>                                                                | SNMP      | system.cpu.interrupt[ssCpuRawInterrupt.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>  |
-| CPU   | CPU guest time              | <p>MIB: UCD-SNMP-MIB</p><p>Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)</p>                                             | SNMP      | system.cpu.guest[ssCpuRawGuest.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p>          |
-| CPU   | CPU guest nice time         | <p>MIB: UCD-SNMP-MIB</p><p>Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)</p>                  | SNMP      | system.cpu.guest_nice[ssCpuRawGuestNice.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
-| CPU   | CPU utilization             | <p>CPU utilization in %</p>                                                                                                                                      | DEPENDENT | system.cpu.util[snmp,{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `//Calculate utilization return (100 - value) `</p>                                                                                           |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |Load average (1m avg) |<p>MIB: UCD-SNMP-MIB</p> |SNMP |system.cpu.load.avg1[laLoad.1] |
+|CPU |Load average (5m avg) |<p>MIB: UCD-SNMP-MIB</p> |SNMP |system.cpu.load.avg5[laLoad.2] |
+|CPU |Load average (15m avg) |<p>MIB: UCD-SNMP-MIB</p> |SNMP |system.cpu.load.avg15[laLoad.3] |
+|CPU |Number of CPUs |<p>MIB: HOST-RESOURCES-MIB</p><p>Count the number of CPU cores by counting number of cores discovered in hrProcessorTable using LLD</p> |SNMP |system.cpu.num[snmp]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `//count the number of cores return JSON.parse(value).length; `</p> |
+|CPU |Interrupts per second |<p>-</p> |SNMP |system.cpu.intr[ssRawInterrupts.0]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|CPU |Context switches per second |<p>-</p> |SNMP |system.cpu.switches[ssRawContexts.0]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|CPU |CPU idle time |<p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent doing nothing.</p> |SNMP |system.cpu.idle[ssCpuRawIdle.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU system time |<p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running the kernel and its processes.</p> |SNMP |system.cpu.system[ssCpuRawSystem.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU user time |<p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running users' processes that are not niced.</p> |SNMP |system.cpu.user[ssCpuRawUser.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU steal time |<p>MIB: UCD-SNMP-MIB</p><p>The amount of CPU 'stolen' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).</p> |SNMP |system.cpu.steal[ssCpuRawSteal.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU softirq time |<p>MIB: UCD-SNMP-MIB</p><p>The amount of time the CPU has been servicing software interrupts.</p> |SNMP |system.cpu.softirq[ssCpuRawSoftIRQ.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU nice time |<p>MIB: UCD-SNMP-MIB</p><p>The time the CPU has spent running users' processes that have been niced.</p> |SNMP |system.cpu.nice[ssCpuRawNice.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU iowait time |<p>MIB: UCD-SNMP-MIB</p><p>Amount of time the CPU has been waiting for I/O to complete.</p> |SNMP |system.cpu.iowait[ssCpuRawWait.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU interrupt time |<p>MIB: UCD-SNMP-MIB</p><p>The amount of time the CPU has been servicing hardware interrupts.</p> |SNMP |system.cpu.interrupt[ssCpuRawInterrupt.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU guest time |<p>MIB: UCD-SNMP-MIB</p><p>Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)</p> |SNMP |system.cpu.guest[ssCpuRawGuest.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU guest nice time |<p>MIB: UCD-SNMP-MIB</p><p>Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)</p> |SNMP |system.cpu.guest_nice[ssCpuRawGuestNice.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- JAVASCRIPT: `//to get utilization in %, divide by N, where N is number of cores. return value/{#CPU.COUNT} `</p> |
+|CPU |CPU utilization |<p>CPU utilization in %</p> |DEPENDENT |system.cpu.util[snmp,{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `//Calculate utilization return (100 - value) `</p> |
 
 ## Triggers
 
-| Name                                                                             | Description                                                                  | Expression                                                                                                                                                                                                                                                    | Severity | Dependencies and additional info |
-|----------------------------------------------------------------------------------|------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) | <p>Per CPU load average is too high. Your system may be slow to respond.</p> | `{TEMPLATE_NAME:system.cpu.load.avg1[laLoad.1].min(5m)}/{Linux CPU SNMP:system.cpu.num[snmp].last()}>{$LOAD_AVG_PER_CPU.MAX.WARN} and {Linux CPU SNMP:system.cpu.load.avg5[laLoad.2].last()}>0 and {Linux CPU SNMP:system.cpu.load.avg15[laLoad.3].last()}>0` | AVERAGE  |                                  |
-| 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[snmp,{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                 | WARNING  |                                  |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux CPU SNMP/system.cpu.load.avg1[laLoad.1],5m)/last(/Linux CPU SNMP/system.cpu.num[snmp])>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux CPU SNMP/system.cpu.load.avg5[laLoad.2])>0 and last(/Linux CPU SNMP/system.cpu.load.avg15[laLoad.3])>0 ` |AVERAGE | |
+|High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Linux CPU SNMP/system.cpu.util[snmp,{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
 
 ## Feedback
 
@@ -174,7 +174,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -186,16 +186,16 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                           | Description                                                                                                | Default                                                |
-|--------------------------------|------------------------------------------------------------------------------------------------------------|--------------------------------------------------------|
-| {$VFS.FS.FSNAME.MATCHES}       | <p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> | `.+`                                                   |
-| {$VFS.FS.FSNAME.NOT_MATCHES}   | <p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> | `^(/dev|/sys|/run|/proc|.+/shm$)`                      |
-| {$VFS.FS.FSTYPE.MATCHES}       | <p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> | `.*(\.4|\.9|hrStorageFixedDisk|hrStorageFlashMemory)$` |
-| {$VFS.FS.FSTYPE.NOT_MATCHES}   | <p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> | `^\s$`                                                 |
-| {$VFS.FS.INODE.PFREE.MIN.CRIT} | <p>-</p>                                                                                                   | `10`                                                   |
-| {$VFS.FS.INODE.PFREE.MIN.WARN} | <p>-</p>                                                                                                   | `20`                                                   |
-| {$VFS.FS.PUSED.MAX.CRIT}       | <p>-</p>                                                                                                   | `90`                                                   |
-| {$VFS.FS.PUSED.MAX.WARN}       | <p>-</p>                                                                                                   | `80`                                                   |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$VFS.FS.FSNAME.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`.+` |
+|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^(/dev|/sys|/run|/proc|.+/shm$)` |
+|{$VFS.FS.FSTYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`.*(\.4|\.9|hrStorageFixedDisk|hrStorageFlashMemory)$` |
+|{$VFS.FS.FSTYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level</p> |`^\s$` |
+|{$VFS.FS.INODE.PFREE.MIN.CRIT} |<p>-</p> |`10` |
+|{$VFS.FS.INODE.PFREE.MIN.WARN} |<p>-</p> |`20` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
 
 ## Template links
 
@@ -203,27 +203,27 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                         | Description                                                        | Type | Key and additional info                                                                                                                                                                                                                                                                                              |
-|------------------------------|--------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Mounted filesystem discovery | <p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> | SNMP | vfs.fs.discovery[snmp]<p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Mounted filesystem discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |vfs.fs.discovery[snmp]<p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
-| Group   | Name                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Type       | Key and additional info                                                                                                                                                        |
-|---------|------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Storage | {#FSNAME}: 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[hrStorageUsed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p>                                                                          |
-| Storage | {#FSNAME}: Total space       | <p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in units of hrStorageAllocationUnits.</p><p>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.</p><p>For example, the amount of main storage allocated to a buffer pool might be modified or the amount of disk space allocated to virtual storage might be modified.</p> | SNMP       | vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p>                                                                         |
-| Storage | {#FSNAME}: Space utilization | <p>Space utilization in % for {#FSNAME}</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                   | CALCULATED | vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}]<p>**Expression**:</p>`(last("vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]")/last("vfs.fs.total[hrStorageSize.{#SNMPINDEX}]"))*100` |
-| Storage | {#FSNAME}: Free inodes in %  | <p>MIB: UCD-SNMP-MIB</p><p>If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.</p>                                                                                                                                                                                                                                                                                                                                                                           | SNMP       | vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (100-value);`</p>                                                             |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Storage |{#FSNAME}: 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[hrStorageUsed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p> |
+|Storage |{#FSNAME}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in units of hrStorageAllocationUnits.</p><p>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.</p><p>For example, the amount of main storage allocated to a buffer pool might be modified or the amount of disk space allocated to virtual storage might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `{#ALLOC_UNITS}`</p> |
+|Storage |{#FSNAME}: Space utilization |<p>Space utilization in % for {#FSNAME}</p> |CALCULATED |vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageUsed.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Storage |{#FSNAME}: Free inodes in % |<p>MIB: UCD-SNMP-MIB</p><p>If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.</p> |SNMP |vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (100-value);`</p> |
 
 ## Triggers
 
-| Name                                                                                       | Description                                                                                                                                                                                                                                                                     | Expression                                                                                                                                                                                                                                                                                                                                                           | Severity | Dependencies and additional info                                                                                                              |
-|--------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%)     | <p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}.</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[storageUsedPercentage.{#SNMPINDEX}].last()}>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and (({Linux filesystems SNMP:vfs.fs.total[hrStorageSize.{#SNMPINDEX}].last()}-{Linux filesystems SNMP:vfs.fs.used[hrStorageUsed.{#SNMPINDEX}].last()})<5G or {TEMPLATE_NAME:vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}].timeleft(1h,,100)}<1d)`  | AVERAGE  | <p>Manual close: YES</p>                                                                                                                      |
-| {#FSNAME}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}%)                | <p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}.</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[storageUsedPercentage.{#SNMPINDEX}].last()}>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and (({Linux filesystems SNMP:vfs.fs.total[hrStorageSize.{#SNMPINDEX}].last()}-{Linux filesystems SNMP:vfs.fs.used[hrStorageUsed.{#SNMPINDEX}].last()})<10G or {TEMPLATE_NAME:vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}].timeleft(1h,,100)}<1d)` | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%)</p> |
-| {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%) | <p>It may become impossible to write to disk if there are no index nodes left.</p><p>As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.</p>                                                                       | `{TEMPLATE_NAME:vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}].min(5m)}<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}`                                                                                                                                                                                                                                                 | AVERAGE  |                                                                                                                                               |
-| {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}%) | <p>It may become impossible to write to disk if there are no index nodes left.</p><p>As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.</p>                                                                       | `{TEMPLATE_NAME:vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}].min(5m)}<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}`                                                                                                                                                                                                                                                 | WARNING  | <p>**Depends on**:</p><p>- {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)</p>                     |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}.</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(/Linux filesystems SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and ((last(/Linux filesystems SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Linux filesystems SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/Linux filesystems SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|{#FSNAME}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}.</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(/Linux filesystems SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and ((last(/Linux filesystems SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Linux filesystems SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<10G or timeleft(/Linux filesystems SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%)</p> |
+|{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%) |<p>It may become impossible to write to disk if there are no index nodes left.</p><p>As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.</p> |`min(/Linux filesystems SNMP/vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}` |AVERAGE | |
+|{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}%) |<p>It may become impossible to write to disk if there are no index nodes left.</p><p>As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.</p> |`min(/Linux filesystems SNMP/vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}` |WARNING |<p>**Depends on**:</p><p>- {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)</p> |
 
 ## Feedback
 
@@ -233,7 +233,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -263,15 +263,15 @@ No specific Zabbix configuration is required.
 
 ## Template links
 
-| Name                     |
-|--------------------------|
-| EtherLike-MIB SNMP       |
-| Generic SNMP             |
-| Interfaces SNMP          |
-| Linux CPU SNMP           |
-| Linux block devices SNMP |
-| Linux filesystems SNMP   |
-| Linux memory SNMP        |
+|Name|
+|----|
+|Linux block devices SNMP |
+|Linux CPU SNMP |
+|Linux filesystems SNMP |
+|Linux memory SNMP |
+|EtherLike-MIB SNMP |
+|Generic SNMP |
+|Interfaces SNMP |
 
 ## Discovery rules
 
diff --git a/templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml b/templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml
index 7100e305c17..3b1173a4226 100644
--- a/templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml
+++ b/templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:46Z'
+  version: '6.0'
+  date: '2021-12-16T06:03:07Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -17,7 +17,7 @@ zabbix_export:
         MIBs used:
         UCD-DISKIO-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -136,7 +136,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         UCD-SNMP-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -644,7 +644,7 @@ zabbix_export:
         HOST-RESOURCES-MIB
         UCD-SNMP-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -878,7 +878,7 @@ zabbix_export:
         
           Description: Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -1051,7 +1051,7 @@ zabbix_export:
               description: 'The system is running out of free memory.'
               dependencies:
                 -
-                  name: 'Lack of available memory (< {$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
+                  name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
                   expression: 'min(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
       macros:
         -
@@ -1072,7 +1072,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387225-discussion-thread-for-official-zabbix-template-for-linux
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'EtherLike-MIB SNMP'
@@ -1121,6 +1121,10 @@ zabbix_export:
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -1128,10 +1132,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
@@ -1178,6 +1178,10 @@ zabbix_export:
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -1185,10 +1189,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
@@ -1202,6 +1202,10 @@ zabbix_export:
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -1209,10 +1213,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
@@ -1250,6 +1250,10 @@ zabbix_export:
                   fields:
                     -
                       type: INTEGER
+                      name: source_type
+                      value: '2'
+                    -
+                      type: INTEGER
                       name: columns
                       value: '1'
                     -
@@ -1257,10 +1261,6 @@ zabbix_export:
                       name: rows
                       value: '1'
                     -
-                      type: INTEGER
-                      name: source_type
-                      value: '2'
-                    -
                       type: GRAPH_PROTOTYPE
                       name: graphid
                       value:
@@ -1279,12 +1279,12 @@ zabbix_export:
           name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
           expression: 'min(/Linux memory SNMP/vm.memory.util[snmp],5m)>{$MEMORY.UTIL.MAX}'
         -
-          name: 'Lack of available memory (< {$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
+          name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
           expression: 'min(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
     -
       uuid: 687586e62f4b4191aa95ba1ba74c7787
       expression: 'min(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
-      name: 'Lack of available memory (< {$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
+      name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
     -
diff --git a/templates/os/windows_agent/README.md b/templates/os/windows_agent/README.md
index e8232b92235..b37763091ba 100644
--- a/templates/os/windows_agent/README.md
+++ b/templates/os/windows_agent/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -34,20 +34,20 @@ There are no template links in this template.
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
 |CPU |CPU utilization |<p>CPU utilization in %</p> |ZABBIX_PASSIVE |system.cpu.util |
-|CPU |CPU interrupt time |<p>The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing </p><p>hardware interrupts during sample intervals. This value is an indirect indicator of the activity of </p><p>devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication </p><p>lines, network interface cards and other peripheral devices. This is an easy way to identify a potential </p><p>hardware failure. This should never be higher than 20%.</p> |ZABBIX_PASSIVE |perf_counter_en["\Processor Information(_total)\% Interrupt Time"] |
+|CPU |CPU interrupt time |<p>The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing</p><p>hardware interrupts during sample intervals. This value is an indirect indicator of the activity of</p><p>devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication</p><p>lines, network interface cards and other peripheral devices. This is an easy way to identify a potential</p><p>hardware failure. This should never be higher than 20%.</p> |ZABBIX_PASSIVE |perf_counter_en["\Processor Information(_total)\% Interrupt Time"] |
 |CPU |Context switches per second |<p>Context Switches/sec is the combined rate at which all processors on the computer are switched from one thread to another.</p><p>Context switches occur when a running thread voluntarily relinquishes the processor, is preempted by a higher priority ready thread, or switches between user-mode and privileged (kernel) mode to use an Executive or subsystem service.</p><p>It is the sum of Thread\\Context Switches/sec for all threads running on all processors in the computer and is measured in numbers of switches.</p><p>There are context switch counters on the System and Thread objects. This counter displays the difference between the values observed in the last two samples, divided by the duration of the sample interval.</p> |ZABBIX_PASSIVE |perf_counter_en["\System\Context Switches/sec"] |
-|CPU |CPU privileged time |<p>The Processor Information\% Privileged Time counter shows the percent of time that the processor is spent </p><p>executing in Kernel (or Privileged) mode. Privileged mode includes services interrupts inside Interrupt </p><p>Service Routines (ISRs), executing Deferred Procedure Calls (DPCs), Device Driver calls and other kernel-mode </p><p>functions of the Windows® Operating System.</p> |ZABBIX_PASSIVE |perf_counter_en["\Processor Information(_total)\% Privileged Time"] |
-|CPU |CPU DPC time |<p>Processor DPC time is the time that a single processor spent receiving and servicing deferred procedure </p><p>calls (DPCs). DPCs are interrupts that run at a lower priority than standard interrupts. % DPC Time is a </p><p>component of % Privileged Time because DPCs are executed in privileged mode. If a high % DPC Time is </p><p>sustained, there may be a processor bottleneck or an application or hardware related issue that can </p><p>significantly diminish overall system performance.</p> |ZABBIX_PASSIVE |perf_counter_en["\Processor Information(_total)\% DPC Time"] |
-|CPU |CPU user time |<p>The Processor Information\% User Time counter shows the percent of time that the processor(s) is spent executing </p><p>in User mode.</p> |ZABBIX_PASSIVE |perf_counter_en["\Processor Information(_total)\% User Time"] |
+|CPU |CPU privileged time |<p>The Processor Information\% Privileged Time counter shows the percent of time that the processor is spent</p><p>executing in Kernel (or Privileged) mode. Privileged mode includes services interrupts inside Interrupt</p><p>Service Routines (ISRs), executing Deferred Procedure Calls (DPCs), Device Driver calls and other kernel-mode</p><p>functions of the Windows® Operating System.</p> |ZABBIX_PASSIVE |perf_counter_en["\Processor Information(_total)\% Privileged Time"] |
+|CPU |CPU DPC time |<p>Processor DPC time is the time that a single processor spent receiving and servicing deferred procedure</p><p>calls (DPCs). DPCs are interrupts that run at a lower priority than standard interrupts. % DPC Time is a</p><p>component of % Privileged Time because DPCs are executed in privileged mode. If a high % DPC Time is</p><p>sustained, there may be a processor bottleneck or an application or hardware related issue that can</p><p>significantly diminish overall system performance.</p> |ZABBIX_PASSIVE |perf_counter_en["\Processor Information(_total)\% DPC Time"] |
+|CPU |CPU user time |<p>The Processor Information\% User Time counter shows the percent of time that the processor(s) is spent executing</p><p>in User mode.</p> |ZABBIX_PASSIVE |perf_counter_en["\Processor Information(_total)\% User Time"] |
 |CPU |Number of cores |<p>The number of logical processors available on the computer.</p> |ZABBIX_PASSIVE |wmi.get[root/cimv2,"Select NumberOfLogicalProcessors from Win32_ComputerSystem"] |
-|CPU |CPU queue length |<p>The Processor Queue Length shows the number of threads that are observed as delayed in the processor Ready Queue </p><p>and are waiting to be executed.</p> |ZABBIX_PASSIVE |perf_counter_en["\System\Processor Queue Length"] |
+|CPU |CPU queue length |<p>The Processor Queue Length shows the number of threads that are observed as delayed in the processor Ready Queue</p><p>and are waiting to be executed.</p> |ZABBIX_PASSIVE |perf_counter_en["\System\Processor Queue Length"] |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Windows CPU by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
-|CPU interrupt time is too high (over {$CPU.INTERRUPT.CRIT.MAX}% for 5m) |<p>"The CPU Interrupt Time in the last 5 minutes exceeds {$CPU.INTERRUPT.CRIT.MAX}%."</p><p>The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing </p><p>hardware interrupts during sample intervals. This value is an indirect indicator of the activity of </p><p>devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication </p><p>lines, network interface cards and other peripheral devices. This is an easy way to identify a potential </p><p>hardware failure. This should never be higher than 20%.</p> |`min(/Windows CPU by Zabbix agent/perf_counter_en["\Processor Information(_total)\% Interrupt Time"],5m)>{$CPU.INTERRUPT.CRIT.MAX}` |WARNING |<p>**Depends on**:</p><p>- High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)</p> |
+|CPU interrupt time is too high (over {$CPU.INTERRUPT.CRIT.MAX}% for 5m) |<p>"The CPU Interrupt Time in the last 5 minutes exceeds {$CPU.INTERRUPT.CRIT.MAX}%."</p><p>The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing</p><p>hardware interrupts during sample intervals. This value is an indirect indicator of the activity of</p><p>devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication</p><p>lines, network interface cards and other peripheral devices. This is an easy way to identify a potential</p><p>hardware failure. This should never be higher than 20%.</p> |`min(/Windows CPU by Zabbix agent/perf_counter_en["\Processor Information(_total)\% Interrupt Time"],5m)>{$CPU.INTERRUPT.CRIT.MAX}` |WARNING |<p>**Depends on**:</p><p>- High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)</p> |
 |CPU privileged time is too high (over {$CPU.PRIV.CRIT.MAX}% for 5m) |<p>The CPU privileged time in the last 5 minutes exceeds {$CPU.PRIV.CRIT.MAX}%.</p> |`min(/Windows CPU by Zabbix agent/perf_counter_en["\Processor Information(_total)\% Privileged Time"],5m)>{$CPU.PRIV.CRIT.MAX}` |WARNING |<p>**Depends on**:</p><p>- CPU interrupt time is too high (over {$CPU.INTERRUPT.CRIT.MAX}% for 5m)</p><p>- High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)</p> |
 |CPU queue length is too high (over {$CPU.QUEUE.CRIT.MAX} for 5m) |<p>The CPU Queue Length in the last 5 minutes exceeds {$CPU.QUEUE.CRIT.MAX}. According to actual observations, PQL should not exceed the number of cores * 2. To fine-tune the conditions, use the macro {$CPU.QUEUE.CRIT.MAX }.</p> |`min(/Windows CPU by Zabbix agent/perf_counter_en["\System\Processor Queue Length"],5m) - last(/Windows CPU by Zabbix agent/wmi.get[root/cimv2,"Select NumberOfLogicalProcessors from Win32_ComputerSystem"]) * 2 > {$CPU.QUEUE.CRIT.MAX}` |WARNING |<p>**Depends on**:</p><p>- High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)</p> |
 
@@ -59,7 +59,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -92,15 +92,15 @@ There are no template links in this template.
 |Memory |Used memory |<p>Used memory in Bytes</p> |ZABBIX_PASSIVE |vm.memory.size[used] |
 |Memory |Total memory |<p>Total memory in Bytes</p> |ZABBIX_PASSIVE |vm.memory.size[total] |
 |Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util<p>**Expression**:</p>`last(//vm.memory.size[used]) / last(//vm.memory.size[total]) * 100` |
-|Memory |Cache bytes |<p>Cache Bytes is the sum of the Memory\\System Cache Resident Bytes, Memory\\System Driver Resident Bytes, </p><p>Memory\\System Code Resident Bytes, and Memory\\Pool Paged Resident Bytes counters. This counter displays </p><p>the last observed value only; it is not an average.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Cache Bytes"] |
+|Memory |Cache bytes |<p>Cache Bytes is the sum of the Memory\\System Cache Resident Bytes, Memory\\System Driver Resident Bytes,</p><p>Memory\\System Code Resident Bytes, and Memory\\Pool Paged Resident Bytes counters. This counter displays</p><p>the last observed value only; it is not an average.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Cache Bytes"] |
 |Memory |Free swap space |<p>The free space of swap volume/file in bytes.</p> |CALCULATED |system.swap.free<p>**Expression**:</p>`last(//system.swap.size[,total]) - last(//system.swap.size[,total]) / 100 * last(//perf_counter_en["\Paging file(_Total)\% Usage"])` |
 |Memory |Free swap space in % |<p>The free space of swap volume/file in percent.</p> |DEPENDENT |system.swap.pfree<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (100 - value)`</p> |
 |Memory |Used swap space in % |<p>The used space of swap volume/file in percent.</p> |ZABBIX_PASSIVE |perf_counter_en["\Paging file(_Total)\% Usage"] |
 |Memory |Total swap space |<p>The total space of swap volume/file in bytes.</p> |ZABBIX_PASSIVE |system.swap.size[,total] |
-|Memory |Free system page table entries |<p>This indicates the number of page table entries not currently in use by the system. If the number is less </p><p>than 5,000, there may well be a memory leak or you running out of memory.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Free System Page Table Entries"] |
-|Memory |Memory page faults per second |<p>Page Faults/sec is the average number of pages faulted per second. It is measured in number of pages </p><p>faulted per second because only one page is faulted in each fault operation, hence this is also equal </p><p>to the number of page fault operations. This counter includes both hard faults (those that require </p><p>disk access) and soft faults (where the faulted page is found elsewhere in physical memory.) Most </p><p>processors can handle large numbers of soft faults without significant consequence. However, hard faults, </p><p>which require disk access, can cause significant delays.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Page Faults/sec"] |
-|Memory |Memory pages per second |<p>This measures the rate at which pages are read from or written to disk to resolve hard page faults. </p><p>If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Pages/sec"] |
-|Memory |Memory pool non-paged |<p>This measures the size, in bytes, of the non-paged pool. This is an area of system memory for objects </p><p>that cannot be written to disk but instead must remain in physical memory as long as they are allocated. </p><p>There is a possible memory leak if the value is greater than 175MB (or 100MB with the /3GB switch). </p><p>A typical Event ID 2019 is recorded in the system event log.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Pool Nonpaged Bytes"] |
+|Memory |Free system page table entries |<p>This indicates the number of page table entries not currently in use by the system. If the number is less</p><p>than 5,000, there may well be a memory leak or you running out of memory.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Free System Page Table Entries"] |
+|Memory |Memory page faults per second |<p>Page Faults/sec is the average number of pages faulted per second. It is measured in number of pages</p><p>faulted per second because only one page is faulted in each fault operation, hence this is also equal</p><p>to the number of page fault operations. This counter includes both hard faults (those that require</p><p>disk access) and soft faults (where the faulted page is found elsewhere in physical memory.) Most</p><p>processors can handle large numbers of soft faults without significant consequence. However, hard faults,</p><p>which require disk access, can cause significant delays.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Page Faults/sec"] |
+|Memory |Memory pages per second |<p>This measures the rate at which pages are read from or written to disk to resolve hard page faults.</p><p>If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Pages/sec"] |
+|Memory |Memory pool non-paged |<p>This measures the size, in bytes, of the non-paged pool. This is an area of system memory for objects</p><p>that cannot be written to disk but instead must remain in physical memory as long as they are allocated.</p><p>There is a possible memory leak if the value is greater than 175MB (or 100MB with the /3GB switch).</p><p>A typical Event ID 2019 is recorded in the system event log.</p> |ZABBIX_PASSIVE |perf_counter_en["\Memory\Pool Nonpaged Bytes"] |
 
 ## Triggers
 
@@ -150,7 +150,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |ZABBIX_PASSIVE |vfs.fs.discovery<p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p><p>- E: {#FSDRIVETYPE} MATCHES_REGEX `{$VFS.FS.FSDRIVETYPE.MATCHES}`</p><p>- F: {#FSDRIVETYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSDRIVETYPE.NOT_MATCHES}`</p> |
+|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |ZABBIX_PASSIVE |vfs.fs.discovery<p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p><p>- {#FSDRIVETYPE} MATCHES_REGEX `{$VFS.FS.FSDRIVETYPE.MATCHES}`</p><p>- {#FSDRIVETYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSDRIVETYPE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -175,7 +175,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -203,7 +203,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Physical disks discovery |<p>Discovery of installed physical disks.</p> |ZABBIX_PASSIVE |perf_instance_en.discovery[PhysicalDisk]<p>**Preprocessing**:</p><p>- STR_REPLACE: `{#INSTANCE} {#DEVNAME}`</p><p>**Filter**:</p>AND <p>- A: {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- B: {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
+|Physical disks discovery |<p>Discovery of installed physical disks.</p> |ZABBIX_PASSIVE |perf_instance_en.discovery[PhysicalDisk]<p>**Preprocessing**:</p><p>- STR_REPLACE: `{#INSTANCE} {#DEVNAME}`</p><p>**Filter**:</p>AND <p>- {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -212,7 +212,7 @@ There are no template links in this template.
 |Storage |{#DEVNAME}: Disk read rate |<p>Rate of read operations on the disk.</p> |ZABBIX_PASSIVE |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Reads/sec",60] |
 |Storage |{#DEVNAME}: Disk write rate |<p>Rate of write operations on the disk.</p> |ZABBIX_PASSIVE |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Writes/sec",60] |
 |Storage |{#DEVNAME}: Disk average queue size (avgqu-sz) |<p>Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |ZABBIX_PASSIVE |perf_counter_en["\PhysicalDisk({#DEVNAME})\Current Disk Queue Length",60] |
-|Storage |{#DEVNAME}: Disk utilization by idle time |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests based on idle time</p> |ZABBIX_PASSIVE |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Idle Time",60]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (100 - value)`</p> |
+|Storage |{#DEVNAME}: Disk utilization by idle time |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests based on idle time.</p> |ZABBIX_PASSIVE |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Idle Time",60]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (100 - value)`</p> |
 |Storage |{#DEVNAME}: Disk read request avg waiting time |<p>The average time for read requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.</p> |ZABBIX_PASSIVE |perf_counter_en["\PhysicalDisk({#DEVNAME})\Avg. Disk sec/Read",60] |
 |Storage |{#DEVNAME}: Disk write request avg waiting time |<p>The average time for write requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.</p> |ZABBIX_PASSIVE |perf_counter_en["\PhysicalDisk({#DEVNAME})\Avg. Disk sec/Write",60] |
 |Storage |{#DEVNAME}: Average disk read queue length |<p>Average disk read queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |ZABBIX_PASSIVE |perf_counter_en["\PhysicalDisk({#DEVNAME})\Avg. Disk Read Queue Length",60] |
@@ -234,7 +234,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -285,7 +285,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -317,18 +317,18 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Network interfaces discovery |<p>Discovery of installed network interfaces.</p> |DEPENDENT |net.if.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>- C: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- D: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- E: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- F: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- G: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- H: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p> |
+|Network interfaces discovery |<p>Discovery of installed network interfaces.</p> |DEPENDENT |net.if.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>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>Incoming traffic on the network interface.</p> |ZABBIX_PASSIVE |net.if.in["{#IFGUID}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>Outgoing traffic on the network interface.</p> |ZABBIX_PASSIVE |net.if.out["{#IFGUID}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>The number of incoming packets dropped on the network interface.</p> |ZABBIX_PASSIVE |net.if.in["{#IFGUID}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>The number of outgoing packets dropped on the network interface.</p> |ZABBIX_PASSIVE |net.if.out["{#IFGUID}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>The number of incoming packets with errors on the network interface.</p> |ZABBIX_PASSIVE |net.if.in["{#IFGUID}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>The number of outgoing packets with errors on the network interface.</p> |ZABBIX_PASSIVE |net.if.out["{#IFGUID}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>Incoming traffic on the network interface.</p> |ZABBIX_PASSIVE |net.if.in["{#IFGUID}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>Outgoing traffic on the network interface.</p> |ZABBIX_PASSIVE |net.if.out["{#IFGUID}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>The number of incoming packets dropped on the network interface.</p> |ZABBIX_PASSIVE |net.if.in["{#IFGUID}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>The number of outgoing packets dropped on the network interface.</p> |ZABBIX_PASSIVE |net.if.out["{#IFGUID}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>The number of incoming packets with errors on the network interface.</p> |ZABBIX_PASSIVE |net.if.in["{#IFGUID}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>The number of outgoing packets with errors on the network interface.</p> |ZABBIX_PASSIVE |net.if.out["{#IFGUID}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>Estimated bandwidth of the network interface if any.</p> |DEPENDENT |net.if.speed["{#IFGUID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.GUID == "{#IFGUID}")].Speed.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- JAVASCRIPT: `return (value=='9223372036854775807' ? 0 : value) `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>The type of the network interface.</p> |DEPENDENT |net.if.type["{#IFGUID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.GUID == "{#IFGUID}")].AdapterTypeId.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>The operational status of the network interface.</p> |DEPENDENT |net.if.status["{#IFGUID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.GUID == "{#IFGUID}")].NetConnectionStatus.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
@@ -351,7 +351,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Special version of services template that is required for Windows OS.
 
 ## Setup
@@ -379,7 +379,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Windows services discovery |<p>Discovery of Windows services of different types as defined in template's macros.</p> |ZABBIX_PASSIVE |service.discovery<p>**Filter**:</p>AND <p>- A: {#SERVICE.NAME} MATCHES_REGEX `{$SERVICE.NAME.MATCHES}`</p><p>- B: {#SERVICE.NAME} NOT_MATCHES_REGEX `{$SERVICE.NAME.NOT_MATCHES}`</p><p>- C: {#SERVICE.STARTUPNAME} MATCHES_REGEX `{$SERVICE.STARTUPNAME.MATCHES}`</p><p>- D: {#SERVICE.STARTUPNAME} NOT_MATCHES_REGEX `{$SERVICE.STARTUPNAME.NOT_MATCHES}`</p> |
+|Windows services discovery |<p>Discovery of Windows services of different types as defined in template's macros.</p> |ZABBIX_PASSIVE |service.discovery<p>**Filter**:</p>AND <p>- {#SERVICE.NAME} MATCHES_REGEX `{$SERVICE.NAME.MATCHES}`</p><p>- {#SERVICE.NAME} NOT_MATCHES_REGEX `{$SERVICE.NAME.NOT_MATCHES}`</p><p>- {#SERVICE.STARTUPNAME} MATCHES_REGEX `{$SERVICE.STARTUPNAME.MATCHES}`</p><p>- {#SERVICE.STARTUPNAME} NOT_MATCHES_REGEX `{$SERVICE.STARTUPNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -401,7 +401,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 New official Windows template. Requires agent of Zabbix 4.4 and newer.
 
 
diff --git a/templates/os/windows_agent/template_os_windows_agent.yaml b/templates/os/windows_agent/template_os_windows_agent.yaml
index 3d2efbe1256..272e4e8d894 100644
--- a/templates/os/windows_agent/template_os_windows_agent.yaml
+++ b/templates/os/windows_agent/template_os_windows_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-27T15:33:47Z'
+  date: '2021-12-16T06:23:19Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387224-discussion-thread-for-official-zabbix-template-for-windows
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Windows CPU by Zabbix agent'
@@ -211,7 +211,7 @@ zabbix_export:
       uuid: e358504d59404f688e236444dd82d2c3
       template: 'Windows CPU by Zabbix agent'
       name: 'Windows CPU by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -224,10 +224,10 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           description: |
-            Processor DPC time is the time that a single processor spent receiving and servicing deferred procedure 
-            calls (DPCs). DPCs are interrupts that run at a lower priority than standard interrupts. % DPC Time is a 
-            component of % Privileged Time because DPCs are executed in privileged mode. If a high % DPC Time is 
-            sustained, there may be a processor bottleneck or an application or hardware related issue that can 
+            Processor DPC time is the time that a single processor spent receiving and servicing deferred procedure
+            calls (DPCs). DPCs are interrupts that run at a lower priority than standard interrupts. % DPC Time is a
+            component of % Privileged Time because DPCs are executed in privileged mode. If a high % DPC Time is
+            sustained, there may be a processor bottleneck or an application or hardware related issue that can
             significantly diminish overall system performance.
           tags:
             -
@@ -241,10 +241,10 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           description: |
-            The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing 
-            hardware interrupts during sample intervals. This value is an indirect indicator of the activity of 
-            devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication 
-            lines, network interface cards and other peripheral devices. This is an easy way to identify a potential 
+            The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing
+            hardware interrupts during sample intervals. This value is an indirect indicator of the activity of
+            devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication
+            lines, network interface cards and other peripheral devices. This is an easy way to identify a potential
             hardware failure. This should never be higher than 20%.
           tags:
             -
@@ -258,10 +258,10 @@ zabbix_export:
               priority: WARNING
               description: |
                 "The CPU Interrupt Time in the last 5 minutes exceeds {$CPU.INTERRUPT.CRIT.MAX}%."
-                The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing 
-                hardware interrupts during sample intervals. This value is an indirect indicator of the activity of 
-                devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication 
-                lines, network interface cards and other peripheral devices. This is an easy way to identify a potential 
+                The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing
+                hardware interrupts during sample intervals. This value is an indirect indicator of the activity of
+                devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication
+                lines, network interface cards and other peripheral devices. This is an easy way to identify a potential
                 hardware failure. This should never be higher than 20%.
               dependencies:
                 -
@@ -275,9 +275,9 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           description: |
-            The Processor Information\% Privileged Time counter shows the percent of time that the processor is spent 
-            executing in Kernel (or Privileged) mode. Privileged mode includes services interrupts inside Interrupt 
-            Service Routines (ISRs), executing Deferred Procedure Calls (DPCs), Device Driver calls and other kernel-mode 
+            The Processor Information\% Privileged Time counter shows the percent of time that the processor is spent
+            executing in Kernel (or Privileged) mode. Privileged mode includes services interrupts inside Interrupt
+            Service Routines (ISRs), executing Deferred Procedure Calls (DPCs), Device Driver calls and other kernel-mode
             functions of the Windows® Operating System.
           tags:
             -
@@ -305,7 +305,7 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           description: |
-            The Processor Information\% User Time counter shows the percent of time that the processor(s) is spent executing 
+            The Processor Information\% User Time counter shows the percent of time that the processor(s) is spent executing
             in User mode.
           tags:
             -
@@ -333,7 +333,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            The Processor Queue Length shows the number of threads that are observed as delayed in the processor Ready Queue 
+            The Processor Queue Length shows the number of threads that are observed as delayed in the processor Ready Queue
             and are waiting to be executed.
           tags:
             -
@@ -390,7 +390,7 @@ zabbix_export:
       uuid: cb28abff977b4b6eb34665ff2218163b
       template: 'Windows filesystems by Zabbix agent'
       name: 'Windows filesystems by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -539,7 +539,7 @@ zabbix_export:
           description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSNAME.NOT_MATCHES}'
-          value: ^(?:/dev|/sys|/run|/proc|.+/shm$)
+          value: '^(?:/dev|/sys|/run|/proc|.+/shm$)'
           description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSTYPE.MATCHES}'
@@ -561,7 +561,7 @@ zabbix_export:
       uuid: 95c4026f8ade4fa7b72f8140fc152aea
       template: 'Windows generic by Zabbix agent'
       name: 'Windows generic by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -698,7 +698,7 @@ zabbix_export:
       uuid: 539b4b98f6fb4e12bbdf3bcdb85df2d1
       template: 'Windows memory by Zabbix agent'
       name: 'Windows memory by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -710,8 +710,8 @@ zabbix_export:
           history: 7d
           units: B
           description: |
-            Cache Bytes is the sum of the Memory\\System Cache Resident Bytes, Memory\\System Driver Resident Bytes, 
-            Memory\\System Code Resident Bytes, and Memory\\Pool Paged Resident Bytes counters. This counter displays 
+            Cache Bytes is the sum of the Memory\\System Cache Resident Bytes, Memory\\System Driver Resident Bytes,
+            Memory\\System Code Resident Bytes, and Memory\\Pool Paged Resident Bytes counters. This counter displays
             the last observed value only; it is not an average.
           tags:
             -
@@ -723,7 +723,7 @@ zabbix_export:
           key: 'perf_counter_en["\Memory\Free System Page Table Entries"]'
           history: 7d
           description: |
-            This indicates the number of page table entries not currently in use by the system. If the number is less 
+            This indicates the number of page table entries not currently in use by the system. If the number is less
             than 5,000, there may well be a memory leak or you running out of memory.
           tags:
             -
@@ -747,11 +747,11 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            Page Faults/sec is the average number of pages faulted per second. It is measured in number of pages 
-            faulted per second because only one page is faulted in each fault operation, hence this is also equal 
-            to the number of page fault operations. This counter includes both hard faults (those that require 
-            disk access) and soft faults (where the faulted page is found elsewhere in physical memory.) Most 
-            processors can handle large numbers of soft faults without significant consequence. However, hard faults, 
+            Page Faults/sec is the average number of pages faulted per second. It is measured in number of pages
+            faulted per second because only one page is faulted in each fault operation, hence this is also equal
+            to the number of page fault operations. This counter includes both hard faults (those that require
+            disk access) and soft faults (where the faulted page is found elsewhere in physical memory.) Most
+            processors can handle large numbers of soft faults without significant consequence. However, hard faults,
             which require disk access, can cause significant delays.
           tags:
             -
@@ -764,7 +764,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            This measures the rate at which pages are read from or written to disk to resolve hard page faults. 
+            This measures the rate at which pages are read from or written to disk to resolve hard page faults.
             If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.
           tags:
             -
@@ -788,9 +788,9 @@ zabbix_export:
           history: 7d
           units: B
           description: |
-            This measures the size, in bytes, of the non-paged pool. This is an area of system memory for objects 
-            that cannot be written to disk but instead must remain in physical memory as long as they are allocated. 
-            There is a possible memory leak if the value is greater than 175MB (or 100MB with the /3GB switch). 
+            This measures the size, in bytes, of the non-paged pool. This is an area of system memory for objects
+            that cannot be written to disk but instead must remain in physical memory as long as they are allocated.
+            There is a possible memory leak if the value is greater than 175MB (or 100MB with the /3GB switch).
             A typical Event ID 2019 is recorded in the system event log.
           tags:
             -
@@ -917,7 +917,7 @@ zabbix_export:
       uuid: 6ad6a4d1e677461ca6d1d5b2dcaba6d2
       template: 'Windows network by Zabbix agent'
       name: 'Windows network by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1464,7 +1464,7 @@ zabbix_export:
       uuid: 4026647be95a47de98b0f09dc36ce72f
       template: 'Windows physical disks by Zabbix agent'
       name: 'Windows physical disks by Zabbix agent'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1716,7 +1716,7 @@ zabbix_export:
       description: |
         Template Services OS Windows
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -1782,7 +1782,7 @@ zabbix_export:
           description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$SERVICE.STARTUPNAME.NOT_MATCHES}'
-          value: ^(?:manual|disabled)$
+          value: '^(?:manual|disabled)$'
           description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
       valuemaps:
         -
diff --git a/templates/os/windows_agent_active/README.md b/templates/os/windows_agent_active/README.md
index d5e7e5349e8..e6c3af1765c 100644
--- a/templates/os/windows_agent_active/README.md
+++ b/templates/os/windows_agent_active/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -34,20 +34,20 @@ There are no template links in this template.
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
 |CPU |CPU utilization |<p>CPU utilization in %</p> |ZABBIX_ACTIVE |system.cpu.util |
-|CPU |CPU interrupt time |<p>The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing </p><p>hardware interrupts during sample intervals. This value is an indirect indicator of the activity of </p><p>devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication </p><p>lines, network interface cards and other peripheral devices. This is an easy way to identify a potential </p><p>hardware failure. This should never be higher than 20%.</p> |ZABBIX_ACTIVE |perf_counter_en["\Processor Information(_total)\% Interrupt Time"] |
+|CPU |CPU interrupt time |<p>The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing</p><p>hardware interrupts during sample intervals. This value is an indirect indicator of the activity of</p><p>devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication</p><p>lines, network interface cards and other peripheral devices. This is an easy way to identify a potential</p><p>hardware failure. This should never be higher than 20%.</p> |ZABBIX_ACTIVE |perf_counter_en["\Processor Information(_total)\% Interrupt Time"] |
 |CPU |Context switches per second |<p>Context Switches/sec is the combined rate at which all processors on the computer are switched from one thread to another.</p><p>Context switches occur when a running thread voluntarily relinquishes the processor, is preempted by a higher priority ready thread, or switches between user-mode and privileged (kernel) mode to use an Executive or subsystem service.</p><p>It is the sum of Thread\\Context Switches/sec for all threads running on all processors in the computer and is measured in numbers of switches.</p><p>There are context switch counters on the System and Thread objects. This counter displays the difference between the values observed in the last two samples, divided by the duration of the sample interval.</p> |ZABBIX_ACTIVE |perf_counter_en["\System\Context Switches/sec"] |
-|CPU |CPU privileged time |<p>The Processor Information\% Privileged Time counter shows the percent of time that the processor is spent </p><p>executing in Kernel (or Privileged) mode. Privileged mode includes services interrupts inside Interrupt </p><p>Service Routines (ISRs), executing Deferred Procedure Calls (DPCs), Device Driver calls and other kernel-mode </p><p>functions of the Windows® Operating System.</p> |ZABBIX_ACTIVE |perf_counter_en["\Processor Information(_total)\% Privileged Time"] |
-|CPU |CPU DPC time |<p>Processor DPC time is the time that a single processor spent receiving and servicing deferred procedure </p><p>calls (DPCs). DPCs are interrupts that run at a lower priority than standard interrupts. % DPC Time is a </p><p>component of % Privileged Time because DPCs are executed in privileged mode. If a high % DPC Time is </p><p>sustained, there may be a processor bottleneck or an application or hardware related issue that can </p><p>significantly diminish overall system performance.</p> |ZABBIX_ACTIVE |perf_counter_en["\Processor Information(_total)\% DPC Time"] |
-|CPU |CPU user time |<p>The Processor Information\% User Time counter shows the percent of time that the processor(s) is spent executing </p><p>in User mode.</p> |ZABBIX_ACTIVE |perf_counter_en["\Processor Information(_total)\% User Time"] |
+|CPU |CPU privileged time |<p>The Processor Information\% Privileged Time counter shows the percent of time that the processor is spent</p><p>executing in Kernel (or Privileged) mode. Privileged mode includes services interrupts inside Interrupt</p><p>Service Routines (ISRs), executing Deferred Procedure Calls (DPCs), Device Driver calls and other kernel-mode</p><p>functions of the Windows® Operating System.</p> |ZABBIX_ACTIVE |perf_counter_en["\Processor Information(_total)\% Privileged Time"] |
+|CPU |CPU DPC time |<p>Processor DPC time is the time that a single processor spent receiving and servicing deferred procedure</p><p>calls (DPCs). DPCs are interrupts that run at a lower priority than standard interrupts. % DPC Time is a</p><p>component of % Privileged Time because DPCs are executed in privileged mode. If a high % DPC Time is</p><p>sustained, there may be a processor bottleneck or an application or hardware related issue that can</p><p>significantly diminish overall system performance.</p> |ZABBIX_ACTIVE |perf_counter_en["\Processor Information(_total)\% DPC Time"] |
+|CPU |CPU user time |<p>The Processor Information\% User Time counter shows the percent of time that the processor(s) is spent executing</p><p>in User mode.</p> |ZABBIX_ACTIVE |perf_counter_en["\Processor Information(_total)\% User Time"] |
 |CPU |Number of cores |<p>The number of logical processors available on the computer.</p> |ZABBIX_ACTIVE |wmi.get[root/cimv2,"Select NumberOfLogicalProcessors from Win32_ComputerSystem"] |
-|CPU |CPU queue length |<p>The Processor Queue Length shows the number of threads that are observed as delayed in the processor Ready Queue </p><p>and are waiting to be executed.</p> |ZABBIX_ACTIVE |perf_counter_en["\System\Processor Queue Length"] |
+|CPU |CPU queue length |<p>The Processor Queue Length shows the number of threads that are observed as delayed in the processor Ready Queue</p><p>and are waiting to be executed.</p> |ZABBIX_ACTIVE |perf_counter_en["\System\Processor Queue Length"] |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Windows CPU by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}` |WARNING | |
-|CPU interrupt time is too high (over {$CPU.INTERRUPT.CRIT.MAX}% for 5m) |<p>"The CPU Interrupt Time in the last 5 minutes exceeds {$CPU.INTERRUPT.CRIT.MAX}%."</p><p>The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing </p><p>hardware interrupts during sample intervals. This value is an indirect indicator of the activity of </p><p>devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication </p><p>lines, network interface cards and other peripheral devices. This is an easy way to identify a potential </p><p>hardware failure. This should never be higher than 20%.</p> |`min(/Windows CPU by Zabbix agent active/perf_counter_en["\Processor Information(_total)\% Interrupt Time"],5m)>{$CPU.INTERRUPT.CRIT.MAX}` |WARNING |<p>**Depends on**:</p><p>- High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)</p> |
+|CPU interrupt time is too high (over {$CPU.INTERRUPT.CRIT.MAX}% for 5m) |<p>"The CPU Interrupt Time in the last 5 minutes exceeds {$CPU.INTERRUPT.CRIT.MAX}%."</p><p>The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing</p><p>hardware interrupts during sample intervals. This value is an indirect indicator of the activity of</p><p>devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication</p><p>lines, network interface cards and other peripheral devices. This is an easy way to identify a potential</p><p>hardware failure. This should never be higher than 20%.</p> |`min(/Windows CPU by Zabbix agent active/perf_counter_en["\Processor Information(_total)\% Interrupt Time"],5m)>{$CPU.INTERRUPT.CRIT.MAX}` |WARNING |<p>**Depends on**:</p><p>- High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)</p> |
 |CPU privileged time is too high (over {$CPU.PRIV.CRIT.MAX}% for 5m) |<p>The CPU privileged time in the last 5 minutes exceeds {$CPU.PRIV.CRIT.MAX}%.</p> |`min(/Windows CPU by Zabbix agent active/perf_counter_en["\Processor Information(_total)\% Privileged Time"],5m)>{$CPU.PRIV.CRIT.MAX}` |WARNING |<p>**Depends on**:</p><p>- CPU interrupt time is too high (over {$CPU.INTERRUPT.CRIT.MAX}% for 5m)</p><p>- High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)</p> |
 |CPU queue length is too high (over {$CPU.QUEUE.CRIT.MAX} for 5m) |<p>The CPU Queue Length in the last 5 minutes exceeds {$CPU.QUEUE.CRIT.MAX}. According to actual observations, PQL should not exceed the number of cores * 2. To fine-tune the conditions, use the macro {$CPU.QUEUE.CRIT.MAX }.</p> |`min(/Windows CPU by Zabbix agent active/perf_counter_en["\System\Processor Queue Length"],5m) - last(/Windows CPU by Zabbix agent active/wmi.get[root/cimv2,"Select NumberOfLogicalProcessors from Win32_ComputerSystem"]) * 2 > {$CPU.QUEUE.CRIT.MAX}` |WARNING |<p>**Depends on**:</p><p>- High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)</p> |
 
@@ -59,7 +59,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -92,15 +92,15 @@ There are no template links in this template.
 |Memory |Used memory |<p>Used memory in Bytes</p> |ZABBIX_ACTIVE |vm.memory.size[used] |
 |Memory |Total memory |<p>Total memory in Bytes</p> |ZABBIX_ACTIVE |vm.memory.size[total] |
 |Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util<p>**Expression**:</p>`last(//vm.memory.size[used]) / last(//vm.memory.size[total]) * 100` |
-|Memory |Cache bytes |<p>Cache Bytes is the sum of the Memory\\System Cache Resident Bytes, Memory\\System Driver Resident Bytes, </p><p>Memory\\System Code Resident Bytes, and Memory\\Pool Paged Resident Bytes counters. This counter displays </p><p>the last observed value only; it is not an average.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Cache Bytes"] |
+|Memory |Cache bytes |<p>Cache Bytes is the sum of the Memory\\System Cache Resident Bytes, Memory\\System Driver Resident Bytes,</p><p>Memory\\System Code Resident Bytes, and Memory\\Pool Paged Resident Bytes counters. This counter displays</p><p>the last observed value only; it is not an average.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Cache Bytes"] |
 |Memory |Free swap space |<p>The free space of swap volume/file in bytes.</p> |CALCULATED |system.swap.free<p>**Expression**:</p>`last(//system.swap.size[,total]) - last(//system.swap.size[,total]) / 100 * last(//perf_counter_en["\Paging file(_Total)\% Usage"])` |
 |Memory |Free swap space in % |<p>The free space of swap volume/file in percent.</p> |DEPENDENT |system.swap.pfree<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return (100 - value)`</p> |
 |Memory |Used swap space in % |<p>The used space of swap volume/file in percent.</p> |ZABBIX_ACTIVE |perf_counter_en["\Paging file(_Total)\% Usage"] |
 |Memory |Total swap space |<p>The total space of swap volume/file in bytes.</p> |ZABBIX_ACTIVE |system.swap.size[,total] |
-|Memory |Free system page table entries |<p>This indicates the number of page table entries not currently in use by the system. If the number is less </p><p>than 5,000, there may well be a memory leak or you running out of memory.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Free System Page Table Entries"] |
-|Memory |Memory page faults per second |<p>Page Faults/sec is the average number of pages faulted per second. It is measured in number of pages </p><p>faulted per second because only one page is faulted in each fault operation, hence this is also equal </p><p>to the number of page fault operations. This counter includes both hard faults (those that require </p><p>disk access) and soft faults (where the faulted page is found elsewhere in physical memory.) Most </p><p>processors can handle large numbers of soft faults without significant consequence. However, hard faults, </p><p>which require disk access, can cause significant delays.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Page Faults/sec"] |
-|Memory |Memory pages per second |<p>This measures the rate at which pages are read from or written to disk to resolve hard page faults. </p><p>If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Pages/sec"] |
-|Memory |Memory pool non-paged |<p>This measures the size, in bytes, of the non-paged pool. This is an area of system memory for objects </p><p>that cannot be written to disk but instead must remain in physical memory as long as they are allocated. </p><p>There is a possible memory leak if the value is greater than 175MB (or 100MB with the /3GB switch). </p><p>A typical Event ID 2019 is recorded in the system event log.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Pool Nonpaged Bytes"] |
+|Memory |Free system page table entries |<p>This indicates the number of page table entries not currently in use by the system. If the number is less</p><p>than 5,000, there may well be a memory leak or you running out of memory.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Free System Page Table Entries"] |
+|Memory |Memory page faults per second |<p>Page Faults/sec is the average number of pages faulted per second. It is measured in number of pages</p><p>faulted per second because only one page is faulted in each fault operation, hence this is also equal</p><p>to the number of page fault operations. This counter includes both hard faults (those that require</p><p>disk access) and soft faults (where the faulted page is found elsewhere in physical memory.) Most</p><p>processors can handle large numbers of soft faults without significant consequence. However, hard faults,</p><p>which require disk access, can cause significant delays.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Page Faults/sec"] |
+|Memory |Memory pages per second |<p>This measures the rate at which pages are read from or written to disk to resolve hard page faults.</p><p>If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Pages/sec"] |
+|Memory |Memory pool non-paged |<p>This measures the size, in bytes, of the non-paged pool. This is an area of system memory for objects</p><p>that cannot be written to disk but instead must remain in physical memory as long as they are allocated.</p><p>There is a possible memory leak if the value is greater than 175MB (or 100MB with the /3GB switch).</p><p>A typical Event ID 2019 is recorded in the system event log.</p> |ZABBIX_ACTIVE |perf_counter_en["\Memory\Pool Nonpaged Bytes"] |
 
 ## Triggers
 
@@ -150,7 +150,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |ZABBIX_ACTIVE |vfs.fs.discovery<p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p><p>- E: {#FSDRIVETYPE} MATCHES_REGEX `{$VFS.FS.FSDRIVETYPE.MATCHES}`</p><p>- F: {#FSDRIVETYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSDRIVETYPE.NOT_MATCHES}`</p> |
+|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |ZABBIX_ACTIVE |vfs.fs.discovery<p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p><p>- {#FSDRIVETYPE} MATCHES_REGEX `{$VFS.FS.FSDRIVETYPE.MATCHES}`</p><p>- {#FSDRIVETYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSDRIVETYPE.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -175,7 +175,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -203,7 +203,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Physical disks discovery |<p>Discovery of installed physical disks.</p> |ZABBIX_ACTIVE |perf_instance_en.discovery[PhysicalDisk]<p>**Preprocessing**:</p><p>- STR_REPLACE: `{#INSTANCE} {#DEVNAME}`</p><p>**Filter**:</p>AND <p>- A: {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- B: {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
+|Physical disks discovery |<p>Discovery of installed physical disks.</p> |ZABBIX_ACTIVE |perf_instance_en.discovery[PhysicalDisk]<p>**Preprocessing**:</p><p>- STR_REPLACE: `{#INSTANCE} {#DEVNAME}`</p><p>**Filter**:</p>AND <p>- {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -234,7 +234,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -285,7 +285,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -317,18 +317,18 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Network interfaces discovery |<p>Discovery of installed network interfaces.</p> |DEPENDENT |net.if.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>- C: {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- D: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- E: {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- F: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- G: {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- H: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p> |
+|Network interfaces discovery |<p>Discovery of installed network interfaces.</p> |DEPENDENT |net.if.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>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>Incoming traffic on the network interface.</p> |ZABBIX_ACTIVE |net.if.in["{#IFGUID}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>Outgoing traffic on the network interface.</p> |ZABBIX_ACTIVE |net.if.out["{#IFGUID}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>The number of incoming packets dropped on the network interface.</p> |ZABBIX_ACTIVE |net.if.in["{#IFGUID}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>The number of outgoing packets dropped on the network interface.</p> |ZABBIX_ACTIVE |net.if.out["{#IFGUID}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>The number of incoming packets with errors on the network interface.</p> |ZABBIX_ACTIVE |net.if.in["{#IFGUID}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>The number of outgoing packets with errors on the network interface.</p> |ZABBIX_ACTIVE |net.if.out["{#IFGUID}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>Incoming traffic on the network interface.</p> |ZABBIX_ACTIVE |net.if.in["{#IFGUID}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>Outgoing traffic on the network interface.</p> |ZABBIX_ACTIVE |net.if.out["{#IFGUID}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>The number of incoming packets dropped on the network interface.</p> |ZABBIX_ACTIVE |net.if.in["{#IFGUID}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>The number of outgoing packets dropped on the network interface.</p> |ZABBIX_ACTIVE |net.if.out["{#IFGUID}",dropped]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>The number of incoming packets with errors on the network interface.</p> |ZABBIX_ACTIVE |net.if.in["{#IFGUID}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>The number of outgoing packets with errors on the network interface.</p> |ZABBIX_ACTIVE |net.if.out["{#IFGUID}",errors]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>Estimated bandwidth of the network interface if any.</p> |DEPENDENT |net.if.speed["{#IFGUID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.GUID == "{#IFGUID}")].Speed.first()`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- JAVASCRIPT: `return (value=='9223372036854775807' ? 0 : value) `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>The type of the network interface.</p> |DEPENDENT |net.if.type["{#IFGUID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.GUID == "{#IFGUID}")].AdapterTypeId.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>The operational status of the network interface.</p> |DEPENDENT |net.if.status["{#IFGUID}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.GUID == "{#IFGUID}")].NetConnectionStatus.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
@@ -351,7 +351,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 Special version of services template that is required for Windows OS.
 
 ## Setup
@@ -379,7 +379,7 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Windows services discovery |<p>Discovery of Windows services of different types as defined in template's macros.</p> |ZABBIX_ACTIVE |service.discovery<p>**Filter**:</p>AND <p>- A: {#SERVICE.NAME} MATCHES_REGEX `{$SERVICE.NAME.MATCHES}`</p><p>- B: {#SERVICE.NAME} NOT_MATCHES_REGEX `{$SERVICE.NAME.NOT_MATCHES}`</p><p>- C: {#SERVICE.STARTUPNAME} MATCHES_REGEX `{$SERVICE.STARTUPNAME.MATCHES}`</p><p>- D: {#SERVICE.STARTUPNAME} NOT_MATCHES_REGEX `{$SERVICE.STARTUPNAME.NOT_MATCHES}`</p> |
+|Windows services discovery |<p>Discovery of Windows services of different types as defined in template's macros.</p> |ZABBIX_ACTIVE |service.discovery<p>**Filter**:</p>AND <p>- {#SERVICE.NAME} MATCHES_REGEX `{$SERVICE.NAME.MATCHES}`</p><p>- {#SERVICE.NAME} NOT_MATCHES_REGEX `{$SERVICE.NAME.NOT_MATCHES}`</p><p>- {#SERVICE.STARTUPNAME} MATCHES_REGEX `{$SERVICE.STARTUPNAME.MATCHES}`</p><p>- {#SERVICE.STARTUPNAME} NOT_MATCHES_REGEX `{$SERVICE.STARTUPNAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -401,7 +401,7 @@ Please report any issues with the template at https://support.zabbix.com
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 New official Windows template. Requires agent of Zabbix 4.4 and newer.
 
 
diff --git a/templates/os/windows_agent_active/template_os_windows_agent_active.yaml b/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
index d263e57b044..07e9c8e074c 100644
--- a/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
+++ b/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-21T07:42:33Z'
+  date: '2021-12-16T06:24:05Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387224-discussion-thread-for-official-zabbix-template-for-windows
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Windows CPU by Zabbix agent active'
@@ -211,7 +211,7 @@ zabbix_export:
       uuid: 296cb27ad93b4063b77aaf1a8339d40c
       template: 'Windows CPU by Zabbix agent active'
       name: 'Windows CPU by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -225,10 +225,10 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           description: |
-            Processor DPC time is the time that a single processor spent receiving and servicing deferred procedure 
-            calls (DPCs). DPCs are interrupts that run at a lower priority than standard interrupts. % DPC Time is a 
-            component of % Privileged Time because DPCs are executed in privileged mode. If a high % DPC Time is 
-            sustained, there may be a processor bottleneck or an application or hardware related issue that can 
+            Processor DPC time is the time that a single processor spent receiving and servicing deferred procedure
+            calls (DPCs). DPCs are interrupts that run at a lower priority than standard interrupts. % DPC Time is a
+            component of % Privileged Time because DPCs are executed in privileged mode. If a high % DPC Time is
+            sustained, there may be a processor bottleneck or an application or hardware related issue that can
             significantly diminish overall system performance.
           tags:
             -
@@ -243,10 +243,10 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           description: |
-            The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing 
-            hardware interrupts during sample intervals. This value is an indirect indicator of the activity of 
-            devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication 
-            lines, network interface cards and other peripheral devices. This is an easy way to identify a potential 
+            The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing
+            hardware interrupts during sample intervals. This value is an indirect indicator of the activity of
+            devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication
+            lines, network interface cards and other peripheral devices. This is an easy way to identify a potential
             hardware failure. This should never be higher than 20%.
           tags:
             -
@@ -260,10 +260,10 @@ zabbix_export:
               priority: WARNING
               description: |
                 "The CPU Interrupt Time in the last 5 minutes exceeds {$CPU.INTERRUPT.CRIT.MAX}%."
-                The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing 
-                hardware interrupts during sample intervals. This value is an indirect indicator of the activity of 
-                devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication 
-                lines, network interface cards and other peripheral devices. This is an easy way to identify a potential 
+                The Processor Information\% Interrupt Time is the time the processor spends receiving and servicing
+                hardware interrupts during sample intervals. This value is an indirect indicator of the activity of
+                devices that generate interrupts, such as the system clock, the mouse, disk drivers, data communication
+                lines, network interface cards and other peripheral devices. This is an easy way to identify a potential
                 hardware failure. This should never be higher than 20%.
               dependencies:
                 -
@@ -278,9 +278,9 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           description: |
-            The Processor Information\% Privileged Time counter shows the percent of time that the processor is spent 
-            executing in Kernel (or Privileged) mode. Privileged mode includes services interrupts inside Interrupt 
-            Service Routines (ISRs), executing Deferred Procedure Calls (DPCs), Device Driver calls and other kernel-mode 
+            The Processor Information\% Privileged Time counter shows the percent of time that the processor is spent
+            executing in Kernel (or Privileged) mode. Privileged mode includes services interrupts inside Interrupt
+            Service Routines (ISRs), executing Deferred Procedure Calls (DPCs), Device Driver calls and other kernel-mode
             functions of the Windows® Operating System.
           tags:
             -
@@ -309,7 +309,7 @@ zabbix_export:
           value_type: FLOAT
           units: '%'
           description: |
-            The Processor Information\% User Time counter shows the percent of time that the processor(s) is spent executing 
+            The Processor Information\% User Time counter shows the percent of time that the processor(s) is spent executing
             in User mode.
           tags:
             -
@@ -339,7 +339,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            The Processor Queue Length shows the number of threads that are observed as delayed in the processor Ready Queue 
+            The Processor Queue Length shows the number of threads that are observed as delayed in the processor Ready Queue
             and are waiting to be executed.
           tags:
             -
@@ -398,7 +398,7 @@ zabbix_export:
       uuid: 1b04ac025fcf474cb97e6c8c95855eeb
       template: 'Windows filesystems by Zabbix agent active'
       name: 'Windows filesystems by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -551,7 +551,7 @@ zabbix_export:
           description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSNAME.NOT_MATCHES}'
-          value: ^(?:/dev|/sys|/run|/proc|.+/shm$)
+          value: '^(?:/dev|/sys|/run|/proc|.+/shm$)'
           description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$VFS.FS.FSTYPE.MATCHES}'
@@ -573,7 +573,7 @@ zabbix_export:
       uuid: 6dd37a415f4c40aa960d7ba91b6b5143
       template: 'Windows generic by Zabbix agent active'
       name: 'Windows generic by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -631,9 +631,9 @@ zabbix_export:
         -
           uuid: 78f2089b58f54042ac70fd9ac3b2aa7e
           name: 'System local time'
+          type: ZABBIX_ACTIVE
           key: system.localtime
           history: 7d
-          status: DISABLED
           units: unixtime
           description: 'System local time of the host.'
           tags:
@@ -717,7 +717,7 @@ zabbix_export:
       uuid: e6535f54a0554463889fb8c65db11250
       template: 'Windows memory by Zabbix agent active'
       name: 'Windows memory by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -730,8 +730,8 @@ zabbix_export:
           history: 7d
           units: B
           description: |
-            Cache Bytes is the sum of the Memory\\System Cache Resident Bytes, Memory\\System Driver Resident Bytes, 
-            Memory\\System Code Resident Bytes, and Memory\\Pool Paged Resident Bytes counters. This counter displays 
+            Cache Bytes is the sum of the Memory\\System Cache Resident Bytes, Memory\\System Driver Resident Bytes,
+            Memory\\System Code Resident Bytes, and Memory\\Pool Paged Resident Bytes counters. This counter displays
             the last observed value only; it is not an average.
           tags:
             -
@@ -744,7 +744,7 @@ zabbix_export:
           key: 'perf_counter_en["\Memory\Free System Page Table Entries"]'
           history: 7d
           description: |
-            This indicates the number of page table entries not currently in use by the system. If the number is less 
+            This indicates the number of page table entries not currently in use by the system. If the number is less
             than 5,000, there may well be a memory leak or you running out of memory.
           tags:
             -
@@ -769,11 +769,11 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            Page Faults/sec is the average number of pages faulted per second. It is measured in number of pages 
-            faulted per second because only one page is faulted in each fault operation, hence this is also equal 
-            to the number of page fault operations. This counter includes both hard faults (those that require 
-            disk access) and soft faults (where the faulted page is found elsewhere in physical memory.) Most 
-            processors can handle large numbers of soft faults without significant consequence. However, hard faults, 
+            Page Faults/sec is the average number of pages faulted per second. It is measured in number of pages
+            faulted per second because only one page is faulted in each fault operation, hence this is also equal
+            to the number of page fault operations. This counter includes both hard faults (those that require
+            disk access) and soft faults (where the faulted page is found elsewhere in physical memory.) Most
+            processors can handle large numbers of soft faults without significant consequence. However, hard faults,
             which require disk access, can cause significant delays.
           tags:
             -
@@ -787,7 +787,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           description: |
-            This measures the rate at which pages are read from or written to disk to resolve hard page faults. 
+            This measures the rate at which pages are read from or written to disk to resolve hard page faults.
             If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.
           tags:
             -
@@ -812,9 +812,9 @@ zabbix_export:
           history: 7d
           units: B
           description: |
-            This measures the size, in bytes, of the non-paged pool. This is an area of system memory for objects 
-            that cannot be written to disk but instead must remain in physical memory as long as they are allocated. 
-            There is a possible memory leak if the value is greater than 175MB (or 100MB with the /3GB switch). 
+            This measures the size, in bytes, of the non-paged pool. This is an area of system memory for objects
+            that cannot be written to disk but instead must remain in physical memory as long as they are allocated.
+            There is a possible memory leak if the value is greater than 175MB (or 100MB with the /3GB switch).
             A typical Event ID 2019 is recorded in the system event log.
           tags:
             -
@@ -945,7 +945,7 @@ zabbix_export:
       uuid: 792cb76a1a6340d8acb36d8802d22c00
       template: 'Windows network by Zabbix agent active'
       name: 'Windows network by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1499,7 +1499,7 @@ zabbix_export:
       uuid: 222cf73cb40941f6be62db0540524e5e
       template: 'Windows physical disks by Zabbix agent active'
       name: 'Windows physical disks by Zabbix agent active'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.40'
       groups:
         -
           name: Templates/Modules
@@ -1760,7 +1760,7 @@ zabbix_export:
       description: |
         Template Services OS Windows
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Modules
@@ -1828,7 +1828,7 @@ zabbix_export:
           description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
         -
           macro: '{$SERVICE.STARTUPNAME.NOT_MATCHES}'
-          value: ^(?:manual|disabled)$
+          value: '^(?:manual|disabled)$'
           description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
       valuemaps:
         -
diff --git a/templates/os/windows_snmp/README.md b/templates/os/windows_snmp/README.md
index cbde060a391..c431ba26cd5 100644
--- a/templates/os/windows_snmp/README.md
+++ b/templates/os/windows_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 
 ## Setup
 
@@ -16,11 +16,11 @@ No specific Zabbix configuration is required.
 
 ## Template links
 
-| Name                    |
-|-------------------------|
-| Generic SNMP            |
-| HOST-RESOURCES-MIB SNMP |
-| Interfaces Windows SNMP |
+|Name|
+|----|
+|HOST-RESOURCES-MIB SNMP |
+|Interfaces Windows SNMP |
+|Generic SNMP |
 
 ## Discovery rules
 
@@ -42,7 +42,7 @@ Please report any issues with the template at https://support.zabbix.com
 ## Known Issues
 
 - Description: Doesn't support In/Out 64 bit counters even though IfxTable is present:
-Currently, Windows gets it’s interface status from MIB-2. Since these 64bit SNMP counters (ifHCInOctets, ifHCOutOctets, etc.) are defined as an extension to IF-MIB, Microsoft has not implemented it.
+Currently, Windows gets it's interface status from MIB-2. Since these 64bit SNMP counters (ifHCInOctets, ifHCOutOctets, etc.) are defined as an extension to IF-MIB, Microsoft has not implemented it.
 https://social.technet.microsoft.com/Forums/windowsserver/en-US/07b62ff0-94f6-40ca-a99d-d129c1b33d70/windows-2008-r2-snmp-64bit-counters-support?forum=winservergen
 
   - Version: Win2008, Win2012R2.
diff --git a/templates/os/windows_snmp/template_os_windows_snmp.yaml b/templates/os/windows_snmp/template_os_windows_snmp.yaml
index 136a2ffc4ef..114da6a49bd 100644
--- a/templates/os/windows_snmp/template_os_windows_snmp.yaml
+++ b/templates/os/windows_snmp/template_os_windows_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:46Z'
+  version: '6.0'
+  date: '2021-12-16T06:31:43Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -17,7 +17,7 @@ zabbix_export:
         Known Issues:
         
           Description: Doesn't support In/Out 64 bit counters even though IfxTable is present:
-        Currently, Windows gets it’s interface status from MIB-2. Since these 64bit SNMP counters (ifHCInOctets, ifHCOutOctets, etc.) are defined as an extension to IF-MIB, Microsoft has not implemented it.
+        Currently, Windows gets it's interface status from MIB-2. Since these 64bit SNMP counters (ifHCInOctets, ifHCOutOctets, etc.) are defined as an extension to IF-MIB, Microsoft has not implemented it.
         https://social.technet.microsoft.com/Forums/windowsserver/en-US/07b62ff0-94f6-40ca-a99d-d129c1b33d70/windows-2008-r2-snmp-64bit-counters-support?forum=winservergen
         
           Version: Win2008, Win2012R2.
@@ -29,7 +29,7 @@ zabbix_export:
           Version: *
           Device: *
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/power/apc/apc_ups_galaxy_3500_snmp/README.md b/templates/power/apc/apc_ups_galaxy_3500_snmp/README.md
index f021287b278..1cc2b88f90a 100644
--- a/templates/power/apc/apc_ups_galaxy_3500_snmp/README.md
+++ b/templates/power/apc/apc_ups_galaxy_3500_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC UPS Galaxy 3500 by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC UPS Galaxy 3500 SNMP/system.name[sysName.0],#1)<>last(/APC UPS Galaxy 3500 SNMP/system.name[sysName.0],#2) and length(last(/APC UPS Galaxy 3500 SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS Galaxy 3500 SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC UPS Galaxy 3500 SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC UPS Galaxy 3500 SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS Galaxy 3500 SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS Galaxy 3500 SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Galaxy 3500 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS Galaxy 3500 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Galaxy 3500 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC UPS Galaxy 3500 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS Galaxy 3500 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS Galaxy 3500 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Galaxy 3500 SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Galaxy 3500 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS Galaxy 3500 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Galaxy 3500 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Galaxy 3500 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS Galaxy 3500 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS Galaxy 3500 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC UPS Galaxy 3500 SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC UPS Galaxy 3500 SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC UPS Galaxy 3500 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Galaxy 3500 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Galaxy 3500 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Galaxy 3500 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Galaxy 3500 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Galaxy 3500 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Galaxy 3500 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Galaxy 3500 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Galaxy 3500 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC UPS Galaxy 3500 SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS Galaxy 3500 SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Galaxy 3500 SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC UPS Galaxy 3500 SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC UPS Galaxy 3500 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC UPS Galaxy 3500 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml b/templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml
index e683a6a608e..415e7b58e43 100644
--- a/templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml
+++ b/templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:18Z'
+  date: '2021-12-15T17:56:41Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: 23bf458b1bbc4ae0b145597292d098cb
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC UPS Galaxy 3500 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC UPS Galaxy 3500 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC UPS Galaxy 3500 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC UPS Galaxy 3500 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC UPS Galaxy 3500 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC UPS Galaxy 3500 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC UPS Galaxy 3500 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC UPS Galaxy 3500 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC UPS Galaxy 3500 SNMP'
       valuemaps:
         -
           uuid: 30a78904cbc94fc58609dc1a11aa48ef
diff --git a/templates/power/apc/apc_ups_smart_2200_rm_snmp/README.md b/templates/power/apc/apc_ups_smart_2200_rm_snmp/README.md
index 406dc621edb..b97045fd302 100644
--- a/templates/power/apc/apc_ups_smart_2200_rm_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_2200_rm_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC Smart-UPS 2200 RM by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC Smart-UPS 2200 RM SNMP/system.name[sysName.0],#1)<>last(/APC Smart-UPS 2200 RM SNMP/system.name[sysName.0],#2) and length(last(/APC Smart-UPS 2200 RM SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS 2200 RM SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC Smart-UPS 2200 RM SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC Smart-UPS 2200 RM SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS 2200 RM SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 2200 RM SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 2200 RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS 2200 RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 2200 RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 2200 RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS 2200 RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS 2200 RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 2200 RM SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 2200 RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS 2200 RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 2200 RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 2200 RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS 2200 RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS 2200 RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC Smart-UPS 2200 RM SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC Smart-UPS 2200 RM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC Smart-UPS 2200 RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 2200 RM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 2200 RM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 2200 RM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 2200 RM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 2200 RM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 2200 RM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 2200 RM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 2200 RM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC Smart-UPS 2200 RM SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 2200 RM SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 2200 RM SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC Smart-UPS 2200 RM SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC Smart-UPS 2200 RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC Smart-UPS 2200 RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml b/templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml
index 6542e938299..1fa2f0dc531 100644
--- a/templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:52Z'
+  date: '2021-12-15T17:56:45Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: ac27c888a2c547b2b71fe6bf1aad69b1
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC Smart-UPS 2200 RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC Smart-UPS 2200 RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC Smart-UPS 2200 RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC Smart-UPS 2200 RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC Smart-UPS 2200 RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC Smart-UPS 2200 RM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC Smart-UPS 2200 RM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC Smart-UPS 2200 RM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC Smart-UPS 2200 RM SNMP'
       valuemaps:
         -
           uuid: 6940a4d08173433bb4bc8ff3b44e578c
diff --git a/templates/power/apc/apc_ups_smart_3000_xlm_snmp/README.md b/templates/power/apc/apc_ups_smart_3000_xlm_snmp/README.md
index 4d03cf2a90c..00b678f59db 100644
--- a/templates/power/apc/apc_ups_smart_3000_xlm_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_3000_xlm_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC Smart-UPS 3000 XLM by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC Smart-UPS 3000 XLM SNMP/system.name[sysName.0],#1)<>last(/APC Smart-UPS 3000 XLM SNMP/system.name[sysName.0],#2) and length(last(/APC Smart-UPS 3000 XLM SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS 3000 XLM SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC Smart-UPS 3000 XLM SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC Smart-UPS 3000 XLM SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS 3000 XLM SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 3000 XLM SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 3000 XLM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS 3000 XLM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 3000 XLM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 3000 XLM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS 3000 XLM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS 3000 XLM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 3000 XLM SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 3000 XLM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS 3000 XLM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 3000 XLM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 3000 XLM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS 3000 XLM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS 3000 XLM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC Smart-UPS 3000 XLM SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC Smart-UPS 3000 XLM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC Smart-UPS 3000 XLM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 3000 XLM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 3000 XLM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 3000 XLM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 3000 XLM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 3000 XLM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 3000 XLM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 3000 XLM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS 3000 XLM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC Smart-UPS 3000 XLM SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS 3000 XLM SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS 3000 XLM SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC Smart-UPS 3000 XLM SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC Smart-UPS 3000 XLM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC Smart-UPS 3000 XLM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml b/templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml
index 77bbdcdf865..31b276b7670 100644
--- a/templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:22:51Z'
+  date: '2021-12-15T17:56:49Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: 829373d305ce44cc9441714fc9d828a5
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC Smart-UPS 3000 XLM SNMP'
       valuemaps:
         -
           uuid: 55fecbd639c44c328b4199569a7305ef
diff --git a/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/README.md b/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/README.md
index 6e6e8ade840..ed1a80d5037 100644
--- a/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC Smart-UPS RT 1000 RM XL by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/system.name[sysName.0],#1)<>last(/APC Smart-UPS RT 1000 RM XL SNMP/system.name[sysName.0],#2) and length(last(/APC Smart-UPS RT 1000 RM XL SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 RM XL SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 RM XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS RT 1000 RM XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 RM XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 RM XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS RT 1000 RM XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS RT 1000 RM XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 RM XL SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 RM XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS RT 1000 RM XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 RM XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 RM XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS RT 1000 RM XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS RT 1000 RM XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC Smart-UPS RT 1000 RM XL SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC Smart-UPS RT 1000 RM XL SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 RM XL SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 RM XL SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 RM XL SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 RM XL SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 RM XL SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 RM XL SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 RM XL SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 RM XL SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC Smart-UPS RT 1000 RM XL SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 RM XL SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 RM XL SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC Smart-UPS RT 1000 RM XL SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC Smart-UPS RT 1000 RM XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml b/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml
index 0c15548075f..7b5ec3fef54 100644
--- a/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:59Z'
+  date: '2021-12-15T17:56:53Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: 2fba6e227f9b4d8fa584664bfd600cf4
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
       valuemaps:
         -
           uuid: 7cf932d3b9304f2cb151134e9ea3be82
diff --git a/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/README.md b/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/README.md
index 47c7170833b..08876651d82 100644
--- a/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC Smart-UPS RT 1000 XL by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/system.name[sysName.0],#1)<>last(/APC Smart-UPS RT 1000 XL SNMP/system.name[sysName.0],#2) and length(last(/APC Smart-UPS RT 1000 XL SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC Smart-UPS RT 1000 XL SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 XL SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS RT 1000 XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS RT 1000 XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS RT 1000 XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 XL SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS RT 1000 XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 XL SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS RT 1000 XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS RT 1000 XL SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC Smart-UPS RT 1000 XL SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC Smart-UPS RT 1000 XL SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 XL SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 XL SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 XL SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 XL SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 XL SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 XL SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 XL SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS RT 1000 XL SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC Smart-UPS RT 1000 XL SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS RT 1000 XL SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS RT 1000 XL SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC Smart-UPS RT 1000 XL SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC Smart-UPS RT 1000 XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml b/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml
index 305851d9198..566fd363f2c 100644
--- a/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:25Z'
+  date: '2021-12-15T17:56:56Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: 8e5f02a3eab44a5f85011b7331696284
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC Smart-UPS RT 1000 XL SNMP'
       valuemaps:
         -
           uuid: b2af1e2dcb874d43949c383f9b347f36
diff --git a/templates/power/apc/apc_ups_smart_srt_5000_snmp/README.md b/templates/power/apc/apc_ups_smart_srt_5000_snmp/README.md
index b994c2a36f6..de12a500a86 100644
--- a/templates/power/apc/apc_ups_smart_srt_5000_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_srt_5000_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC Smart-UPS SRT 5000 by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC Smart-UPS SRT 5000 SNMP/system.name[sysName.0],#1)<>last(/APC Smart-UPS SRT 5000 SNMP/system.name[sysName.0],#2) and length(last(/APC Smart-UPS SRT 5000 SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS SRT 5000 SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC Smart-UPS SRT 5000 SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC Smart-UPS SRT 5000 SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS SRT 5000 SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 5000 SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and ((min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}))` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and ((min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN}))` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and ((min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}))` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and ((min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN}))` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC Smart-UPS SRT 5000 SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC Smart-UPS SRT 5000 SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC Smart-UPS SRT 5000 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 5000 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 5000 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC Smart-UPS SRT 5000 SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 5000 SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC Smart-UPS SRT 5000 SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC Smart-UPS SRT 5000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC Smart-UPS SRT 5000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml b/templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml
index 8b973b21d43..7941d8dab19 100644
--- a/templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:38Z'
+  date: '2021-12-15T17:57:00Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: ceb28c7c39e44859a4c1076978a40788
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC Smart-UPS SRT 5000 SNMP'
       valuemaps:
         -
           uuid: 41e166e2a5f948488238198920ab4b17
diff --git a/templates/power/apc/apc_ups_smart_srt_8000_snmp/README.md b/templates/power/apc/apc_ups_smart_srt_8000_snmp/README.md
index 275cef95eb4..dd74bb85093 100644
--- a/templates/power/apc/apc_ups_smart_srt_8000_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_srt_8000_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC Smart-UPS SRT 8000 by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC Smart-UPS SRT 8000 SNMP/system.name[sysName.0],#1)<>last(/APC Smart-UPS SRT 8000 SNMP/system.name[sysName.0],#2) and length(last(/APC Smart-UPS SRT 8000 SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS SRT 8000 SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC Smart-UPS SRT 8000 SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC Smart-UPS SRT 8000 SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS SRT 8000 SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 8000 SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 8000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS SRT 8000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 8000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 8000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS SRT 8000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS SRT 8000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 8000 SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 8000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS SRT 8000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 8000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 8000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS SRT 8000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS SRT 8000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC Smart-UPS SRT 8000 SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC Smart-UPS SRT 8000 SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC Smart-UPS SRT 8000 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 8000 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 8000 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 8000 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 8000 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 8000 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 8000 SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 8000 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 8000 SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC Smart-UPS SRT 8000 SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC Smart-UPS SRT 8000 SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 8000 SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC Smart-UPS SRT 8000 SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC Smart-UPS SRT 8000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC Smart-UPS SRT 8000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml b/templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml
index 5a4aa69fed1..54395e941bf 100644
--- a/templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:45Z'
+  date: '2021-12-15T17:57:04Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: 268ead40a9dd40798df6d75f554ec1bb
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC Smart-UPS SRT 8000 SNMP'
       valuemaps:
         -
           uuid: 864d59cbfcc8431cb334b812bf7ef3a3
diff --git a/templates/power/apc/apc_ups_snmp/README.md b/templates/power/apc/apc_ups_snmp/README.md
index 680846cb853..73c5bd46584 100644
--- a/templates/power/apc/apc_ups_snmp/README.md
+++ b/templates/power/apc/apc_ups_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC UPS with NMC by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -49,7 +49,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -108,29 +108,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC UPS SNMP/system.name[sysName.0],#1)<>last(/APC UPS SNMP/system.name[sysName.0],#2) and length(last(/APC UPS SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC UPS SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC UPS SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC UPS SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC UPS SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC UPS SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC UPS SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC UPS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC UPS SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC UPS SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC UPS SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC UPS SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml b/templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml
index 4db906f7b38..b81e7dc26a2 100644
--- a/templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml
+++ b/templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:31Z'
+  date: '2021-12-15T17:57:08Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: e1b2126fa06d44e3b0984f5bb904cd9a
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC UPS SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC UPS SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC UPS SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC UPS SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC UPS SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC UPS SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC UPS SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC UPS SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC UPS SNMP'
       valuemaps:
         -
           uuid: a808aadebf964e0cb6b8724bf1165013
@@ -1593,16 +1765,6 @@ zabbix_export:
               value: '26'
               newvalue: 'Charger Only'
         -
-          uuid: cbd3d7c999244cd6a44a8fc566533005
-          name: 'Service state'
-          mappings:
-            -
-              value: '0'
-              newvalue: Down
-            -
-              value: '1'
-              newvalue: Up
-        -
           uuid: 781c568d935d40f2a43951488cf2e046
           name: zabbix.host.available
           mappings:
diff --git a/templates/power/apc/apc_ups_symmetra_lx_snmp/README.md b/templates/power/apc/apc_ups_symmetra_lx_snmp/README.md
index d33de955844..595a6d47d70 100644
--- a/templates/power/apc/apc_ups_symmetra_lx_snmp/README.md
+++ b/templates/power/apc/apc_ups_symmetra_lx_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC UPS Symmetra LX by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC UPS Symmetra LX SNMP/system.name[sysName.0],#1)<>last(/APC UPS Symmetra LX SNMP/system.name[sysName.0],#2) and length(last(/APC UPS Symmetra LX SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS Symmetra LX SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC UPS Symmetra LX SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC UPS Symmetra LX SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS Symmetra LX SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra LX SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra LX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra LX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra LX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra LX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra LX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS Symmetra LX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra LX SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra LX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra LX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra LX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra LX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra LX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS Symmetra LX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC UPS Symmetra LX SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC UPS Symmetra LX SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC UPS Symmetra LX SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra LX SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra LX SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra LX SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra LX SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra LX SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra LX SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra LX SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra LX SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC UPS Symmetra LX SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra LX SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra LX SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC UPS Symmetra LX SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC UPS Symmetra LX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC UPS Symmetra LX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml b/templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml
index f35ca281026..7d03af1196d 100644
--- a/templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml
+++ b/templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:22:58Z'
+  date: '2021-12-15T17:57:12Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: fbf5cb79251d48bdbe4bc7b81dbd2d65
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC UPS Symmetra LX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC UPS Symmetra LX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC UPS Symmetra LX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC UPS Symmetra LX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC UPS Symmetra LX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC UPS Symmetra LX SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC UPS Symmetra LX SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC UPS Symmetra LX SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC UPS Symmetra LX SNMP'
       valuemaps:
         -
           uuid: aec3362485c242ec928cb8ecfe5e61cf
diff --git a/templates/power/apc/apc_ups_symmetra_rm_snmp/README.md b/templates/power/apc/apc_ups_symmetra_rm_snmp/README.md
index bf3e8d79e40..3d11b9085f3 100644
--- a/templates/power/apc/apc_ups_symmetra_rm_snmp/README.md
+++ b/templates/power/apc/apc_ups_symmetra_rm_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC UPS Symmetra RM by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -53,7 +53,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -112,29 +112,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC UPS Symmetra RM SNMP/system.name[sysName.0],#1)<>last(/APC UPS Symmetra RM SNMP/system.name[sysName.0],#2) and length(last(/APC UPS Symmetra RM SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS Symmetra RM SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC UPS Symmetra RM SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC UPS Symmetra RM SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS Symmetra RM SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RM SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS Symmetra RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RM SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RM SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS Symmetra RM SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC UPS Symmetra RM SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC UPS Symmetra RM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC UPS Symmetra RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RM SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RM SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC UPS Symmetra RM SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RM SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RM SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC UPS Symmetra RM SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC UPS Symmetra RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC UPS Symmetra RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml b/templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml
index 5ef223ce8cf..4f4ae1a0c70 100644
--- a/templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml
+++ b/templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:11Z'
+  date: '2021-12-15T17:57:16Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: 3d8fa7f93f9f4a0bbc0b9f70282aa5cd
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC UPS Symmetra RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC UPS Symmetra RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC UPS Symmetra RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC UPS Symmetra RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC UPS Symmetra RM SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC UPS Symmetra RM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC UPS Symmetra RM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC UPS Symmetra RM SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC UPS Symmetra RM SNMP'
       valuemaps:
         -
           uuid: 8516e97893ed4f2ebe70766d17eeacde
diff --git a/templates/power/apc/apc_ups_symmetra_rx_snmp/README.md b/templates/power/apc/apc_ups_symmetra_rx_snmp/README.md
index ff2a5e25822..d16719a8d23 100644
--- a/templates/power/apc/apc_ups_symmetra_rx_snmp/README.md
+++ b/templates/power/apc/apc_ups_symmetra_rx_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor APC UPS Symmetra RX by Zabbix SNMP agent.
 Note: please, use the latest version of the firmware for your NMC in order for the template to work correctly.
 
@@ -49,7 +49,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
 |Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- A: {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
@@ -108,29 +108,29 @@ There are no template links in this template.
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/APC UPS Symmetra RX SNMP/system.name[sysName.0],#1)<>last(/APC UPS Symmetra RX SNMP/system.name[sysName.0],#2) and length(last(/APC UPS Symmetra RX SNMP/system.name[sysName.0]))>0` |INFO |<p>Manual close: YES</p> |
 |Battery has an internal error condition |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS Symmetra RX SNMP/battery.status[upsBasicBatteryStatus])=4` |AVERAGE | |
 |Battery is Low |<p>The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.</p> |`last(/APC UPS Symmetra RX SNMP/battery.status[upsBasicBatteryStatus])=3` |AVERAGE | |
-|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) | |`last(/APC UPS Symmetra RX SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
+|Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC UPS Symmetra RX SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
-|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RX SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra RX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra RX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS Symmetra RX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
+|Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RX SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra RX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RX SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC UPS Symmetra RX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC UPS Symmetra RX SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC UPS Symmetra RX SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
-|UPS is Timed Sleeping | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
-|UPS is Switched Bypass | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
-|UPS is Software Bypass | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
-|UPS is Sleeping Until Power Return | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
-|UPS is Rebooting | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
-|UPS is On Smart Trim | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
-|UPS is on Smart Boost | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
-|UPS is on battery | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
-|UPS is Off | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
-|UPS is Emergency Static Bypass | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
-|UPS is Hardware Failure Bypass | |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
+|UPS is Timed Sleeping |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
+|UPS is Switched Bypass |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
+|UPS is Software Bypass |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=6` |AVERAGE | |
+|UPS is Sleeping Until Power Return |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=11` |AVERAGE | |
+|UPS is Rebooting |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=8` |AVERAGE | |
+|UPS is On Smart Trim |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=12` |AVERAGE | |
+|UPS is on Smart Boost |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=4` |AVERAGE | |
+|UPS is on battery |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=3` |AVERAGE | |
+|UPS is Off |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=7` |AVERAGE | |
+|UPS is Emergency Static Bypass |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=16` |AVERAGE | |
+|UPS is Hardware Failure Bypass |<p>-</p> |`last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=10` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/APC UPS Symmetra RX SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/APC UPS Symmetra RX SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RX SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RX SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
-|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RX SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RX SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RX SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RX SNMP/phase.input.voltage[upsPhaseInputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
+|{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RX SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC UPS Symmetra RX SNMP/phase.output.voltage[upsPhaseOutputVoltage.1.1.{#PHASEINDEX}],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status is not okay |<p>The battery cartridge status:</p><p>bit 0 Disconnected</p><p>bit 1 Overvoltage</p><p>bit 2 NeedsReplacement</p><p>bit 3 OvertemperatureCritical</p><p>bit 4 Charger</p><p>bit 5 TemperatureSensor</p><p>bit 6 BusSoftStart</p><p>bit 7 OvertemperatureWarning</p><p>bit 8 GeneralError</p><p>bit 9 Communication</p><p>bit 10 DisconnectedFrame</p><p>bit 11 FirmwareMismatch</p> |`find(/APC UPS Symmetra RX SNMP/battery.pack.status[upsHighPrecBatteryPackCartridgeStatus.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0{16})$")=0` |WARNING | |
-|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) | |`min(/APC UPS Symmetra RX SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
+|{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC UPS Symmetra RX SNMP/battery.temperature[upsHighPrecBatteryPackTemperature.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
 |{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery lifetime is not okay |<p>The battery cartridge health.</p><p>  bit 0 Battery lifetime okay</p><p>  bit 1 Battery lifetime near end, order replacement cartridge</p><p>  bit 2 Battery lifetime exceeded, replace battery</p><p>  bit 3 Battery lifetime near end acknowledged, order replacement cartridge</p><p>  bit 4 Battery lifetime exceeded acknowledged, replace battery</p><p>  bit 5 Battery measured lifetime near end, order replacement cartridge</p><p>  bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge</p> |`find(/APC UPS Symmetra RX SNMP/battery.pack.cartridge_health[upsHighPrecBatteryPackCartridgeHealth.{#BATTERY_PACK}.{#CARTRIDGE_INDEX}],,"regexp","^(0)[0|1]{15}$")=1` |WARNING | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable |<p>The external sensor does not work or is not connected.</p> |`last(/APC UPS Symmetra RX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4` |INFO | |
 |{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning |<p>The external sensor has returned a value greater than the warning threshold.</p> |`last(/APC UPS Symmetra RX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2` |AVERAGE | |
diff --git a/templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml b/templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml
index 8856586e6a1..b7d6967be11 100644
--- a/templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml
+++ b/templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-28T08:23:04Z'
+  date: '2021-12-15T17:57:19Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Power
@@ -1433,6 +1433,178 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
+      dashboards:
+        -
+          uuid: b070a774806547ffa7e688b2746c8d58
+          name: 'UPS Summary'
+          pages:
+            -
+              widgets:
+                -
+                  type: PLAIN_TEXT
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'system.uptime[sysUpTime.0]'
+                        host: 'APC UPS Symmetra RX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'input.fail[upsAdvInputLineFailCause]'
+                        host: 'APC UPS Symmetra RX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'output.status[upsBasicOutputStatus]'
+                        host: 'APC UPS Symmetra RX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.status[upsBasicBatteryStatus]'
+                        host: 'APC UPS Symmetra RX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '8'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
+                        host: 'APC UPS Symmetra RX SNMP'
+                -
+                  type: PLAIN_TEXT
+                  x: '16'
+                  'y': '2'
+                  width: '8'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: show_as_html
+                      value: '0'
+                    -
+                      type: INTEGER
+                      name: show_lines
+                      value: '1'
+                    -
+                      type: ITEM
+                      name: itemids
+                      value:
+                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
+                        host: 'APC UPS Symmetra RX SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Capacity of the UPS batteries'
+                        host: 'APC UPS Symmetra RX SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '8'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Voltage
+                        host: 'APC UPS Symmetra RX SNMP'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '16'
+                  'y': '4'
+                  width: '8'
+                  height: '7'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: Output
+                        host: 'APC UPS Symmetra RX SNMP'
       valuemaps:
         -
           uuid: e2877a188bd24918992f8c7878550924
diff --git a/templates/san/huawei_5300v5_snmp/README.md b/templates/san/huawei_5300v5_snmp/README.md
index 0a38de6cee9..89c698f2c5d 100644
--- a/templates/san/huawei_5300v5_snmp/README.md
+++ b/templates/san/huawei_5300v5_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor SAN Huawei OceanStor 5300 V5 by Zabbix SNMP agent.
 
 
@@ -12,10 +12,11 @@ The template to monitor SAN Huawei OceanStor 5300 V5 by Zabbix SNMP agent.
 This template was tested on:
 
 - Huawei OceanStor 5300 V5
-- Zabbix, version 5.4
 
 ## Setup
 
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
 1\. Create a host for Huawei OceanStor 5300 V5 with controller management IP as SNMPv2 interface.
 
 2\. Link the template to the host.
@@ -74,21 +75,21 @@ No specific Zabbix configuration is required.
 |Huawei |OceanStor 5300 V5: Status |<p>System running status.</p> |SNMP |huawei.5300.v5[status]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |OceanStor 5300 V5: Version |<p>The device version.</p> |SNMP |huawei.5300.v5[version]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |OceanStor 5300 V5: Capacity total |<p>Total capacity of a device.</p> |SNMP |huawei.5300.v5[totalCapacity]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
-|Huawei |OceanStor 5300 V5: Capacity used |<p>Used capacity of a device.</p> |SNMP |huawei.5300.v5[usedCapacity]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Huawei |OceanStor 5300 V5: Capacity used |<p>Used capacity of a device.</p> |SNMP |huawei.5300.v5[usedCapacity]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p> |
 |Huawei |Controller {#ID}: Memory utilization |<p>Memory usage of a controller {#ID}.</p> |SNMP |huawei.5300.v5[hwInfoControllerMemoryUsage, "{#ID}"] |
 |Huawei |Controller {#ID}: Health status |<p>Controller health status. For details, see definition of Enum Values (HEALTH_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoControllerHealthStatus, "{#ID}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |Controller {#ID}: Running status |<p>Controller running status. For details, see definition of Enum Values (RUNNING_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoControllerRunningStatus, "{#ID}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |Controller {#ID}: Role |<p>Controller role..</p> |SNMP |huawei.5300.v5[hwInfoControllerRole, "{#ID}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |Enclosure {#NAME}: Health status |<p>Enclosure health status. For details, see definition of Enum Values (HEALTH_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoEnclosureHealthStatus, "{#NAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |Enclosure {#NAME}: Running status |<p>Enclosure running status. For details, see definition of Enum Values (RUNNING_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoEnclosureRunningStatus, "{#NAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Huawei |Enclosure {#NAME}: Temperature |<p>Enclosure temperature.</p> |SNMP |huawei.5300.v5[hwInfoEnclosureTemperature, "{#NAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Huawei |Enclosure {#NAME}: Temperature |<p>Enclosure temperature.</p> |SNMP |huawei.5300.v5[hwInfoEnclosureTemperature, "{#NAME}"] |
 |Huawei |FAN {#ID} on {#LOCATION}: Health status |<p>Health status of a fan. For details, see definition of Enum Values (HEALTH_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoFanHealthStatus, "{#ID}:{#LOCATION}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |FAN {#ID} on {#LOCATION}: Running status |<p>Operating status of a fan. For details, see definition of Enum Values (RUNNING_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoFanRunningStatus, "{#ID}:{#LOCATION}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |BBU {#ID} on {#LOCATION}: Health status |<p>Health status of a BBU. For details, see definition of Enum Values (HEALTH_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoBBUHealthStatus, "{#ID}:{#LOCATION}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |BBU {#ID} on {#LOCATION}: Running status |<p>Running status of a BBU. For details, see definition of Enum Values (RUNNING_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoBBURunningStatus, "{#ID}:{#LOCATION}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |Disk {#MODEL} on {#LOCATION}: Health status |<p>Disk health status. For details, see definition of Enum Values (HEALTH_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoDiskHealthStatus, "{#ID}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |Disk {#MODEL} on {#LOCATION}: Running status |<p>Disk running status. For details, see definition of Enum Values (RUNNING_STATUS_E).</p><p>https://support.huawei.com/enterprise/en/centralized-storage/oceanstor-5300-v5-pid-22462029?category=reference-guides&subcategory=mib-reference</p> |SNMP |huawei.5300.v5[hwInfoDiskRunningStatus, "{#ID}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Huawei |Disk {#MODEL} on {#LOCATION}: Temperature |<p>Disk temperature.</p> |SNMP |huawei.5300.v5[hwInfoDiskTemperature, "{#ID}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Huawei |Disk {#MODEL} on {#LOCATION}: Temperature |<p>Disk temperature.</p> |SNMP |huawei.5300.v5[hwInfoDiskTemperature, "{#ID}"] |
 |Huawei |Disk {#MODEL} on {#LOCATION}: Health score |<p>Health score of a disk. If the value is 255, indicating invalid.</p> |SNMP |huawei.5300.v5[hwInfoDiskHealthMark, "{#ID}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Huawei |Node {#NODE}: Average I/O latency |<p>Average I/O latency of the node.</p> |SNMP |huawei.5300.v5[hwPerfNodeDelay, "{#NODE}"] |
 |Huawei |Node {#NODE}: Total I/O per second |<p>Total IOPS of the node.</p> |SNMP |huawei.5300.v5[hwPerfNodeTotalIOPS, "{#NODE}"] |
@@ -113,35 +114,35 @@ No specific Zabbix configuration is required.
 |Huawei |Pool {#NAME}: Capacity total |<p>Total capacity of a storage pool.</p> |SNMP |huawei.5300.v5[hwInfoStoragePoolTotalCapacity, "{#NAME}"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |Huawei |Pool {#NAME}: Capacity free |<p>Available capacity of a storage pool.</p> |SNMP |huawei.5300.v5[hwInfoStoragePoolFreeCapacity, "{#NAME}"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p> |
 |Huawei |Pool {#NAME}: Capacity used |<p>Used capacity of a storage pool.</p> |SNMP |huawei.5300.v5[hwInfoStoragePoolSubscribedCapacity, "{#NAME}"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p> |
-|Huawei |Pool {#NAME}: Capacity used percentage |<p>Used capacity of a storage pool in percents.</p> |CALCULATED |huawei.5300.v5[hwInfoStoragePoolFreeCapacityPct, "{#NAME}"]<p>**Expression**:</p>`last("huawei.5300.v5[hwInfoStoragePoolSubscribedCapacity, \"{#NAME}\"]")/last("huawei.5300.v5[hwInfoStoragePoolTotalCapacity, \"{#NAME}\"]")*100` |
+|Huawei |Pool {#NAME}: Capacity used percentage |<p>Used capacity of a storage pool in percents.</p> |CALCULATED |huawei.5300.v5[hwInfoStoragePoolFreeCapacityPct, "{#NAME}"]<p>**Expression**:</p>`last(//huawei.5300.v5[hwInfoStoragePoolSubscribedCapacity, "{#NAME}"])/last(//huawei.5300.v5[hwInfoStoragePoolTotalCapacity, "{#NAME}"])*100` |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Controller {#ID}: 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:huawei.5300.v5[hwInfoControllerCPUUsage, "{#ID}"].min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|Node {#NODE}: 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:huawei.5300.v5[hwPerfNodeCPUUsage, "{#NODE}"].min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|OceanStor 5300 V5: Storage version has been changed |<p>OceanStor 5300 V5 version has changed. Ack to close.</p> |`{TEMPLATE_NAME:huawei.5300.v5[version].diff()}=1 and {TEMPLATE_NAME:huawei.5300.v5[version].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Controller {#ID}: Memory usage is too high (over {$HUAWEI.5300.MEM.MAX.WARN} for {$HUAWEI.5300.MEM.MAX.TIME}) |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoControllerMemoryUsage, "{#ID}"].min({$HUAWEI.5300.MEM.MAX.TIME})}>{$HUAWEI.5300.MEM.MAX.WARN}` |AVERAGE | |
-|Controller {#ID}: Health status is not Normal |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoControllerHealthStatus, "{#ID}"].last()}<>1` |HIGH | |
-|Controller {#ID}: Running status is not Online |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoControllerRunningStatus, "{#ID}"].last()}<>27` |AVERAGE | |
-|Controller {#ID}: Role has been changed |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoControllerRole, "{#ID}"].diff()}=1` |WARNING |<p>Manual close: YES</p> |
-|Enclosure {#NAME}: Health status is not Normal |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoEnclosureHealthStatus, "{#NAME}"].last()}<>1` |HIGH | |
-|Enclosure {#NAME}: Running status is not Online |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoEnclosureRunningStatus, "{#NAME}"].last()}<>27` |AVERAGE | |
-|Enclosure {#NAME}: Temperature is too high (over {$HUAWEI.5300.TEMP.MAX.WARN} for {$HUAWEI.5300.TEMP.MAX.TIME}) |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoEnclosureTemperature, "{#NAME}"].min({$HUAWEI.5300.TEMP.MAX.TIME})}>{$HUAWEI.5300.TEMP.MAX.WARN}` |HIGH | |
-|FAN {#ID} on {#LOCATION}: Health status is not Normal |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoFanHealthStatus, "{#ID}:{#LOCATION}"].last()}<>1` |HIGH | |
-|FAN {#ID} on {#LOCATION}: Running status is not Running |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoFanRunningStatus, "{#ID}:{#LOCATION}"].last()}<>2` |AVERAGE | |
-|BBU {#ID} on {#LOCATION}: Health status is not Normal |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoBBUHealthStatus, "{#ID}:{#LOCATION}"].last()}<>1` |HIGH | |
-|BBU {#ID} on {#LOCATION}: Running status is not Online |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoBBURunningStatus, "{#ID}:{#LOCATION}"].last()}<>2` |AVERAGE | |
-|Disk {#MODEL} on {#LOCATION}: Health status is not Normal |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoDiskHealthStatus, "{#ID}"].last()}<>1` |HIGH | |
-|Disk {#MODEL} on {#LOCATION}: Running status is not Online |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoDiskRunningStatus, "{#ID}"].last()}<>27` |AVERAGE | |
-|Disk {#MODEL} on {#LOCATION}: Temperature is too high (over {$HUAWEI.5300.DISK.TEMP.MAX.WARN:"{#MODEL}"} for {$HUAWEI.5300.DISK.TEMP.MAX.TIME}) |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoDiskTemperature, "{#ID}"].min({$HUAWEI.5300.DISK.TEMP.MAX.TIME})}>{$HUAWEI.5300.DISK.TEMP.MAX.WARN:"{#MODEL}"}` |HIGH | |
-|Node {#NODE}: Average I/O latency is too high (over {$HUAWEI.5300.NODE.IO.DELAY.MAX.WARN}ms for {$HUAWEI.5300.NODE.IO.DELAY.MAX.TIME}) |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwPerfNodeDelay, "{#NODE}"].min({$HUAWEI.5300.NODE.IO.DELAY.MAX.TIME})}>{$HUAWEI.5300.NODE.IO.DELAY.MAX.WARN}` |WARNING | |
-|LUN {#NAME}: Status is not Normal |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwStorageLunStatus, "{#NAME}"].last()}<>1` |AVERAGE | |
-|LUN {#NAME}: Average I/O response time is too high (over {$HUAWEI.5300.LUN.IO.TIME.MAX.WARN}ms for {$HUAWEI.5300.LUN.IO.TIME.MAX.TIME}) |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwPerfLunAverageIOResponseTime, "{#NAME}"].min({$HUAWEI.5300.LUN.IO.TIME.MAX.TIME})}>{$HUAWEI.5300.LUN.IO.TIME.MAX.WARN}` |WARNING | |
-|Pool {#NAME}: Health status is not Normal |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoStoragePoolHealthStatus, "{#NAME}"].last()}<>1` |HIGH | |
-|Pool {#NAME}: Running status is not Online |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoStoragePoolRunningStatus, "{#NAME}"].last()}<>27` |AVERAGE | |
-|Pool {#NAME}: Used capacity is too high (over {#THRESHOLD}%) |<p>-</p> |`{TEMPLATE_NAME:huawei.5300.v5[hwInfoStoragePoolFreeCapacityPct, "{#NAME}"].min({$HUAWEI.5300.POOL.CAPACITY.THRESH.TIME})}>{#THRESHOLD}` |AVERAGE | |
+|Controller {#ID}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerCPUUsage, "{#ID}"],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Node {#NODE}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwPerfNodeCPUUsage, "{#NODE}"],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|OceanStor 5300 V5: Storage version has been changed |<p>OceanStor 5300 V5 version has changed. Ack to close.</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[version],#1)<>last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[version],#2) and length(last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[version]))>0` |INFO |<p>Manual close: YES</p> |
+|Controller {#ID}: Memory usage is too high (over {$HUAWEI.5300.MEM.MAX.WARN} for {$HUAWEI.5300.MEM.MAX.TIME}) |<p>-</p> |`min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerMemoryUsage, "{#ID}"],{$HUAWEI.5300.MEM.MAX.TIME})>{$HUAWEI.5300.MEM.MAX.WARN}` |AVERAGE | |
+|Controller {#ID}: Health status is not Normal |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerHealthStatus, "{#ID}"])<>1` |HIGH | |
+|Controller {#ID}: Running status is not Online |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerRunningStatus, "{#ID}"])<>27` |AVERAGE | |
+|Controller {#ID}: Role has been changed |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerRole, "{#ID}"],#1)<>last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerRole, "{#ID}"],#2)` |WARNING |<p>Manual close: YES</p> |
+|Enclosure {#NAME}: Health status is not Normal |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoEnclosureHealthStatus, "{#NAME}"])<>1` |HIGH | |
+|Enclosure {#NAME}: Running status is not Online |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoEnclosureRunningStatus, "{#NAME}"])<>27` |AVERAGE | |
+|Enclosure {#NAME}: Temperature is too high (over {$HUAWEI.5300.TEMP.MAX.WARN} for {$HUAWEI.5300.TEMP.MAX.TIME}) |<p>-</p> |`min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoEnclosureTemperature, "{#NAME}"],{$HUAWEI.5300.TEMP.MAX.TIME})>{$HUAWEI.5300.TEMP.MAX.WARN}` |HIGH | |
+|FAN {#ID} on {#LOCATION}: Health status is not Normal |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoFanHealthStatus, "{#ID}:{#LOCATION}"])<>1` |HIGH | |
+|FAN {#ID} on {#LOCATION}: Running status is not Running |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoFanRunningStatus, "{#ID}:{#LOCATION}"])<>2` |AVERAGE | |
+|BBU {#ID} on {#LOCATION}: Health status is not Normal |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoBBUHealthStatus, "{#ID}:{#LOCATION}"])<>1` |HIGH | |
+|BBU {#ID} on {#LOCATION}: Running status is not Online |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoBBURunningStatus, "{#ID}:{#LOCATION}"])<>2` |AVERAGE | |
+|Disk {#MODEL} on {#LOCATION}: Health status is not Normal |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoDiskHealthStatus, "{#ID}"])<>1` |HIGH | |
+|Disk {#MODEL} on {#LOCATION}: Running status is not Online |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoDiskRunningStatus, "{#ID}"])<>27` |AVERAGE | |
+|Disk {#MODEL} on {#LOCATION}: Temperature is too high (over {$HUAWEI.5300.DISK.TEMP.MAX.WARN:"{#MODEL}"} for {$HUAWEI.5300.DISK.TEMP.MAX.TIME}) |<p>-</p> |`min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoDiskTemperature, "{#ID}"],{$HUAWEI.5300.DISK.TEMP.MAX.TIME})>{$HUAWEI.5300.DISK.TEMP.MAX.WARN:"{#MODEL}"}` |HIGH | |
+|Node {#NODE}: Average I/O latency is too high (over {$HUAWEI.5300.NODE.IO.DELAY.MAX.WARN}ms for {$HUAWEI.5300.NODE.IO.DELAY.MAX.TIME}) |<p>-</p> |`min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwPerfNodeDelay, "{#NODE}"],{$HUAWEI.5300.NODE.IO.DELAY.MAX.TIME})>{$HUAWEI.5300.NODE.IO.DELAY.MAX.WARN}` |WARNING | |
+|LUN {#NAME}: Status is not Normal |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwStorageLunStatus, "{#NAME}"])<>1` |AVERAGE | |
+|LUN {#NAME}: Average I/O response time is too high (over {$HUAWEI.5300.LUN.IO.TIME.MAX.WARN}ms for {$HUAWEI.5300.LUN.IO.TIME.MAX.TIME}) |<p>-</p> |`min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwPerfLunAverageIOResponseTime, "{#NAME}"],{$HUAWEI.5300.LUN.IO.TIME.MAX.TIME})>{$HUAWEI.5300.LUN.IO.TIME.MAX.WARN}` |WARNING | |
+|Pool {#NAME}: Health status is not Normal |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoStoragePoolHealthStatus, "{#NAME}"])<>1` |HIGH | |
+|Pool {#NAME}: Running status is not Online |<p>-</p> |`last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoStoragePoolRunningStatus, "{#NAME}"])<>27` |AVERAGE | |
+|Pool {#NAME}: Used capacity is too high (over {#THRESHOLD}%) |<p>-</p> |`min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoStoragePoolFreeCapacityPct, "{#NAME}"],{$HUAWEI.5300.POOL.CAPACITY.THRESH.TIME})>{#THRESHOLD}` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml b/templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml
index 316579a7376..997dc132070 100644
--- a/templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml
+++ b/templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:45Z'
+  version: '6.0'
+  date: '2021-12-15T14:25:38Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -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/418855-discussion-thread-for-official-zabbix-template-huawei-oceanstor
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/san/netapp_aff_a700_http/README.md b/templates/san/netapp_aff_a700_http/README.md
index 824b017dfac..91e89535e98 100644
--- a/templates/san/netapp_aff_a700_http/README.md
+++ b/templates/san/netapp_aff_a700_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor SAN NetApp AFF A700 cluster by Zabbix HTTP agent.
 
 
@@ -63,21 +63,21 @@ There are no template links in this template.
 |General |Cluster name |<p>The name of the cluster.</p> |DEPENDENT |netapp.cluster.name<p>**Preprocessing**:</p><p>- JSONPATH: `$.name`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |Cluster location |<p>The location of the cluster.</p> |DEPENDENT |netapp.cluster.location<p>**Preprocessing**:</p><p>- JSONPATH: `$.location`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |Cluster status |<p>The status of the cluster: ok, error, partial_no_data, partial_no_response, partial_other_error, negative_delta, backfilled_data, inconsistent_delta_time, inconsistent_old_data.</p> |DEPENDENT |netapp.cluster.status<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.status`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |Cluster throughput, other rate |<p>Throughput bytes observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.cluster.statistics.throughput.other.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.throughput_raw.other`</p><p>- CHANGE_PER_SECOND |
-|General |Cluster throughput, read rate |<p>Throughput bytes observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.throughput.read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.throughput_raw.read`</p><p>- CHANGE_PER_SECOND |
-|General |Cluster throughput, write rate |<p>Throughput bytes observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.throughput.write.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.throughput_raw.write`</p><p>- CHANGE_PER_SECOND |
-|General |Cluster throughput, total rate |<p>Throughput bytes observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.throughput.total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.throughput_raw.total`</p><p>- CHANGE_PER_SECOND |
-|General |Cluster IOPS, other rate |<p>The number of I/O operations observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.cluster.statistics.iops.other.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.other`</p><p>- CHANGE_PER_SECOND |
-|General |Cluster IOPS, read rate |<p>The number of I/O operations observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops.read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.read`</p><p>- CHANGE_PER_SECOND |
-|General |Cluster IOPS, write rate |<p>The number of I/O operations observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops.write.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.write`</p><p>- CHANGE_PER_SECOND |
-|General |Cluster IOPS, total rate |<p>The number of I/O operations observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops.total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.total`</p><p>- CHANGE_PER_SECOND |
-|General |Cluster latency, other |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |CALCULATED |netapp.cluster.statistics.latency.other<p>**Expression**:</p>`(last(netapp.cluster.statistics.latency_raw.other) - prev(netapp.cluster.statistics.latency_raw.other)) / (last(netapp.cluster.statistics.iops_raw.other) - prev(netapp.cluster.statistics.iops_raw.other) + (last(netapp.cluster.statistics.iops_raw.other) - prev(netapp.cluster.statistics.iops_raw.other) = 0) ) * 0.001 ` |
-|General |Cluster latency, read |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for read I/O operations.</p> |CALCULATED |netapp.cluster.statistics.latency.read<p>**Expression**:</p>`(last(netapp.cluster.statistics.latency_raw.read) - prev(netapp.cluster.statistics.latency_raw.read)) / ( last(netapp.cluster.statistics.iops_raw.read) - prev(netapp.cluster.statistics.iops_raw.read) + (last(netapp.cluster.statistics.iops_raw.read) - prev(netapp.cluster.statistics.iops_raw.read) = 0) ) * 0.001 ` |
-|General |Cluster latency, write |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for write I/O operations.</p> |CALCULATED |netapp.cluster.statistics.latency.write<p>**Expression**:</p>`(last(netapp.cluster.statistics.latency_raw.write) - prev(netapp.cluster.statistics.latency_raw.write)) / ( last(netapp.cluster.statistics.iops_raw.write) - prev(netapp.cluster.statistics.iops_raw.write) + (last(netapp.cluster.statistics.iops_raw.write) - prev(netapp.cluster.statistics.iops_raw.write) = 0) ) * 0.001 ` |
-|General |Cluster latency, total |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |CALCULATED |netapp.cluster.statistics.latency.total<p>**Expression**:</p>`(last(netapp.cluster.statistics.latency_raw.total) - prev(netapp.cluster.statistics.latency_raw.total)) / ( last(netapp.cluster.statistics.iops_raw.total) - prev(netapp.cluster.statistics.iops_raw.total) + (last(netapp.cluster.statistics.iops_raw.total) - prev(netapp.cluster.statistics.iops_raw.total) = 0) ) * 0.001 ` |
+|General |Cluster throughput, other rate |<p>Throughput bytes observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.cluster.statistics.throughput.other.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.throughput_raw.other`</p><p>- CHANGE_PER_SECOND</p> |
+|General |Cluster throughput, read rate |<p>Throughput bytes observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.throughput.read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.throughput_raw.read`</p><p>- CHANGE_PER_SECOND</p> |
+|General |Cluster throughput, write rate |<p>Throughput bytes observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.throughput.write.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.throughput_raw.write`</p><p>- CHANGE_PER_SECOND</p> |
+|General |Cluster throughput, total rate |<p>Throughput bytes observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.throughput.total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.throughput_raw.total`</p><p>- CHANGE_PER_SECOND</p> |
+|General |Cluster IOPS, other rate |<p>The number of I/O operations observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.cluster.statistics.iops.other.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.other`</p><p>- CHANGE_PER_SECOND</p> |
+|General |Cluster IOPS, read rate |<p>The number of I/O operations observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops.read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.read`</p><p>- CHANGE_PER_SECOND</p> |
+|General |Cluster IOPS, write rate |<p>The number of I/O operations observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops.write.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.write`</p><p>- CHANGE_PER_SECOND</p> |
+|General |Cluster IOPS, total rate |<p>The number of I/O operations observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops.total.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.total`</p><p>- CHANGE_PER_SECOND</p> |
+|General |Cluster latency, other |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |CALCULATED |netapp.cluster.statistics.latency.other<p>**Expression**:</p>`(last(//netapp.cluster.statistics.latency_raw.other) - last(//netapp.cluster.statistics.latency_raw.other,#2)) / (last(//netapp.cluster.statistics.iops_raw.other) - last(//netapp.cluster.statistics.iops_raw.other,#2) + (last(//netapp.cluster.statistics.iops_raw.other) - last(//netapp.cluster.statistics.iops_raw.other,#2) = 0) ) * 0.001 ` |
+|General |Cluster latency, read |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for read I/O operations.</p> |CALCULATED |netapp.cluster.statistics.latency.read<p>**Expression**:</p>`(last(//netapp.cluster.statistics.latency_raw.read) - last(//netapp.cluster.statistics.latency_raw.read,#2)) / ( last(//netapp.cluster.statistics.iops_raw.read) - last(//netapp.cluster.statistics.iops_raw.read,#2) + (last(//netapp.cluster.statistics.iops_raw.read) - last(//netapp.cluster.statistics.iops_raw.read,#2) = 0) ) * 0.001 ` |
+|General |Cluster latency, write |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for write I/O operations.</p> |CALCULATED |netapp.cluster.statistics.latency.write<p>**Expression**:</p>`(last(//netapp.cluster.statistics.latency_raw.write) - last(//netapp.cluster.statistics.latency_raw.write,#2)) / ( last(//netapp.cluster.statistics.iops_raw.write) - last(//netapp.cluster.statistics.iops_raw.write,#2) + (last(//netapp.cluster.statistics.iops_raw.write) - last(//netapp.cluster.statistics.iops_raw.write,#2) = 0) ) * 0.001 ` |
+|General |Cluster latency, total |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |CALCULATED |netapp.cluster.statistics.latency.total<p>**Expression**:</p>`(last(//netapp.cluster.statistics.latency_raw.total) - last(//netapp.cluster.statistics.latency_raw.total,#2)) / ( last(//netapp.cluster.statistics.iops_raw.total) - last(//netapp.cluster.statistics.iops_raw.total,#2) + (last(//netapp.cluster.statistics.iops_raw.total) - last(//netapp.cluster.statistics.iops_raw.total,#2) = 0) ) * 0.001 ` |
 |General |{#NODENAME}: Software version |<p>This returns the cluster version information. When the cluster has more than one node, the cluster version is equivalent to the lowest of generation, major, and minor versions on all nodes.</p> |DEPENDENT |netapp.node.version[{#NODENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#NODENAME}')].version.full.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#NODENAME}: Location |<p>The location of the node.</p> |DEPENDENT |netapp.nodes.location[{#NODENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#NODENAME}')].location.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |{#NODENAME}: State |<p>State of the node:</p><p>up - Node is up and operational.</p><p>booting - Node is booting up.</p><p>down - Node has stopped or is dumping core.</p><p>taken_over - Node has been taken over by its HA partner and is not yet waiting for giveback.</p><p>waiting_for_giveback - Node has been taken over by its HA partner and is waiting for the HA partner to giveback disks.</p><p>degraded - Node has one or more critical services offline.</p><p>unknown - Node or its HA partner cannot be contacted and there is no information on the node’s state.</p> |DEPENDENT |netapp.nodes.state[{#NODENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#NODENAME}')].state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|General |{#NODENAME}: State |<p>State of the node:</p><p>up - Node is up and operational.</p><p>booting - Node is booting up.</p><p>down - Node has stopped or is dumping core.</p><p>taken_over - Node has been taken over by its HA partner and is not yet waiting for giveback.</p><p>waiting_for_giveback - Node has been taken over by its HA partner and is waiting for the HA partner to giveback disks.</p><p>degraded - Node has one or more critical services offline.</p><p>unknown - Node or its HA partner cannot be contacted and there is no information on the node's state.</p> |DEPENDENT |netapp.nodes.state[{#NODENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#NODENAME}')].state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#NODENAME}: Membership |<p>Possible values:</p><p>  available - If a node is available, this means it is detected on the internal cluster network and can be added to the cluster. Nodes that have a membership of “available” are not returned when a GET request is called when the cluster exists. A query on the “membership” property for available must be provided to scan for nodes on the cluster network. Nodes that have a membership of “available” are returned automatically before a cluster is created.</p><p>  joining - Joining nodes are in the process of being added to the cluster. The node may be progressing through the steps to become a member or might have failed. The job to add the node or create the cluster provides details on the current progress of the node.</p><p>  member - Nodes that are members have successfully joined the cluster.</p> |DEPENDENT |netapp.nodes.membership[{#NODENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#NODENAME}')].membership.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#NODENAME}: Uptime |<p>The total time, in seconds, that the node has been up.</p> |DEPENDENT |netapp.nodes.uptime[{#NODENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#NODENAME}')].uptime.first()`</p> |
 |General |{#NODENAME}: Controller over temperature |<p>Specifies whether the hardware is currently operating outside of its recommended temperature range. The hardware shuts down if the temperature exceeds critical thresholds. Possible values: over, normal</p> |DEPENDENT |netapp.nodes.controller.over_temperature[{#NODENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#NODENAME}')].controller.over_temperature.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -94,24 +94,24 @@ There are no template links in this template.
 |General |{#LUNNAME}: Space size |<p>The total provisioned size of the LUN.</p> |DEPENDENT |netapp.lun.space.size[{#SVMNAME},{#LUNNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.svm.name=='{#SVMNAME}'&&@.name=='{#LUNNAME}')].space.size.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#LUNNAME}: Space used |<p>The amount of space consumed by the main data stream of the LUN.</p> |DEPENDENT |netapp.lun.space.used[{#SVMNAME},{#LUNNAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.svm.name=='{#SVMNAME}'&&@.name=='{#LUNNAME}')].space.used.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#VOLUMENAME}: Comment |<p>A comment for the volume.</p> |DEPENDENT |netapp.volume.comment[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].comment.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |{#VOLUMENAME}: State |<p>Volume state. A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The ‘mixed’ state applies to FlexGroup volumes only and cannot be specified as a target state. An ‘error’ state implies that the volume is not in a state to serve data.</p> |DEPENDENT |netapp.volume.state[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |{#VOLUMENAME}: Type |<p>Type of the volume.</p><p>rw ‐ read-write volume.</p><p>dp ‐ data-protection volume.</p><p>ls ‐ load-sharing dp volume.</p> |DEPENDENT |netapp.volume.type[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].type.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|General |{#VOLUMENAME}: State |<p>Volume state. A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The 'mixed' state applies to FlexGroup volumes only and cannot be specified as a target state. An 'error' state implies that the volume is not in a state to serve data.</p> |DEPENDENT |netapp.volume.state[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|General |{#VOLUMENAME}: Type |<p>Type of the volume.</p><p>rw - read-write volume.</p><p>dp - data-protection volume.</p><p>ls - load-sharing dp volume.</p> |DEPENDENT |netapp.volume.type[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].type.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#VOLUMENAME}: SVM name |<p>The volume belongs this SVM.</p> |DEPENDENT |netapp.volume.svm_name[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].svm.name.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#VOLUMENAME}: Space size |<p>Total provisioned size. The default size is equal to the minimum size of 20MB, in bytes.</p> |DEPENDENT |netapp.volume.space_size[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].space.size.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#VOLUMENAME}: Available size |<p>The available space, in bytes.</p> |DEPENDENT |netapp.volume.space_available[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].space.available.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |{#VOLUMENAME}: Used size |<p>The virtual space used (includes volume reserves) before storage efficiency, in bytes.</p> |DEPENDENT |netapp.volume.space_used[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].space.used.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |{#VOLUMENAME}: Volume throughput, other rate |<p>Throughput bytes observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.volume.statistics.throughput.other.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.throughput_raw.other.first()`</p><p>- CHANGE_PER_SECOND |
-|General |{#VOLUMENAME}: Volume throughput, read rate |<p>Throughput bytes observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.volume.statistics.throughput.read.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.throughput_raw.read.first()`</p><p>- CHANGE_PER_SECOND |
-|General |{#VOLUMENAME}: Volume throughput, write rate |<p>Throughput bytes observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.volume.statistics.throughput.write.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.throughput_raw.write.first()`</p><p>- CHANGE_PER_SECOND |
-|General |{#VOLUMENAME}: Volume throughput, total rate |<p>Throughput bytes observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.volume.statistics.throughput.total.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.throughput_raw.total.first()`</p><p>- CHANGE_PER_SECOND |
-|General |{#VOLUMENAME}: Volume IOPS, other rate |<p>The number of I/O operations observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.volume.statistics.iops.other.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.other.first()`</p><p>- CHANGE_PER_SECOND |
-|General |{#VOLUMENAME}: Volume IOPS, read rate |<p>The number of I/O operations observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops.read.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.read.first()`</p><p>- CHANGE_PER_SECOND |
-|General |{#VOLUMENAME}: Volume IOPS, write rate |<p>The number of I/O operations observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops.write.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.write.first()`</p><p>- CHANGE_PER_SECOND |
-|General |{#VOLUMENAME}: Volume IOPS, total rate |<p>The number of I/O operations observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops.total.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.total.first()`</p><p>- CHANGE_PER_SECOND |
-|General |{#VOLUMENAME}: Volume latency, other |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |CALCULATED |netapp.volume.statistics.latency.other[{#VOLUMENAME}]<p>**Expression**:</p>`(last(netapp.volume.statistics.latency_raw.other[{#VOLUMENAME}]) - prev(netapp.volume.statistics.latency_raw.other[{#VOLUMENAME}])) / ( last(netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}]) - prev(netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}]) + (last(netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}]) - prev(netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}]) = 0) ) * 0.001 ` |
-|General |{#VOLUMENAME}: Volume latency, read |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for read I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.read[{#VOLUMENAME}]<p>**Expression**:</p>`(last(netapp.volume.statistics.latency_raw.read[{#VOLUMENAME}]) - prev(netapp.volume.statistics.latency_raw.read[{#VOLUMENAME}])) / ( last(netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]) - prev(netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]) + (last(netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]) - prev(netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]) = 0)) * 0.001 ` |
-|General |{#VOLUMENAME}: Volume latency, write |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for write I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.write[{#VOLUMENAME}]<p>**Expression**:</p>`(last(netapp.volume.statistics.latency_raw.write[{#VOLUMENAME}]) - prev(netapp.volume.statistics.latency_raw.write[{#VOLUMENAME}])) / ( last(netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]) - prev(netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]) + (last(netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]) - prev(netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]) = 0) ) * 0.001 ` |
-|General |{#VOLUMENAME}: Volume latency, total |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.total[{#VOLUMENAME}]<p>**Expression**:</p>`(last(netapp.volume.statistics.latency_raw.total[{#VOLUMENAME}]) - prev(netapp.volume.statistics.latency_raw.total[{#VOLUMENAME}])) / ( last(netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]) - prev(netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]) + (last(netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]) - prev(netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]) = 0) ) * 0.001 ` |
+|General |{#VOLUMENAME}: Volume throughput, other rate |<p>Throughput bytes observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.volume.statistics.throughput.other.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.throughput_raw.other.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|General |{#VOLUMENAME}: Volume throughput, read rate |<p>Throughput bytes observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.volume.statistics.throughput.read.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.throughput_raw.read.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|General |{#VOLUMENAME}: Volume throughput, write rate |<p>Throughput bytes observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.volume.statistics.throughput.write.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.throughput_raw.write.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|General |{#VOLUMENAME}: Volume throughput, total rate |<p>Throughput bytes observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.volume.statistics.throughput.total.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.throughput_raw.total.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|General |{#VOLUMENAME}: Volume IOPS, other rate |<p>The number of I/O operations observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.volume.statistics.iops.other.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.other.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|General |{#VOLUMENAME}: Volume IOPS, read rate |<p>The number of I/O operations observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops.read.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.read.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|General |{#VOLUMENAME}: Volume IOPS, write rate |<p>The number of I/O operations observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops.write.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.write.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|General |{#VOLUMENAME}: Volume IOPS, total rate |<p>The number of I/O operations observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops.total.rate[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.total.first()`</p><p>- CHANGE_PER_SECOND</p> |
+|General |{#VOLUMENAME}: Volume latency, other |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |CALCULATED |netapp.volume.statistics.latency.other[{#VOLUMENAME}]<p>**Expression**:</p>`(last(//netapp.volume.statistics.latency_raw.other[{#VOLUMENAME}]) - last(//netapp.volume.statistics.latency_raw.other[{#VOLUMENAME}],#2)) / ( last(//netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}],#2) + (last(//netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}],#2) = 0) ) * 0.001 ` |
+|General |{#VOLUMENAME}: Volume latency, read |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for read I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.read[{#VOLUMENAME}]<p>**Expression**:</p>`(last(//netapp.volume.statistics.latency_raw.read[{#VOLUMENAME}]) - last(//netapp.volume.statistics.latency_raw.read[{#VOLUMENAME}],#2)) / ( last(//netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}],#2) + (last(//netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}],#2) = 0)) * 0.001 ` |
+|General |{#VOLUMENAME}: Volume latency, write |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for write I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.write[{#VOLUMENAME}]<p>**Expression**:</p>`(last(//netapp.volume.statistics.latency_raw.write[{#VOLUMENAME}]) - last(//netapp.volume.statistics.latency_raw.write[{#VOLUMENAME}],#2)) / ( last(//netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}],#2) + (last(//netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}],#2) = 0) ) * 0.001 ` |
+|General |{#VOLUMENAME}: Volume latency, total |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.total[{#VOLUMENAME}]<p>**Expression**:</p>`(last(//netapp.volume.statistics.latency_raw.total[{#VOLUMENAME}]) - last(//netapp.volume.statistics.latency_raw.total[{#VOLUMENAME}],#2)) / ( last(//netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}],#2) + (last(//netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}],#2) = 0) ) * 0.001 ` |
 |Zabbix_raw_items |Get cluster |<p>-</p> |HTTP_AGENT |netapp.cluster.get |
 |Zabbix_raw_items |Get nodes |<p>-</p> |HTTP_AGENT |netapp.nodes.get |
 |Zabbix_raw_items |Get disks |<p>-</p> |HTTP_AGENT |netapp.disks.get |
@@ -143,21 +143,21 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Version has changed (new version: {ITEM.VALUE}) |<p>__RESOURCE__ version has changed. Ack to close.</p> |`{TEMPLATE_NAME:netapp.cluster.version.diff()}=1 and {TEMPLATE_NAME:netapp.cluster.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Cluster status is abnormal |<p>Any errors associated with the sample. For example, if the aggregation of data over multiple nodes fails then any of the partial errors might be returned, “ok” on success, or “error” on any internal uncategorized failure. Whenever a sample collection is missed but done at a later time, it is back filled to the previous 15 second timestamp and tagged with "backfilled_data". “Inconsistent_ delta_time” is encountered when the time between two collections is not the same for all nodes. Therefore, the aggregated value might be over or under inflated. “Negative_delta” is returned when an expected monotonically increasing value has decreased in value. “Inconsistent_old_data” is returned when one or more nodes do not have the latest data.</p> |`({TEMPLATE_NAME:netapp.cluster.status.last()}<>"ok")` |AVERAGE | |
-|{#NODENAME}: Version has changed (new version: {ITEM.VALUE}) |<p>{#NODENAME} version has changed. Ack to close.</p> |`{TEMPLATE_NAME:netapp.node.version[{#NODENAME}].diff()}=1 and {TEMPLATE_NAME:netapp.node.version[{#NODENAME}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|{#NODENAME}: Node state is abnormal |<p>The state of the node is different from up:</p><p>booting - Node is booting up.</p><p>down - Node has stopped or is dumping core.</p><p>taken_over - Node has been taken over by its HA partner and is not yet waiting for giveback.</p><p>waiting_for_giveback - Node has been taken over by its HA partner and is waiting for the HA partner to giveback disks.</p><p>degraded - Node has one or more critical services offline.</p><p>unknown - Node or its HA partner cannot be contacted and there is no information on the node’s state.</p> |`({TEMPLATE_NAME:netapp.nodes.state[{#NODENAME}].last()}<>"up")` |AVERAGE | |
-|{#NODENAME}: Node has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:netapp.nodes.uptime[{#NODENAME}].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|{#NODENAME}: Node has over temperature |<p>The hardware shuts down if the temperature exceeds critical thresholds(item's value is "over").</p> |`({TEMPLATE_NAME:netapp.nodes.controller.over_temperature[{#NODENAME}].last()}<>"normal")` |AVERAGE | |
-|{#ETHPORTNAME}: Ethernet port of the Node "{#NODENAME}" is down |<p>Something is wrong with the ethernet port.</p> |`({TEMPLATE_NAME:netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}].last()}="down")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}].last()}="up")` |AVERAGE |<p>Manual close: YES</p> |
-|{#FCPORTNAME}: FC port of the Node "{#NODENAME}" has state different from "online" |<p>Something is wrong with the FC port.</p> |`({TEMPLATE_NAME:netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}].last()}<>"online")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}].last()}="online")` |AVERAGE |<p>Manual close: YES</p> |
-|{#DISKNAME}: Disk of the Node "{#NODENAME}" has state different from "present" |<p>Something is wrong with the disk.</p> |`({TEMPLATE_NAME:netapp.disk.state[{#NODENAME},{#DISKNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.disk.state[{#NODENAME},{#DISKNAME}].last()}<>"present")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.disk.state[{#NODENAME},{#DISKNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.disk.state[{#NODENAME},{#DISKNAME}].last()}="present")` |AVERAGE |<p>Manual close: YES</p> |
-|{#ID}: Chassis has something errors |<p>Something is wrong with the chassis.</p> |`({TEMPLATE_NAME:netapp.chassis.state[{#ID}].diff()}=1 and {TEMPLATE_NAME:netapp.chassis.state[{#ID}].last()}="error")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.chassis.state[{#ID}].diff()}=1 and {TEMPLATE_NAME:netapp.chassis.state[{#ID}].last()}="ok")` |AVERAGE |<p>Manual close: YES</p> |
-|{#FRUID}: FRU of the chassis "{#ID}" state is error |<p>Something is wrong with the FRU.</p> |`({TEMPLATE_NAME:netapp.chassis.fru.state[{#CHASSISID},{#FRUID}].diff()}=1 and {TEMPLATE_NAME:netapp.chassis.fru.state[{#CHASSISID},{#FRUID}].last()}="error")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.chassis.fru.state[{#CHASSISID},{#FRUID}].diff()}=1 and {TEMPLATE_NAME:netapp.chassis.fru.state[{#CHASSISID},{#FRUID}].last()}="ok")` |AVERAGE |<p>Manual close: YES</p> |
-|{#SVMNAME}: SVM state is abnormal |<p>Something is wrong with the SVM.</p> |`({TEMPLATE_NAME:netapp.svm.state[{#SVMNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.svm.state[{#SVMNAME}].last()}<>"running")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.svm.state[{#SVMNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.svm.state[{#SVMNAME}].last()}="running")` |AVERAGE |<p>Manual close: YES</p> |
-|{#LUNNAME}: LUN of the SVM "{#SVMNAME}" has abnormal state |<p>Normal states for a LUN are online and offline. Other states indicate errors.</p> |`({TEMPLATE_NAME:netapp.lun.status.state[{#SVMNAME},{#LUNNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.lun.status.state[{#SVMNAME},{#LUNNAME}].last()}<>"online")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.lun.status.state[{#SVMNAME},{#LUNNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.lun.status.state[{#SVMNAME},{#LUNNAME}].last()}="online")` |AVERAGE |<p>Manual close: YES</p> |
-|{#LUNNAME}: LUN of the SVM "{#SVMNAME}" has abnormal container state |<p>LUNs are only available when their containers are available.</p> |`({TEMPLATE_NAME:netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}].last()}<>"online")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}].diff()}=1 and {TEMPLATE_NAME:netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}].last()}="online")` |AVERAGE |<p>Manual close: YES</p> |
-|{#VOLUMENAME}: Volume state is abnormal |<p>A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The ‘mixed’ state applies to FlexGroup volumes only and cannot be specified as a target state. An ‘error’ state implies that the volume is not in a state to serve data.</p> |`({TEMPLATE_NAME:netapp.volume.state[{#VOLUMENAME}].diff()}=1 and {TEMPLATE_NAME:netapp.volume.state[{#VOLUMENAME}].last()}<>"online")`<p>Recovery expression:</p>`({TEMPLATE_NAME:netapp.volume.state[{#VOLUMENAME}].diff()}=1 and {TEMPLATE_NAME:netapp.volume.state[{#VOLUMENAME}].last()}="online")` |AVERAGE |<p>Manual close: YES</p> |
+|Version has changed (new version: {ITEM.VALUE}) |<p>__RESOURCE__ version has changed. Ack to close.</p> |`last(/NetApp AFF A700 by HTTP/netapp.cluster.version,#1)<>last(/NetApp AFF A700 by HTTP/netapp.cluster.version,#2) and length(last(/NetApp AFF A700 by HTTP/netapp.cluster.version))>0` |INFO |<p>Manual close: YES</p> |
+|Cluster status is abnormal |<p>Any errors associated with the sample. For example, if the aggregation of data over multiple nodes fails then any of the partial errors might be returned, “ok” on success, or “error” on any internal uncategorized failure. Whenever a sample collection is missed but done at a later time, it is back filled to the previous 15 second timestamp and tagged with "backfilled_data". “Inconsistent_ delta_time” is encountered when the time between two collections is not the same for all nodes. Therefore, the aggregated value might be over or under inflated. “Negative_delta” is returned when an expected monotonically increasing value has decreased in value. “Inconsistent_old_data” is returned when one or more nodes do not have the latest data.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.cluster.status)<>"ok")` |AVERAGE | |
+|{#NODENAME}: Version has changed (new version: {ITEM.VALUE}) |<p>{#NODENAME} version has changed. Ack to close.</p> |`last(/NetApp AFF A700 by HTTP/netapp.node.version[{#NODENAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.node.version[{#NODENAME}],#2) and length(last(/NetApp AFF A700 by HTTP/netapp.node.version[{#NODENAME}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#NODENAME}: Node state is abnormal |<p>The state of the node is different from up:</p><p>booting - Node is booting up.</p><p>down - Node has stopped or is dumping core.</p><p>taken_over - Node has been taken over by its HA partner and is not yet waiting for giveback.</p><p>waiting_for_giveback - Node has been taken over by its HA partner and is waiting for the HA partner to giveback disks.</p><p>degraded - Node has one or more critical services offline.</p><p>unknown - Node or its HA partner cannot be contacted and there is no information on the node's state.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.nodes.state[{#NODENAME}])<>"up")` |AVERAGE | |
+|{#NODENAME}: Node has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/NetApp AFF A700 by HTTP/netapp.nodes.uptime[{#NODENAME}])<10m` |INFO |<p>Manual close: YES</p> |
+|{#NODENAME}: Node has over temperature |<p>The hardware shuts down if the temperature exceeds critical thresholds(item's value is "over").</p> |`(last(/NetApp AFF A700 by HTTP/netapp.nodes.controller.over_temperature[{#NODENAME}])<>"normal")` |AVERAGE | |
+|{#ETHPORTNAME}: Ethernet port of the Node "{#NODENAME}" is down |<p>Something is wrong with the ethernet port.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}])="down")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.port.eth.state[{#NODENAME},{#ETHPORTNAME}])="up")` |AVERAGE |<p>Manual close: YES</p> |
+|{#FCPORTNAME}: FC port of the Node "{#NODENAME}" has state different from "online" |<p>Something is wrong with the FC port.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}])<>"online")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.port.fc.state[{#NODENAME},{#FCPORTNAME}])="online")` |AVERAGE |<p>Manual close: YES</p> |
+|{#DISKNAME}: Disk of the Node "{#NODENAME}" has state different from "present" |<p>Something is wrong with the disk.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.disk.state[{#NODENAME},{#DISKNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.disk.state[{#NODENAME},{#DISKNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.disk.state[{#NODENAME},{#DISKNAME}])<>"present")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.disk.state[{#NODENAME},{#DISKNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.disk.state[{#NODENAME},{#DISKNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.disk.state[{#NODENAME},{#DISKNAME}])="present")` |AVERAGE |<p>Manual close: YES</p> |
+|{#ID}: Chassis has something errors |<p>Something is wrong with the chassis.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.chassis.state[{#ID}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.chassis.state[{#ID}],#2) and last(/NetApp AFF A700 by HTTP/netapp.chassis.state[{#ID}])="error")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.chassis.state[{#ID}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.chassis.state[{#ID}],#2) and last(/NetApp AFF A700 by HTTP/netapp.chassis.state[{#ID}])="ok")` |AVERAGE |<p>Manual close: YES</p> |
+|{#FRUID}: FRU of the chassis "{#ID}" state is error |<p>Something is wrong with the FRU.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.chassis.fru.state[{#CHASSISID},{#FRUID}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.chassis.fru.state[{#CHASSISID},{#FRUID}],#2) and last(/NetApp AFF A700 by HTTP/netapp.chassis.fru.state[{#CHASSISID},{#FRUID}])="error")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.chassis.fru.state[{#CHASSISID},{#FRUID}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.chassis.fru.state[{#CHASSISID},{#FRUID}],#2) and last(/NetApp AFF A700 by HTTP/netapp.chassis.fru.state[{#CHASSISID},{#FRUID}])="ok")` |AVERAGE |<p>Manual close: YES</p> |
+|{#SVMNAME}: SVM state is abnormal |<p>Something is wrong with the SVM.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.svm.state[{#SVMNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.svm.state[{#SVMNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.svm.state[{#SVMNAME}])<>"running")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.svm.state[{#SVMNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.svm.state[{#SVMNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.svm.state[{#SVMNAME}])="running")` |AVERAGE |<p>Manual close: YES</p> |
+|{#LUNNAME}: LUN of the SVM "{#SVMNAME}" has abnormal state |<p>Normal states for a LUN are online and offline. Other states indicate errors.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.lun.status.state[{#SVMNAME},{#LUNNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.lun.status.state[{#SVMNAME},{#LUNNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.lun.status.state[{#SVMNAME},{#LUNNAME}])<>"online")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.lun.status.state[{#SVMNAME},{#LUNNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.lun.status.state[{#SVMNAME},{#LUNNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.lun.status.state[{#SVMNAME},{#LUNNAME}])="online")` |AVERAGE |<p>Manual close: YES</p> |
+|{#LUNNAME}: LUN of the SVM "{#SVMNAME}" has abnormal container state |<p>LUNs are only available when their containers are available.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}])<>"online")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.lun.status.container_state[{#SVMNAME},{#LUNNAME}])="online")` |AVERAGE |<p>Manual close: YES</p> |
+|{#VOLUMENAME}: Volume state is abnormal |<p>A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The 'mixed' state applies to FlexGroup volumes only and cannot be specified as a target state. An 'error' state implies that the volume is not in a state to serve data.</p> |`(last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}])<>"online")`<p>Recovery expression:</p>`(last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}])="online")` |AVERAGE |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml b/templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml
index 084626950e8..85ea35f18db 100644
--- a/templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml
+++ b/templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:45Z'
+  version: '6.0'
+  date: '2021-12-15T15:01:55Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -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/
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/SAN
@@ -1215,7 +1215,7 @@ zabbix_export:
                 taken_over - Node has been taken over by its HA partner and is not yet waiting for giveback.
                 waiting_for_giveback - Node has been taken over by its HA partner and is waiting for the HA partner to giveback disks.
                 degraded - Node has one or more critical services offline.
-                unknown - Node or its HA partner cannot be contacted and there is no information on the node’s state.
+                unknown - Node or its HA partner cannot be contacted and there is no information on the node's state.
               preprocessing:
                 -
                   type: JSONPATH
@@ -1244,7 +1244,7 @@ zabbix_export:
                     taken_over - Node has been taken over by its HA partner and is not yet waiting for giveback.
                     waiting_for_giveback - Node has been taken over by its HA partner and is waiting for the HA partner to giveback disks.
                     degraded - Node has one or more critical services offline.
-                    unknown - Node or its HA partner cannot be contacted and there is no information on the node’s state.
+                    unknown - Node or its HA partner cannot be contacted and there is no information on the node's state.
             -
               uuid: 56e0b6df4dbd456880c2481bec40b41e
               name: '{#NODENAME}: Uptime'
@@ -1638,7 +1638,7 @@ zabbix_export:
               history: 7d
               trends: '0'
               value_type: CHAR
-              description: 'Volume state. A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The ‘mixed’ state applies to FlexGroup volumes only and cannot be specified as a target state. An ‘error’ state implies that the volume is not in a state to serve data.'
+              description: 'Volume state. A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The ''mixed'' state applies to FlexGroup volumes only and cannot be specified as a target state. An ''error'' state implies that the volume is not in a state to serve data.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1662,7 +1662,7 @@ zabbix_export:
                   recovery_expression: '(last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}],#1)<>last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}],#2) and last(/NetApp AFF A700 by HTTP/netapp.volume.state[{#VOLUMENAME}])="online")'
                   name: '{#VOLUMENAME}: Volume state is abnormal'
                   priority: AVERAGE
-                  description: 'A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The ‘mixed’ state applies to FlexGroup volumes only and cannot be specified as a target state. An ‘error’ state implies that the volume is not in a state to serve data.'
+                  description: 'A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The ''mixed'' state applies to FlexGroup volumes only and cannot be specified as a target state. An ''error'' state implies that the volume is not in a state to serve data.'
                   manual_close: 'YES'
             -
               uuid: cb4cfb0ce84f405ebfbf2e4a64c12ca2
@@ -2128,9 +2128,9 @@ zabbix_export:
               value_type: CHAR
               description: |
                 Type of the volume.
-                rw ‐ read-write volume.
-                dp ‐ data-protection volume.
-                ls ‐ load-sharing dp volume.
+                rw - read-write volume.
+                dp - data-protection volume.
+                ls - load-sharing dp volume.
               preprocessing:
                 -
                   type: JSONPATH
diff --git a/templates/san/netapp_fas3220_snmp/README.md b/templates/san/netapp_fas3220_snmp/README.md
index 380adecf092..d20e931b5ae 100644
--- a/templates/san/netapp_fas3220_snmp/README.md
+++ b/templates/san/netapp_fas3220_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template to monitor SAN NetApp FAS3220 cluster by Zabbix SNMP agent.
 
 
@@ -12,7 +12,6 @@ The template to monitor SAN NetApp FAS3220 cluster by Zabbix SNMP agent.
 This template was tested on:
 
 - NetApp FAS3220, firmware version: 5.3.0
-- Zabbix, version 5.4
 
 ## Setup
 
@@ -66,15 +65,15 @@ No specific Zabbix configuration is required.
 |CPU discovery |<p>Discovery of CPU metrics per node</p> |SNMP |fas3220.cpu.discovery |
 |Cluster metrics discovery |<p>Discovery of Cluster metrics per node</p> |SNMP |fas3220.cluster.discovery |
 |HA discovery |<p>Discovery of high availability metrics per node</p> |SNMP |fas3220.ha.discovery |
-|Filesystems discovery |<p>Filesystems discovery with filter.</p> |SNMP |fas3220.fs.discovery<p>**Filter**:</p>AND <p>- A: {#FSTYPE} MATCHES_REGEX `{$FAS3220.FS.TYPE.MATCHES}`</p><p>- B: {#FSTYPE} NOT_MATCHES_REGEX `{$FAS3220.FS.TYPE.NOT_MATCHES}`</p><p>- C: {#FSNAME} MATCHES_REGEX `{$FAS3220.FS.NAME.MATCHES}`</p><p>- D: {#FSNAME} NOT_MATCHES_REGEX `{$FAS3220.FS.NAME.NOT_MATCHES}`</p> |
-|Network ports discovery |<p>Network interfaces discovery with filter.</p> |SNMP |fas3220.net.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#TYPE} MATCHES_REGEX `{$FAS3220.NET.PORT.TYPE.MATCHES}`</p><p>- B: {#TYPE} NOT_MATCHES_REGEX `{$FAS3220.NET.PORT.TYPE.NOT_MATCHES}`</p><p>- C: {#ROLE} MATCHES_REGEX `{$FAS3220.NET.PORT.ROLE.MATCHES}`</p><p>- D: {#TYPE} NOT_MATCHES_REGEX `{$FAS3220.NET.PORT.ROLE.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$FAS3220.NET.PORT.NAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$FAS3220.NET.PORT.NAME.NOT_MATCHES}`</p> |
+|Filesystems discovery |<p>Filesystems discovery with filter.</p> |SNMP |fas3220.fs.discovery<p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$FAS3220.FS.TYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$FAS3220.FS.TYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$FAS3220.FS.NAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$FAS3220.FS.NAME.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Do not discover aggregate metrics<br> - {#FSTYPE} MATCHES_REGEX `3|4`<br>  - ITEM_PROTOTYPE LIKE `Saved` - NO_DISCOVER</p> |
+|Network ports discovery |<p>Network interfaces discovery with filter.</p> |SNMP |fas3220.net.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#TYPE} MATCHES_REGEX `{$FAS3220.NET.PORT.TYPE.MATCHES}`</p><p>- {#TYPE} NOT_MATCHES_REGEX `{$FAS3220.NET.PORT.TYPE.NOT_MATCHES}`</p><p>- {#ROLE} MATCHES_REGEX `{$FAS3220.NET.PORT.ROLE.MATCHES}`</p><p>- {#TYPE} NOT_MATCHES_REGEX `{$FAS3220.NET.PORT.ROLE.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$FAS3220.NET.PORT.NAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$FAS3220.NET.PORT.NAME.NOT_MATCHES}`</p> |
 
 ## Items collected
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
 |CPU |Node {#NODE.NAME}: CPU utilization |<p>The average, over the last minute, of the percentage of time that this processor was not idle.</p> |SNMP |fas3220.cpu[cDOTCpuBusyTimePerCent, "{#NODE.NAME}"] |
-|NetApp FAS3220 |NetApp FAS3220: Product version |<p>Version string for the software running on this platform.</p> |SNMP |fas3220.inventory[productVersion]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|NetApp FAS3220 |NetApp FAS3220: Product version |<p>MIB: NETAPP-MIB</p><p>Version string for the software running on this platform.</p> |SNMP |fas3220.inventory[productVersion]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |NetApp FAS3220 |NetApp FAS3220: Product firmware version |<p>Version string for the firmware running on this platform.</p> |SNMP |fas3220.inventory[productFirmwareVersion]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |NetApp FAS3220 |NetApp FAS3220: Failed disks count |<p>The number of disks that are currently broken.</p> |SNMP |fas3220.disk[diskFailedCount]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |NetApp FAS3220 |NetApp FAS3220: Failed disks message |<p>If diskFailedCount is non-zero, this is a string describing the failed disk or disks. Each failed disk is described.</p> |SNMP |fas3220.disk[diskFailedMessage]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -100,36 +99,36 @@ No specific Zabbix configuration is required.
 |NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Up by an administrator |<p>Indicates whether the port status is set 'UP' by an administrator.</p> |SNMP |fas3220.net.port[netportUpAdmin, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Role |<p>Role of the port. A port must have one of the following roles: cluster(1), data(2), mgmt(3), intercluster(4), cluster-mgmt(5) or undef(0). The cluster port is used to communicate to other node(s) in the cluster. The data port services clients' requests. It is where all the file requests come in. The management port is used by administrator to manage resources within a node. The intercluster port is used to communicate to other cluster. The cluster-mgmt port is used to manage resources within the cluster. The undef role is for the port that has not yet been assigned a role.</p> |SNMP |fas3220.net.port[netportRole, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Speed |<p>The speed appears on the port. It can be either undef(0), auto(1), ten Mb/s(2), hundred Mb/s(3), one Gb/s(4), or ten Gb/s(5).</p> |SNMP |fas3220.net.port[netportSpeedOper, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Bits received |<p>The total number of octets received on the interface, including framing characters.</p> |SNMP |fas3220.net.if[if64InOctets, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
-|NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Bits sent |<p>The total number of octets transmitted out of the interface, including framing characters.</p> |SNMP |fas3220.net.if[if64OutOctets, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND |
+|NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Bits received |<p>The total number of octets received on the interface, including framing characters.</p> |SNMP |fas3220.net.if[if64InOctets, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Bits sent |<p>The total number of octets transmitted out of the interface, including framing characters.</p> |SNMP |fas3220.net.if[if64OutOctets, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
 |NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): State |<p>The link-state of the port. Normally it is either UP(2) or DOWN(3).</p> |SNMP |fas3220.net.port[netportLinkState, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Health |<p>The health status of the port.</p> |SNMP |fas3220.net.port[netportHealthStatus, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |NetApp FAS3220 |Node {#NODE}: port {#IFNAME} ({#TYPE}): Health degraded reason |<p>The list of reasons why the port is marked as degraded.</p> |SNMP |fas3220.net.port[netportDegradedReason, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Node {#NODE}: port {#IFNAME} ({#TYPE}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>The number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.</p> |SNMP |fas3220.net.if[if64InErrors, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Node {#NODE}: port {#IFNAME} ({#TYPE}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>The number of outbound packets that could not be transmitted because of errors.</p> |SNMP |fas3220.net.if[if64OutErrors, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Node {#NODE}: port {#IFNAME} ({#TYPE}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets that were chosen to be discarded even though no errors had been detected to prevent their being deliverable to a higher-layer protocol. One possible reason for discarding such a packet could be to free up buffer space.</p> |SNMP |fas3220.net.if[if64InDiscards, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Node {#NODE}: port {#IFNAME} ({#TYPE}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets that were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.</p> |SNMP |fas3220.net.if[if64OutDiscards, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |Node {#NODE}: port {#IFNAME} ({#TYPE}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>The number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.</p> |SNMP |fas3220.net.if[if64InErrors, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Node {#NODE}: port {#IFNAME} ({#TYPE}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>The number of outbound packets that could not be transmitted because of errors.</p> |SNMP |fas3220.net.if[if64OutErrors, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Node {#NODE}: port {#IFNAME} ({#TYPE}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets that were chosen to be discarded even though no errors had been detected to prevent their being deliverable to a higher-layer protocol. One possible reason for discarding such a packet could be to free up buffer space.</p> |SNMP |fas3220.net.if[if64InDiscards, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Node {#NODE}: port {#IFNAME} ({#TYPE}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets that were chosen to be discarded even though no errors had been detected to prevent their being transmitted. One possible reason for discarding such a packet could be to free up buffer space.</p> |SNMP |fas3220.net.if[if64OutDiscards, "{#NODE}", "{#IFNAME}"]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Node {#NODE.NAME}: 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:fas3220.cpu[cDOTCpuBusyTimePerCent, "{#NODE.NAME}"].min(5m)}>{$CPU.UTIL.CRIT}` |WARNING | |
-|NetApp FAS3220: Number of failed disks has changed |<p>{{ITEM.LASTVALUE2}.regsub("(.*)", \1)}</p> |`{TEMPLATE_NAME:fas3220.disk[diskFailedCount].last()}>0 and {NetApp FAS3220 SNMP:fas3220.disk[diskFailedMessage].diff()}=1`<p>Recovery expression:</p>`{TEMPLATE_NAME:fas3220.disk[diskFailedCount].last()}=0` |WARNING | |
-|Node {#NODE.NAME}: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:fas3220.cluster[nodeUptime, "{#NODE.NAME}"].last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Node {#NODE.NAME}: Node can not communicate with the cluster |<p>-</p> |`{TEMPLATE_NAME:fas3220.cluster[nodeHealth, "{#NODE.NAME}"].last()}=0` |HIGH |<p>Manual close: YES</p> |
-|Node {#NODE.NAME}: NVRAM battery status is not OK |<p>-</p> |`{TEMPLATE_NAME:fas3220.cluster[nodeNvramBatteryStatus, "{#NODE.NAME}"].last()}<>1` |AVERAGE |<p>Manual close: YES</p> |
-|Node {#NODE.NAME}: Temperature is over than recommended |<p>The hardware will shutdown if the temperature exceeds critical thresholds.</p> |`{TEMPLATE_NAME:fas3220.cluster[nodeEnvOverTemperature, "{#NODE.NAME}"].last()}=2` |HIGH | |
-|Node {#NODE.NAME}: Failed FAN count is over than zero |<p>{{ITEM.VALUE2}.regsub("(.*)", \1)}</p> |`{TEMPLATE_NAME:fas3220.cluster[nodeEnvFailedFanCount, "{#NODE.NAME}"].last()}>0 and {NetApp FAS3220 SNMP:fas3220.cluster[nodeEnvFailedFanMessage, "{#NODE.NAME}"].last()}={NetApp FAS3220 SNMP:fas3220.cluster[nodeEnvFailedFanMessage, "{#NODE.NAME}"].last()}` |HIGH | |
-|Node {#NODE.NAME}: Degraded power supplies count is more than zero |<p>{{ITEM.VALUE2}.regsub("(.*)", \1)}</p> |`{TEMPLATE_NAME:fas3220.cluster[nodeEnvFailedPowerSupplyCount, "{#NODE.NAME}"].last()}>0 and {NetApp FAS3220 SNMP:fas3220.cluster[nodeEnvFailedPowerSupplyMessage, "{#NODE.NAME}"].last()}={NetApp FAS3220 SNMP:fas3220.cluster[nodeEnvFailedPowerSupplyMessage, "{#NODE.NAME}"].last()}` |AVERAGE | |
-|Node {#NODE.NAME}: Node cannot takeover it's HA partner {#PARTNER.NAME}. Reason: {ITEM.VALUE} |<p>Possible reasons:</p><p>  unknownReason(2),</p><p>  disabledByOperator(3),</p><p>  interconnectOffline(4),</p><p>  disabledByPartner(5),</p><p>  takeoverFailed(6),</p><p>  mailboxIsInDegradedState(7),</p><p>  partnermailboxIsInUninitialisedState(8),</p><p>  mailboxVersionMismatch(9),</p><p>  nvramSizeMismatch(10),</p><p>  kernelVersionMismatch(11),</p><p>  partnerIsInBootingStage(12),</p><p>  diskshelfIsTooHot(13),</p><p>  partnerIsPerformingRevert(14),</p><p>  nodeIsPerformingRevert(15),</p><p>  sametimePartnerIsAlsoTryingToTakeUsOver(16),</p><p>  alreadyInTakenoverMode(17),</p><p>  nvramLogUnsynchronized(18),</p><p>  stateofBackupMailboxIsDoubtful(19).</p> |`{TEMPLATE_NAME:fas3220.ha[haCannotTakeoverCause, "{#NODE.NAME}"].last()}<>1` |HIGH | |
-|Node {#NODE.NAME}: Node has been taken over |<p>The thisNodeDead(5) setting indicates that this node has been takenover.</p> |`{TEMPLATE_NAME:fas3220.ha[haSettings, "{#NODE.NAME}"].last()}=5` |HIGH | |
-|Node {#NODE.NAME}: HA is not licensed |<p>The value notConfigured(1) indicates that the HA is not licensed.</p> |`{TEMPLATE_NAME:fas3220.ha[haSettings, "{#NODE.NAME}"].last()}=1` |AVERAGE | |
-|{#VSERVER}{#FSNAME}: Disk space is too low (below {$FAS3220.FS.AVAIL.MIN.CRIT:"{#FSNAME}"} for {$FAS3220.FS.TIME:"{#FSNAME}"}) |<p>-</p> |`{TEMPLATE_NAME:fas3220.fs[df64AvailKBytes, "{#VSERVER}{#FSNAME}"].min({$FAS3220.FS.TIME:"{#FSNAME}"})}<{$FAS3220.FS.AVAIL.MIN.CRIT:"{#FSNAME}"} and {$FAS3220.FS.USE.PCT:"{#FSNAME}"}=0` |HIGH | |
-|{#VSERVER}{#FSNAME}: Disk space is too low (used over {$FAS3220.FS.PUSED.MAX.CRIT:"{#FSNAME}"}% for {$FAS3220.FS.TIME:"{#FSNAME}"}) |<p>-</p> |`{TEMPLATE_NAME:fas3220.fs[dfPerCentKBytesCapacity, "{#VSERVER}{#FSNAME}"].max({$FAS3220.FS.TIME:"{#FSNAME}"})}>{$FAS3220.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and {$FAS3220.FS.USE.PCT:"{#FSNAME}"}=1` |HIGH | |
-|Node {#NODE}: port {#IFNAME} ({#TYPE}): Link down |<p>Link state is not UP and the port status is set 'UP' by an administrator.</p> |`{TEMPLATE_NAME:fas3220.net.port[netportLinkState, "{#NODE}", "{#IFNAME}"].last()}<>2 and {NetApp FAS3220 SNMP:fas3220.net.port[netportUpAdmin, "{#NODE}", "{#IFNAME}"].last()}=1` |AVERAGE |<p>Manual close: YES</p> |
-|Node {#NODE}: port {#IFNAME} ({#TYPE}): Port is not healthy |<p>{{ITEM.LASTVALUE2}.regsub("(.*)", \1)}</p> |`{TEMPLATE_NAME:fas3220.net.port[netportHealthStatus, "{#NODE}", "{#IFNAME}"].last()}<>0 and {NetApp FAS3220 SNMP:fas3220.net.port[netportDegradedReason, "{#NODE}", "{#IFNAME}"].strlen()}>0` |INFO | |
-|Node {#NODE}: port {#IFNAME} ({#TYPE}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`{TEMPLATE_NAME:fas3220.net.if[if64InErrors, "{#NODE}", "{#IFNAME}"].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"} or {NetApp FAS3220 SNMP:fas3220.net.if[if64OutErrors, "{#NODE}", "{#IFNAME}"].min(5m)}>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:fas3220.net.if[if64InErrors, "{#NODE}", "{#IFNAME}"].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and {NetApp FAS3220 SNMP:fas3220.net.if[if64OutErrors, "{#NODE}", "{#IFNAME}"].max(5m)}<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p> |
+|Node {#NODE.NAME}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/NetApp FAS3220 SNMP/fas3220.cpu[cDOTCpuBusyTimePerCent, "{#NODE.NAME}"],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|NetApp FAS3220: Number of failed disks has changed |<p>{{ITEM.LASTVALUE2}.regsub("(.*)", \1)}</p> |`last(/NetApp FAS3220 SNMP/fas3220.disk[diskFailedCount])>0 and last(/NetApp FAS3220 SNMP/fas3220.disk[diskFailedMessage],#1)<>last(/NetApp FAS3220 SNMP/fas3220.disk[diskFailedMessage],#2)`<p>Recovery expression:</p>`last(/NetApp FAS3220 SNMP/fas3220.disk[diskFailedCount])=0` |WARNING | |
+|Node {#NODE.NAME}: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeUptime, "{#NODE.NAME}"])<10m` |INFO |<p>Manual close: YES</p> |
+|Node {#NODE.NAME}: Node can not communicate with the cluster |<p>-</p> |`last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeHealth, "{#NODE.NAME}"])=0` |HIGH |<p>Manual close: YES</p> |
+|Node {#NODE.NAME}: NVRAM battery status is not OK |<p>-</p> |`last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeNvramBatteryStatus, "{#NODE.NAME}"])<>1` |AVERAGE |<p>Manual close: YES</p> |
+|Node {#NODE.NAME}: Temperature is over than recommended |<p>The hardware will shutdown if the temperature exceeds critical thresholds.</p> |`last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvOverTemperature, "{#NODE.NAME}"])=2` |HIGH | |
+|Node {#NODE.NAME}: Failed FAN count is over than zero |<p>{{ITEM.VALUE2}.regsub("(.*)", \1)}</p> |`last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedFanCount, "{#NODE.NAME}"])>0 and last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedFanMessage, "{#NODE.NAME}"])=last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedFanMessage, "{#NODE.NAME}"])` |HIGH | |
+|Node {#NODE.NAME}: Degraded power supplies count is more than zero |<p>{{ITEM.VALUE2}.regsub("(.*)", \1)}</p> |`last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedPowerSupplyCount, "{#NODE.NAME}"])>0 and last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedPowerSupplyMessage, "{#NODE.NAME}"])=last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedPowerSupplyMessage, "{#NODE.NAME}"])` |AVERAGE | |
+|Node {#NODE.NAME}: Node cannot takeover it's HA partner {#PARTNER.NAME}. Reason: {ITEM.VALUE} |<p>Possible reasons:</p><p>  unknownReason(2),</p><p>  disabledByOperator(3),</p><p>  interconnectOffline(4),</p><p>  disabledByPartner(5),</p><p>  takeoverFailed(6),</p><p>  mailboxIsInDegradedState(7),</p><p>  partnermailboxIsInUninitialisedState(8),</p><p>  mailboxVersionMismatch(9),</p><p>  nvramSizeMismatch(10),</p><p>  kernelVersionMismatch(11),</p><p>  partnerIsInBootingStage(12),</p><p>  diskshelfIsTooHot(13),</p><p>  partnerIsPerformingRevert(14),</p><p>  nodeIsPerformingRevert(15),</p><p>  sametimePartnerIsAlsoTryingToTakeUsOver(16),</p><p>  alreadyInTakenoverMode(17),</p><p>  nvramLogUnsynchronized(18),</p><p>  stateofBackupMailboxIsDoubtful(19).</p> |`last(/NetApp FAS3220 SNMP/fas3220.ha[haCannotTakeoverCause, "{#NODE.NAME}"])<>1` |HIGH | |
+|Node {#NODE.NAME}: Node has been taken over |<p>The thisNodeDead(5) setting indicates that this node has been takenover.</p> |`last(/NetApp FAS3220 SNMP/fas3220.ha[haSettings, "{#NODE.NAME}"])=5` |HIGH | |
+|Node {#NODE.NAME}: HA is not licensed |<p>The value notConfigured(1) indicates that the HA is not licensed.</p> |`last(/NetApp FAS3220 SNMP/fas3220.ha[haSettings, "{#NODE.NAME}"])=1` |AVERAGE | |
+|{#VSERVER}{#FSNAME}: Disk space is too low (below {$FAS3220.FS.AVAIL.MIN.CRIT:"{#FSNAME}"} for {$FAS3220.FS.TIME:"{#FSNAME}"}) |<p>-</p> |`min(/NetApp FAS3220 SNMP/fas3220.fs[df64AvailKBytes, "{#VSERVER}{#FSNAME}"],{$FAS3220.FS.TIME:"{#FSNAME}"})<{$FAS3220.FS.AVAIL.MIN.CRIT:"{#FSNAME}"} and {$FAS3220.FS.USE.PCT:"{#FSNAME}"}=0` |HIGH | |
+|{#VSERVER}{#FSNAME}: Disk space is too low (used over {$FAS3220.FS.PUSED.MAX.CRIT:"{#FSNAME}"}% for {$FAS3220.FS.TIME:"{#FSNAME}"}) |<p>-</p> |`max(/NetApp FAS3220 SNMP/fas3220.fs[dfPerCentKBytesCapacity, "{#VSERVER}{#FSNAME}"],{$FAS3220.FS.TIME:"{#FSNAME}"})>{$FAS3220.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and {$FAS3220.FS.USE.PCT:"{#FSNAME}"}=1` |HIGH | |
+|Node {#NODE}: port {#IFNAME} ({#TYPE}): Link down |<p>Link state is not UP and the port status is set 'UP' by an administrator.</p> |`last(/NetApp FAS3220 SNMP/fas3220.net.port[netportLinkState, "{#NODE}", "{#IFNAME}"])<>2 and last(/NetApp FAS3220 SNMP/fas3220.net.port[netportUpAdmin, "{#NODE}", "{#IFNAME}"])=1` |AVERAGE |<p>Manual close: YES</p> |
+|Node {#NODE}: port {#IFNAME} ({#TYPE}): Port is not healthy |<p>{{ITEM.LASTVALUE2}.regsub("(.*)", \1)}</p> |`last(/NetApp FAS3220 SNMP/fas3220.net.port[netportHealthStatus, "{#NODE}", "{#IFNAME}"])<>0 and length(last(/NetApp FAS3220 SNMP/fas3220.net.port[netportDegradedReason, "{#NODE}", "{#IFNAME}"]))>0` |INFO | |
+|Node {#NODE}: port {#IFNAME} ({#TYPE}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/NetApp FAS3220 SNMP/fas3220.net.if[if64InErrors, "{#NODE}", "{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/NetApp FAS3220 SNMP/fas3220.net.if[if64OutErrors, "{#NODE}", "{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} `<p>Recovery expression:</p>`max(/NetApp FAS3220 SNMP/fas3220.net.if[if64InErrors, "{#NODE}", "{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/NetApp FAS3220 SNMP/fas3220.net.if[if64OutErrors, "{#NODE}", "{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 ` |WARNING |<p>Manual close: YES</p> |
 
 ## Feedback
 
diff --git a/templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml b/templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml
index edb682c5323..961d1f4c610 100644
--- a/templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml
+++ b/templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-30T13:54:35Z'
+  version: '6.0'
+  date: '2021-12-15T14:25:45Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -15,10 +15,11 @@ zabbix_export:
         
         MIBs used:
         NETAPP-MIB
+        IF-MIB
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/416694-discussion-thread-for-official-zabbix-template-netapp-fas3220
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
@@ -90,7 +91,9 @@ zabbix_export:
           history: 7d
           trends: '0'
           value_type: CHAR
-          description: 'Version string for the software running on this platform.'
+          description: |
+            MIB: NETAPP-MIB
+            Version string for the software running on this platform.
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1084,7 +1087,7 @@ zabbix_export:
                                   elem["{#TYPE}"] = 'undef';
                                   break;
                           };
-                      
+                  
                           out.push(elem);
                       }
                   });
diff --git a/templates/server/chassis_ipmi/README.md b/templates/server/chassis_ipmi/README.md
index 7eebf72f0c0..b9b9c32dcdf 100644
--- a/templates/server/chassis_ipmi/README.md
+++ b/templates/server/chassis_ipmi/README.md
@@ -3,16 +3,12 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
-Template for monitoring servers with BMC over IPMI that work without any external scripts.  
-All metrics are collected at once, thanks to Zabbix's bulk data collection. The template is available starting from Zabbix version 5.0.  
+For Zabbix version: 6.0 and higher  
+Template for monitoring servers with BMC over IPMI that work without any external scripts.
+All metrics are collected at once, thanks to Zabbix's bulk data collection.
 It collects metrics by polling BMC remotely using an IPMI agent.
 
 
-This template was tested on:
-
-- Zabbix, version 5.0
-
 ## Setup
 
 > See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/ipmi) for basic instructions.
@@ -26,12 +22,12 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                            | Description                                                                                                | Default   |
-|---------------------------------|------------------------------------------------------------------------------------------------------------|-----------|
-| {$IPMI.PASSWORD}                | <p>This macro is used for access to BMC. It can be overridden on the host or linked template level.</p>    | ``        |
-| {$IPMI.SENSOR_TYPE.MATCHES}     | <p>This macro is used in sensors discovery. It can be overridden on the host or linked template level.</p> | `.*`      |
-| {$IPMI.SENSOR_TYPE.NOT_MATCHES} | <p>This macro is used in sensors discovery. It can be overridden on the host or linked template level.</p> | `invalid` |
-| {$IPMI.USER}                    | <p>This macro is used for access to BMC. It can be overridden on the host or linked template level.</p>    | ``        |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$IPMI.PASSWORD} |<p>This macro is used for access to BMC. It can be overridden on the host or linked template level.</p> |`` |
+|{$IPMI.SENSOR_TYPE.MATCHES} |<p>This macro is used in sensors discovery. It can be overridden on the host or linked template level.</p> |`.*` |
+|{$IPMI.SENSOR_TYPE.NOT_MATCHES} |<p>This macro is used in sensors discovery. It can be overridden on the host or linked template level.</p> |`invalid` |
+|{$IPMI.USER} |<p>This macro is used for access to BMC. It can be overridden on the host or linked template level.</p> |`` |
 
 ## Template links
 
@@ -39,30 +35,30 @@ There are no template links in this template.
 
 ## Discovery rules
 
-| Name                        | Description                                     | Type      | Key and additional info                                                                                                                                                                                                                                           |
-|-----------------------------|-------------------------------------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Discrete sensors discovery  | <p>Discovery of the discrete IPMI sensors.</p>  | DEPENDENT | ipmi.discrete.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR_READING_TYPE} NOT_MATCHES_REGEX `threshold`</p><p>- B: {#SENSOR_TYPE} MATCHES_REGEX `{$IPMI.SENSOR_TYPE.MATCHES}`</p><p>- C: {#SENSOR_TYPE} NOT_MATCHES_REGEX `{$IPMI.SENSOR_TYPE.NOT_MATCHES}`</p> |
-| Threshold sensors discovery | <p>Discovery of the threshold IPMI sensors.</p> | DEPENDENT | ipmi.sensors.discovery<p>**Filter**:</p>AND <p>- A: {#SENSOR_READING_TYPE} MATCHES_REGEX `threshold`</p><p>- B: {#SENSOR_TYPE} MATCHES_REGEX `{$IPMI.SENSOR_TYPE.MATCHES}`</p><p>- C: {#SENSOR_TYPE} NOT_MATCHES_REGEX `{$IPMI.SENSOR_TYPE.NOT_MATCHES}`</p>      |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Discrete sensors discovery |<p>Discovery of the discrete IPMI sensors.</p> |DEPENDENT |ipmi.discrete.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_READING_TYPE} NOT_MATCHES_REGEX `threshold`</p><p>- {#SENSOR_TYPE} MATCHES_REGEX `{$IPMI.SENSOR_TYPE.MATCHES}`</p><p>- {#SENSOR_TYPE} NOT_MATCHES_REGEX `{$IPMI.SENSOR_TYPE.NOT_MATCHES}`</p> |
+|Threshold sensors discovery |<p>Discovery of the threshold IPMI sensors.</p> |DEPENDENT |ipmi.sensors.discovery<p>**Filter**:</p>AND <p>- {#SENSOR_READING_TYPE} MATCHES_REGEX `threshold`</p><p>- {#SENSOR_TYPE} MATCHES_REGEX `{$IPMI.SENSOR_TYPE.MATCHES}`</p><p>- {#SENSOR_TYPE} NOT_MATCHES_REGEX `{$IPMI.SENSOR_TYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>trigger SENSOR_LO_WARN<br><br>  - TRIGGER_PROTOTYPE LIKE `{#SENSOR_LO_WARN}` - NO_DISCOVER</p><p>trigger SENSOR_LO_CRIT<br><br>  - TRIGGER_PROTOTYPE LIKE `{#SENSOR_LO_CRIT}` - NO_DISCOVER</p><p>trigger SENSOR_LO_DISAST<br><br>  - TRIGGER_PROTOTYPE LIKE `{#SENSOR_LO_DISAST}` - NO_DISCOVER</p><p>trigger SENSOR_HI_WARN<br><br>  - TRIGGER_PROTOTYPE LIKE `{#SENSOR_HI_WARN}` - NO_DISCOVER</p><p>trigger SENSOR_HI_CRIT<br><br>  - TRIGGER_PROTOTYPE LIKE `{#SENSOR_HI_CRIT}` - NO_DISCOVER</p><p>trigger SENSOR_HI_DISAST<br><br>  - TRIGGER_PROTOTYPE LIKE `{#SENSOR_HI_DISAST}` - NO_DISCOVER</p> |
 
 ## Items collected
 
-| Group            | Name                               | Description                                                                                           | Type      | Key and additional info                                                                                                                                             |
-|------------------|------------------------------------|-------------------------------------------------------------------------------------------------------|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| General          | IPMI: {#SENSOR_ID}                 | <p>It is a state of the discrete IPMI sensor.</p>                                                     | DEPENDENT | ipmi.state_text[{#SENSOR_ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=='{#SENSOR_ID}')].state.text.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| General          | IPMI: {#SENSOR_ID}, {#SENSOR_UNIT} | <p>It is a state of the threshold IPMI sensor.</p>                                                    | DEPENDENT | ipmi.value[{#SENSOR_ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=='{#SENSOR_ID}')].value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>           |
-| Zabbix_raw_items | Get IPMI sensors                   | <p>The master item that receives all sensors with values for LLD and dependent elements from BMC.</p> | IPMI      | ipmi.get                                                                                                                                                            |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|General |IPMI: {#SENSOR_ID} |<p>It is a state of the discrete IPMI sensor.</p> |DEPENDENT |ipmi.state_text[{#SENSOR_ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=='{#SENSOR_ID}')].state.text.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|General |IPMI: {#SENSOR_ID}, {#SENSOR_UNIT} |<p>It is a state of the threshold IPMI sensor.</p> |DEPENDENT |ipmi.value[{#SENSOR_ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.id=='{#SENSOR_ID}')].value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Zabbix_raw_items |Get IPMI sensors |<p>The master item that receives all sensors with values for LLD and dependent elements from BMC.</p> |IPMI |ipmi.get |
 
 ## Triggers
 
-| Name                                                                                             | Description                                                                                                                                       | Expression                                                             | Severity | Dependencies and additional info                                                                                                                                                                                                |
-|--------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| IPMI: {#SENSOR_ID} value has changed                                                             | <p>The trigger is informing about changes in a state of the discrete IPMI sensor. A problem generated by this trigger can be manually closed.</p> | `{TEMPLATE_NAME:ipmi.state_text[{#SENSOR_ID}].diff()}=1`               | INFO     | <p>Manual close: YES</p>                                                                                                                                                                                                        |
-| IPMI: {#SENSOR_ID} value is below non-critical low (less than {#SENSOR_LO_WARN} for 5m)          | <p>The trigger is informing that a value less than the lower non-critical threshold has been reached.</p>                                         | `{TEMPLATE_NAME:ipmi.value[{#SENSOR_ID}].min(5m)}<{#SENSOR_LO_WARN}`   | WARNING  | <p>**Depends on**:</p><p>- IPMI: {#SENSOR_ID} value is below critical low (less than {#SENSOR_LO_CRIT} for 5m)</p><p>- IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m)</p>         |
-| IPMI: {#SENSOR_ID} value is below critical low (less than {#SENSOR_LO_CRIT} for 5m)              | <p>The trigger is informing that a value less than the lower critical threshold has been reached.</p>                                             | `{TEMPLATE_NAME:ipmi.value[{#SENSOR_ID}].min(5m)}<{#SENSOR_LO_CRIT}`   | HIGH     | <p>**Depends on**:</p><p>- IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m)</p>                                                                                                     |
-| IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m)     | <p>The trigger is informing that a value less than the lower non-recoverable threshold has been reached.</p>                                      | `{TEMPLATE_NAME:ipmi.value[{#SENSOR_ID}].min(5m)}<{#SENSOR_LO_DISAST}` | DISASTER |                                                                                                                                                                                                                                 |
-| IPMI: {#SENSOR_ID} value is above non-critical high (greater than {#SENSOR_HI_WARN} for 5m)      | <p>The trigger is informing that a value higher than the upper non-critical threshold has been reached.</p>                                       | `{TEMPLATE_NAME:ipmi.value[{#SENSOR_ID}].min(5m)}>{#SENSOR_HI_WARN}`   | WARNING  | <p>**Depends on**:</p><p>- IPMI: {#SENSOR_ID} value is above critical high (greater than {#SENSOR_HI_CRIT} for 5m)</p><p>- IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m)</p> |
-| IPMI: {#SENSOR_ID} value is above critical high (greater than {#SENSOR_HI_CRIT} for 5m)          | <p>The trigger is informing that a value higher than the upper critical threshold has been reached.</p>                                           | `{TEMPLATE_NAME:ipmi.value[{#SENSOR_ID}].min(5m)}>{#SENSOR_HI_CRIT}`   | HIGH     | <p>**Depends on**:</p><p>- IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m)</p>                                                                                                 |
-| IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m) | <p>The trigger is informing that a value higher than the upper non-recoverable threshold has been reached.</p>                                    | `{TEMPLATE_NAME:ipmi.value[{#SENSOR_ID}].min(5m)}>{#SENSOR_HI_DISAST}` | DISASTER |                                                                                                                                                                                                                                 |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|IPMI: {#SENSOR_ID} value has changed |<p>The trigger is informing about changes in a state of the discrete IPMI sensor. A problem generated by this trigger can be manually closed.</p> |`last(/Chassis by IPMI/ipmi.state_text[{#SENSOR_ID}],#1)<>last(/Chassis by IPMI/ipmi.state_text[{#SENSOR_ID}],#2)` |INFO |<p>Manual close: YES</p> |
+|IPMI: {#SENSOR_ID} value is below non-critical low (less than {#SENSOR_LO_WARN} for 5m) |<p>The trigger is informing that a value less than the lower non-critical threshold has been reached.</p> |`min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)<{#SENSOR_LO_WARN}` |WARNING |<p>**Depends on**:</p><p>- IPMI: {#SENSOR_ID} value is below critical low (less than {#SENSOR_LO_CRIT} for 5m)</p><p>- IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m)</p> |
+|IPMI: {#SENSOR_ID} value is below critical low (less than {#SENSOR_LO_CRIT} for 5m) |<p>The trigger is informing that a value less than the lower critical threshold has been reached.</p> |`min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)<{#SENSOR_LO_CRIT}` |HIGH |<p>**Depends on**:</p><p>- IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m)</p> |
+|IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m) |<p>The trigger is informing that a value less than the lower non-recoverable threshold has been reached.</p> |`min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)<{#SENSOR_LO_DISAST}` |DISASTER | |
+|IPMI: {#SENSOR_ID} value is above non-critical high (greater than {#SENSOR_HI_WARN} for 5m) |<p>The trigger is informing that a value higher than the upper non-critical threshold has been reached.</p> |`min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)>{#SENSOR_HI_WARN}` |WARNING |<p>**Depends on**:</p><p>- IPMI: {#SENSOR_ID} value is above critical high (greater than {#SENSOR_HI_CRIT} for 5m)</p><p>- IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m)</p> |
+|IPMI: {#SENSOR_ID} value is above critical high (greater than {#SENSOR_HI_CRIT} for 5m) |<p>The trigger is informing that a value higher than the upper critical threshold has been reached.</p> |`min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)>{#SENSOR_HI_CRIT}` |HIGH |<p>**Depends on**:</p><p>- IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m)</p> |
+|IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m) |<p>The trigger is informing that a value higher than the upper non-recoverable threshold has been reached.</p> |`min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)>{#SENSOR_HI_DISAST}` |DISASTER | |
 
 ## Feedback
 
@@ -77,6 +73,6 @@ You can also provide a feedback, discuss the template or ask for help with it at
 
 ## References
 
-https://www.intel.com/content/www/us/en/products/docs/servers/ipmi/ipmi-second-gen-interface-spec-v2-rev1-1.html  
+https://www.intel.com/content/www/us/en/products/docs/servers/ipmi/ipmi-second-gen-interface-spec-v2-rev1-1.html
 https://www.zabbix.com/documentation/5.0/manual/config/items/itemtypes/ipmi
 
diff --git a/templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml b/templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml
index b43b6667992..6a7e392084d 100644
--- a/templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml
+++ b/templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:37Z'
+  version: '6.0'
+  date: '2021-12-17T06:14:13Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -11,8 +11,8 @@ zabbix_export:
       template: 'Chassis by IPMI'
       name: 'Chassis by IPMI'
       description: |
-        Template for monitoring servers with BMC over IPMI that work without any external scripts. 
-        All metrics are collected at once, thanks to Zabbix's bulk data collection. The template is available starting from Zabbix version 5.0. 
+        Template for monitoring servers with BMC over IPMI that work without any external scripts.
+        All metrics are collected at once, thanks to Zabbix's bulk data collection. The template is available starting from Zabbix version 5.0.
         It collects metrics by polling BMC remotely using an IPMI agent.
         
         
@@ -22,7 +22,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/398023-discussion-thread-for-official-zabbix-template-ipmi
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
diff --git a/templates/server/cisco_ucs_manager_snmp/README.md b/templates/server/cisco_ucs_manager_snmp/README.md
index d384c2349a7..ad87badd672 100644
--- a/templates/server/cisco_ucs_manager_snmp/README.md
+++ b/templates/server/cisco_ucs_manager_snmp/README.md
@@ -8,8 +8,8 @@ Cisco UCS® Manager provides unified, embedded management of all software and ha
  components of the Cisco Unified Computing System™ (Cisco UCS) across multiple chassis
  and rack servers. It enables server, fabric, and storage provisioning as well as,
  device discovery, inventory, configuration, diagnostics, monitoring, fault detection,
- auditing, and statistics collection.  
-This is a template for Cisco UCS Manager monitoring via Zabbix SNMP Agent that works without any external scripts.  
+ auditing, and statistics collection.
+This is a template for Cisco UCS Manager monitoring via Zabbix SNMP Agent that works without any external scripts.
 You can download UCS MIB files there ftp://ftp.cisco.com/pub/mibs/ucs-mibs/.
 
 
@@ -83,7 +83,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>-</p> |SNMP |cisco.ucs.temp.discovery |
 |Temperature CPU discovery |<p>-</p> |SNMP |cisco.ucs.temp.cpu.discovery |
-|Network interface discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |cisco.ucs.net.if.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- A: {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IFADMINSTATUS.MATCHES}`</p><p>- B: {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IFADMINSTATUS.NOT_MATCHES}`</p><p>- C: {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IFOPERSTATUS.MATCHES}`</p><p>- D: {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IFOPERSTATUS.NOT_MATCHES}`</p><p>- E: {#IFNAME} MATCHES_REGEX `{$NET.IFNAME.MATCHES}`</p><p>- F: {#IFNAME} NOT_MATCHES_REGEX `{$NET.IFNAME.NOT_MATCHES}`</p><p>- G: {#IFDESCR} MATCHES_REGEX `{$NET.IFDESCR.MATCHES}`</p><p>- H: {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IFDESCR.NOT_MATCHES}`</p><p>- I: {#IFALIAS} MATCHES_REGEX `{$NET.IFALIAS.MATCHES}`</p><p>- J: {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IFALIAS.NOT_MATCHES}`</p><p>- K: {#IFTYPE} MATCHES_REGEX `{$NET.IFTYPE.MATCHES}`</p><p>- L: {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IFTYPE.NOT_MATCHES}`</p> |
+|Network interface discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |cisco.ucs.net.if.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IFTYPE.NOT_MATCHES}`</p> |
 |PSU discovery |<p>-</p> |SNMP |cisco.ucs.psu.discovery |
 |Unit discovery |<p>-</p> |SNMP |cisco.ucs.unit.discovery |
 |FAN discovery |<p>-</p> |SNMP |cisco.ucs.fan.discovery |
@@ -109,16 +109,16 @@ There are no template links in this template.
 |Inventory |{#UNIT_LOCATION}: Hardware model name |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnit:model managed object property</p> |SNMP |cisco.ucs.hw.model[cucsComputeRackUnitModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |{#UNIT_LOCATION}: Hardware serial number |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnit:serial managed object property</p> |SNMP |cisco.ucs.hw.serialnumber[cucsComputeRackUnitSerial.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |cisco.ucs.if.status[ifOperStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in[ifHCInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out[ifHCOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND<p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Multicast packets received |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.  This object</p><p>is a 64-bit version of ifInMulticastPkts.</p><p>Discontinuities in the value of this counter can occur at</p><p>re-initialization of the management system, and at other</p><p>times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in.multicast[ifHCInMulticastPkts.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Multicast packets sent |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.  This object</p><p>is a 64-bit version of ifOutMulticastPkts.</p><p>Discontinuities in the value of this counter can occur at</p><p>re-initialization of the management system, and at other</p><p>times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out.multicast[ifHCOutMulticastPkts.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Broadcast packets received |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.  This object is a 64-bit version</p><p>of ifInBroadcastPkts.</p><p>Discontinuities in the value of this counter can occur at</p><p>re-initialization of the management system, and at other</p><p>times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in.broadcast[ifHCInBroadcastPkts.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Broadcast packets sent |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.  This object is a 64-bit version</p><p>of ifOutBroadcastPkts.</p><p>Discontinuities in the value of this counter can occur at</p><p>re-initialization of the management system, and at other</p><p>times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out.broadcast[ifHCOutBroadcastPkts.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface, including framing characters. This object is a 64-bit version of ifInOctets. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in[ifHCInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. This object is a 64-bit version of ifOutOctets.Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out[ifHCOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Multicast packets received |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.  This object</p><p>is a 64-bit version of ifInMulticastPkts.</p><p>Discontinuities in the value of this counter can occur at</p><p>re-initialization of the management system, and at other</p><p>times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in.multicast[ifHCInMulticastPkts.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Multicast packets sent |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.  This object</p><p>is a 64-bit version of ifOutMulticastPkts.</p><p>Discontinuities in the value of this counter can occur at</p><p>re-initialization of the management system, and at other</p><p>times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out.multicast[ifHCOutMulticastPkts.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Broadcast packets received |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.  This object is a 64-bit version</p><p>of ifInBroadcastPkts.</p><p>Discontinuities in the value of this counter can occur at</p><p>re-initialization of the management system, and at other</p><p>times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.in.broadcast[ifHCInBroadcastPkts.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Broadcast packets sent |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.  This object is a 64-bit version</p><p>of ifOutBroadcastPkts.</p><p>Discontinuities in the value of this counter can occur at</p><p>re-initialization of the management system, and at other</p><p>times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |cisco.ucs.if.out.broadcast[ifHCOutBroadcastPkts.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |cisco.ucs.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the</p><p>interface.  This string should include the name of the</p><p>manufacturer, the product name and the version of the</p><p>interface hardware/software.</p> |SNMP |cisco.ucs.if.descr[ifDescr.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in units of 1,000,000 bits per second. If this object reports a value of `n' then the speed of the interface is somewhere in the range of `n-500,000' to`n+499,999'.  For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made, this object should contain the nominal bandwidth. For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |cisco.ucs.if.speed[ifHighSpeed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -164,13 +164,13 @@ There are no template links in this template.
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Cisco UCS Manager SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
 |{#UNIT_LOCATION}: System status is in critical state |<p>Please check the device for errors</p> |`last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.CRIT:"computeFailed"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.CRIT:"configFailure"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.CRIT:"unconfigFailure"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.CRIT:"inoperable"}` |HIGH | |
 |{#UNIT_LOCATION}: System status is in warning state |<p>Please check the device for warnings</p> |`last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"testFailed"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"thermalProblem"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"powerProblem"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"voltageProblem"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"diagnosticsFailed"}` |WARNING |<p>**Depends on**:</p><p>- {#UNIT_LOCATION}: System status is in critical state</p> |
-|{#SENSOR_LOCATION}.Ambient: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCATION}.Ambient: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p> |
 |{#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3` |HIGH | |
-|{#SENSOR_LOCATION}.Front: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCATION}.Front: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p> |
 |{#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3` |HIGH | |
-|{#SENSOR_LOCATION}.Rear: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCATION}.Rear: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p> |
 |{#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3` |HIGH | |
-|{#SENSOR_LOCATION}.IOH: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p><p>- {#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCATION}.IOH: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}</p> |
 |{#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3` |HIGH | |
 |{#SENSOR_LOCATION}: Temperature is above warning threshold: >{$TEMP.MAX.WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"CPU"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)<{$TEMP.MAX.WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"CPU"}</p> |
 |{#SENSOR_LOCATION}: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"CPU"}`<p>Recovery expression:</p>`max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"CPU"}-3` |HIGH | |
diff --git a/templates/server/cisco_ucs_manager_snmp/template_server_cisco_ucs_manager_snmp.yaml b/templates/server/cisco_ucs_manager_snmp/template_server_cisco_ucs_manager_snmp.yaml
index 03eeba26e43..a9da64333f8 100644
--- a/templates/server/cisco_ucs_manager_snmp/template_server_cisco_ucs_manager_snmp.yaml
+++ b/templates/server/cisco_ucs_manager_snmp/template_server_cisco_ucs_manager_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-10-26T11:17:26Z'
+  date: '2021-12-16T20:04:06Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.39
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -1245,21 +1245,9 @@ zabbix_export:
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
                   dependencies:
                     -
-                      name: '{#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
                       name: '{#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
             -
               uuid: d5e4b5b7e18c4545853c48db018dc127
               name: '{#SENSOR_LOCATION}.Ambient: Temperature'
@@ -1305,18 +1293,6 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
             -
               uuid: 9980042de8d74353bf4a386bb0f28d30
               name: '{#SENSOR_LOCATION}.Front: Temperature'
@@ -1359,21 +1335,9 @@ zabbix_export:
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
                   dependencies:
                     -
-                      name: '{#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
                       name: '{#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
             -
               uuid: e20bfa52f31f4a1a9f08ba02fe27f90c
               name: '{#SENSOR_LOCATION}.Rear: Temperature'
@@ -1416,18 +1380,6 @@ zabbix_export:
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
                   dependencies:
                     -
-                      name: '{#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
-                      name: '{#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
-                      expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
-                      recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
-                    -
                       name: '{#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
diff --git a/templates/server/cisco_ucs_snmp/README.md b/templates/server/cisco_ucs_snmp/README.md
index cb2962c7690..76ec5ac02f2 100644
--- a/templates/server/cisco_ucs_snmp/README.md
+++ b/templates/server/cisco_ucs_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 for Cisco UCS via Integrated Management Controller
 
 This template was tested on:
@@ -20,115 +20,115 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                      | Description | Default |
-|-------------------------------------------|-------------|---------|
-| {$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS}   | <p>-</p>    | `2`     |
-| {$DISK_ARRAY_CACHE_BATTERY_OK_STATUS}     | <p>-</p>    | `1`     |
-| {$DISK_ARRAY_CRIT_STATUS:"inoperable"}    | <p>-</p>    | `2`     |
-| {$DISK_ARRAY_OK_STATUS:"operable"}        | <p>-</p>    | `1`     |
-| {$DISK_ARRAY_WARN_STATUS:"degraded"}      | <p>-</p>    | `3`     |
-| {$DISK_CRIT_STATUS:"bad"}                 | <p>-</p>    | `16`    |
-| {$DISK_CRIT_STATUS:"predictiveFailure"}   | <p>-</p>    | `11`    |
-| {$DISK_FAIL_STATUS:"failed"}              | <p>-</p>    | `9`     |
-| {$FAN_CRIT_STATUS:"inoperable"}           | <p>-</p>    | `2`     |
-| {$FAN_WARN_STATUS:"degraded"}             | <p>-</p>    | `3`     |
-| {$HEALTH_CRIT_STATUS:"computeFailed"}     | <p>-</p>    | `30`    |
-| {$HEALTH_CRIT_STATUS:"configFailure"}     | <p>-</p>    | `33`    |
-| {$HEALTH_CRIT_STATUS:"inoperable"}        | <p>-</p>    | `60`    |
-| {$HEALTH_CRIT_STATUS:"unconfigFailure"}   | <p>-</p>    | `34`    |
-| {$HEALTH_WARN_STATUS:"diagnosticsFailed"} | <p>-</p>    | `204`   |
-| {$HEALTH_WARN_STATUS:"powerProblem"}      | <p>-</p>    | `62`    |
-| {$HEALTH_WARN_STATUS:"testFailed"}        | <p>-</p>    | `35`    |
-| {$HEALTH_WARN_STATUS:"thermalProblem"}    | <p>-</p>    | `60`    |
-| {$HEALTH_WARN_STATUS:"voltageProblem"}    | <p>-</p>    | `62`    |
-| {$PSU_CRIT_STATUS:"inoperable"}           | <p>-</p>    | `2`     |
-| {$PSU_WARN_STATUS:"degraded"}             | <p>-</p>    | `3`     |
-| {$TEMP_CRIT:"Ambient"}                    | <p>-</p>    | `35`    |
-| {$TEMP_CRIT_LOW}                          | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}                              | <p>-</p>    | `60`    |
-| {$TEMP_WARN:"Ambient"}                    | <p>-</p>    | `30`    |
-| {$TEMP_WARN}                              | <p>-</p>    | `50`    |
-| {$VDISK_OK_STATUS:"equipped"}             | <p>-</p>    | `10`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS} |<p>-</p> |`2` |
+|{$DISK_ARRAY_CACHE_BATTERY_OK_STATUS} |<p>-</p> |`1` |
+|{$DISK_ARRAY_CRIT_STATUS:"inoperable"} |<p>-</p> |`2` |
+|{$DISK_ARRAY_OK_STATUS:"operable"} |<p>-</p> |`1` |
+|{$DISK_ARRAY_WARN_STATUS:"degraded"} |<p>-</p> |`3` |
+|{$DISK_CRIT_STATUS:"bad"} |<p>-</p> |`16` |
+|{$DISK_CRIT_STATUS:"predictiveFailure"} |<p>-</p> |`11` |
+|{$DISK_FAIL_STATUS:"failed"} |<p>-</p> |`9` |
+|{$FAN_CRIT_STATUS:"inoperable"} |<p>-</p> |`2` |
+|{$FAN_WARN_STATUS:"degraded"} |<p>-</p> |`3` |
+|{$HEALTH_CRIT_STATUS:"computeFailed"} |<p>-</p> |`30` |
+|{$HEALTH_CRIT_STATUS:"configFailure"} |<p>-</p> |`33` |
+|{$HEALTH_CRIT_STATUS:"inoperable"} |<p>-</p> |`60` |
+|{$HEALTH_CRIT_STATUS:"unconfigFailure"} |<p>-</p> |`34` |
+|{$HEALTH_WARN_STATUS:"diagnosticsFailed"} |<p>-</p> |`204` |
+|{$HEALTH_WARN_STATUS:"powerProblem"} |<p>-</p> |`62` |
+|{$HEALTH_WARN_STATUS:"testFailed"} |<p>-</p> |`35` |
+|{$HEALTH_WARN_STATUS:"thermalProblem"} |<p>-</p> |`60` |
+|{$HEALTH_WARN_STATUS:"voltageProblem"} |<p>-</p> |`62` |
+|{$PSU_CRIT_STATUS:"inoperable"} |<p>-</p> |`2` |
+|{$PSU_WARN_STATUS:"degraded"} |<p>-</p> |`3` |
+|{$TEMP_CRIT:"Ambient"} |<p>-</p> |`35` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"Ambient"} |<p>-</p> |`30` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VDISK_OK_STATUS:"equipped"} |<p>-</p> |`10` |
 
 ## Template links
 
-| Name         |
-|--------------|
-| Generic SNMP |
+|Name|
+|----|
+|Generic SNMP |
 
 ## Discovery rules
 
-| Name                             | Description                                                                                                     | Type | Key and additional info |
-|----------------------------------|-----------------------------------------------------------------------------------------------------------------|------|-------------------------|
-| Temperature Discovery            | <p>-</p>                                                                                                        | SNMP | temp.discovery          |
-| Temperature CPU Discovery        | <p>-</p>                                                                                                        | SNMP | temp.cpu.discovery      |
-| PSU Discovery                    | <p>-</p>                                                                                                        | SNMP | psu.discovery           |
-| Unit Discovery                   | <p>-</p>                                                                                                        | SNMP | unit.discovery          |
-| FAN Discovery                    | <p>-</p>                                                                                                        | SNMP | fan.discovery           |
-| Physical Disk Discovery          | <p>Scanning table of physical drive entries CISCO-UNIFIED-COMPUTING-STORAGE-MIB::cucsStorageLocalDiskTable.</p> | SNMP | physicalDisk.discovery  |
-| Virtual Disk Discovery           | <p>CISCO-UNIFIED-COMPUTING-STORAGE-MIB::cucsStorageLocalLunTable</p>                                            | SNMP | virtualdisk.discovery   |
-| Array Controller Discovery       | <p>Scanning table of Array controllers: CISCO-UNIFIED-COMPUTING-STORAGE-MIB::cucsStorageControllerTable.</p>    | SNMP | array.discovery         |
-| Array Controller Cache Discovery | <p>Scanning table of Array controllers: CISCO-UNIFIED-COMPUTING-STORAGE-MIB::cucsStorageControllerTable.</p>    | SNMP | array.cache.discovery   |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature Discovery |<p>-</p> |SNMP |temp.discovery |
+|Temperature CPU Discovery |<p>-</p> |SNMP |temp.cpu.discovery |
+|PSU Discovery |<p>-</p> |SNMP |psu.discovery |
+|Unit Discovery |<p>-</p> |SNMP |unit.discovery |
+|FAN Discovery |<p>-</p> |SNMP |fan.discovery |
+|Physical Disk Discovery |<p>Scanning table of physical drive entries CISCO-UNIFIED-COMPUTING-STORAGE-MIB::cucsStorageLocalDiskTable.</p> |SNMP |physicalDisk.discovery |
+|Virtual Disk Discovery |<p>CISCO-UNIFIED-COMPUTING-STORAGE-MIB::cucsStorageLocalLunTable</p> |SNMP |virtualdisk.discovery |
+|Array Controller Discovery |<p>Scanning table of Array controllers: CISCO-UNIFIED-COMPUTING-STORAGE-MIB::cucsStorageControllerTable.</p> |SNMP |array.discovery |
+|Array Controller Cache Discovery |<p>Scanning table of Array controllers: CISCO-UNIFIED-COMPUTING-STORAGE-MIB::cucsStorageControllerTable.</p> |SNMP |array.cache.discovery |
 
 ## Items collected
 
-| Group          | Name                                                                    | Description                                                                                                                                         | Type | Key and additional info                                                                                                           |
-|----------------|-------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|------|-----------------------------------------------------------------------------------------------------------------------------------|
-| Disk_arrays    | {#DISKARRAY_LOCATION}: Disk array controller status                     | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p>                                                                                                     | SNMP | system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}]                                                           |
-| Disk_arrays    | {#DISKARRAY_LOCATION}: Disk array controller model                      | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p>                                                                                                     | SNMP | system.hw.diskarray.model[cucsStorageControllerModel.{#SNMPINDEX}]                                                                |
-| Disk_arrays    | {#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery status | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p>                                                                                                     | SNMP | system.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}]                                          |
-| Fans           | {#FAN_LOCATION}: Fan status                                             | <p>MIB: CISCO-UNIFIED-COMPUTING-EQUIPMENT-MIB</p><p>Cisco UCS equipment:Fan:operState managed object property</p>                                   | SNMP | sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}]                                                                         |
-| Inventory      | {#UNIT_LOCATION}: Hardware model name                                   | <p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnit:model managed object property</p>                                      | SNMP | system.hw.model[cucsComputeRackUnitModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>         |
-| Inventory      | {#UNIT_LOCATION}: Hardware serial number                                | <p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnit:serial managed object property</p>                                     | SNMP | system.hw.serialnumber[cucsComputeRackUnitSerial.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-| Physical_disks | {#DISK_LOCATION}: Physical disk status                                  | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalDisk:diskState managed object property.</p>                                | SNMP | system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}]                                                         |
-| Physical_disks | {#DISK_LOCATION}: Physical disk model name                              | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalDisk:serial managed object property. Actually returns part number code</p> | SNMP | system.hw.physicaldisk.model[cucsStorageLocalDiskSerial.{#SNMPINDEX}]                                                             |
-| Physical_disks | {#DISK_LOCATION}: Physical disk media type                              | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalDisk:model managed object property. Actually returns 'HDD' or 'SSD'</p>    | SNMP | system.hw.physicaldisk.media_type[cucsStorageLocalDiskModel.{#SNMPINDEX}]                                                         |
-| Physical_disks | {#DISK_LOCATION}: Disk size                                             | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalDisk:size managed object property. In MB.</p>                              | SNMP | system.hw.physicaldisk.size[cucsStorageLocalDiskSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p>         |
-| Power_supply   | {#PSU_LOCATION}: Power supply status                                    | <p>MIB: CISCO-UNIFIED-COMPUTING-EQUIPMENT-MIB</p><p>Cisco UCS equipment:Psu:operState managed object property</p>                                   | SNMP | sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}]                                                                         |
-| Status         | {#UNIT_LOCATION}: Overall system health status                          | <p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnit:operState managed object property</p>                                  | SNMP | system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}]                                                                          |
-| Temperature    | {#SENSOR_LOCATION}.Ambient: Temperature                                 | <p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Temperature readings of testpoint: {#SENSOR_LOCATION}.Ambient</p>                                 | SNMP | sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}]                                                         |
-| Temperature    | {#SENSOR_LOCATION}.Front: Temperature                                   | <p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnitMbTempStats:frontTemp managed object property</p>                       | SNMP | sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}]                                                           |
-| Temperature    | {#SENSOR_LOCATION}.Rear: Temperature                                    | <p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnitMbTempStats:rearTemp managed object property</p>                        | SNMP | sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}]                                                            |
-| Temperature    | {#SENSOR_LOCATION}.IOH: Temperature                                     | <p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnitMbTempStats:ioh1Temp managed object property</p>                        | SNMP | sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}]                                                           |
-| Temperature    | {#SENSOR_LOCATION}: Temperature                                         | <p>MIB: CISCO-UNIFIED-COMPUTING-PROCESSOR-MIB</p><p>Cisco UCS processor:EnvStats:temperature managed object property</p>                            | SNMP | sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}]                                                                  |
-| Virtual_disks  | {#VDISK_LOCATION}: Status                                               | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalLun:presence managed object property</p>                                   | SNMP | system.hw.virtualdisk.status[cucsStorageLocalLunPresence.{#SNMPINDEX}]                                                            |
-| Virtual_disks  | {#VDISK_LOCATION}: Layout type                                          | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalLun:type managed object property</p>                                       | SNMP | system.hw.virtualdisk.layout[cucsStorageLocalLunType.{#SNMPINDEX}]                                                                |
-| Virtual_disks  | {#VDISK_LOCATION}: Disk size                                            | <p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalLun:size managed object property in MB.</p>                                | SNMP | system.hw.virtualdisk.size[cucsStorageLocalLunSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p>           |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Disk_arrays |{#DISKARRAY_LOCATION}: Disk array controller status |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p> |SNMP |system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}] |
+|Disk_arrays |{#DISKARRAY_LOCATION}: Disk array controller model |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p> |SNMP |system.hw.diskarray.model[cucsStorageControllerModel.{#SNMPINDEX}] |
+|Disk_arrays |{#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery status |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p> |SNMP |system.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}] |
+|Fans |{#FAN_LOCATION}: Fan status |<p>MIB: CISCO-UNIFIED-COMPUTING-EQUIPMENT-MIB</p><p>Cisco UCS equipment:Fan:operState managed object property</p> |SNMP |sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}] |
+|Inventory |{#UNIT_LOCATION}: Hardware model name |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnit:model managed object property</p> |SNMP |system.hw.model[cucsComputeRackUnitModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |{#UNIT_LOCATION}: Hardware serial number |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnit:serial managed object property</p> |SNMP |system.hw.serialnumber[cucsComputeRackUnitSerial.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Physical_disks |{#DISK_LOCATION}: Physical disk status |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalDisk:diskState managed object property.</p> |SNMP |system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_LOCATION}: Physical disk model name |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalDisk:serial managed object property. Actually returns part number code</p> |SNMP |system.hw.physicaldisk.model[cucsStorageLocalDiskSerial.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalDisk:model managed object property. Actually returns 'HDD' or 'SSD'</p> |SNMP |system.hw.physicaldisk.media_type[cucsStorageLocalDiskModel.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_LOCATION}: Disk size |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalDisk:size managed object property. In MB.</p> |SNMP |system.hw.physicaldisk.size[cucsStorageLocalDiskSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p> |
+|Power_supply |{#PSU_LOCATION}: Power supply status |<p>MIB: CISCO-UNIFIED-COMPUTING-EQUIPMENT-MIB</p><p>Cisco UCS equipment:Psu:operState managed object property</p> |SNMP |sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}] |
+|Status |{#UNIT_LOCATION}: Overall system health status |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnit:operState managed object property</p> |SNMP |system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_LOCATION}.Ambient: Temperature |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Temperature readings of testpoint: {#SENSOR_LOCATION}.Ambient</p> |SNMP |sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_LOCATION}.Front: Temperature |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnitMbTempStats:frontTemp managed object property</p> |SNMP |sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_LOCATION}.Rear: Temperature |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnitMbTempStats:rearTemp managed object property</p> |SNMP |sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_LOCATION}.IOH: Temperature |<p>MIB: CISCO-UNIFIED-COMPUTING-COMPUTE-MIB</p><p>Cisco UCS compute:RackUnitMbTempStats:ioh1Temp managed object property</p> |SNMP |sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_LOCATION}: Temperature |<p>MIB: CISCO-UNIFIED-COMPUTING-PROCESSOR-MIB</p><p>Cisco UCS processor:EnvStats:temperature managed object property</p> |SNMP |sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}] |
+|Virtual_disks |{#VDISK_LOCATION}: Status |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalLun:presence managed object property</p> |SNMP |system.hw.virtualdisk.status[cucsStorageLocalLunPresence.{#SNMPINDEX}] |
+|Virtual_disks |{#VDISK_LOCATION}: Layout type  |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalLun:type managed object property</p> |SNMP |system.hw.virtualdisk.layout[cucsStorageLocalLunType.{#SNMPINDEX}] |
+|Virtual_disks |{#VDISK_LOCATION}: Disk size |<p>MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB</p><p>Cisco UCS storage:LocalLun:size managed object property in MB.</p> |SNMP |system.hw.virtualdisk.size[cucsStorageLocalLunSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p> |
 
 ## Triggers
 
-| Name                                                                                         | Description                                                                                          | Expression                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | Severity | Dependencies and additional info                                                                                                                                          |
-|----------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| {#DISKARRAY_LOCATION}: Disk array controller is in critical state                            | <p>Please check the device for faults</p>                                                            | `{TEMPLATE_NAME:system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CRIT_STATUS:"inoperable"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | HIGH     |                                                                                                                                                                           |
-| {#DISKARRAY_LOCATION}: Disk array controller is in warning state                             | <p>Please check the device for faults</p>                                                            | `{TEMPLATE_NAME:system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_WARN_STATUS:"degraded"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | AVERAGE  | <p>**Depends on**:</p><p>- {#DISKARRAY_LOCATION}: Disk array controller is in critical state</p>                                                                          |
-| {#DISKARRAY_LOCATION}: Disk array controller is not in optimal state                         | <p>Please check the device for faults</p>                                                            | `{TEMPLATE_NAME:system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_OK_STATUS:"operable"},ne)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>**Depends on**:</p><p>- {#DISKARRAY_LOCATION}: Disk array controller is in critical state</p><p>- {#DISKARRAY_LOCATION}: Disk array controller is in warning state</p> |
-| {#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery is in critical state!       | <p>Please check the device for faults</p>                                                            | `{TEMPLATE_NAME:system.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  |                                                                                                                                                                           |
-| {#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery is not in optimal state     | <p>Please check the device for faults</p>                                                            | `{TEMPLATE_NAME:system.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_BATTERY_OK_STATUS},ne)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>**Depends on**:</p><p>- {#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery is in critical state!</p>                                                     |
-| {#FAN_LOCATION}: Fan is in critical state                                                    | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"inoperable"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | AVERAGE  |                                                                                                                                                                           |
-| {#FAN_LOCATION}: Fan is in warning state                                                     | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}].count(#1,{$FAN_WARN_STATUS:"degraded"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | WARNING  | <p>**Depends on**:</p><p>- {#FAN_LOCATION}: Fan is in critical state</p>                                                                                                  |
-| {#UNIT_LOCATION}: Device has been replaced (new serial number received)                      | <p>Device serial number has changed. Ack to close</p>                                                | `{TEMPLATE_NAME:system.hw.serialnumber[cucsComputeRackUnitSerial.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber[cucsComputeRackUnitSerial.{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | INFO     | <p>Manual close: YES</p>                                                                                                                                                  |
-| {#DISK_LOCATION}: Physical disk failed                                                       | <p>Please check physical disk for warnings or errors</p>                                             | `{TEMPLATE_NAME:system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}].count(#1,{$DISK_FAIL_STATUS:"failed"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | HIGH     |                                                                                                                                                                           |
-| {#DISK_LOCATION}: Physical disk error                                                        | <p>Please check physical disk for warnings or errors</p>                                             | `{TEMPLATE_NAME:system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}].count(#1,{$DISK_CRIT_STATUS:"bad"},eq)}=1 or {TEMPLATE_NAME:system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}].count(#1,{$DISK_CRIT_STATUS:"predictiveFailure"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                              | AVERAGE  | <p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p>                                                                                                     |
-| {#PSU_LOCATION}: Power supply is in critical state                                           | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS:"inoperable"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | AVERAGE  |                                                                                                                                                                           |
-| {#PSU_LOCATION}: Power supply is in warning state                                            | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}].count(#1,{$PSU_WARN_STATUS:"degraded"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | WARNING  | <p>**Depends on**:</p><p>- {#PSU_LOCATION}: Power supply is in critical state</p>                                                                                         |
-| {#UNIT_LOCATION}: System status is in critical state                                         | <p>Please check the device for errors</p>                                                            | `{TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_CRIT_STATUS:"computeFailed"},eq)}=1 or {TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_CRIT_STATUS:"configFailure"},eq)}=1 or {TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_CRIT_STATUS:"unconfigFailure"},eq)}=1 or {TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_CRIT_STATUS:"inoperable"},eq)}=1`                                                                                                                                     | HIGH     |                                                                                                                                                                           |
-| {#UNIT_LOCATION}: System status is in warning state                                          | <p>Please check the device for warnings</p>                                                          | `{TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_WARN_STATUS:"testFailed"},eq)}=1 or {TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_WARN_STATUS:"thermalProblem"},eq)}=1 or {TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_WARN_STATUS:"powerProblem"},eq)}=1 or {TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_WARN_STATUS:"voltageProblem"},eq)}=1 or {TEMPLATE_NAME:system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}].count(#1,{$HEALTH_WARN_STATUS:"diagnosticsFailed"},eq)}=1` | WARNING  | <p>**Depends on**:</p><p>- {#UNIT_LOCATION}: System status is in critical state</p>                                                                                       |
-| {#SENSOR_LOCATION}.Ambient: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"Ambient"}-3`                                                                                                                                                                                                                                                                                                                                                                                     | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p>                                               |
-| {#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"Ambient"}-3`                                                                                                                                                                                                                                                                                                                                                                                     | HIGH     |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}.Ambient: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"Ambient"}+3`                                                                                                                                                                                                                                                                                                                                                                             | AVERAGE  |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}.Front: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"}    | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"Ambient"}-3`                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p>                                                 |
-| {#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}   | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"Ambient"}-3`                                                                                                                                                                                                                                                                                                                                                                                         | HIGH     |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}.Front: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}                | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"Ambient"}+3`                                                                                                                                                                                                                                                                                                                                                                                 | AVERAGE  |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}.Rear: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"}     | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"Ambient"}-3`                                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p>                                                  |
-| {#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}    | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"Ambient"}-3`                                                                                                                                                                                                                                                                                                                                                                                           | HIGH     |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}.Rear: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}                 | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"Ambient"}+3`                                                                                                                                                                                                                                                                                                                                                                                   | AVERAGE  |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}.IOH: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"}      | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"Ambient"}-3`                                                                                                                                                                                                                                                                                                                                                                                         | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p>                                                   |
-| {#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}     | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"Ambient"}-3`                                                                                                                                                                                                                                                                                                                                                                                         | HIGH     |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}.IOH: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}                  | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"Ambient"}+3`                                                                                                                                                                                                                                                                                                                                                                                 | AVERAGE  |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}: 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[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"CPU"}-3`                                                                                                                                                                                                                                                                                                                                                                                                               | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_LOCATION}: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p>                                                           |
-| {#SENSOR_LOCATION}: 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[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"CPU"}-3`                                                                                                                                                                                                                                                                                                                                                                                                               | HIGH     |                                                                                                                                                                           |
-| {#SENSOR_LOCATION}: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}                          | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"CPU"}+3`                                                                                                                                                                                                                                                                                                                                                                                                       | AVERAGE  |                                                                                                                                                                           |
-| {#VDISK_LOCATION}: Virtual disk is not in OK state                                           | <p>Please check virtual disk for warnings or errors</p>                                              | `{TEMPLATE_NAME:system.hw.virtualdisk.status[cucsStorageLocalLunPresence.{#SNMPINDEX}].count(#1,{$VDISK_OK_STATUS:"equipped"},ne)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | WARNING  |                                                                                                                                                                           |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#DISKARRAY_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults</p> |`count(/Cisco UCS SNMP/system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CRIT_STATUS:\"inoperable\"}")=1` |HIGH | |
+|{#DISKARRAY_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults</p> |`count(/Cisco UCS SNMP/system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_WARN_STATUS:\"degraded\"}")=1` |AVERAGE |<p>**Depends on**:</p><p>- {#DISKARRAY_LOCATION}: Disk array controller is in critical state</p> |
+|{#DISKARRAY_LOCATION}: Disk array controller is not in optimal state |<p>Please check the device for faults</p> |`count(/Cisco UCS SNMP/system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}],#1,"ne","{$DISK_ARRAY_OK_STATUS:\"operable\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#DISKARRAY_LOCATION}: Disk array controller is in critical state</p><p>- {#DISKARRAY_LOCATION}: Disk array controller is in warning state</p> |
+|{#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery is in critical state! |<p>Please check the device for faults</p> |`count(/Cisco UCS SNMP/system.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS}")=1` |AVERAGE | |
+|{#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery is not in optimal state |<p>Please check the device for faults</p> |`count(/Cisco UCS SNMP/system.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}],#1,"ne","{$DISK_ARRAY_CACHE_BATTERY_OK_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- {#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery is in critical state!</p> |
+|{#FAN_LOCATION}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Cisco UCS SNMP/sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"inoperable\"}")=1` |AVERAGE | |
+|{#FAN_LOCATION}: Fan is in warning state |<p>Please check the fan unit</p> |`count(/Cisco UCS SNMP/sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"degraded\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#FAN_LOCATION}: Fan is in critical state</p> |
+|{#UNIT_LOCATION}: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Cisco UCS SNMP/system.hw.serialnumber[cucsComputeRackUnitSerial.{#SNMPINDEX}],#1)<>last(/Cisco UCS SNMP/system.hw.serialnumber[cucsComputeRackUnitSerial.{#SNMPINDEX}],#2) and length(last(/Cisco UCS SNMP/system.hw.serialnumber[cucsComputeRackUnitSerial.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors</p> |`count(/Cisco UCS SNMP/system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"failed\"}")=1` |HIGH | |
+|{#DISK_LOCATION}: Physical disk error |<p>Please check physical disk for warnings or errors</p> |`count(/Cisco UCS SNMP/system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}],#1,"eq","{$DISK_CRIT_STATUS:\"bad\"}")=1 or count(/Cisco UCS SNMP/system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}],#1,"eq","{$DISK_CRIT_STATUS:\"predictiveFailure\"}")=1` |AVERAGE |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#PSU_LOCATION}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Cisco UCS SNMP/sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"inoperable\"}")=1` |AVERAGE | |
+|{#PSU_LOCATION}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`count(/Cisco UCS SNMP/sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"degraded\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#PSU_LOCATION}: Power supply is in critical state</p> |
+|{#UNIT_LOCATION}: System status is in critical state |<p>Please check the device for errors</p> |`count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_CRIT_STATUS:\"computeFailed\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_CRIT_STATUS:\"configFailure\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_CRIT_STATUS:\"unconfigFailure\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_CRIT_STATUS:\"inoperable\"}")=1` |HIGH | |
+|{#UNIT_LOCATION}: System status is in warning state |<p>Please check the device for warnings</p> |`count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"testFailed\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"thermalProblem\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"powerProblem\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"voltageProblem\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"diagnosticsFailed\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#UNIT_LOCATION}: System status is in critical state</p> |
+|{#SENSOR_LOCATION}.Ambient: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3` |HIGH | |
+|{#SENSOR_LOCATION}.Ambient: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"} |<p>-</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`min(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Ambient"}+3` |AVERAGE | |
+|{#SENSOR_LOCATION}.Front: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3` |HIGH | |
+|{#SENSOR_LOCATION}.Front: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"} |<p>-</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`min(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Ambient"}+3` |AVERAGE | |
+|{#SENSOR_LOCATION}.Rear: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3` |HIGH | |
+|{#SENSOR_LOCATION}.Rear: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"} |<p>-</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`min(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Ambient"}+3` |AVERAGE | |
+|{#SENSOR_LOCATION}.IOH: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3` |HIGH | |
+|{#SENSOR_LOCATION}.IOH: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"} |<p>-</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`min(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Ambient"}+3` |AVERAGE | |
+|{#SENSOR_LOCATION}: 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(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCATION}: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|{#SENSOR_LOCATION}: 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(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|{#SENSOR_LOCATION}: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|{#VDISK_LOCATION}: Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors</p> |`count(/Cisco UCS SNMP/system.hw.virtualdisk.status[cucsStorageLocalLunPresence.{#SNMPINDEX}],#1,"ne","{$VDISK_OK_STATUS:\"equipped\"}")=1` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml b/templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml
index f8a6b393e60..a8a2ea868ee 100644
--- a/templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml
+++ b/templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:38Z'
+  version: '6.0'
+  date: '2021-12-16T20:02:57Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -19,7 +19,7 @@ zabbix_export:
         CISCO-UNIFIED-COMPUTING-EQUIPMENT-MIB
         CISCO-UNIFIED-COMPUTING-STORAGE-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/server/dell/dell_r720_http/README.md b/templates/server/dell/dell_r720_http/README.md
index 055c9b48079..947c4a0daa1 100644
--- a/templates/server/dell/dell_r720_http/README.md
+++ b/templates/server/dell/dell_r720_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring DELL PowerEdge R720 servers with iDRAC 8/9 firmware 4.32 and later with Redfish API enabled via Zabbix HTTP agent that works without any external scripts.
 
 ## Setup
@@ -95,29 +95,29 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Dell R720: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R720: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R720: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.serialnumber.diff()}=1 and {TEMPLATE_NAME:dell.server.hw.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R720: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.hw.firmware.diff()}=1 and {TEMPLATE_NAME:dell.server.hw.firmware.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R720: {#IFNAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and ({TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].str()}="Down" and {TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].diff()}=1)`<p>Recovery expression:</p>`{TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].str()}<>"Down" or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Dell R720: {#IFNAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.net.if.health[{#IFNAME}].str("Critical")}=1` |HIGH | |
-|Dell R720: {#IFNAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.net.if.health[{#IFNAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#IFNAME} is in a critical state</p> |
-|Dell R720: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[{#DISK_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R720: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[{#DISK_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} is in a critical state</p> |
-|Dell R720: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R720: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R720: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R720: Server is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.status.str("Critical")}=1` |HIGH | |
-|Dell R720: Server is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.status.str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: Server is in a critical state</p> |
-|Dell R720: Redfish API service is unavailable |<p>The service is unavailable or does not accept TCP connections.</p> |`{TEMPLATE_NAME:net.tcp.service[https].last()}=0` |HIGH | |
-|Dell R720: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R720: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R720: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[{#DISK_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R720: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[{#DISK_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} is in a critical state</p> |
-|Dell R720: {#CNTLR_NAME} in slot {#SLOT} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}].str("Critical")}=1` |HIGH | |
-|Dell R720: {#CNTLR_NAME} in slot {#SLOT} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#CNTLR_NAME} in slot {#SLOT} is in a critical state</p> |
-|Dell R720: {#BATTERY_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R720: {#BATTERY_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#BATTERY_NAME} is in a critical state</p> |
+|Dell R720: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.sensor.fan.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R720: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.sensor.fan.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R720: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R720 by HTTP/dell.server.hw.serialnumber,#1)<>last(/DELL PowerEdge R720 by HTTP/dell.server.hw.serialnumber,#2) and length(last(/DELL PowerEdge R720 by HTTP/dell.server.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R720: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`last(/DELL PowerEdge R720 by HTTP/dell.server.hw.firmware,#1)<>last(/DELL PowerEdge R720 by HTTP/dell.server.hw.firmware,#2) and length(last(/DELL PowerEdge R720 by HTTP/dell.server.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R720: {#IFNAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. Condition of difference between last and previous value - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (find(/DELL PowerEdge R720 by HTTP/dell.server.net.if.status[{#IFNAME}],,"like")="Down" and last(/DELL PowerEdge R720 by HTTP/dell.server.net.if.status[{#IFNAME}],#1)<>last(/DELL PowerEdge R720 by HTTP/dell.server.net.if.status[{#IFNAME}],#2))`<p>Recovery expression:</p>`find(/DELL PowerEdge R720 by HTTP/dell.server.net.if.status[{#IFNAME}],,"like")<>"Down" or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
+|Dell R720: {#IFNAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.net.if.health[{#IFNAME}],,"like","Critical")=1` |HIGH | |
+|Dell R720: {#IFNAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.net.if.health[{#IFNAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#IFNAME} is in a critical state</p> |
+|Dell R720: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.hw.physicaldisk.status[{#DISK_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R720: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.hw.physicaldisk.status[{#DISK_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} is in a critical state</p> |
+|Dell R720: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R720 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}],#1)<>last(/DELL PowerEdge R720 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}],#2) and length(last(/DELL PowerEdge R720 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R720: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.sensor.psu.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R720: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.sensor.psu.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R720: Server is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.status,,"like","Critical")=1` |HIGH | |
+|Dell R720: Server is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.status,,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: Server is in a critical state</p> |
+|Dell R720: Redfish API service is unavailable |<p>The service is unavailable or does not accept TCP connections.</p> |`last(/DELL PowerEdge R720 by HTTP/net.tcp.service[https])=0` |HIGH | |
+|Dell R720: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.sensor.temp.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R720: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.sensor.temp.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R720: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.hw.virtualdisk.status[{#DISK_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R720: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.hw.virtualdisk.status[{#DISK_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} is in a critical state</p> |
+|Dell R720: {#CNTLR_NAME} in slot {#SLOT} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}],,"like","Critical")=1` |HIGH | |
+|Dell R720: {#CNTLR_NAME} in slot {#SLOT} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#CNTLR_NAME} in slot {#SLOT} is in a critical state</p> |
+|Dell R720: {#BATTERY_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R720: {#BATTERY_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R720 by HTTP/dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#BATTERY_NAME} is in a critical state</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell/dell_r720_http/template_server_dell_r720_http.yaml b/templates/server/dell/dell_r720_http/template_server_dell_r720_http.yaml
index 6ec3684c8a3..625c06e6cd5 100644
--- a/templates/server/dell/dell_r720_http/template_server_dell_r720_http.yaml
+++ b/templates/server/dell/dell_r720_http/template_server_dell_r720_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T08:40:45Z'
+  version: '6.0'
+  date: '2021-12-16T20:16:17Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -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/426752-discussion-thread-for-official-zabbix-dell-templates
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -267,7 +267,6 @@ zabbix_export:
                   result.firmware = getField(response.body, 'FirmwareVersion', '');
                   
                   return JSON.stringify(result);
-                  
           url: '{$API.URL}/redfish/v1/Systems/System.Embedded.1'
           tags:
             -
@@ -455,7 +454,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -618,7 +616,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -798,7 +795,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -962,7 +958,7 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
-                    3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)
+                    3. Condition of difference between last and previous value - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
@@ -1069,7 +1065,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1357,7 +1352,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1531,7 +1525,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1726,7 +1719,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2031,7 +2023,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
diff --git a/templates/server/dell/dell_r720_snmp/README.md b/templates/server/dell/dell_r720_snmp/README.md
index b79a147c69e..0a8ea53970c 100644
--- a/templates/server/dell/dell_r720_snmp/README.md
+++ b/templates/server/dell/dell_r720_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring DELL PowerEdge R720 servers with iDRAC version 7 and later via Zabbix SNMP agent that works without any external scripts.
 
 ## Setup
@@ -64,7 +64,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>Scanning table of Temperature Probe Table IDRAC-MIB-SMIv2::temperatureProbeTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |PSU discovery |<p>IDRAC-MIB-SMIv2::powerSupplyTable</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|FAN discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#TYPE} MATCHES_REGEX `3`</p> |
+|FAN discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#TYPE} MATCHES_REGEX `3`</p> |
 |Array controller discovery |<p>Scanning table of Array controllers: IDRAC-MIB-SMIv2::controllerTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array controller cache discovery |<p>Scanning table of Array controllers: IDRAC-MIB-SMIv2::batteryTable</p> |SNMP |array.cache.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical disk discovery |<p>Scanning  table of physical drive entries IDRAC-MIB-SMIv2::physicalDiskTable.</p> |SNMP |physicaldisk.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -112,34 +112,34 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Dell R720: {#CNTLR_NAME} is in unrecoverable state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.FAIL}` |DISASTER | |
-|Dell R720: {#CNTLR_NAME} is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.CRIT}` |HIGH |<p>**Depends on**:</p><p>- Dell R720: {#CNTLR_NAME} is in unrecoverable state</p> |
-|Dell R720: {#CNTLR_NAME} is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R720: {#CNTLR_NAME} is in critical state</p><p>- Dell R720: {#CNTLR_NAME} is in unrecoverable state</p> |
-|Dell R720: {#BATTERY_NAME} is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}` |AVERAGE | |
-|Dell R720: {#BATTERY_NAME} is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#BATTERY_NAME} is in critical state</p> |
-|Dell R720: {#BATTERY_NAME} is not in optimal state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#BATTERY_NAME} is in critical state</p><p>- Dell R720: {#BATTERY_NAME} is in warning state</p> |
-|Dell R720: {#FAN_DESCR} is in critical state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"criticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"nonRecoverableUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"criticalLower"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"nonRecoverableLower"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"failed"}` |AVERAGE | |
-|Dell R720: {#FAN_DESCR} is in warning state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN:"nonCriticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#FAN_DESCR} is in critical state</p> |
-|Dell R720: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.name[sysName].diff()}=1 and {TEMPLATE_NAME:dell.server.name[sysName].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R720: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.serialnumber[systemServiceTag].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.serialnumber[systemServiceTag].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R720: Operating system description has changed |<p>Operating system description has changed. Possibly, the system has been updated or replaced. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.sw.os[systemOSName].diff()}=1 and {TEMPLATE_NAME:dell.server.sw.os[systemOSName].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R720: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.hw.firmware[racFirmwareVersion].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.firmware[racFirmwareVersion].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R720: {#DISK_NAME} failed |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL:"critical"} or {TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL:"nonRecoverable"}` |HIGH | |
-|Dell R720: {#DISK_NAME} is in warning state |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} failed</p> |
-|Dell R720: {#DISK_NAME} S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or {TEMPLATE_NAME:dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} failed</p> |
-|Dell R720: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R720: Power supply {#PSU_DESCR} is in critical state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT:"critical"} or {TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT:"nonRecoverable"}` |AVERAGE | |
-|Dell R720: Power supply {#PSU_DESCR} is in warning state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: Power supply {#PSU_DESCR} is in critical state</p> |
-|Dell R720: System is in unrecoverable state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.DISASTER}` |DISASTER | |
-|Dell R720: System status is in critical state |<p>Please check the device for errors.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.CRIT}` |HIGH | |
-|Dell R720: System status is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: System status is in critical state</p> |
-|Dell R720: {HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:dell.server.uptime[sysUpTime].last()}<10m` |WARNING |<p>Manual close: YES</p> |
-|Dell R720: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|Dell R720: Probe {#SENSOR_LOCALE} is in critical status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"criticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"criticalLower"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableLower"}` |AVERAGE | |
-|Dell R720: Probe {#SENSOR_LOCALE} is in warning status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.WARN:"nonCriticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: Probe {#SENSOR_LOCALE} is in critical status</p> |
-|Dell R720: Probe {#SENSOR_LOCALE} is not in optimal status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}<>{$SENSOR.TEMP.STATUS.OK}` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Dell R720: Probe {#SENSOR_LOCALE} is in critical status</p><p>- Dell R720: Probe {#SENSOR_LOCALE} is in warning status</p> |
-|Dell R720: {#DISK_NAME} failed |<p>Please check the virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].last()}={$VDISK.STATUS.CRIT:"failed"}` |HIGH | |
-|Dell R720: {#DISK_NAME} is in warning state |<p>Please check the virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].last()}={$VDISK.STATUS.WARN:"degraded"}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} failed</p> |
+|Dell R720: {#CNTLR_NAME} is in unrecoverable state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.FAIL}` |DISASTER | |
+|Dell R720: {#CNTLR_NAME} is in critical state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT}` |HIGH |<p>**Depends on**:</p><p>- Dell R720: {#CNTLR_NAME} is in unrecoverable state</p> |
+|Dell R720: {#CNTLR_NAME} is in warning state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R720: {#CNTLR_NAME} is in critical state</p><p>- Dell R720: {#CNTLR_NAME} is in unrecoverable state</p> |
+|Dell R720: {#BATTERY_NAME} is in critical state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}` |AVERAGE | |
+|Dell R720: {#BATTERY_NAME} is in warning state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#BATTERY_NAME} is in critical state</p> |
+|Dell R720: {#BATTERY_NAME} is not in optimal state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#BATTERY_NAME} is in critical state</p><p>- Dell R720: {#BATTERY_NAME} is in warning state</p> |
+|Dell R720: {#FAN_DESCR} is in critical state |<p>Please check the fan unit.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"criticalUpper"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"nonRecoverableUpper"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"criticalLower"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"nonRecoverableLower"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"failed"}` |AVERAGE | |
+|Dell R720: {#FAN_DESCR} is in warning state |<p>Please check the fan unit.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.WARN:"nonCriticalUpper"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#FAN_DESCR} is in critical state</p> |
+|Dell R720: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.name[sysName],#1)<>last(/DELL PowerEdge R720 SNMP/dell.server.name[sysName],#2) and length(last(/DELL PowerEdge R720 SNMP/dell.server.name[sysName]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R720: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.serialnumber[systemServiceTag],#1)<>last(/DELL PowerEdge R720 SNMP/dell.server.hw.serialnumber[systemServiceTag],#2) and length(last(/DELL PowerEdge R720 SNMP/dell.server.hw.serialnumber[systemServiceTag]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R720: Operating system description has changed |<p>Operating system description has changed. Possibly, the system has been updated or replaced. Ack to close.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.sw.os[systemOSName],#1)<>last(/DELL PowerEdge R720 SNMP/dell.server.sw.os[systemOSName],#2) and length(last(/DELL PowerEdge R720 SNMP/dell.server.sw.os[systemOSName]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R720: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.firmware[racFirmwareVersion],#1)<>last(/DELL PowerEdge R720 SNMP/dell.server.hw.firmware[racFirmwareVersion],#2) and length(last(/DELL PowerEdge R720 SNMP/dell.server.hw.firmware[racFirmwareVersion]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R720: {#DISK_NAME} failed |<p>Please check physical disk for warnings or errors.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"critical"} or last(/DELL PowerEdge R720 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"nonRecoverable"}` |HIGH | |
+|Dell R720: {#DISK_NAME} is in warning state |<p>Please check physical disk for warnings or errors.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} failed</p> |
+|Dell R720: {#DISK_NAME} S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or last(/DELL PowerEdge R720 SNMP/dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} failed</p> |
+|Dell R720: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#1)<>last(/DELL PowerEdge R720 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#2) and length(last(/DELL PowerEdge R720 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R720: Power supply {#PSU_DESCR} is in critical state |<p>Please check the power supply unit for errors.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"critical"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"nonRecoverable"}` |AVERAGE | |
+|Dell R720: Power supply {#PSU_DESCR} is in warning state |<p>Please check the power supply unit for errors.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: Power supply {#PSU_DESCR} is in critical state</p> |
+|Dell R720: System is in unrecoverable state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.DISASTER}` |DISASTER | |
+|Dell R720: System status is in critical state |<p>Please check the device for errors.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.CRIT}` |HIGH | |
+|Dell R720: System status is in warning state |<p>Please check the device for warnings.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: System status is in critical state</p> |
+|Dell R720: {HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.uptime[sysUpTime])<10m` |WARNING |<p>Manual close: YES</p> |
+|Dell R720: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/DELL PowerEdge R720 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|Dell R720: Probe {#SENSOR_LOCALE} is in critical status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"criticalUpper"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableUpper"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"criticalLower"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableLower"}` |AVERAGE | |
+|Dell R720: Probe {#SENSOR_LOCALE} is in warning status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.WARN:"nonCriticalUpper"} or last(/DELL PowerEdge R720 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R720: Probe {#SENSOR_LOCALE} is in critical status</p> |
+|Dell R720: Probe {#SENSOR_LOCALE} is not in optimal status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])<>{$SENSOR.TEMP.STATUS.OK}` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Dell R720: Probe {#SENSOR_LOCALE} is in critical status</p><p>- Dell R720: Probe {#SENSOR_LOCALE} is in warning status</p> |
+|Dell R720: {#DISK_NAME} failed |<p>Please check the virtual disk for warnings or errors.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}])={$VDISK.STATUS.CRIT:"failed"}` |HIGH | |
+|Dell R720: {#DISK_NAME} is in warning state |<p>Please check the virtual disk for warnings or errors.</p> |`last(/DELL PowerEdge R720 SNMP/dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}])={$VDISK.STATUS.WARN:"degraded"}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R720: {#DISK_NAME} failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell/dell_r720_snmp/template_server_dell_r720_snmp.yaml b/templates/server/dell/dell_r720_snmp/template_server_dell_r720_snmp.yaml
index ba0b1a33249..22666df3114 100644
--- a/templates/server/dell/dell_r720_snmp/template_server_dell_r720_snmp.yaml
+++ b/templates/server/dell/dell_r720_snmp/template_server_dell_r720_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T08:42:50Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:09Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/426752-discussion-thread-for-official-zabbix-dell-templates
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
diff --git a/templates/server/dell/dell_r740_http/README.md b/templates/server/dell/dell_r740_http/README.md
index ab06c5867f1..d9a5402260d 100644
--- a/templates/server/dell/dell_r740_http/README.md
+++ b/templates/server/dell/dell_r740_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring DELL PowerEdge R740 servers with iDRAC 8/9 firmware 4.32 and later with Redfish API enabled via Zabbix HTTP agent that works without any external scripts.
 
 ## Setup
@@ -95,29 +95,29 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Dell R740: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R740: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R740: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.serialnumber.diff()}=1 and {TEMPLATE_NAME:dell.server.hw.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R740: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.hw.firmware.diff()}=1 and {TEMPLATE_NAME:dell.server.hw.firmware.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R740: {#IFNAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and ({TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].str()}="Down" and {TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].diff()}=1)`<p>Recovery expression:</p>`{TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].str()}<>"Down" or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Dell R740: {#IFNAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.net.if.health[{#IFNAME}].str("Critical")}=1` |HIGH | |
-|Dell R740: {#IFNAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.net.if.health[{#IFNAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#IFNAME} is in a critical state</p> |
-|Dell R740: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[{#DISK_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R740: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[{#DISK_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} is in a critical state</p> |
-|Dell R740: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R740: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R740: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R740: Server is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.status.str("Critical")}=1` |HIGH | |
-|Dell R740: Server is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.status.str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: Server is in a critical state</p> |
-|Dell R740: Redfish API service is unavailable |<p>The service is unavailable or does not accept TCP connections.</p> |`{TEMPLATE_NAME:net.tcp.service[https].last()}=0` |HIGH | |
-|Dell R740: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R740: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R740: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[{#DISK_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R740: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[{#DISK_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} is in a critical state</p> |
-|Dell R740: {#CNTLR_NAME} in slot {#SLOT} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}].str("Critical")}=1` |HIGH | |
-|Dell R740: {#CNTLR_NAME} in slot {#SLOT} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#CNTLR_NAME} in slot {#SLOT} is in a critical state</p> |
-|Dell R740: {#BATTERY_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R740: {#BATTERY_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#BATTERY_NAME} is in a critical state</p> |
+|Dell R740: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.sensor.fan.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R740: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.sensor.fan.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R740: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R740 by HTTP/dell.server.hw.serialnumber,#1)<>last(/DELL PowerEdge R740 by HTTP/dell.server.hw.serialnumber,#2) and length(last(/DELL PowerEdge R740 by HTTP/dell.server.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R740: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`last(/DELL PowerEdge R740 by HTTP/dell.server.hw.firmware,#1)<>last(/DELL PowerEdge R740 by HTTP/dell.server.hw.firmware,#2) and length(last(/DELL PowerEdge R740 by HTTP/dell.server.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R740: {#IFNAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. Condition of difference between last and previous value - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (find(/DELL PowerEdge R740 by HTTP/dell.server.net.if.status[{#IFNAME}],,"like")="Down" and last(/DELL PowerEdge R740 by HTTP/dell.server.net.if.status[{#IFNAME}],#1)<>last(/DELL PowerEdge R740 by HTTP/dell.server.net.if.status[{#IFNAME}],#2))`<p>Recovery expression:</p>`find(/DELL PowerEdge R740 by HTTP/dell.server.net.if.status[{#IFNAME}],,"like")<>"Down" or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
+|Dell R740: {#IFNAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.net.if.health[{#IFNAME}],,"like","Critical")=1` |HIGH | |
+|Dell R740: {#IFNAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.net.if.health[{#IFNAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#IFNAME} is in a critical state</p> |
+|Dell R740: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.hw.physicaldisk.status[{#DISK_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R740: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.hw.physicaldisk.status[{#DISK_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} is in a critical state</p> |
+|Dell R740: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R740 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}],#1)<>last(/DELL PowerEdge R740 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}],#2) and length(last(/DELL PowerEdge R740 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R740: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.sensor.psu.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R740: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.sensor.psu.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R740: Server is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.status,,"like","Critical")=1` |HIGH | |
+|Dell R740: Server is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.status,,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: Server is in a critical state</p> |
+|Dell R740: Redfish API service is unavailable |<p>The service is unavailable or does not accept TCP connections.</p> |`last(/DELL PowerEdge R740 by HTTP/net.tcp.service[https])=0` |HIGH | |
+|Dell R740: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.sensor.temp.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R740: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.sensor.temp.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R740: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.hw.virtualdisk.status[{#DISK_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R740: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.hw.virtualdisk.status[{#DISK_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} is in a critical state</p> |
+|Dell R740: {#CNTLR_NAME} in slot {#SLOT} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}],,"like","Critical")=1` |HIGH | |
+|Dell R740: {#CNTLR_NAME} in slot {#SLOT} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#CNTLR_NAME} in slot {#SLOT} is in a critical state</p> |
+|Dell R740: {#BATTERY_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R740: {#BATTERY_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R740 by HTTP/dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#BATTERY_NAME} is in a critical state</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell/dell_r740_http/template_server_dell_r740_http.yaml b/templates/server/dell/dell_r740_http/template_server_dell_r740_http.yaml
index 18cf98ee278..805e4da9259 100644
--- a/templates/server/dell/dell_r740_http/template_server_dell_r740_http.yaml
+++ b/templates/server/dell/dell_r740_http/template_server_dell_r740_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T08:43:35Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:13Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -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/426752-discussion-thread-for-official-zabbix-dell-templates
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -267,7 +267,6 @@ zabbix_export:
                   result.firmware = getField(response.body, 'FirmwareVersion', '');
                   
                   return JSON.stringify(result);
-                  
           url: '{$API.URL}/redfish/v1/Systems/System.Embedded.1'
           tags:
             -
@@ -455,7 +454,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -618,7 +616,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -798,7 +795,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -962,7 +958,7 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
-                    3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)
+                    3. Condition of difference between last and previous value - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
@@ -1069,7 +1065,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1357,7 +1352,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1531,7 +1525,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1726,7 +1719,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2031,7 +2023,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
diff --git a/templates/server/dell/dell_r740_snmp/README.md b/templates/server/dell/dell_r740_snmp/README.md
index e20ebf2f6f7..30e019f2839 100644
--- a/templates/server/dell/dell_r740_snmp/README.md
+++ b/templates/server/dell/dell_r740_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring DELL PowerEdge R740 servers with iDRAC version 7 and later via Zabbix SNMP agent that works without any external scripts.
 
 ## Setup
@@ -64,7 +64,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>Scanning table of Temperature Probe Table IDRAC-MIB-SMIv2::temperatureProbeTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |PSU discovery |<p>IDRAC-MIB-SMIv2::powerSupplyTable</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|FAN discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#TYPE} MATCHES_REGEX `3`</p> |
+|FAN discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#TYPE} MATCHES_REGEX `3`</p> |
 |Array controller discovery |<p>Scanning table of Array controllers: IDRAC-MIB-SMIv2::controllerTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array controller cache discovery |<p>Scanning table of Array controllers: IDRAC-MIB-SMIv2::batteryTable</p> |SNMP |array.cache.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical disk discovery |<p>Scanning  table of physical drive entries IDRAC-MIB-SMIv2::physicalDiskTable.</p> |SNMP |physicaldisk.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -112,34 +112,34 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Dell R740: {#CNTLR_NAME} is in unrecoverable state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.FAIL}` |DISASTER | |
-|Dell R740: {#CNTLR_NAME} is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.CRIT}` |HIGH |<p>**Depends on**:</p><p>- Dell R740: {#CNTLR_NAME} is in unrecoverable state</p> |
-|Dell R740: {#CNTLR_NAME} is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R740: {#CNTLR_NAME} is in critical state</p><p>- Dell R740: {#CNTLR_NAME} is in unrecoverable state</p> |
-|Dell R740: {#BATTERY_NAME} is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}` |AVERAGE | |
-|Dell R740: {#BATTERY_NAME} is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#BATTERY_NAME} is in critical state</p> |
-|Dell R740: {#BATTERY_NAME} is not in optimal state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#BATTERY_NAME} is in critical state</p><p>- Dell R740: {#BATTERY_NAME} is in warning state</p> |
-|Dell R740: {#FAN_DESCR} is in critical state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"criticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"nonRecoverableUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"criticalLower"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"nonRecoverableLower"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"failed"}` |AVERAGE | |
-|Dell R740: {#FAN_DESCR} is in warning state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN:"nonCriticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#FAN_DESCR} is in critical state</p> |
-|Dell R740: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.name[sysName].diff()}=1 and {TEMPLATE_NAME:dell.server.name[sysName].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R740: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.serialnumber[systemServiceTag].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.serialnumber[systemServiceTag].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R740: Operating system description has changed |<p>Operating system description has changed. Possibly, the system has been updated or replaced. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.sw.os[systemOSName].diff()}=1 and {TEMPLATE_NAME:dell.server.sw.os[systemOSName].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R740: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.hw.firmware[racFirmwareVersion].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.firmware[racFirmwareVersion].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R740: {#DISK_NAME} failed |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL:"critical"} or {TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL:"nonRecoverable"}` |HIGH | |
-|Dell R740: {#DISK_NAME} is in warning state |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} failed</p> |
-|Dell R740: {#DISK_NAME} S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or {TEMPLATE_NAME:dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} failed</p> |
-|Dell R740: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R740: Power supply {#PSU_DESCR} is in critical state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT:"critical"} or {TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT:"nonRecoverable"}` |AVERAGE | |
-|Dell R740: Power supply {#PSU_DESCR} is in warning state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: Power supply {#PSU_DESCR} is in critical state</p> |
-|Dell R740: System is in unrecoverable state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.DISASTER}` |DISASTER | |
-|Dell R740: System status is in critical state |<p>Please check the device for errors.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.CRIT}` |HIGH | |
-|Dell R740: System status is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: System status is in critical state</p> |
-|Dell R740: {HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:dell.server.uptime[sysUpTime].last()}<10m` |WARNING |<p>Manual close: YES</p> |
-|Dell R740: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|Dell R740: Probe {#SENSOR_LOCALE} is in critical status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"criticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"criticalLower"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableLower"}` |AVERAGE | |
-|Dell R740: Probe {#SENSOR_LOCALE} is in warning status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.WARN:"nonCriticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: Probe {#SENSOR_LOCALE} is in critical status</p> |
-|Dell R740: Probe {#SENSOR_LOCALE} is not in optimal status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}<>{$SENSOR.TEMP.STATUS.OK}` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Dell R740: Probe {#SENSOR_LOCALE} is in critical status</p><p>- Dell R740: Probe {#SENSOR_LOCALE} is in warning status</p> |
-|Dell R740: {#DISK_NAME} failed |<p>Please check the virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].last()}={$VDISK.STATUS.CRIT:"failed"}` |HIGH | |
-|Dell R740: {#DISK_NAME} is in warning state |<p>Please check the virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].last()}={$VDISK.STATUS.WARN:"degraded"}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} failed</p> |
+|Dell R740: {#CNTLR_NAME} is in unrecoverable state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.FAIL}` |DISASTER | |
+|Dell R740: {#CNTLR_NAME} is in critical state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT}` |HIGH |<p>**Depends on**:</p><p>- Dell R740: {#CNTLR_NAME} is in unrecoverable state</p> |
+|Dell R740: {#CNTLR_NAME} is in warning state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R740: {#CNTLR_NAME} is in critical state</p><p>- Dell R740: {#CNTLR_NAME} is in unrecoverable state</p> |
+|Dell R740: {#BATTERY_NAME} is in critical state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}` |AVERAGE | |
+|Dell R740: {#BATTERY_NAME} is in warning state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#BATTERY_NAME} is in critical state</p> |
+|Dell R740: {#BATTERY_NAME} is not in optimal state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#BATTERY_NAME} is in critical state</p><p>- Dell R740: {#BATTERY_NAME} is in warning state</p> |
+|Dell R740: {#FAN_DESCR} is in critical state |<p>Please check the fan unit.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"criticalUpper"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"nonRecoverableUpper"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"criticalLower"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"nonRecoverableLower"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"failed"}` |AVERAGE | |
+|Dell R740: {#FAN_DESCR} is in warning state |<p>Please check the fan unit.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.WARN:"nonCriticalUpper"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#FAN_DESCR} is in critical state</p> |
+|Dell R740: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.name[sysName],#1)<>last(/DELL PowerEdge R740 SNMP/dell.server.name[sysName],#2) and length(last(/DELL PowerEdge R740 SNMP/dell.server.name[sysName]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R740: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.serialnumber[systemServiceTag],#1)<>last(/DELL PowerEdge R740 SNMP/dell.server.hw.serialnumber[systemServiceTag],#2) and length(last(/DELL PowerEdge R740 SNMP/dell.server.hw.serialnumber[systemServiceTag]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R740: Operating system description has changed |<p>Operating system description has changed. Possibly, the system has been updated or replaced. Ack to close.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.sw.os[systemOSName],#1)<>last(/DELL PowerEdge R740 SNMP/dell.server.sw.os[systemOSName],#2) and length(last(/DELL PowerEdge R740 SNMP/dell.server.sw.os[systemOSName]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R740: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.firmware[racFirmwareVersion],#1)<>last(/DELL PowerEdge R740 SNMP/dell.server.hw.firmware[racFirmwareVersion],#2) and length(last(/DELL PowerEdge R740 SNMP/dell.server.hw.firmware[racFirmwareVersion]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R740: {#DISK_NAME} failed |<p>Please check physical disk for warnings or errors.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"critical"} or last(/DELL PowerEdge R740 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"nonRecoverable"}` |HIGH | |
+|Dell R740: {#DISK_NAME} is in warning state |<p>Please check physical disk for warnings or errors.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} failed</p> |
+|Dell R740: {#DISK_NAME} S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or last(/DELL PowerEdge R740 SNMP/dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} failed</p> |
+|Dell R740: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#1)<>last(/DELL PowerEdge R740 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#2) and length(last(/DELL PowerEdge R740 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R740: Power supply {#PSU_DESCR} is in critical state |<p>Please check the power supply unit for errors.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"critical"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"nonRecoverable"}` |AVERAGE | |
+|Dell R740: Power supply {#PSU_DESCR} is in warning state |<p>Please check the power supply unit for errors.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: Power supply {#PSU_DESCR} is in critical state</p> |
+|Dell R740: System is in unrecoverable state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.DISASTER}` |DISASTER | |
+|Dell R740: System status is in critical state |<p>Please check the device for errors.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.CRIT}` |HIGH | |
+|Dell R740: System status is in warning state |<p>Please check the device for warnings.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: System status is in critical state</p> |
+|Dell R740: {HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.uptime[sysUpTime])<10m` |WARNING |<p>Manual close: YES</p> |
+|Dell R740: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/DELL PowerEdge R740 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|Dell R740: Probe {#SENSOR_LOCALE} is in critical status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"criticalUpper"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableUpper"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"criticalLower"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableLower"}` |AVERAGE | |
+|Dell R740: Probe {#SENSOR_LOCALE} is in warning status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.WARN:"nonCriticalUpper"} or last(/DELL PowerEdge R740 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R740: Probe {#SENSOR_LOCALE} is in critical status</p> |
+|Dell R740: Probe {#SENSOR_LOCALE} is not in optimal status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])<>{$SENSOR.TEMP.STATUS.OK}` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Dell R740: Probe {#SENSOR_LOCALE} is in critical status</p><p>- Dell R740: Probe {#SENSOR_LOCALE} is in warning status</p> |
+|Dell R740: {#DISK_NAME} failed |<p>Please check the virtual disk for warnings or errors.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}])={$VDISK.STATUS.CRIT:"failed"}` |HIGH | |
+|Dell R740: {#DISK_NAME} is in warning state |<p>Please check the virtual disk for warnings or errors.</p> |`last(/DELL PowerEdge R740 SNMP/dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}])={$VDISK.STATUS.WARN:"degraded"}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R740: {#DISK_NAME} failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell/dell_r740_snmp/template_server_dell_r740_snmp.yaml b/templates/server/dell/dell_r740_snmp/template_server_dell_r740_snmp.yaml
index f4f111cdc69..e8695802d52 100644
--- a/templates/server/dell/dell_r740_snmp/template_server_dell_r740_snmp.yaml
+++ b/templates/server/dell/dell_r740_snmp/template_server_dell_r740_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T08:44:54Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:17Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/426752-discussion-thread-for-official-zabbix-dell-templates
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
diff --git a/templates/server/dell/dell_r820_http/README.md b/templates/server/dell/dell_r820_http/README.md
index c0eab32487e..ff0ba2998f0 100644
--- a/templates/server/dell/dell_r820_http/README.md
+++ b/templates/server/dell/dell_r820_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring DELL PowerEdge R820 servers with iDRAC 8/9 firmware 4.32 and later with Redfish API enabled via Zabbix HTTP agent that works without any external scripts.
 
 ## Setup
@@ -95,29 +95,29 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Dell R820: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R820: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R820: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.serialnumber.diff()}=1 and {TEMPLATE_NAME:dell.server.hw.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R820: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.hw.firmware.diff()}=1 and {TEMPLATE_NAME:dell.server.hw.firmware.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R820: {#IFNAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and ({TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].str()}="Down" and {TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].diff()}=1)`<p>Recovery expression:</p>`{TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].str()}<>"Down" or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Dell R820: {#IFNAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.net.if.health[{#IFNAME}].str("Critical")}=1` |HIGH | |
-|Dell R820: {#IFNAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.net.if.health[{#IFNAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#IFNAME} is in a critical state</p> |
-|Dell R820: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[{#DISK_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R820: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[{#DISK_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} is in a critical state</p> |
-|Dell R820: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R820: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R820: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R820: Server is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.status.str("Critical")}=1` |HIGH | |
-|Dell R820: Server is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.status.str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: Server is in a critical state</p> |
-|Dell R820: Redfish API service is unavailable |<p>The service is unavailable or does not accept TCP connections.</p> |`{TEMPLATE_NAME:net.tcp.service[https].last()}=0` |HIGH | |
-|Dell R820: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R820: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R820: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[{#DISK_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R820: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[{#DISK_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} is in a critical state</p> |
-|Dell R820: {#CNTLR_NAME} in slot {#SLOT} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}].str("Critical")}=1` |HIGH | |
-|Dell R820: {#CNTLR_NAME} in slot {#SLOT} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#CNTLR_NAME} in slot {#SLOT} is in a critical state</p> |
-|Dell R820: {#BATTERY_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R820: {#BATTERY_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#BATTERY_NAME} is in a critical state</p> |
+|Dell R820: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.sensor.fan.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R820: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.sensor.fan.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R820: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R820 by HTTP/dell.server.hw.serialnumber,#1)<>last(/DELL PowerEdge R820 by HTTP/dell.server.hw.serialnumber,#2) and length(last(/DELL PowerEdge R820 by HTTP/dell.server.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R820: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`last(/DELL PowerEdge R820 by HTTP/dell.server.hw.firmware,#1)<>last(/DELL PowerEdge R820 by HTTP/dell.server.hw.firmware,#2) and length(last(/DELL PowerEdge R820 by HTTP/dell.server.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R820: {#IFNAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. Condition of difference between last and previous value - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (find(/DELL PowerEdge R820 by HTTP/dell.server.net.if.status[{#IFNAME}],,"like")="Down" and last(/DELL PowerEdge R820 by HTTP/dell.server.net.if.status[{#IFNAME}],#1)<>last(/DELL PowerEdge R820 by HTTP/dell.server.net.if.status[{#IFNAME}],#2))`<p>Recovery expression:</p>`find(/DELL PowerEdge R820 by HTTP/dell.server.net.if.status[{#IFNAME}],,"like")<>"Down" or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
+|Dell R820: {#IFNAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.net.if.health[{#IFNAME}],,"like","Critical")=1` |HIGH | |
+|Dell R820: {#IFNAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.net.if.health[{#IFNAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#IFNAME} is in a critical state</p> |
+|Dell R820: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.hw.physicaldisk.status[{#DISK_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R820: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.hw.physicaldisk.status[{#DISK_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} is in a critical state</p> |
+|Dell R820: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R820 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}],#1)<>last(/DELL PowerEdge R820 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}],#2) and length(last(/DELL PowerEdge R820 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R820: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.sensor.psu.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R820: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.sensor.psu.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R820: Server is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.status,,"like","Critical")=1` |HIGH | |
+|Dell R820: Server is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.status,,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: Server is in a critical state</p> |
+|Dell R820: Redfish API service is unavailable |<p>The service is unavailable or does not accept TCP connections.</p> |`last(/DELL PowerEdge R820 by HTTP/net.tcp.service[https])=0` |HIGH | |
+|Dell R820: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.sensor.temp.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R820: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.sensor.temp.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R820: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.hw.virtualdisk.status[{#DISK_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R820: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.hw.virtualdisk.status[{#DISK_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} is in a critical state</p> |
+|Dell R820: {#CNTLR_NAME} in slot {#SLOT} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}],,"like","Critical")=1` |HIGH | |
+|Dell R820: {#CNTLR_NAME} in slot {#SLOT} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#CNTLR_NAME} in slot {#SLOT} is in a critical state</p> |
+|Dell R820: {#BATTERY_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R820: {#BATTERY_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R820 by HTTP/dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#BATTERY_NAME} is in a critical state</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell/dell_r820_http/template_server_dell_r820_http.yaml b/templates/server/dell/dell_r820_http/template_server_dell_r820_http.yaml
index 9ae25f872de..bba1a35d0e8 100644
--- a/templates/server/dell/dell_r820_http/template_server_dell_r820_http.yaml
+++ b/templates/server/dell/dell_r820_http/template_server_dell_r820_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T08:45:38Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:21Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -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/426752-discussion-thread-for-official-zabbix-dell-templates
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -124,8 +124,6 @@ zabbix_export:
           trends: '0'
           value_type: CHAR
           description: 'This attribute defines the overall rollup status of all components in the system being monitored by the remote access card. Includes system, storage, IO devices, iDRAC, CPU, memory, etc.'
-          valuemap:
-            name: 'IDRAC-MIB-SMIv2::ObjectStatusEnum'
           preprocessing:
             -
               type: JSONPATH
@@ -269,7 +267,6 @@ zabbix_export:
                   result.firmware = getField(response.body, 'FirmwareVersion', '');
                   
                   return JSON.stringify(result);
-                  
           url: '{$API.URL}/redfish/v1/Systems/System.Embedded.1'
           tags:
             -
@@ -323,8 +320,6 @@ zabbix_export:
               username: '{$API.USER}'
               password: '{$API.PASSWORD}'
               description: 'The status of the job. Possible values: OK, Warning, Critical.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::batteryState'
               preprocessing:
                 -
                   type: JSONPATH
@@ -459,7 +454,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -487,8 +481,6 @@ zabbix_export:
               username: '{$API.USER}'
               password: '{$API.PASSWORD}'
               description: 'The status of the job. Possible values: OK, Warning, Critical.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::ObjectStatusEnum'
               preprocessing:
                 -
                   type: JSONPATH
@@ -624,7 +616,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -687,8 +678,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'The status of the job. Possible values: OK, Warning, Critical.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::StatusProbeEnum'
               preprocessing:
                 -
                   type: JSONPATH
@@ -806,7 +795,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -970,7 +958,7 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
-                    3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)
+                    3. Condition of difference between last and previous value - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
@@ -1077,7 +1065,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1120,8 +1107,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'The type of media contained in this drive. Possible values: HDD, SSD, SMR, null.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::physicalDiskMediaType'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1230,8 +1215,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'The status of the job. Possible values: OK, Warning, Critical.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::physicalDiskComponentStatus'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1369,7 +1352,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1412,8 +1394,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'The status of the job. Possible values: OK, Warning, Critical.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::ObjectStatusEnum'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1545,7 +1525,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1588,8 +1567,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'The status of the job. Possible values: OK, Warning, Critical.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::StatusProbeEnum'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1742,7 +1719,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1810,8 +1786,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'Indicates the read cache policy setting for the Volume. Possible values: ReadAhead, AdaptiveReadAhead, Off.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::virtualDiskReadPolicy'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1862,8 +1836,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'The known state of the Resource, for example, enabled. Possible values: Enabled, Disabled, StandbyOffline, StandbySpare, InTest, Starting, Absent, UnavailableOffline, Deferring, Quiesced, Updating, Qualified.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::virtualDiskOperationalState'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1889,8 +1861,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'The status of the job. Possible values: OK, Warning, Critical.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::virtualDiskState'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1935,8 +1905,6 @@ zabbix_export:
               trends: '0'
               value_type: CHAR
               description: 'Indicates the write cache policy setting for the Volume. Possible values: WriteThrough, ProtectedWriteBack, UnprotectedWriteBack.'
-              valuemap:
-                name: 'IDRAC-MIB-SMIv2::virtualDiskWritePolicy'
               preprocessing:
                 -
                   type: JSONPATH
@@ -2055,7 +2023,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2079,183 +2046,6 @@ zabbix_export:
           description: 'Link status trigger will be fired only for interfaces that have the context macro equaled 1.'
       valuemaps:
         -
-          uuid: ce3baf68b6e54ad3a67f77d5e8d5567a
-          name: 'IDRAC-MIB-SMIv2::batteryState'
-          mappings:
-            -
-              value: '1'
-              newvalue: Unknown
-            -
-              value: '2'
-              newvalue: Ready
-            -
-              value: '3'
-              newvalue: Failed
-            -
-              value: '4'
-              newvalue: Degraded
-            -
-              value: '5'
-              newvalue: Missing
-            -
-              value: '6'
-              newvalue: Charging
-            -
-              value: '7'
-              newvalue: 'Below threshold'
-        -
-          uuid: 1ce66d22fc074d6ab113fb5449cb778a
-          name: 'IDRAC-MIB-SMIv2::ObjectStatusEnum'
-          mappings:
-            -
-              value: '1'
-              newvalue: other
-            -
-              value: '2'
-              newvalue: unknown
-            -
-              value: '3'
-              newvalue: ok
-            -
-              value: '4'
-              newvalue: nonCritical
-            -
-              value: '5'
-              newvalue: critical
-            -
-              value: '6'
-              newvalue: nonRecoverable
-        -
-          uuid: c137d9094e9c434e975bac41ebdff156
-          name: 'IDRAC-MIB-SMIv2::physicalDiskComponentStatus'
-          mappings:
-            -
-              value: '1'
-              newvalue: other
-            -
-              value: '2'
-              newvalue: unknown
-            -
-              value: '3'
-              newvalue: ok
-            -
-              value: '4'
-              newvalue: nonCritical
-            -
-              value: '5'
-              newvalue: critical
-            -
-              value: '6'
-              newvalue: nonRecoverable
-        -
-          uuid: f1ee4057a7394260b877b3a2b1ad0943
-          name: 'IDRAC-MIB-SMIv2::physicalDiskMediaType'
-          mappings:
-            -
-              value: '1'
-              newvalue: Unknown
-            -
-              value: '2'
-              newvalue: HDD
-            -
-              value: '3'
-              newvalue: SSD
-        -
-          uuid: 660f91b00d694691953b39ac2800bdbe
-          name: 'IDRAC-MIB-SMIv2::StatusProbeEnum'
-          mappings:
-            -
-              value: '1'
-              newvalue: other
-            -
-              value: '2'
-              newvalue: unknown
-            -
-              value: '3'
-              newvalue: ok
-            -
-              value: '4'
-              newvalue: nonCriticalUpper
-            -
-              value: '5'
-              newvalue: criticalUpper
-            -
-              value: '6'
-              newvalue: nonRecoverableUpper
-            -
-              value: '7'
-              newvalue: nonCriticalLower
-            -
-              value: '8'
-              newvalue: criticalLower
-            -
-              value: '9'
-              newvalue: nonRecoverableLower
-            -
-              value: '10'
-              newvalue: failed
-        -
-          uuid: d8f93c2c425d4d8c9c2d5a5a489ba614
-          name: 'IDRAC-MIB-SMIv2::virtualDiskOperationalState'
-          mappings:
-            -
-              value: '1'
-              newvalue: 'Not applicable'
-            -
-              value: '2'
-              newvalue: Reconstructing
-            -
-              value: '3'
-              newvalue: Resynching
-            -
-              value: '4'
-              newvalue: Initializing
-            -
-              value: '5'
-              newvalue: 'Background init'
-        -
-          uuid: 335c6dd916ba49cda3f537a6f3371540
-          name: 'IDRAC-MIB-SMIv2::virtualDiskReadPolicy'
-          mappings:
-            -
-              value: '1'
-              newvalue: 'No Read Ahead'
-            -
-              value: '2'
-              newvalue: 'Read Ahead'
-            -
-              value: '3'
-              newvalue: 'Adaptive Read Ahead'
-        -
-          uuid: be6fadfed0574457b289dd5beda43e73
-          name: 'IDRAC-MIB-SMIv2::virtualDiskState'
-          mappings:
-            -
-              value: '1'
-              newvalue: Unknown
-            -
-              value: '2'
-              newvalue: Online
-            -
-              value: '3'
-              newvalue: Failed
-            -
-              value: '4'
-              newvalue: Degraded
-        -
-          uuid: 2c0f81605b694b7cba7232b102bde235
-          name: 'IDRAC-MIB-SMIv2::virtualDiskWritePolicy'
-          mappings:
-            -
-              value: '1'
-              newvalue: 'Write Through'
-            -
-              value: '2'
-              newvalue: 'Write Back'
-            -
-              value: '3'
-              newvalue: 'Force Write Back'
-        -
           uuid: 42059b2450fd4856a4c38019df326920
           name: zabbix.host.available
           mappings:
diff --git a/templates/server/dell/dell_r820_snmp/README.md b/templates/server/dell/dell_r820_snmp/README.md
index 9589939b0dd..e1d281a2d35 100644
--- a/templates/server/dell/dell_r820_snmp/README.md
+++ b/templates/server/dell/dell_r820_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring DELL PowerEdge R820 servers with iDRAC version 7 and later via Zabbix SNMP agent that works without any external scripts.
 
 ## Setup
@@ -64,7 +64,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>Scanning table of Temperature Probe Table IDRAC-MIB-SMIv2::temperatureProbeTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |PSU discovery |<p>IDRAC-MIB-SMIv2::powerSupplyTable</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|FAN discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#TYPE} MATCHES_REGEX `3`</p> |
+|FAN discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#TYPE} MATCHES_REGEX `3`</p> |
 |Array controller discovery |<p>Scanning table of Array controllers: IDRAC-MIB-SMIv2::controllerTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array controller cache discovery |<p>Scanning table of Array controllers: IDRAC-MIB-SMIv2::batteryTable</p> |SNMP |array.cache.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical disk discovery |<p>Scanning  table of physical drive entries IDRAC-MIB-SMIv2::physicalDiskTable.</p> |SNMP |physicaldisk.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -112,34 +112,34 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Dell R820: {#CNTLR_NAME} is in unrecoverable state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.FAIL}` |DISASTER | |
-|Dell R820: {#CNTLR_NAME} is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.CRIT}` |HIGH |<p>**Depends on**:</p><p>- Dell R820: {#CNTLR_NAME} is in unrecoverable state</p> |
-|Dell R820: {#CNTLR_NAME} is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R820: {#CNTLR_NAME} is in critical state</p><p>- Dell R820: {#CNTLR_NAME} is in unrecoverable state</p> |
-|Dell R820: {#BATTERY_NAME} is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}` |AVERAGE | |
-|Dell R820: {#BATTERY_NAME} is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#BATTERY_NAME} is in critical state</p> |
-|Dell R820: {#BATTERY_NAME} is not in optimal state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#BATTERY_NAME} is in critical state</p><p>- Dell R820: {#BATTERY_NAME} is in warning state</p> |
-|Dell R820: {#FAN_DESCR} is in critical state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"criticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"nonRecoverableUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"criticalLower"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"nonRecoverableLower"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"failed"}` |AVERAGE | |
-|Dell R820: {#FAN_DESCR} is in warning state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN:"nonCriticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#FAN_DESCR} is in critical state</p> |
-|Dell R820: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.name[sysName].diff()}=1 and {TEMPLATE_NAME:dell.server.name[sysName].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R820: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.serialnumber[systemServiceTag].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.serialnumber[systemServiceTag].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R820: Operating system description has changed |<p>Operating system description has changed. Possibly, the system has been updated or replaced. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.sw.os[systemOSName].diff()}=1 and {TEMPLATE_NAME:dell.server.sw.os[systemOSName].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R820: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.hw.firmware[racFirmwareVersion].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.firmware[racFirmwareVersion].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R820: {#DISK_NAME} failed |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL:"critical"} or {TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL:"nonRecoverable"}` |HIGH | |
-|Dell R820: {#DISK_NAME} is in warning state |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} failed</p> |
-|Dell R820: {#DISK_NAME} S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or {TEMPLATE_NAME:dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} failed</p> |
-|Dell R820: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R820: Power supply {#PSU_DESCR} is in critical state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT:"critical"} or {TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT:"nonRecoverable"}` |AVERAGE | |
-|Dell R820: Power supply {#PSU_DESCR} is in warning state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: Power supply {#PSU_DESCR} is in critical state</p> |
-|Dell R820: System is in unrecoverable state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.DISASTER}` |DISASTER | |
-|Dell R820: System status is in critical state |<p>Please check the device for errors.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.CRIT}` |HIGH | |
-|Dell R820: System status is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: System status is in critical state</p> |
-|Dell R820: {HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:dell.server.uptime[sysUpTime].last()}<10m` |WARNING |<p>Manual close: YES</p> |
-|Dell R820: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|Dell R820: Probe {#SENSOR_LOCALE} is in critical status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"criticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"criticalLower"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableLower"}` |AVERAGE | |
-|Dell R820: Probe {#SENSOR_LOCALE} is in warning status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.WARN:"nonCriticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: Probe {#SENSOR_LOCALE} is in critical status</p> |
-|Dell R820: Probe {#SENSOR_LOCALE} is not in optimal status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}<>{$SENSOR.TEMP.STATUS.OK}` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Dell R820: Probe {#SENSOR_LOCALE} is in critical status</p><p>- Dell R820: Probe {#SENSOR_LOCALE} is in warning status</p> |
-|Dell R820: {#DISK_NAME} failed |<p>Please check the virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].last()}={$VDISK.STATUS.CRIT:"failed"}` |HIGH | |
-|Dell R820: {#DISK_NAME} is in warning state |<p>Please check the virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].last()}={$VDISK.STATUS.WARN:"degraded"}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} failed</p> |
+|Dell R820: {#CNTLR_NAME} is in unrecoverable state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.FAIL}` |DISASTER | |
+|Dell R820: {#CNTLR_NAME} is in critical state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT}` |HIGH |<p>**Depends on**:</p><p>- Dell R820: {#CNTLR_NAME} is in unrecoverable state</p> |
+|Dell R820: {#CNTLR_NAME} is in warning state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R820: {#CNTLR_NAME} is in critical state</p><p>- Dell R820: {#CNTLR_NAME} is in unrecoverable state</p> |
+|Dell R820: {#BATTERY_NAME} is in critical state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}` |AVERAGE | |
+|Dell R820: {#BATTERY_NAME} is in warning state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#BATTERY_NAME} is in critical state</p> |
+|Dell R820: {#BATTERY_NAME} is not in optimal state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#BATTERY_NAME} is in critical state</p><p>- Dell R820: {#BATTERY_NAME} is in warning state</p> |
+|Dell R820: {#FAN_DESCR} is in critical state |<p>Please check the fan unit.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"criticalUpper"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"nonRecoverableUpper"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"criticalLower"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"nonRecoverableLower"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"failed"}` |AVERAGE | |
+|Dell R820: {#FAN_DESCR} is in warning state |<p>Please check the fan unit.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.WARN:"nonCriticalUpper"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#FAN_DESCR} is in critical state</p> |
+|Dell R820: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.name[sysName],#1)<>last(/DELL PowerEdge R820 SNMP/dell.server.name[sysName],#2) and length(last(/DELL PowerEdge R820 SNMP/dell.server.name[sysName]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R820: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.serialnumber[systemServiceTag],#1)<>last(/DELL PowerEdge R820 SNMP/dell.server.hw.serialnumber[systemServiceTag],#2) and length(last(/DELL PowerEdge R820 SNMP/dell.server.hw.serialnumber[systemServiceTag]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R820: Operating system description has changed |<p>Operating system description has changed. Possibly, the system has been updated or replaced. Ack to close.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.sw.os[systemOSName],#1)<>last(/DELL PowerEdge R820 SNMP/dell.server.sw.os[systemOSName],#2) and length(last(/DELL PowerEdge R820 SNMP/dell.server.sw.os[systemOSName]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R820: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.firmware[racFirmwareVersion],#1)<>last(/DELL PowerEdge R820 SNMP/dell.server.hw.firmware[racFirmwareVersion],#2) and length(last(/DELL PowerEdge R820 SNMP/dell.server.hw.firmware[racFirmwareVersion]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R820: {#DISK_NAME} failed |<p>Please check physical disk for warnings or errors.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"critical"} or last(/DELL PowerEdge R820 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"nonRecoverable"}` |HIGH | |
+|Dell R820: {#DISK_NAME} is in warning state |<p>Please check physical disk for warnings or errors.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} failed</p> |
+|Dell R820: {#DISK_NAME} S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or last(/DELL PowerEdge R820 SNMP/dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} failed</p> |
+|Dell R820: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#1)<>last(/DELL PowerEdge R820 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#2) and length(last(/DELL PowerEdge R820 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R820: Power supply {#PSU_DESCR} is in critical state |<p>Please check the power supply unit for errors.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"critical"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"nonRecoverable"}` |AVERAGE | |
+|Dell R820: Power supply {#PSU_DESCR} is in warning state |<p>Please check the power supply unit for errors.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: Power supply {#PSU_DESCR} is in critical state</p> |
+|Dell R820: System is in unrecoverable state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.DISASTER}` |DISASTER | |
+|Dell R820: System status is in critical state |<p>Please check the device for errors.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.CRIT}` |HIGH | |
+|Dell R820: System status is in warning state |<p>Please check the device for warnings.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: System status is in critical state</p> |
+|Dell R820: {HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.uptime[sysUpTime])<10m` |WARNING |<p>Manual close: YES</p> |
+|Dell R820: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/DELL PowerEdge R820 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|Dell R820: Probe {#SENSOR_LOCALE} is in critical status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"criticalUpper"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableUpper"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"criticalLower"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableLower"}` |AVERAGE | |
+|Dell R820: Probe {#SENSOR_LOCALE} is in warning status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.WARN:"nonCriticalUpper"} or last(/DELL PowerEdge R820 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R820: Probe {#SENSOR_LOCALE} is in critical status</p> |
+|Dell R820: Probe {#SENSOR_LOCALE} is not in optimal status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])<>{$SENSOR.TEMP.STATUS.OK}` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Dell R820: Probe {#SENSOR_LOCALE} is in critical status</p><p>- Dell R820: Probe {#SENSOR_LOCALE} is in warning status</p> |
+|Dell R820: {#DISK_NAME} failed |<p>Please check the virtual disk for warnings or errors.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}])={$VDISK.STATUS.CRIT:"failed"}` |HIGH | |
+|Dell R820: {#DISK_NAME} is in warning state |<p>Please check the virtual disk for warnings or errors.</p> |`last(/DELL PowerEdge R820 SNMP/dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}])={$VDISK.STATUS.WARN:"degraded"}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R820: {#DISK_NAME} failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell/dell_r820_snmp/template_server_dell_r820_snmp.yaml b/templates/server/dell/dell_r820_snmp/template_server_dell_r820_snmp.yaml
index 1beb5ce84ff..84c148aaf12 100644
--- a/templates/server/dell/dell_r820_snmp/template_server_dell_r820_snmp.yaml
+++ b/templates/server/dell/dell_r820_snmp/template_server_dell_r820_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T08:46:26Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:25Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/426752-discussion-thread-for-official-zabbix-dell-templates
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
diff --git a/templates/server/dell/dell_r840_http/README.md b/templates/server/dell/dell_r840_http/README.md
index 674245e2b22..f800961d8fa 100644
--- a/templates/server/dell/dell_r840_http/README.md
+++ b/templates/server/dell/dell_r840_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring DELL PowerEdge R840 servers with iDRAC 8/9 firmware 4.32 and later with Redfish API enabled via Zabbix HTTP agent that works without any external scripts.
 
 ## Setup
@@ -95,29 +95,29 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Dell R840: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R840: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R840: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.serialnumber.diff()}=1 and {TEMPLATE_NAME:dell.server.hw.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R840: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.hw.firmware.diff()}=1 and {TEMPLATE_NAME:dell.server.hw.firmware.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R840: {#IFNAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and ({TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].str()}="Down" and {TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].diff()}=1)`<p>Recovery expression:</p>`{TEMPLATE_NAME:dell.server.net.if.status[{#IFNAME}].str()}<>"Down" or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Dell R840: {#IFNAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.net.if.health[{#IFNAME}].str("Critical")}=1` |HIGH | |
-|Dell R840: {#IFNAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.net.if.health[{#IFNAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#IFNAME} is in a critical state</p> |
-|Dell R840: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[{#DISK_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R840: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[{#DISK_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} is in a critical state</p> |
-|Dell R840: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R840: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R840: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R840: Server is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.status.str("Critical")}=1` |HIGH | |
-|Dell R840: Server is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.status.str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: Server is in a critical state</p> |
-|Dell R840: Redfish API service is unavailable |<p>The service is unavailable or does not accept TCP connections.</p> |`{TEMPLATE_NAME:net.tcp.service[https].last()}=0` |HIGH | |
-|Dell R840: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[{#SENSOR_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R840: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[{#SENSOR_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#SENSOR_NAME} is in a critical state</p> |
-|Dell R840: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[{#DISK_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R840: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[{#DISK_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} is in a critical state</p> |
-|Dell R840: {#CNTLR_NAME} in slot {#SLOT} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}].str("Critical")}=1` |HIGH | |
-|Dell R840: {#CNTLR_NAME} in slot {#SLOT} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#CNTLR_NAME} in slot {#SLOT} is in a critical state</p> |
-|Dell R840: {#BATTERY_NAME} is in a critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}].str("Critical")}=1` |HIGH | |
-|Dell R840: {#BATTERY_NAME} is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}].str("Warning")}=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#BATTERY_NAME} is in a critical state</p> |
+|Dell R840: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.sensor.fan.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R840: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.sensor.fan.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R840: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R840 by HTTP/dell.server.hw.serialnumber,#1)<>last(/DELL PowerEdge R840 by HTTP/dell.server.hw.serialnumber,#2) and length(last(/DELL PowerEdge R840 by HTTP/dell.server.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R840: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`last(/DELL PowerEdge R840 by HTTP/dell.server.hw.firmware,#1)<>last(/DELL PowerEdge R840 by HTTP/dell.server.hw.firmware,#2) and length(last(/DELL PowerEdge R840 by HTTP/dell.server.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R840: {#IFNAME} Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. Condition of difference between last and previous value - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and (find(/DELL PowerEdge R840 by HTTP/dell.server.net.if.status[{#IFNAME}],,"like")="Down" and last(/DELL PowerEdge R840 by HTTP/dell.server.net.if.status[{#IFNAME}],#1)<>last(/DELL PowerEdge R840 by HTTP/dell.server.net.if.status[{#IFNAME}],#2))`<p>Recovery expression:</p>`find(/DELL PowerEdge R840 by HTTP/dell.server.net.if.status[{#IFNAME}],,"like")<>"Down" or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
+|Dell R840: {#IFNAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.net.if.health[{#IFNAME}],,"like","Critical")=1` |HIGH | |
+|Dell R840: {#IFNAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.net.if.health[{#IFNAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#IFNAME} is in a critical state</p> |
+|Dell R840: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.hw.physicaldisk.status[{#DISK_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R840: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.hw.physicaldisk.status[{#DISK_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} is in a critical state</p> |
+|Dell R840: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R840 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}],#1)<>last(/DELL PowerEdge R840 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}],#2) and length(last(/DELL PowerEdge R840 by HTTP/dell.server.hw.physicaldisk.serialnumber[{#DISK_NAME}]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R840: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.sensor.psu.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R840: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.sensor.psu.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R840: Server is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.status,,"like","Critical")=1` |HIGH | |
+|Dell R840: Server is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.status,,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: Server is in a critical state</p> |
+|Dell R840: Redfish API service is unavailable |<p>The service is unavailable or does not accept TCP connections.</p> |`last(/DELL PowerEdge R840 by HTTP/net.tcp.service[https])=0` |HIGH | |
+|Dell R840: {#SENSOR_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.sensor.temp.status[{#SENSOR_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R840: {#SENSOR_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.sensor.temp.status[{#SENSOR_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#SENSOR_NAME} is in a critical state</p> |
+|Dell R840: {#DISK_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.hw.virtualdisk.status[{#DISK_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R840: {#DISK_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.hw.virtualdisk.status[{#DISK_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} is in a critical state</p> |
+|Dell R840: {#CNTLR_NAME} in slot {#SLOT} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}],,"like","Critical")=1` |HIGH | |
+|Dell R840: {#CNTLR_NAME} in slot {#SLOT} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.hw.diskarray.status[{#CNTLR_NAME}{#SLOT}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#CNTLR_NAME} in slot {#SLOT} is in a critical state</p> |
+|Dell R840: {#BATTERY_NAME} is in a critical state |<p>Please check the device for faults.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}],,"like","Critical")=1` |HIGH | |
+|Dell R840: {#BATTERY_NAME} is in warning state |<p>Please check the device for warnings.</p> |`find(/DELL PowerEdge R840 by HTTP/dell.server.hw.diskarray.cache.battery.status[{#BATTERY_NAME}],,"like","Warning")=1` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#BATTERY_NAME} is in a critical state</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell/dell_r840_http/template_server_dell_r840_http.yaml b/templates/server/dell/dell_r840_http/template_server_dell_r840_http.yaml
index 3760be510ff..c986c981d83 100644
--- a/templates/server/dell/dell_r840_http/template_server_dell_r840_http.yaml
+++ b/templates/server/dell/dell_r840_http/template_server_dell_r840_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T08:48:21Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:29Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -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/426752-discussion-thread-for-official-zabbix-dell-templates
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -267,7 +267,6 @@ zabbix_export:
                   result.firmware = getField(response.body, 'FirmwareVersion', '');
                   
                   return JSON.stringify(result);
-                  
           url: '{$API.URL}/redfish/v1/Systems/System.Embedded.1'
           tags:
             -
@@ -455,7 +454,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -618,7 +616,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -798,7 +795,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -962,7 +958,7 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
-                    3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)
+                    3. Condition of difference between last and previous value - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
@@ -1069,7 +1065,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1357,7 +1352,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1531,7 +1525,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -1726,7 +1719,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
@@ -2031,7 +2023,6 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
-                  
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
diff --git a/templates/server/dell/dell_r840_snmp/README.md b/templates/server/dell/dell_r840_snmp/README.md
index 0c5bbc47a1e..48b6c8d9047 100644
--- a/templates/server/dell/dell_r840_snmp/README.md
+++ b/templates/server/dell/dell_r840_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring DELL PowerEdge R840 servers with iDRAC version 7 and later via Zabbix SNMP agent that works without any external scripts.
 
 ## Setup
@@ -64,7 +64,7 @@ There are no template links in this template.
 |----|-----------|----|----|
 |Temperature discovery |<p>Scanning table of Temperature Probe Table IDRAC-MIB-SMIv2::temperatureProbeTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |PSU discovery |<p>IDRAC-MIB-SMIv2::powerSupplyTable</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|FAN discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#TYPE} MATCHES_REGEX `3`</p> |
+|FAN discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#TYPE} MATCHES_REGEX `3`</p> |
 |Array controller discovery |<p>Scanning table of Array controllers: IDRAC-MIB-SMIv2::controllerTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array controller cache discovery |<p>Scanning table of Array controllers: IDRAC-MIB-SMIv2::batteryTable</p> |SNMP |array.cache.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical disk discovery |<p>Scanning  table of physical drive entries IDRAC-MIB-SMIv2::physicalDiskTable.</p> |SNMP |physicaldisk.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -112,34 +112,34 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Dell R840: {#CNTLR_NAME} is in unrecoverable state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.FAIL}` |DISASTER | |
-|Dell R840: {#CNTLR_NAME} is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.CRIT}` |HIGH |<p>**Depends on**:</p><p>- Dell R840: {#CNTLR_NAME} is in unrecoverable state</p> |
-|Dell R840: {#CNTLR_NAME} is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R840: {#CNTLR_NAME} is in critical state</p><p>- Dell R840: {#CNTLR_NAME} is in unrecoverable state</p> |
-|Dell R840: {#BATTERY_NAME} is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}` |AVERAGE | |
-|Dell R840: {#BATTERY_NAME} is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#BATTERY_NAME} is in critical state</p> |
-|Dell R840: {#BATTERY_NAME} is not in optimal state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#BATTERY_NAME} is in critical state</p><p>- Dell R840: {#BATTERY_NAME} is in warning state</p> |
-|Dell R840: {#FAN_DESCR} is in critical state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"criticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"nonRecoverableUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"criticalLower"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"nonRecoverableLower"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT:"failed"}` |AVERAGE | |
-|Dell R840: {#FAN_DESCR} is in warning state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN:"nonCriticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#FAN_DESCR} is in critical state</p> |
-|Dell R840: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.name[sysName].diff()}=1 and {TEMPLATE_NAME:dell.server.name[sysName].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R840: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.serialnumber[systemServiceTag].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.serialnumber[systemServiceTag].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R840: Operating system description has changed |<p>Operating system description has changed. Possibly, the system has been updated or replaced. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.sw.os[systemOSName].diff()}=1 and {TEMPLATE_NAME:dell.server.sw.os[systemOSName].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R840: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`{TEMPLATE_NAME:dell.server.hw.firmware[racFirmwareVersion].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.firmware[racFirmwareVersion].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R840: {#DISK_NAME} failed |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL:"critical"} or {TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL:"nonRecoverable"}` |HIGH | |
-|Dell R840: {#DISK_NAME} is in warning state |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} failed</p> |
-|Dell R840: {#DISK_NAME} S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or {TEMPLATE_NAME:dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} failed</p> |
-|Dell R840: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Dell R840: Power supply {#PSU_DESCR} is in critical state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT:"critical"} or {TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT:"nonRecoverable"}` |AVERAGE | |
-|Dell R840: Power supply {#PSU_DESCR} is in warning state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].last()}={$PSU.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: Power supply {#PSU_DESCR} is in critical state</p> |
-|Dell R840: System is in unrecoverable state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.DISASTER}` |DISASTER | |
-|Dell R840: System status is in critical state |<p>Please check the device for errors.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.CRIT}` |HIGH | |
-|Dell R840: System status is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:dell.server.status[globalSystemStatus].last()}={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: System status is in critical state</p> |
-|Dell R840: {HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:dell.server.uptime[sysUpTime].last()}<10m` |WARNING |<p>Manual close: YES</p> |
-|Dell R840: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|Dell R840: Probe {#SENSOR_LOCALE} is in critical status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"criticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"criticalLower"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableLower"}` |AVERAGE | |
-|Dell R840: Probe {#SENSOR_LOCALE} is in warning status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.WARN:"nonCriticalUpper"} or {TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}={$SENSOR.TEMP.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: Probe {#SENSOR_LOCALE} is in critical status</p> |
-|Dell R840: Probe {#SENSOR_LOCALE} is not in optimal status |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}].last()}<>{$SENSOR.TEMP.STATUS.OK}` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Dell R840: Probe {#SENSOR_LOCALE} is in critical status</p><p>- Dell R840: Probe {#SENSOR_LOCALE} is in warning status</p> |
-|Dell R840: {#DISK_NAME} failed |<p>Please check the virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].last()}={$VDISK.STATUS.CRIT:"failed"}` |HIGH | |
-|Dell R840: {#DISK_NAME} is in warning state |<p>Please check the virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].last()}={$VDISK.STATUS.WARN:"degraded"}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} failed</p> |
+|Dell R840: {#CNTLR_NAME} is in unrecoverable state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.FAIL}` |DISASTER | |
+|Dell R840: {#CNTLR_NAME} is in critical state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT}` |HIGH |<p>**Depends on**:</p><p>- Dell R840: {#CNTLR_NAME} is in unrecoverable state</p> |
+|Dell R840: {#CNTLR_NAME} is in warning state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R840: {#CNTLR_NAME} is in critical state</p><p>- Dell R840: {#CNTLR_NAME} is in unrecoverable state</p> |
+|Dell R840: {#BATTERY_NAME} is in critical state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}` |AVERAGE | |
+|Dell R840: {#BATTERY_NAME} is in warning state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#BATTERY_NAME} is in critical state</p> |
+|Dell R840: {#BATTERY_NAME} is not in optimal state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#BATTERY_NAME} is in critical state</p><p>- Dell R840: {#BATTERY_NAME} is in warning state</p> |
+|Dell R840: {#FAN_DESCR} is in critical state |<p>Please check the fan unit.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"criticalUpper"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"nonRecoverableUpper"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"criticalLower"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"nonRecoverableLower"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"failed"}` |AVERAGE | |
+|Dell R840: {#FAN_DESCR} is in warning state |<p>Please check the fan unit.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.WARN:"nonCriticalUpper"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}])={$FAN.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#FAN_DESCR} is in critical state</p> |
+|Dell R840: System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.name[sysName],#1)<>last(/DELL PowerEdge R840 SNMP/dell.server.name[sysName],#2) and length(last(/DELL PowerEdge R840 SNMP/dell.server.name[sysName]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R840: Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.serialnumber[systemServiceTag],#1)<>last(/DELL PowerEdge R840 SNMP/dell.server.hw.serialnumber[systemServiceTag],#2) and length(last(/DELL PowerEdge R840 SNMP/dell.server.hw.serialnumber[systemServiceTag]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R840: Operating system description has changed |<p>Operating system description has changed. Possibly, the system has been updated or replaced. Ack to close.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.sw.os[systemOSName],#1)<>last(/DELL PowerEdge R840 SNMP/dell.server.sw.os[systemOSName],#2) and length(last(/DELL PowerEdge R840 SNMP/dell.server.sw.os[systemOSName]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R840: Firmware has changed |<p>Firmware version has changed. Ack to close.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.firmware[racFirmwareVersion],#1)<>last(/DELL PowerEdge R840 SNMP/dell.server.hw.firmware[racFirmwareVersion],#2) and length(last(/DELL PowerEdge R840 SNMP/dell.server.hw.firmware[racFirmwareVersion]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R840: {#DISK_NAME} failed |<p>Please check physical disk for warnings or errors.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"critical"} or last(/DELL PowerEdge R840 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"nonRecoverable"}` |HIGH | |
+|Dell R840: {#DISK_NAME} is in warning state |<p>Please check physical disk for warnings or errors.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}])={$DISK.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} failed</p> |
+|Dell R840: {#DISK_NAME} S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or last(/DELL PowerEdge R840 SNMP/dell.server.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} failed</p> |
+|Dell R840: {#DISK_NAME} has been replaced (new serial number received) |<p>{#DISK_NAME} serial number has changed. Ack to close</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#1)<>last(/DELL PowerEdge R840 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#2) and length(last(/DELL PowerEdge R840 SNMP/dell.server.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Dell R840: Power supply {#PSU_DESCR} is in critical state |<p>Please check the power supply unit for errors.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"critical"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"nonRecoverable"}` |AVERAGE | |
+|Dell R840: Power supply {#PSU_DESCR} is in warning state |<p>Please check the power supply unit for errors.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}])={$PSU.STATUS.WARN:"nonCritical"}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: Power supply {#PSU_DESCR} is in critical state</p> |
+|Dell R840: System is in unrecoverable state |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.DISASTER}` |DISASTER | |
+|Dell R840: System status is in critical state |<p>Please check the device for errors.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.CRIT}` |HIGH | |
+|Dell R840: System status is in warning state |<p>Please check the device for warnings.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.status[globalSystemStatus])={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: System status is in critical state</p> |
+|Dell R840: {HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.uptime[sysUpTime])<10m` |WARNING |<p>Manual close: YES</p> |
+|Dell R840: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/DELL PowerEdge R840 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|Dell R840: Probe {#SENSOR_LOCALE} is in critical status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"criticalUpper"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableUpper"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"criticalLower"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.CRIT:"nonRecoverableLower"}` |AVERAGE | |
+|Dell R840: Probe {#SENSOR_LOCALE} is in warning status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.WARN:"nonCriticalUpper"} or last(/DELL PowerEdge R840 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])={$SENSOR.TEMP.STATUS.WARN:"nonCriticalLower"}` |WARNING |<p>**Depends on**:</p><p>- Dell R840: Probe {#SENSOR_LOCALE} is in critical status</p> |
+|Dell R840: Probe {#SENSOR_LOCALE} is not in optimal status |<p>Please check the device for faults.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.sensor.temp.status[temperatureProbeStatus.{#SNMPINDEX}])<>{$SENSOR.TEMP.STATUS.OK}` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Dell R840: Probe {#SENSOR_LOCALE} is in critical status</p><p>- Dell R840: Probe {#SENSOR_LOCALE} is in warning status</p> |
+|Dell R840: {#DISK_NAME} failed |<p>Please check the virtual disk for warnings or errors.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}])={$VDISK.STATUS.CRIT:"failed"}` |HIGH | |
+|Dell R840: {#DISK_NAME} is in warning state |<p>Please check the virtual disk for warnings or errors.</p> |`last(/DELL PowerEdge R840 SNMP/dell.server.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}])={$VDISK.STATUS.WARN:"degraded"}` |AVERAGE |<p>**Depends on**:</p><p>- Dell R840: {#DISK_NAME} failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell/dell_r840_snmp/template_server_dell_r840_snmp.yaml b/templates/server/dell/dell_r840_snmp/template_server_dell_r840_snmp.yaml
index 606f17453f3..693290882bf 100644
--- a/templates/server/dell/dell_r840_snmp/template_server_dell_r840_snmp.yaml
+++ b/templates/server/dell/dell_r840_snmp/template_server_dell_r840_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-06-18T08:50:22Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:33Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/426752-discussion-thread-for-official-zabbix-dell-templates
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
diff --git a/templates/server/dell_idrac_snmp/README.md b/templates/server/dell_idrac_snmp/README.md
index f2acf567f67..197418e0302 100644
--- a/templates/server/dell_idrac_snmp/README.md
+++ b/templates/server/dell_idrac_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 for Dell servers with iDRAC controllers
 http://www.dell.com/support/manuals/us/en/19/dell-openmanage-server-administrator-v8.3/snmp_idrac8/idrac-mib?guid=guid-e686536d-bc8e-4e09-8e8b-de8eb052efee
 Supported systems: http://www.dell.com/support/manuals/us/en/04/dell-openmanage-server-administrator-v8.3/snmp_idrac8/supported-systems?guid=guid-f72b75ba-e686-4e8a-b8c5-ca11c7c21381
@@ -24,128 +24,128 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                                       | Description | Default |
-|--------------------------------------------|-------------|---------|
-| {$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS}    | <p>-</p>    | `3`     |
-| {$DISK_ARRAY_CACHE_BATTERY_OK_STATUS}      | <p>-</p>    | `2`     |
-| {$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS}    | <p>-</p>    | `4`     |
-| {$DISK_ARRAY_CRIT_STATUS:"critical"}       | <p>-</p>    | `5`     |
-| {$DISK_ARRAY_FAIL_STATUS:"nonRecoverable"} | <p>-</p>    | `6`     |
-| {$DISK_ARRAY_WARN_STATUS:"nonCritical"}    | <p>-</p>    | `4`     |
-| {$DISK_FAIL_STATUS:"critical"}             | <p>-</p>    | `5`     |
-| {$DISK_FAIL_STATUS:"nonRecoverable"}       | <p>-</p>    | `6`     |
-| {$DISK_SMART_FAIL_STATUS}                  | <p>-</p>    | `1`     |
-| {$DISK_WARN_STATUS:"nonCritical"}          | <p>-</p>    | `4`     |
-| {$FAN_CRIT_STATUS:"criticalLower"}         | <p>-</p>    | `8`     |
-| {$FAN_CRIT_STATUS:"criticalUpper"}         | <p>-</p>    | `5`     |
-| {$FAN_CRIT_STATUS:"failed"}                | <p>-</p>    | `10`    |
-| {$FAN_CRIT_STATUS:"nonRecoverableLower"}   | <p>-</p>    | `9`     |
-| {$FAN_CRIT_STATUS:"nonRecoverableUpper"}   | <p>-</p>    | `6`     |
-| {$FAN_WARN_STATUS:"nonCriticalLower"}      | <p>-</p>    | `7`     |
-| {$FAN_WARN_STATUS:"nonCriticalUpper"}      | <p>-</p>    | `4`     |
-| {$HEALTH_CRIT_STATUS}                      | <p>-</p>    | `5`     |
-| {$HEALTH_DISASTER_STATUS}                  | <p>-</p>    | `6`     |
-| {$HEALTH_WARN_STATUS}                      | <p>-</p>    | `4`     |
-| {$PSU_CRIT_STATUS:"critical"}              | <p>-</p>    | `5`     |
-| {$PSU_CRIT_STATUS:"nonRecoverable"}        | <p>-</p>    | `6`     |
-| {$PSU_WARN_STATUS:"nonCritical"}           | <p>-</p>    | `4`     |
-| {$TEMP_CRIT:"Ambient"}                     | <p>-</p>    | `35`    |
-| {$TEMP_CRIT:"CPU"}                         | <p>-</p>    | `75`    |
-| {$TEMP_CRIT_LOW}                           | <p>-</p>    | `5`     |
-| {$TEMP_CRIT_STATUS}                        | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}                               | <p>-</p>    | `60`    |
-| {$TEMP_DISASTER_STATUS}                    | <p>-</p>    | `6`     |
-| {$TEMP_WARN:"Ambient"}                     | <p>-</p>    | `30`    |
-| {$TEMP_WARN:"CPU"}                         | <p>-</p>    | `70`    |
-| {$TEMP_WARN_STATUS}                        | <p>-</p>    | `4`     |
-| {$TEMP_WARN}                               | <p>-</p>    | `50`    |
-| {$VDISK_CRIT_STATUS:"failed"}              | <p>-</p>    | `3`     |
-| {$VDISK_WARN_STATUS:"degraded"}            | <p>-</p>    | `4`     |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS} |<p>-</p> |`3` |
+|{$DISK_ARRAY_CACHE_BATTERY_OK_STATUS} |<p>-</p> |`2` |
+|{$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS} |<p>-</p> |`4` |
+|{$DISK_ARRAY_CRIT_STATUS:"critical"} |<p>-</p> |`5` |
+|{$DISK_ARRAY_FAIL_STATUS:"nonRecoverable"} |<p>-</p> |`6` |
+|{$DISK_ARRAY_WARN_STATUS:"nonCritical"} |<p>-</p> |`4` |
+|{$DISK_FAIL_STATUS:"critical"} |<p>-</p> |`5` |
+|{$DISK_FAIL_STATUS:"nonRecoverable"} |<p>-</p> |`6` |
+|{$DISK_SMART_FAIL_STATUS} |<p>-</p> |`1` |
+|{$DISK_WARN_STATUS:"nonCritical"} |<p>-</p> |`4` |
+|{$FAN_CRIT_STATUS:"criticalLower"} |<p>-</p> |`8` |
+|{$FAN_CRIT_STATUS:"criticalUpper"} |<p>-</p> |`5` |
+|{$FAN_CRIT_STATUS:"failed"} |<p>-</p> |`10` |
+|{$FAN_CRIT_STATUS:"nonRecoverableLower"} |<p>-</p> |`9` |
+|{$FAN_CRIT_STATUS:"nonRecoverableUpper"} |<p>-</p> |`6` |
+|{$FAN_WARN_STATUS:"nonCriticalLower"} |<p>-</p> |`7` |
+|{$FAN_WARN_STATUS:"nonCriticalUpper"} |<p>-</p> |`4` |
+|{$HEALTH_CRIT_STATUS} |<p>-</p> |`5` |
+|{$HEALTH_DISASTER_STATUS} |<p>-</p> |`6` |
+|{$HEALTH_WARN_STATUS} |<p>-</p> |`4` |
+|{$PSU_CRIT_STATUS:"critical"} |<p>-</p> |`5` |
+|{$PSU_CRIT_STATUS:"nonRecoverable"} |<p>-</p> |`6` |
+|{$PSU_WARN_STATUS:"nonCritical"} |<p>-</p> |`4` |
+|{$TEMP_CRIT:"Ambient"} |<p>-</p> |`35` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT_STATUS} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_DISASTER_STATUS} |<p>-</p> |`6` |
+|{$TEMP_WARN:"Ambient"} |<p>-</p> |`30` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN_STATUS} |<p>-</p> |`4` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VDISK_CRIT_STATUS:"failed"} |<p>-</p> |`3` |
+|{$VDISK_WARN_STATUS:"degraded"} |<p>-</p> |`4` |
 
 ## Template links
 
-| Name         |
-|--------------|
-| Generic SNMP |
+|Name|
+|----|
+|Generic SNMP |
 
 ## Discovery rules
 
-| Name                             | Description                                                                             | Type | Key and additional info                                                                                    |
-|----------------------------------|-----------------------------------------------------------------------------------------|------|------------------------------------------------------------------------------------------------------------|
-| Temperature CPU Discovery        | <p>Scanning table of Temperature Probe Table IDRAC-MIB-SMIv2::temperatureProbeTable</p> | SNMP | temp.cpu.discovery<p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `.*CPU.*`</p>            |
-| Temperature Ambient Discovery    | <p>Scanning table of Temperature Probe Table IDRAC-MIB-SMIv2::temperatureProbeTable</p> | SNMP | temp.ambient.discovery<p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `.*Inlet Temp.*`</p> |
-| PSU Discovery                    | <p>IDRAC-MIB-SMIv2::powerSupplyTable</p>                                                | SNMP | psu.discovery                                                                                              |
-| FAN Discovery                    | <p>IDRAC-MIB-SMIv2::coolingDeviceTable</p>                                              | SNMP | fan.discovery<p>**Filter**:</p>AND_OR <p>- A: {#TYPE} MATCHES_REGEX `3`</p>                                |
-| Physical Disk Discovery          | <p>IDRAC-MIB-SMIv2::physicalDiskTable</p>                                               | SNMP | physicaldisk.discovery                                                                                     |
-| Virtual Disk Discovery           | <p>IDRAC-MIB-SMIv2::virtualDiskTable</p>                                                | SNMP | virtualdisk.discovery                                                                                      |
-| Array Controller Discovery       | <p>IDRAC-MIB-SMIv2::controllerTable</p>                                                 | SNMP | physicaldisk.arr.discovery                                                                                 |
-| Array Controller Cache Discovery | <p>IDRAC-MIB-SMIv2::batteryTable</p>                                                    | SNMP | array.cache.discovery                                                                                      |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature CPU Discovery |<p>Scanning table of Temperature Probe Table IDRAC-MIB-SMIv2::temperatureProbeTable</p> |SNMP |temp.cpu.discovery<p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `.*CPU.*`</p> |
+|Temperature Ambient Discovery |<p>Scanning table of Temperature Probe Table IDRAC-MIB-SMIv2::temperatureProbeTable</p> |SNMP |temp.ambient.discovery<p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `.*Inlet Temp.*`</p> |
+|PSU Discovery |<p>IDRAC-MIB-SMIv2::powerSupplyTable</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>IDRAC-MIB-SMIv2::coolingDeviceTable</p> |SNMP |fan.discovery<p>**Filter**:</p>AND_OR <p>- {#TYPE} MATCHES_REGEX `3`</p> |
+|Physical Disk Discovery |<p>IDRAC-MIB-SMIv2::physicalDiskTable</p> |SNMP |physicaldisk.discovery |
+|Virtual Disk Discovery |<p>IDRAC-MIB-SMIv2::virtualDiskTable</p> |SNMP |virtualdisk.discovery |
+|Array Controller Discovery |<p>IDRAC-MIB-SMIv2::controllerTable</p> |SNMP |physicaldisk.arr.discovery |
+|Array Controller Cache Discovery |<p>IDRAC-MIB-SMIv2::batteryTable</p> |SNMP |array.cache.discovery |
 
 ## Items collected
 
-| Group          | Name                                                               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Type | Key and additional info                                                                                                   |
-|----------------|--------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------------------------------------------------------------------------------------------------------------------------|
-| Disk_arrays    | {#CNTLR_NAME}: Disk array controller status                        | <p>MIB: IDRAC-MIB-SMIv2</p><p>The status of the controller itself without the propagation of any contained component status.</p><p>Possible values:</p><p>1: Other</p><p>2: Unknown</p><p>3: OK</p><p>4: Non-critical</p><p>5: Critical</p><p>6: Non-recoverable</p><p>                </p>                                                                                                                                                                                                                                                               | SNMP | system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}]                                                        |
-| Disk_arrays    | {#CNTLR_NAME}: Disk array controller model                         | <p>MIB: IDRAC-MIB-SMIv2</p><p>The controller's name as represented in Storage Management.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                             | SNMP | system.hw.diskarray.model[controllerName.{#SNMPINDEX}]                                                                    |
-| Disk_arrays    | Battery {#BATTERY_NUM}: Disk array cache controller battery status | <p>MIB: IDRAC-MIB-SMIv2</p><p>Current state of battery.</p><p>Possible values:</p><p>1: The current state could not be determined.</p><p>2: The battery is operating normally.</p><p>3: The battery has failed and needs to be replaced.</p><p>4: The battery temperature is high or charge level is depleting.</p><p>5: The battery is missing or not detected.</p><p>6: The battery is undergoing the re-charge phase.</p><p>7: The battery voltage or charge level is below the threshold.</p><p>                </p>                                  | SNMP | system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}]                                                       |
-| Fans           | {#FAN_DESCR}: Fan status                                           | <p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0012.0001.0005 This attribute defines the probe status of the cooling device.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                      | SNMP | sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}]                                                                       |
-| Fans           | {#FAN_DESCR}: Fan speed                                            | <p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0012.0001.0006 This attribute defines the reading for a cooling device</p><p>of subtype other than coolingDeviceSubTypeIsDiscrete.  When the value</p><p>for coolingDeviceSubType is other than coolingDeviceSubTypeIsDiscrete, the</p><p>value returned for this attribute is the speed in RPM or the OFF/ON value</p><p>of the cooling device.  When the value for coolingDeviceSubType is</p><p>coolingDeviceSubTypeIsDiscrete, a value is not returned for this attribute.</p>                                     | SNMP | sensor.fan.speed[coolingDeviceReading.{#SNMPINDEX}]                                                                       |
-| Inventory      | Hardware model name                                                | <p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the model name of the system.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | SNMP | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                        |
-| Inventory      | Operating system                                                   | <p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the name of the operating system that the hostis running.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP | system.sw.os[systemOSName]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                             |
-| Inventory      | Hardware serial number                                             | <p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the service tag of the system.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | SNMP | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                 |
-| Inventory      | Firmware version                                                   | <p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the firmware version of a remote access card.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                    | SNMP | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                     |
-| Physical_disks | {#DISK_NAME}: Physical disk status                                 | <p>MIB: IDRAC-MIB-SMIv2</p><p>The status of the physical disk itself without the propagation of any contained component status.</p><p>Possible values:</p><p>1: Other</p><p>2: Unknown</p><p>3: OK</p><p>4: Non-critical</p><p>5: Critical</p><p>6: Non-recoverable</p>                                                                                                                                                                                                                                                                                   | SNMP | system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}]                                                   |
-| Physical_disks | {#DISK_NAME}: Physical disk serial number                          | <p>MIB: IDRAC-MIB-SMIv2</p><p>The physical disk's unique identification number from the manufacturer.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                 | SNMP | system.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}]                                                    |
-| Physical_disks | {#DISK_NAME}: Physical disk S.M.A.R.T. status                      | <p>MIB: IDRAC-MIB-SMIv2</p><p>Indicates whether the physical disk has received a predictive failure alert.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP | system.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}]                                        |
-| Physical_disks | {#DISK_NAME}: Physical disk model name                             | <p>MIB: IDRAC-MIB-SMIv2</p><p>The model number of the physical disk.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | SNMP | system.hw.physicaldisk.model[physicalDiskProductID.{#SNMPINDEX}]                                                          |
-| Physical_disks | {#DISK_NAME}: Physical disk part number                            | <p>MIB: IDRAC-MIB-SMIv2</p><p>The part number of the disk.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | SNMP | system.hw.physicaldisk.part_number[physicalDiskPartNumber.{#SNMPINDEX}]                                                   |
-| Physical_disks | {#DISK_NAME}: Physical disk media type                             | <p>MIB: IDRAC-MIB-SMIv2</p><p>The media type of the physical disk. Possible Values:</p><p>1: The media type could not be determined.</p><p>2: Hard Disk Drive (HDD).</p><p>3: Solid State Drive (SSD).</p>                                                                                                                                                                                                                                                                                                                                                | SNMP | system.hw.physicaldisk.media_type[physicalDiskMediaType.{#SNMPINDEX}]                                                     |
-| Physical_disks | {#DISK_NAME}: Disk size                                            | <p>MIB: IDRAC-MIB-SMIv2</p><p>The size of the physical disk in megabytes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | SNMP | system.hw.physicaldisk.size[physicalDiskCapacityInMB.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p> |
-| Power_supply   | {#PSU_DESCR}: Power supply status                                  | <p>MIB: IDRAC-MIB-SMIv2</p><p>0600.0012.0001.0005 This attribute defines the status of the power supply.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                              | SNMP | sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}]                                                                         |
-| Status         | Overall system health status                                       | <p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the overall rollup status of all components in the system being monitored by the remote access card. Includes system, storage, IO devices, iDRAC, CPU, memory, etc.</p>                                                                                                                                                                                                                                                                                                                              | SNMP | system.status[globalSystemStatus.0]                                                                                       |
-| Temperature    | {#SENSOR_LOCALE}: Temperature                                      | <p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0020.0001.0006 This attribute defines the reading for a temperature probe of type other than temperatureProbeTypeIsDiscrete.  When the value for temperatureProbeType is other than temperatureProbeTypeIsDiscrete,the value returned for this attribute is the temperature that the probeis reading in tenths of degrees Centigrade. When the value for temperatureProbeType is temperatureProbeTypeIsDiscrete, a value is not returned for this attribute.</p>                                                       | SNMP | sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>            |
-| Temperature    | {#SENSOR_LOCALE}: Temperature status                               | <p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0020.0001.0005 This attribute defines the probe status of the temperature probe.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                   | SNMP | sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}]                                                               |
-| Temperature    | {#SENSOR_LOCALE}: Temperature                                      | <p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0020.0001.0006 This attribute defines the reading for a temperature probe of type other than temperatureProbeTypeIsDiscrete.  When the value for temperatureProbeType is other than temperatureProbeTypeIsDiscrete,the value returned for this attribute is the temperature that the probeis reading in tenths of degrees Centigrade. When the value for temperatureProbeType is temperatureProbeTypeIsDiscrete, a value is not returned for this attribute.</p>                                                       | SNMP | sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>        |
-| Temperature    | {#SENSOR_LOCALE}: Temperature status                               | <p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0020.0001.0005 This attribute defines the probe status of the temperature probe.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                   | SNMP | sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}]                                                           |
-| Virtual_disks  | Disk {#SNMPVALUE}({#DISK_NAME}): Layout type                       | <p>MIB: IDRAC-MIB-SMIv2</p><p>The virtual disk's RAID type.</p><p>Possible values:</p><p>1: Not one of the following</p><p>2: RAID-0</p><p>3: RAID-1</p><p>4: RAID-5</p><p>5: RAID-6</p><p>6: RAID-10</p><p>7: RAID-50</p><p>8: RAID-60</p><p>9: Concatenated RAID 1</p><p>10: Concatenated RAID 5</p>                                                                                                                                                                                                                                                    | SNMP | system.hw.virtualdisk.layout[virtualDiskLayout.{#SNMPINDEX}]                                                              |
-| Virtual_disks  | Disk {#SNMPVALUE}({#DISK_NAME}): Current state                     | <p>MIB: IDRAC-MIB-SMIv2</p><p>The state of the virtual disk when there are progressive operations ongoing.</p><p>Possible values:</p><p>1: There is no active operation running.</p><p>2: The virtual disk configuration has changed. The physical disks included in the virtual disk are being modified to support the new configuration.</p><p>3: A Consistency Check (CC) is being performed on the virtual disk.</p><p>4: The virtual disk is being initialized.</p><p>5: BackGround Initialization (BGI) is being performed on the virtual disk.</p> | SNMP | system.hw.virtualdisk.state[virtualDiskOperationalState.{#SNMPINDEX}]                                                     |
-| Virtual_disks  | Disk {#SNMPVALUE}({#DISK_NAME}): Read policy                       | <p>MIB: IDRAC-MIB-SMIv2</p><p>The read policy used by the controller for read operations on this virtual disk.</p><p>Possible values:</p><p>1: No Read Ahead.</p><p>2: Read Ahead.</p><p>3: Adaptive Read Ahead.</p>                                                                                                                                                                                                                                                                                                                                      | SNMP | system.hw.virtualdisk.readpolicy[virtualDiskReadPolicy.{#SNMPINDEX}]                                                      |
-| Virtual_disks  | Disk {#SNMPVALUE}({#DISK_NAME}): Write policy                      | <p>MIB: IDRAC-MIB-SMIv2</p><p>The write policy used by the controller for write operations on this virtual disk.</p><p>Possible values:</p><p>1: Write Through.</p><p>2: Write Back.</p><p>3: Force Write Back.</p>                                                                                                                                                                                                                                                                                                                                       | SNMP | system.hw.virtualdisk.writepolicy[virtualDiskWritePolicy.{#SNMPINDEX}]                                                    |
-| Virtual_disks  | Disk {#SNMPVALUE}({#DISK_NAME}): Disk size                         | <p>MIB: IDRAC-MIB-SMIv2</p><p>The size of the virtual disk in megabytes.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | SNMP | system.hw.virtualdisk.size[virtualDiskSizeInMB.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p>       |
-| Virtual_disks  | Disk {#SNMPVALUE}({#DISK_NAME}): Status                            | <p>MIB: IDRAC-MIB-SMIv2</p><p>The current state of this virtual disk (which includes any member physical disks.)</p><p>Possible states:</p><p>1: The current state could not be determined.</p><p>2: The virtual disk is operating normally or optimally.</p><p>3: The virtual disk has encountered a failure. The data on disk is lost or is about to be lost.</p><p>4: The virtual disk encountered a failure with one or all of the constituent redundant physical disks.</p><p>The data on the virtual disk might no longer be fault tolerant.</p>    | SNMP | system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}]                                                               |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Disk_arrays |{#CNTLR_NAME}: Disk array controller status |<p>MIB: IDRAC-MIB-SMIv2</p><p>The status of the controller itself without the propagation of any contained component status.</p><p>Possible values:</p><p>1: Other</p><p>2: Unknown</p><p>3: OK</p><p>4: Non-critical</p><p>5: Critical</p><p>6: Non-recoverable</p><p>                </p> |SNMP |system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}] |
+|Disk_arrays |{#CNTLR_NAME}: Disk array controller model |<p>MIB: IDRAC-MIB-SMIv2</p><p>The controller's name as represented in Storage Management.</p> |SNMP |system.hw.diskarray.model[controllerName.{#SNMPINDEX}] |
+|Disk_arrays |Battery {#BATTERY_NUM}: Disk array cache controller battery status |<p>MIB: IDRAC-MIB-SMIv2</p><p>Current state of battery.</p><p>Possible values:</p><p>1: The current state could not be determined.</p><p>2: The battery is operating normally.</p><p>3: The battery has failed and needs to be replaced.</p><p>4: The battery temperature is high or charge level is depleting.</p><p>5: The battery is missing or not detected.</p><p>6: The battery is undergoing the re-charge phase.</p><p>7: The battery voltage or charge level is below the threshold.</p><p>                </p> |SNMP |system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}] |
+|Fans |{#FAN_DESCR}: Fan status |<p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0012.0001.0005 This attribute defines the probe status of the cooling device.</p> |SNMP |sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}] |
+|Fans |{#FAN_DESCR}: Fan speed |<p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0012.0001.0006 This attribute defines the reading for a cooling device</p><p>of subtype other than coolingDeviceSubTypeIsDiscrete.  When the value</p><p>for coolingDeviceSubType is other than coolingDeviceSubTypeIsDiscrete, the</p><p>value returned for this attribute is the speed in RPM or the OFF/ON value</p><p>of the cooling device.  When the value for coolingDeviceSubType is</p><p>coolingDeviceSubTypeIsDiscrete, a value is not returned for this attribute.</p> |SNMP |sensor.fan.speed[coolingDeviceReading.{#SNMPINDEX}] |
+|Inventory |Hardware model name |<p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the model name of the system.</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Operating system |<p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the name of the operating system that the hostis running.</p> |SNMP |system.sw.os[systemOSName]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the service tag of the system.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the firmware version of a remote access card.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Physical_disks |{#DISK_NAME}: Physical disk status |<p>MIB: IDRAC-MIB-SMIv2</p><p>The status of the physical disk itself without the propagation of any contained component status.</p><p>Possible values:</p><p>1: Other</p><p>2: Unknown</p><p>3: OK</p><p>4: Non-critical</p><p>5: Critical</p><p>6: Non-recoverable</p> |SNMP |system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_NAME}: Physical disk serial number |<p>MIB: IDRAC-MIB-SMIv2</p><p>The physical disk's unique identification number from the manufacturer.</p> |SNMP |system.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_NAME}: Physical disk S.M.A.R.T. status |<p>MIB: IDRAC-MIB-SMIv2</p><p>Indicates whether the physical disk has received a predictive failure alert.</p> |SNMP |system.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_NAME}: Physical disk model name |<p>MIB: IDRAC-MIB-SMIv2</p><p>The model number of the physical disk.</p> |SNMP |system.hw.physicaldisk.model[physicalDiskProductID.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_NAME}: Physical disk part number |<p>MIB: IDRAC-MIB-SMIv2</p><p>The part number of the disk.</p> |SNMP |system.hw.physicaldisk.part_number[physicalDiskPartNumber.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_NAME}: Physical disk media type |<p>MIB: IDRAC-MIB-SMIv2</p><p>The media type of the physical disk. Possible Values:</p><p>1: The media type could not be determined.</p><p>2: Hard Disk Drive (HDD).</p><p>3: Solid State Drive (SSD).</p> |SNMP |system.hw.physicaldisk.media_type[physicalDiskMediaType.{#SNMPINDEX}] |
+|Physical_disks |{#DISK_NAME}: Disk size |<p>MIB: IDRAC-MIB-SMIv2</p><p>The size of the physical disk in megabytes.</p> |SNMP |system.hw.physicaldisk.size[physicalDiskCapacityInMB.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p> |
+|Power_supply |{#PSU_DESCR}: Power supply status |<p>MIB: IDRAC-MIB-SMIv2</p><p>0600.0012.0001.0005 This attribute defines the status of the power supply.</p> |SNMP |sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}] |
+|Status |Overall system health status |<p>MIB: IDRAC-MIB-SMIv2</p><p>This attribute defines the overall rollup status of all components in the system being monitored by the remote access card. Includes system, storage, IO devices, iDRAC, CPU, memory, etc.</p> |SNMP |system.status[globalSystemStatus.0] |
+|Temperature |{#SENSOR_LOCALE}: Temperature |<p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0020.0001.0006 This attribute defines the reading for a temperature probe of type other than temperatureProbeTypeIsDiscrete.  When the value for temperatureProbeType is other than temperatureProbeTypeIsDiscrete,the value returned for this attribute is the temperature that the probeis reading in tenths of degrees Centigrade. When the value for temperatureProbeType is temperatureProbeTypeIsDiscrete, a value is not returned for this attribute.</p> |SNMP |sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |{#SENSOR_LOCALE}: Temperature status |<p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0020.0001.0005 This attribute defines the probe status of the temperature probe.</p> |SNMP |sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_LOCALE}: Temperature |<p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0020.0001.0006 This attribute defines the reading for a temperature probe of type other than temperatureProbeTypeIsDiscrete.  When the value for temperatureProbeType is other than temperatureProbeTypeIsDiscrete,the value returned for this attribute is the temperature that the probeis reading in tenths of degrees Centigrade. When the value for temperatureProbeType is temperatureProbeTypeIsDiscrete, a value is not returned for this attribute.</p> |SNMP |sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |{#SENSOR_LOCALE}: Temperature status |<p>MIB: IDRAC-MIB-SMIv2</p><p>0700.0020.0001.0005 This attribute defines the probe status of the temperature probe.</p> |SNMP |sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}] |
+|Virtual_disks |Disk {#SNMPVALUE}({#DISK_NAME}): Layout type  |<p>MIB: IDRAC-MIB-SMIv2</p><p>The virtual disk's RAID type.</p><p>Possible values:</p><p>1: Not one of the following</p><p>2: RAID-0</p><p>3: RAID-1</p><p>4: RAID-5</p><p>5: RAID-6</p><p>6: RAID-10</p><p>7: RAID-50</p><p>8: RAID-60</p><p>9: Concatenated RAID 1</p><p>10: Concatenated RAID 5</p> |SNMP |system.hw.virtualdisk.layout[virtualDiskLayout.{#SNMPINDEX}] |
+|Virtual_disks |Disk {#SNMPVALUE}({#DISK_NAME}): Current state |<p>MIB: IDRAC-MIB-SMIv2</p><p>The state of the virtual disk when there are progressive operations ongoing.</p><p>Possible values:</p><p>1: There is no active operation running.</p><p>2: The virtual disk configuration has changed. The physical disks included in the virtual disk are being modified to support the new configuration.</p><p>3: A Consistency Check (CC) is being performed on the virtual disk.</p><p>4: The virtual disk is being initialized.</p><p>5: BackGround Initialization (BGI) is being performed on the virtual disk.</p> |SNMP |system.hw.virtualdisk.state[virtualDiskOperationalState.{#SNMPINDEX}] |
+|Virtual_disks |Disk {#SNMPVALUE}({#DISK_NAME}): Read policy |<p>MIB: IDRAC-MIB-SMIv2</p><p>The read policy used by the controller for read operations on this virtual disk.</p><p>Possible values:</p><p>1: No Read Ahead.</p><p>2: Read Ahead.</p><p>3: Adaptive Read Ahead.</p> |SNMP |system.hw.virtualdisk.readpolicy[virtualDiskReadPolicy.{#SNMPINDEX}] |
+|Virtual_disks |Disk {#SNMPVALUE}({#DISK_NAME}): Write policy |<p>MIB: IDRAC-MIB-SMIv2</p><p>The write policy used by the controller for write operations on this virtual disk.</p><p>Possible values:</p><p>1: Write Through.</p><p>2: Write Back.</p><p>3: Force Write Back.</p> |SNMP |system.hw.virtualdisk.writepolicy[virtualDiskWritePolicy.{#SNMPINDEX}] |
+|Virtual_disks |Disk {#SNMPVALUE}({#DISK_NAME}): Disk size |<p>MIB: IDRAC-MIB-SMIv2</p><p>The size of the virtual disk in megabytes.</p> |SNMP |system.hw.virtualdisk.size[virtualDiskSizeInMB.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p> |
+|Virtual_disks |Disk {#SNMPVALUE}({#DISK_NAME}): Status |<p>MIB: IDRAC-MIB-SMIv2</p><p>The current state of this virtual disk (which includes any member physical disks.)</p><p>Possible states:</p><p>1: The current state could not be determined.</p><p>2: The virtual disk is operating normally or optimally.</p><p>3: The virtual disk has encountered a failure. The data on disk is lost or is about to be lost.</p><p>4: The virtual disk encountered a failure with one or all of the constituent redundant physical disks.</p><p>The data on the virtual disk might no longer be fault tolerant.</p> |SNMP |system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                                | Description                                                                                                               | Expression                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Severity | Dependencies and additional info                                                                                                                                                                         |
-|-------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| {#CNTLR_NAME}: Disk array controller is in unrecoverable state!                     | <p>Please check the device for faults</p>                                                                                 | `{TEMPLATE_NAME:system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_FAIL_STATUS:"nonRecoverable"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | DISASTER |                                                                                                                                                                                                          |
-| {#CNTLR_NAME}: Disk array controller is in critical state                           | <p>Please check the device for faults</p>                                                                                 | `{TEMPLATE_NAME:system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CRIT_STATUS:"critical"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | HIGH     | <p>**Depends on**:</p><p>- {#CNTLR_NAME}: Disk array controller is in unrecoverable state!</p>                                                                                                           |
-| {#CNTLR_NAME}: Disk array controller is in warning state                            | <p>Please check the device for faults</p>                                                                                 | `{TEMPLATE_NAME:system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_WARN_STATUS:"nonCritical"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | AVERAGE  | <p>**Depends on**:</p><p>- {#CNTLR_NAME}: Disk array controller is in critical state</p><p>- {#CNTLR_NAME}: Disk array controller is in unrecoverable state!</p>                                         |
-| Battery {#BATTERY_NUM}: Disk array cache controller battery is in warning state     | <p>Please check the device for faults</p>                                                                                 | `{TEMPLATE_NAME:system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | WARNING  | <p>**Depends on**:</p><p>- Battery {#BATTERY_NUM}: Disk array cache controller battery is in critical state!</p>                                                                                         |
-| Battery {#BATTERY_NUM}: Disk array cache controller battery is not in optimal state | <p>Please check the device for faults</p>                                                                                 | `{TEMPLATE_NAME:system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_BATTERY_OK_STATUS},ne)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>**Depends on**:</p><p>- Battery {#BATTERY_NUM}: Disk array cache controller battery is in critical state!</p><p>- Battery {#BATTERY_NUM}: Disk array cache controller battery is in warning state</p> |
-| Battery {#BATTERY_NUM}: Disk array cache controller battery is in critical state!   | <p>Please check the device for faults</p>                                                                                 | `{TEMPLATE_NAME:system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  |                                                                                                                                                                                                          |
-| {#FAN_DESCR}: Fan is in critical state                                              | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"criticalUpper"},eq)}=1 or {TEMPLATE_NAME:sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"nonRecoverableUpper"},eq)}=1 or {TEMPLATE_NAME:sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"criticalLower"},eq)}=1 or {TEMPLATE_NAME:sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"nonRecoverableLower"},eq)}=1 or {TEMPLATE_NAME:sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS:"failed"},eq)}=1` | AVERAGE  |                                                                                                                                                                                                          |
-| {#FAN_DESCR}: Fan is in warning state                                               | <p>Please check the fan unit</p>                                                                                          | `{TEMPLATE_NAME:sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].count(#1,{$FAN_WARN_STATUS:"nonCriticalUpper"},eq)}=1 or {TEMPLATE_NAME:sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}].count(#1,{$FAN_WARN_STATUS:"nonCriticalLower"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                           | WARNING  | <p>**Depends on**:</p><p>- {#FAN_DESCR}: Fan is in critical state</p>                                                                                                                                    |
-| 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[systemOSName].diff()}=1 and {TEMPLATE_NAME:system.sw.os[systemOSName].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>                                                                                                                                                                                 |
-| {#DISK_NAME}: Physical disk failed                                                  | <p>Please check physical disk for warnings or errors</p>                                                                  | `{TEMPLATE_NAME:system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].count(#1,{$DISK_FAIL_STATUS:"critical"},eq)}=1 or {TEMPLATE_NAME:system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].count(#1,{$DISK_FAIL_STATUS:"nonRecoverable"},eq)}=1`                                                                                                                                                                                                                                                                                                                                           | HIGH     |                                                                                                                                                                                                          |
-| {#DISK_NAME}: Physical disk is in warning state                                     | <p>Please check physical disk for warnings or errors</p>                                                                  | `{TEMPLATE_NAME:system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}].count(#1,{$DISK_WARN_STATUS:"nonCritical"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>**Depends on**:</p><p>- {#DISK_NAME}: Physical disk failed</p>                                                                                                                                        |
-| {#DISK_NAME}: Disk has been replaced (new serial number received)                   | <p>Disk serial number has changed. Ack to close</p>                                                                       | `{TEMPLATE_NAME:system.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}].strlen()}>0`                                                                                                                                                                                                                                                                                                                                                                                                                          | INFO     | <p>Manual close: YES</p>                                                                                                                                                                                 |
-| {#DISK_NAME}: Physical disk S.M.A.R.T. failed                                       | <p>Disk probably requires replacement.</p>                                                                                | `{TEMPLATE_NAME:system.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}].count(#1,{$DISK_SMART_FAIL_STATUS},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | HIGH     | <p>**Depends on**:</p><p>- {#DISK_NAME}: Physical disk failed</p>                                                                                                                                        |
-| {#PSU_DESCR}: Power supply is in critical state                                     | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS:"critical"},eq)}=1 or {TEMPLATE_NAME:sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS:"nonRecoverable"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                         | AVERAGE  |                                                                                                                                                                                                          |
-| {#PSU_DESCR}: Power supply is in warning state                                      | <p>Please check the power supply unit for errors</p>                                                                      | `{TEMPLATE_NAME:sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}].count(#1,{$PSU_WARN_STATUS:"nonCritical"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | WARNING  | <p>**Depends on**:</p><p>- {#PSU_DESCR}: Power supply is in critical state</p>                                                                                                                           |
-| System is in unrecoverable state!                                                   | <p>Please check the device for faults</p>                                                                                 | `{TEMPLATE_NAME:system.status[globalSystemStatus.0].count(#1,{$HEALTH_DISASTER_STATUS},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | HIGH     |                                                                                                                                                                                                          |
-| System status is in critical state                                                  | <p>Please check the device for errors</p>                                                                                 | `{TEMPLATE_NAME:system.status[globalSystemStatus.0].count(#1,{$HEALTH_CRIT_STATUS},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | HIGH     | <p>**Depends on**:</p><p>- System is in unrecoverable state!</p>                                                                                                                                         |
-| System status is in warning state                                                   | <p>Please check the device for warnings</p>                                                                               | `{TEMPLATE_NAME:system.status[globalSystemStatus.0].count(#1,{$HEALTH_WARN_STATUS},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | WARNING  | <p>**Depends on**:</p><p>- System is in unrecoverable state!</p><p>- System status is in critical state</p>                                                                                              |
-| {#SENSOR_LOCALE}: 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[temperatureProbeReading.CPU.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"CPU"} or {Dell iDRAC SNMP:sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"CPU"}-3`                                                                                                                                                                                                                                                                        | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_LOCALE}: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p>                                                                                            |
-| {#SENSOR_LOCALE}: 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[temperatureProbeReading.CPU.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"CPU"} or {Dell iDRAC SNMP:sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS} or {Dell iDRAC SNMP:sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}].last()}={$TEMP_DISASTER_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"CPU"}-3`                                                                                                                                                        | HIGH     |                                                                                                                                                                                                          |
-| {#SENSOR_LOCALE}: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}                   | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"CPU"}+3`                                                                                                                                                                                                                                                                                                                                                                            | AVERAGE  |                                                                                                                                                                                                          |
-| {#SENSOR_LOCALE}: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"}   | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"Ambient"} or {Dell iDRAC SNMP:sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"Ambient"}-3`                                                                                                                                                                                                                                                    | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_LOCALE}: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p>                                                                                        |
-| {#SENSOR_LOCALE}: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                      | `{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"Ambient"} or {Dell iDRAC SNMP:sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS} or {Dell iDRAC SNMP:sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}].last()}={$TEMP_DISASTER_STATUS}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"Ambient"}-3`                                                                                                                                | HIGH     |                                                                                                                                                                                                          |
-| {#SENSOR_LOCALE}: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}               | <p>-</p>                                                                                                                  | `{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"Ambient"}+3`                                                                                                                                                                                                                                                                                                                                                            | AVERAGE  |                                                                                                                                                                                                          |
-| Disk {#SNMPVALUE}({#DISK_NAME}): Virtual disk failed                                | <p>Please check virtual disk for warnings or errors</p>                                                                   | `{TEMPLATE_NAME:system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].count(#1,{$VDISK_CRIT_STATUS:"failed"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | HIGH     |                                                                                                                                                                                                          |
-| Disk {#SNMPVALUE}({#DISK_NAME}): Virtual disk is in warning state                   | <p>Please check virtual disk for warnings or errors</p>                                                                   | `{TEMPLATE_NAME:system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}].count(#1,{$VDISK_WARN_STATUS:"degraded"},eq)}=1`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | AVERAGE  | <p>**Depends on**:</p><p>- Disk {#SNMPVALUE}({#DISK_NAME}): Virtual disk failed</p>                                                                                                                      |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#CNTLR_NAME}: Disk array controller is in unrecoverable state! |<p>Please check the device for faults</p> |`count(/Dell iDRAC SNMP/system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_FAIL_STATUS:\"nonRecoverable\"}")=1` |DISASTER | |
+|{#CNTLR_NAME}: Disk array controller is in critical state |<p>Please check the device for faults</p> |`count(/Dell iDRAC SNMP/system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CRIT_STATUS:\"critical\"}")=1` |HIGH |<p>**Depends on**:</p><p>- {#CNTLR_NAME}: Disk array controller is in unrecoverable state!</p> |
+|{#CNTLR_NAME}: Disk array controller is in warning state |<p>Please check the device for faults</p> |`count(/Dell iDRAC SNMP/system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_WARN_STATUS:\"nonCritical\"}")=1` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_NAME}: Disk array controller is in critical state</p><p>- {#CNTLR_NAME}: Disk array controller is in unrecoverable state!</p> |
+|Battery {#BATTERY_NUM}: Disk array cache controller battery is in warning state |<p>Please check the device for faults</p> |`count(/Dell iDRAC SNMP/system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- Battery {#BATTERY_NUM}: Disk array cache controller battery is in critical state!</p> |
+|Battery {#BATTERY_NUM}: Disk array cache controller battery is not in optimal state |<p>Please check the device for faults</p> |`count(/Dell iDRAC SNMP/system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}],#1,"ne","{$DISK_ARRAY_CACHE_BATTERY_OK_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- Battery {#BATTERY_NUM}: Disk array cache controller battery is in critical state!</p><p>- Battery {#BATTERY_NUM}: Disk array cache controller battery is in warning state</p> |
+|Battery {#BATTERY_NUM}: Disk array cache controller battery is in critical state! |<p>Please check the device for faults</p> |`count(/Dell iDRAC SNMP/system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS}")=1` |AVERAGE | |
+|{#FAN_DESCR}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"criticalUpper\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"nonRecoverableUpper\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"criticalLower\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"nonRecoverableLower\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"failed\"}")=1` |AVERAGE | |
+|{#FAN_DESCR}: Fan is in warning state |<p>Please check the fan unit</p> |`count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"nonCriticalUpper\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"nonCriticalLower\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#FAN_DESCR}: Fan is in critical state</p> |
+|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(/Dell iDRAC SNMP/system.sw.os[systemOSName],#1)<>last(/Dell iDRAC SNMP/system.sw.os[systemOSName],#2) and length(last(/Dell iDRAC SNMP/system.sw.os[systemOSName]))>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(/Dell iDRAC SNMP/system.hw.serialnumber,#1)<>last(/Dell iDRAC SNMP/system.hw.serialnumber,#2) and length(last(/Dell iDRAC SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/Dell iDRAC SNMP/system.hw.firmware,#1)<>last(/Dell iDRAC SNMP/system.hw.firmware,#2) and length(last(/Dell iDRAC SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|{#DISK_NAME}: Physical disk failed |<p>Please check physical disk for warnings or errors</p> |`count(/Dell iDRAC SNMP/system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"critical\"}")=1 or count(/Dell iDRAC SNMP/system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"nonRecoverable\"}")=1` |HIGH | |
+|{#DISK_NAME}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors</p> |`count(/Dell iDRAC SNMP/system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_WARN_STATUS:\"nonCritical\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#DISK_NAME}: Physical disk failed</p> |
+|{#DISK_NAME}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`last(/Dell iDRAC SNMP/system.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#1)<>last(/Dell iDRAC SNMP/system.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}],#2) and length(last(/Dell iDRAC SNMP/system.hw.physicaldisk.serialnumber[physicalDiskSerialNo.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|{#DISK_NAME}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`count(/Dell iDRAC SNMP/system.hw.physicaldisk.smart_status[physicalDiskSmartAlertIndication.{#SNMPINDEX}],#1,"eq","{$DISK_SMART_FAIL_STATUS}")=1` |HIGH |<p>**Depends on**:</p><p>- {#DISK_NAME}: Physical disk failed</p> |
+|{#PSU_DESCR}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Dell iDRAC SNMP/sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"critical\"}")=1 or count(/Dell iDRAC SNMP/sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"nonRecoverable\"}")=1` |AVERAGE | |
+|{#PSU_DESCR}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`count(/Dell iDRAC SNMP/sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"nonCritical\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#PSU_DESCR}: Power supply is in critical state</p> |
+|System is in unrecoverable state! |<p>Please check the device for faults</p> |`count(/Dell iDRAC SNMP/system.status[globalSystemStatus.0],#1,"eq","{$HEALTH_DISASTER_STATUS}")=1` |HIGH | |
+|System status is in critical state |<p>Please check the device for errors</p> |`count(/Dell iDRAC SNMP/system.status[globalSystemStatus.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1` |HIGH |<p>**Depends on**:</p><p>- System is in unrecoverable state!</p> |
+|System status is in warning state |<p>Please check the device for warnings</p> |`count(/Dell iDRAC SNMP/system.status[globalSystemStatus.0],#1,"eq","{$HEALTH_WARN_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- System is in unrecoverable state!</p><p>- System status is in critical state</p> |
+|{#SENSOR_LOCALE}: 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(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"} or last(/Dell iDRAC SNMP/sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}])={$TEMP_WARN_STATUS} `<p>Recovery expression:</p>`max(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCALE}: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|{#SENSOR_LOCALE}: 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(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"} or last(/Dell iDRAC SNMP/sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}])={$TEMP_CRIT_STATUS} or last(/Dell iDRAC SNMP/sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}])={$TEMP_DISASTER_STATUS} `<p>Recovery expression:</p>`max(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|{#SENSOR_LOCALE}: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|{#SENSOR_LOCALE}: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"} or last(/Dell iDRAC SNMP/sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}])={$TEMP_WARN_STATUS} `<p>Recovery expression:</p>`max(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_LOCALE}: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p> |
+|{#SENSOR_LOCALE}: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"} or last(/Dell iDRAC SNMP/sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}])={$TEMP_CRIT_STATUS} or last(/Dell iDRAC SNMP/sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}])={$TEMP_DISASTER_STATUS} `<p>Recovery expression:</p>`max(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3` |HIGH | |
+|{#SENSOR_LOCALE}: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"} |<p>-</p> |`avg(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`min(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Ambient"}+3` |AVERAGE | |
+|Disk {#SNMPVALUE}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors</p> |`count(/Dell iDRAC SNMP/system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}],#1,"eq","{$VDISK_CRIT_STATUS:\"failed\"}")=1` |HIGH | |
+|Disk {#SNMPVALUE}({#DISK_NAME}): Virtual disk is in warning state |<p>Please check virtual disk for warnings or errors</p> |`count(/Dell iDRAC SNMP/system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}],#1,"eq","{$VDISK_WARN_STATUS:\"degraded\"}")=1` |AVERAGE |<p>**Depends on**:</p><p>- Disk {#SNMPVALUE}({#DISK_NAME}): Virtual disk failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml b/templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml
index b2e7f391d22..bc56393acd1 100644
--- a/templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml
+++ b/templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:37Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:01Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         IDRAC-MIB-SMIv2
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/server/hp/hp_bl460_snmp/README.md b/templates/server/hp/hp_bl460_snmp/README.md
index bfaa6c42509..916d5a2c8f7 100644
--- a/templates/server/hp/hp_bl460_snmp/README.md
+++ b/templates/server/hp/hp_bl460_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring HPE ProLiant BL460 servers with HP iLO version 4 and later via Zabbix SNMP agent that works without any external scripts.
 
 ## Setup
@@ -54,13 +54,13 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
-|Temperature ambient discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |temp.ambient.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- B: {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
-|Temperature CPU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |temp.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
-|Temperature memory discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |temp.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
-|Temperature PSU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |temp.psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
-|Temperature I/O discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |temp.io.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
-|Temperature system discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |temp.system.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
+|Temperature discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
+|Temperature ambient discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |temp.ambient.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
+|Temperature CPU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |temp.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
+|Temperature memory discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |temp.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
+|Temperature PSU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |temp.psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
+|Temperature I/O discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |temp.io.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
+|Temperature system discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |temp.system.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
 |PSU discovery |<p>CPQHLTH-MIB::cpqHeFltTolPowerSupplyStatus</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |FAN discovery |<p>CPQHLTH-MIB::cpqHeFltTolFanCondition</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array controller discovery |<p>Scanning table of Array controllers: CPQIDA-MIB::cpqDaCntlrTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -78,7 +78,7 @@ There are no template links in this template.
 |Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller status |<p>MIB: CPQIDA-MIB</p><p>Cache Module/Operations Status. This describes the status of the cache module and/or cache operations.</p><p>Note that for some controller models, a cache module board that physically attaches to the controller or chipset may not be an available option.</p><p>The status can be:</p><p>Other (1)</p><p> Indicates that the instrument agent does not recognize the status of the cache module. You may need to upgrade the instrument agent.</p><p>Invalid (2)</p><p> Indicates that a cache module board has not been installed in this system or is present but not configured.</p><p>Enabled (3)</p><p> Indicates that cache operations are currently configured and enabled for at least one logical drive.</p><p>Temporarily Disabled (4)</p><p> Indicates that cache operations have been temporarily disabled. View the cache module board error code object to determine why the write cache operations have been temporarily disabled.</p><p>Permanently Disabled (5)</p><p> Indicates that cache operations have been permanently disabled. View the cache module board error code object to determine why the write cache operations have been disabled.</p><p>Cache Module Flash Memory Not Attached (6)</p><p> Indicates that the flash memory component of the flash backed cache module is not attached. This status will be set when the flash memory is not attached and the Supercap is attached. This value is only used on flash backed cache modules that support removable flash memory.</p><p>Cache Module Degraded Failsafe Speed (7)</p><p> Indicates that the cache module board is currently degraded and operating at a failsafe speed. View variables cpqDaCacheMemoryDataWidth and cpqDaCacheMemoryTransferRate to obtain the cache module board`s current memory data width and memory transfer rate.</p><p>Cache Module Critical Failure (8)</p><p> Indicates that the cache module board has encountered a critical failure. The controller is currently operating in Zero Memory Raid mode.</p><p>Read Cache Could Not Be Mapped (9)</p><p> Indicates that the read cache memory in a split cache configuration could not be mapped by the operating system and as a result is not available. This status may be caused by virtual space limitations in certain operating systems and is only applicable to B-Series controllers.</p> |SNMP |hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery status |<p>MIB: CPQIDA-MIB</p><p>Cache Module Board Backup Power Status. This monitors the status of each backup power source on the board.</p><p>The backup power source can only recharge when the system has power applied. The type of backup power source used is indicated by cpqDaAccelBackupPowerSource.</p><p>The following values are valid:</p><p>Other (1)  Indicates that the instrument agent does not recognize  backup power status.  You may need to update your software.</p><p>Ok (2)  The backup power source is fully charged.</p><p>Recharging (3)  The array controller has one or more cache module backup power  sources that are recharging.</p><p>Cache module operations such as Battery/Flash Backed Write Cache, Expansion, Extension and Migration are temporarily suspended until the backup power source is fully charged.</p><p>Cache module operations will automatically resume  when charging is complete.</p><p>Failed (4)  The battery pack is below the sufficient voltage level and  has not recharged in 36 hours.</p><p>Your Cache Module board  needs to be serviced.</p><p>Degraded (5)  The battery is still operating, however, one of the batteries  in the pack has failed to recharge properly.</p><p>Your Cache  Module board should be serviced as soon as possible.</p><p>NotPresent (6)  A backup power source is not present on the cache module board. Some controllers do not have backup power sources.</p><p>Capacitor Failed (7)  The flash backed cache module capacitor is below the sufficient voltage level and has not recharged in 10 minutes.  Your Cache Module board needs to be serviced.</p><p>                </p> |SNMP |hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Fans |Fan {#SNMPINDEX}: Fan status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the fan.</p><p>This value will be one of the following:</p><p>other(1)  Fan status detection is not supported by this system or driver.</p><p>ok(2)  The fan is operating properly.</p><p>degraded(2)  A redundant fan is not operating properly.</p><p>failed(4)  A non-redundant fan is not operating properly.</p> |SNMP |hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
+|General |SNMP traps (fallback) |<p>The item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |hp.server.location[sysLocation]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |hp.server.contact[sysContact]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |hp.server.objectid[sysObjectID]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -91,7 +91,7 @@ There are no template links in this template.
 |Physical_disks |{#DISK_LOCATION}: Physical disk S.M.A.R.T. status |<p>MIB: CPQIDA-MIB</p><p>Physical Drive S.M.A.R.T Status. The following values are defined:</p><p>other(1)  The agent is unable to determine if the status of S.M.A.R.T  predictive failure monitoring for this drive.</p><p>ok(2)  Indicates the drive is functioning properly.</p><p>replaceDrive(3)  Indicates that the drive has a S.M.A.R.T predictive failure  error and should be replaced.</p> |SNMP |hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk serial number |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Serial Number.</p><p>This is the serial number assigned to the physical drive.</p><p>This value is based upon the serial number as returned by the SCSI inquiry command</p><p>but may have been modified due to space limitations.  This can be used for identification purposes.</p> |SNMP |hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk model name |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Model. This is a text description of the physical drive.</p><p>The text that appears depends upon who manufactured the drive and the drive type.</p><p>If a drive fails, note the model to identify the type of drive necessary for replacement.</p><p>If a model number is not present, you may not have properly initialized the drive array to which the physical drive is attached for monitoring.</p> |SNMP |hp.server.hw.physicaldisk.model[cpqDaPhyDrvModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type. The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive’s media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |hp.server.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type. The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive's media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |hp.server.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Disk size |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Size in MB.</p><p>This is the size of the physical drive in megabytes.</p><p>This value is calculated using the value 1,048,576 (2^20) as a megabyte.</p><p>Drive manufacturers sometimes use the number 1,000,000 as a megabyte when giving drive capacities so this value may differ</p><p>from the advertised size of a drive. This field is only applicable for controllers which support SCSI drives,</p><p>and therefore is not supported by the IDA or IDA-2 controllers. The field will contain 0xFFFFFFFF if the drive capacity cannot be calculated</p><p>or if the controller does not support SCSI drives.</p> |SNMP |hp.server.hw.physicaldisk.size[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Power_supply |Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the power supply. This value will be one of the following:</p><p>other(1)  The status could not be determined or not present.</p><p>ok(2)  The power supply is operating normally.</p><p>degraded(3)  A temperature sensor, fan or other power supply component is  outside of normal operating range.</p><p>failed(4)  A power supply component detects a condition that could  permanently damage the system.</p> |SNMP |hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Status |Overall system health status |<p>MIB: CPQHLTH-MIB</p><p>The overall condition. This object represents the overall status of the server information represented by this MIB.</p> |SNMP |hp.server.status[cpqHeMibCondition]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -121,52 +121,52 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.CRIT}` |HIGH | |
-|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.CRIT:"cacheModCriticalFailure"}` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModDegradedFailsafeSpeed"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheReadCacheNotMapped"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModFlashMemNotAttached"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.STATUS.OK:"enabled"} and {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.STATUS.WARN:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"failed"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"capacitorFailed"}` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN:"degraded"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state</p> |
-|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT}` |AVERAGE | |
-|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
-|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`{TEMPLATE_NAME:hp.server.name[sysName].diff()}=1 and {TEMPLATE_NAME:hp.server.name[sysName].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:hp.server.hw.serialnumber[cpqSiSysSerialNum].diff()}=1 and {TEMPLATE_NAME:hp.server.hw.serialnumber[cpqSiSysSerialNum].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed |<p>Please check the physical adapter.</p> |`{TEMPLATE_NAME:hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}].last()}=3` |HIGH | |
-|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has lost link |<p>Please check the cable connections to this adapter.</p> |`{TEMPLATE_NAME:hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}].last()}=4` |AVERAGE |<p>**Depends on**:</p><p>- {#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed</p> |
-|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL}` |HIGH | |
-|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or {TEMPLATE_NAME:hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT}` |AVERAGE | |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].last()}={$PSU.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
-|System status is in critical state |<p>Please check the device for errors.</p> |`{TEMPLATE_NAME:hp.server.status[cpqHeMibCondition].last()}={$HEALTH.STATUS.CRIT}` |HIGH | |
-|System status is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:hp.server.status[cpqHeMibCondition].last()}={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
-|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:hp.server.uptime[sysUpTime].last()}<10m` |WARNING |<p>Manual close: YES</p> |
-|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 3` |WARNING | |
-|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 4` |HIGH | |
-|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].last()}={$VDISK.STATUS.CRIT}` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].last()}<>{$VDISK.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
+|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT}` |HIGH | |
+|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.CRIT:"cacheModCriticalFailure"}` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModDegradedFailsafeSpeed"} or last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheReadCacheNotMapped"} or last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModFlashMemNotAttached"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.STATUS.OK:"enabled"} and last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.STATUS.WARN:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"failed"} or last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"capacitorFailed"}` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN:"degraded"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state</p> |
+|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}])={$FAN.STATUS.CRIT}` |AVERAGE | |
+|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}])={$FAN.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.name[sysName],#1)<>last(/HPE ProLiant BL460 SNMP/hp.server.name[sysName],#2) and length(last(/HPE ProLiant BL460 SNMP/hp.server.name[sysName]))>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(/HPE ProLiant BL460 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum],#1)<>last(/HPE ProLiant BL460 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum],#2) and length(last(/HPE ProLiant BL460 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed |<p>Please check the physical adapter.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}])=3` |HIGH | |
+|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has lost link |<p>Please check the cable connections to this adapter.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}])=4` |AVERAGE |<p>**Depends on**:</p><p>- {#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed</p> |
+|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL}` |HIGH | |
+|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}])={$DISK.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or last(/HPE ProLiant BL460 SNMP/hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#1)<>last(/HPE ProLiant BL460 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#2) and length(last(/HPE ProLiant BL460 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}])={$PSU.STATUS.CRIT}` |AVERAGE | |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}])={$PSU.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
+|System status is in critical state |<p>Please check the device for errors.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.status[cpqHeMibCondition])={$HEALTH.STATUS.CRIT}` |HIGH | |
+|System status is in warning state |<p>Please check the device for warnings.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.status[cpqHeMibCondition])={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.uptime[sysUpTime])<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/HPE ProLiant BL460 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 3` |WARNING | |
+|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 4` |HIGH | |
+|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 3` |WARNING | |
+|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 4` |HIGH | |
+|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 3` |WARNING | |
+|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 4` |HIGH | |
+|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 3` |WARNING | |
+|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 4` |HIGH | |
+|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 3` |WARNING | |
+|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 4` |HIGH | |
+|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 1` |INFO |<p>Manual close: YES</p> |
+|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 3` |WARNING | |
+|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 4` |HIGH | |
+|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 3` |WARNING | |
+|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 4` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}])={$VDISK.STATUS.CRIT}` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors.</p> |`last(/HPE ProLiant BL460 SNMP/hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}])<>{$VDISK.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/hp/hp_bl460_snmp/template_server_hp_bl460_snmp.yaml b/templates/server/hp/hp_bl460_snmp/template_server_hp_bl460_snmp.yaml
index d146d9c1535..67404b68462 100644
--- a/templates/server/hp/hp_bl460_snmp/template_server_hp_bl460_snmp.yaml
+++ b/templates/server/hp/hp_bl460_snmp/template_server_hp_bl460_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-28T06:39:38Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:37Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -20,7 +20,7 @@ zabbix_export:
         CPQSINFO-MIB
         CPQIDA-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -305,7 +305,7 @@ zabbix_export:
           history: 2w
           trends: '0'
           value_type: LOG
-          description: 'Item is used to collect all SNMP traps unmatched by other snmptrap items'
+          description: 'The item is used to collect all SNMP traps unmatched by other snmptrap items'
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
@@ -715,7 +715,7 @@ zabbix_export:
               description: |
                 MIB: CPQIDA-MIB
                 Drive Array Physical Drive Media Type. The following values are defined:
-                other(1)  The instrument agent is unable to determine the physical drive’s media type.
+                other(1)  The instrument agent is unable to determine the physical drive's media type.
                 rotatingPlatters(2)  The physical drive media is composed of rotating platters.
                 solidState(3)  The physical drive media is composed of solid state electronics.
               valuemap:
diff --git a/templates/server/hp/hp_bl920_snmp/README.md b/templates/server/hp/hp_bl920_snmp/README.md
index 7998e072bdd..07ad3123e60 100644
--- a/templates/server/hp/hp_bl920_snmp/README.md
+++ b/templates/server/hp/hp_bl920_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring HPE ProLiant BL920 servers with HP iLO version 4 and later via Zabbix SNMP agent that works without any external scripts.
 
 ## Setup
@@ -54,13 +54,13 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
-|Temperature ambient discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |temp.ambient.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- B: {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
-|Temperature CPU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |temp.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
-|Temperature memory discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |temp.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
-|Temperature PSU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |temp.psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
-|Temperature I/O discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |temp.io.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
-|Temperature system discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |temp.system.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
+|Temperature discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
+|Temperature ambient discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |temp.ambient.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
+|Temperature CPU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |temp.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
+|Temperature memory discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |temp.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
+|Temperature PSU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |temp.psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
+|Temperature I/O discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |temp.io.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
+|Temperature system discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |temp.system.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
 |PSU discovery |<p>CPQHLTH-MIB::cpqHeFltTolPowerSupplyStatus</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |FAN discovery |<p>CPQHLTH-MIB::cpqHeFltTolFanCondition</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array controller discovery |<p>Scanning table of Array controllers: CPQIDA-MIB::cpqDaCntlrTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -78,7 +78,7 @@ There are no template links in this template.
 |Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller status |<p>MIB: CPQIDA-MIB</p><p>Cache Module/Operations Status. This describes the status of the cache module and/or cache operations.</p><p>Note that for some controller models, a cache module board that physically attaches to the controller or chipset may not be an available option.</p><p>The status can be:</p><p>Other (1)</p><p> Indicates that the instrument agent does not recognize the status of the cache module. You may need to upgrade the instrument agent.</p><p>Invalid (2)</p><p> Indicates that a cache module board has not been installed in this system or is present but not configured.</p><p>Enabled (3)</p><p> Indicates that cache operations are currently configured and enabled for at least one logical drive.</p><p>Temporarily Disabled (4)</p><p> Indicates that cache operations have been temporarily disabled. View the cache module board error code object to determine why the write cache operations have been temporarily disabled.</p><p>Permanently Disabled (5)</p><p> Indicates that cache operations have been permanently disabled. View the cache module board error code object to determine why the write cache operations have been disabled.</p><p>Cache Module Flash Memory Not Attached (6)</p><p> Indicates that the flash memory component of the flash backed cache module is not attached. This status will be set when the flash memory is not attached and the Supercap is attached. This value is only used on flash backed cache modules that support removable flash memory.</p><p>Cache Module Degraded Failsafe Speed (7)</p><p> Indicates that the cache module board is currently degraded and operating at a failsafe speed. View variables cpqDaCacheMemoryDataWidth and cpqDaCacheMemoryTransferRate to obtain the cache module board`s current memory data width and memory transfer rate.</p><p>Cache Module Critical Failure (8)</p><p> Indicates that the cache module board has encountered a critical failure. The controller is currently operating in Zero Memory Raid mode.</p><p>Read Cache Could Not Be Mapped (9)</p><p> Indicates that the read cache memory in a split cache configuration could not be mapped by the operating system and as a result is not available. This status may be caused by virtual space limitations in certain operating systems and is only applicable to B-Series controllers.</p> |SNMP |hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery status |<p>MIB: CPQIDA-MIB</p><p>Cache Module Board Backup Power Status. This monitors the status of each backup power source on the board.</p><p>The backup power source can only recharge when the system has power applied. The type of backup power source used is indicated by cpqDaAccelBackupPowerSource.</p><p>The following values are valid:</p><p>Other (1)  Indicates that the instrument agent does not recognize  backup power status.  You may need to update your software.</p><p>Ok (2)  The backup power source is fully charged.</p><p>Recharging (3)  The array controller has one or more cache module backup power  sources that are recharging.</p><p>Cache module operations such as Battery/Flash Backed Write Cache, Expansion, Extension and Migration are temporarily suspended until the backup power source is fully charged.</p><p>Cache module operations will automatically resume  when charging is complete.</p><p>Failed (4)  The battery pack is below the sufficient voltage level and  has not recharged in 36 hours.</p><p>Your Cache Module board  needs to be serviced.</p><p>Degraded (5)  The battery is still operating, however, one of the batteries  in the pack has failed to recharge properly.</p><p>Your Cache  Module board should be serviced as soon as possible.</p><p>NotPresent (6)  A backup power source is not present on the cache module board. Some controllers do not have backup power sources.</p><p>Capacitor Failed (7)  The flash backed cache module capacitor is below the sufficient voltage level and has not recharged in 10 minutes.  Your Cache Module board needs to be serviced.</p><p>                </p> |SNMP |hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Fans |Fan {#SNMPINDEX}: Fan status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the fan.</p><p>This value will be one of the following:</p><p>other(1)  Fan status detection is not supported by this system or driver.</p><p>ok(2)  The fan is operating properly.</p><p>degraded(2)  A redundant fan is not operating properly.</p><p>failed(4)  A non-redundant fan is not operating properly.</p> |SNMP |hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
+|General |SNMP traps (fallback) |<p>The item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |hp.server.location[sysLocation]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |hp.server.contact[sysContact]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |hp.server.objectid[sysObjectID]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -91,7 +91,7 @@ There are no template links in this template.
 |Physical_disks |{#DISK_LOCATION}: Physical disk S.M.A.R.T. status |<p>MIB: CPQIDA-MIB</p><p>Physical Drive S.M.A.R.T Status. The following values are defined:</p><p>other(1)  The agent is unable to determine if the status of S.M.A.R.T  predictive failure monitoring for this drive.</p><p>ok(2)  Indicates the drive is functioning properly.</p><p>replaceDrive(3)  Indicates that the drive has a S.M.A.R.T predictive failure  error and should be replaced.</p> |SNMP |hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk serial number |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Serial Number.</p><p>This is the serial number assigned to the physical drive.</p><p>This value is based upon the serial number as returned by the SCSI inquiry command</p><p>but may have been modified due to space limitations.  This can be used for identification purposes.</p> |SNMP |hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk model name |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Model. This is a text description of the physical drive.</p><p>The text that appears depends upon who manufactured the drive and the drive type.</p><p>If a drive fails, note the model to identify the type of drive necessary for replacement.</p><p>If a model number is not present, you may not have properly initialized the drive array to which the physical drive is attached for monitoring.</p> |SNMP |hp.server.hw.physicaldisk.model[cpqDaPhyDrvModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type. The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive’s media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |hp.server.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type. The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive's media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |hp.server.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Disk size |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Size in MB.</p><p>This is the size of the physical drive in megabytes.</p><p>This value is calculated using the value 1,048,576 (2^20) as a megabyte.</p><p>Drive manufacturers sometimes use the number 1,000,000 as a megabyte when giving drive capacities so this value may differ</p><p>from the advertised size of a drive. This field is only applicable for controllers which support SCSI drives,</p><p>and therefore is not supported by the IDA or IDA-2 controllers. The field will contain 0xFFFFFFFF if the drive capacity cannot be calculated</p><p>or if the controller does not support SCSI drives.</p> |SNMP |hp.server.hw.physicaldisk.size[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Power_supply |Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the power supply. This value will be one of the following:</p><p>other(1)  The status could not be determined or not present.</p><p>ok(2)  The power supply is operating normally.</p><p>degraded(3)  A temperature sensor, fan or other power supply component is  outside of normal operating range.</p><p>failed(4)  A power supply component detects a condition that could  permanently damage the system.</p> |SNMP |hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Status |Overall system health status |<p>MIB: CPQHLTH-MIB</p><p>The overall condition. This object represents the overall status of the server information represented by this MIB.</p> |SNMP |hp.server.status[cpqHeMibCondition]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -121,52 +121,52 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.CRIT}` |HIGH | |
-|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.CRIT:"cacheModCriticalFailure"}` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModDegradedFailsafeSpeed"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheReadCacheNotMapped"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModFlashMemNotAttached"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.STATUS.OK:"enabled"} and {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.STATUS.WARN:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"failed"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"capacitorFailed"}` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN:"degraded"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state</p> |
-|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT}` |AVERAGE | |
-|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
-|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`{TEMPLATE_NAME:hp.server.name[sysName].diff()}=1 and {TEMPLATE_NAME:hp.server.name[sysName].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:hp.server.hw.serialnumber[cpqSiSysSerialNum].diff()}=1 and {TEMPLATE_NAME:hp.server.hw.serialnumber[cpqSiSysSerialNum].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed |<p>Please check the physical adapter.</p> |`{TEMPLATE_NAME:hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}].last()}=3` |HIGH | |
-|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has lost link |<p>Please check the cable connections to this adapter.</p> |`{TEMPLATE_NAME:hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}].last()}=4` |AVERAGE |<p>**Depends on**:</p><p>- {#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed</p> |
-|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL}` |HIGH | |
-|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or {TEMPLATE_NAME:hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT}` |AVERAGE | |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].last()}={$PSU.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
-|System status is in critical state |<p>Please check the device for errors.</p> |`{TEMPLATE_NAME:hp.server.status[cpqHeMibCondition].last()}={$HEALTH.STATUS.CRIT}` |HIGH | |
-|System status is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:hp.server.status[cpqHeMibCondition].last()}={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
-|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:hp.server.uptime[sysUpTime].last()}<10m` |WARNING |<p>Manual close: YES</p> |
-|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 3` |WARNING | |
-|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 4` |HIGH | |
-|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].last()}={$VDISK.STATUS.CRIT}` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].last()}<>{$VDISK.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
+|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT}` |HIGH | |
+|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.CRIT:"cacheModCriticalFailure"}` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModDegradedFailsafeSpeed"} or last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheReadCacheNotMapped"} or last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModFlashMemNotAttached"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.STATUS.OK:"enabled"} and last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.STATUS.WARN:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"failed"} or last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"capacitorFailed"}` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN:"degraded"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state</p> |
+|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}])={$FAN.STATUS.CRIT}` |AVERAGE | |
+|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}])={$FAN.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.name[sysName],#1)<>last(/HPE ProLiant BL920 SNMP/hp.server.name[sysName],#2) and length(last(/HPE ProLiant BL920 SNMP/hp.server.name[sysName]))>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(/HPE ProLiant BL920 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum],#1)<>last(/HPE ProLiant BL920 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum],#2) and length(last(/HPE ProLiant BL920 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed |<p>Please check the physical adapter.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}])=3` |HIGH | |
+|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has lost link |<p>Please check the cable connections to this adapter.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}])=4` |AVERAGE |<p>**Depends on**:</p><p>- {#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed</p> |
+|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL}` |HIGH | |
+|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}])={$DISK.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or last(/HPE ProLiant BL920 SNMP/hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#1)<>last(/HPE ProLiant BL920 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#2) and length(last(/HPE ProLiant BL920 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}])={$PSU.STATUS.CRIT}` |AVERAGE | |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}])={$PSU.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
+|System status is in critical state |<p>Please check the device for errors.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.status[cpqHeMibCondition])={$HEALTH.STATUS.CRIT}` |HIGH | |
+|System status is in warning state |<p>Please check the device for warnings.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.status[cpqHeMibCondition])={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.uptime[sysUpTime])<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/HPE ProLiant BL920 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 3` |WARNING | |
+|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 4` |HIGH | |
+|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 3` |WARNING | |
+|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 4` |HIGH | |
+|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 3` |WARNING | |
+|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 4` |HIGH | |
+|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 3` |WARNING | |
+|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 4` |HIGH | |
+|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 3` |WARNING | |
+|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 4` |HIGH | |
+|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 1` |INFO |<p>Manual close: YES</p> |
+|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 3` |WARNING | |
+|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 4` |HIGH | |
+|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 3` |WARNING | |
+|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 4` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}])={$VDISK.STATUS.CRIT}` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors.</p> |`last(/HPE ProLiant BL920 SNMP/hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}])<>{$VDISK.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/hp/hp_bl920_snmp/template_server_hp_bl920_snmp.yaml b/templates/server/hp/hp_bl920_snmp/template_server_hp_bl920_snmp.yaml
index b2905834ed8..2a23010d2fb 100644
--- a/templates/server/hp/hp_bl920_snmp/template_server_hp_bl920_snmp.yaml
+++ b/templates/server/hp/hp_bl920_snmp/template_server_hp_bl920_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-28T06:40:44Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:41Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -20,7 +20,7 @@ zabbix_export:
         CPQSINFO-MIB
         CPQIDA-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -305,7 +305,7 @@ zabbix_export:
           history: 2w
           trends: '0'
           value_type: LOG
-          description: 'Item is used to collect all SNMP traps unmatched by other snmptrap items'
+          description: 'The item is used to collect all SNMP traps unmatched by other snmptrap items'
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
@@ -715,7 +715,7 @@ zabbix_export:
               description: |
                 MIB: CPQIDA-MIB
                 Drive Array Physical Drive Media Type. The following values are defined:
-                other(1)  The instrument agent is unable to determine the physical drive’s media type.
+                other(1)  The instrument agent is unable to determine the physical drive's media type.
                 rotatingPlatters(2)  The physical drive media is composed of rotating platters.
                 solidState(3)  The physical drive media is composed of solid state electronics.
               valuemap:
diff --git a/templates/server/hp/hp_dl360_snmp/README.md b/templates/server/hp/hp_dl360_snmp/README.md
index 0d0aac679e1..00fdd4aeffa 100644
--- a/templates/server/hp/hp_dl360_snmp/README.md
+++ b/templates/server/hp/hp_dl360_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring HPE ProLiant DL360 servers with HP iLO version 4 and later via Zabbix SNMP agent that works without any external scripts.
 
 ## Setup
@@ -54,13 +54,13 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
-|Temperature ambient discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |temp.ambient.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- B: {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
-|Temperature CPU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |temp.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
-|Temperature memory discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |temp.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
-|Temperature PSU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |temp.psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
-|Temperature I/O discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |temp.io.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
-|Temperature system discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |temp.system.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
+|Temperature discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
+|Temperature ambient discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |temp.ambient.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
+|Temperature CPU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |temp.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
+|Temperature memory discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |temp.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
+|Temperature PSU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |temp.psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
+|Temperature I/O discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |temp.io.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
+|Temperature system discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |temp.system.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
 |PSU discovery |<p>CPQHLTH-MIB::cpqHeFltTolPowerSupplyStatus</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |FAN discovery |<p>CPQHLTH-MIB::cpqHeFltTolFanCondition</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array controller discovery |<p>Scanning table of Array controllers: CPQIDA-MIB::cpqDaCntlrTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -78,7 +78,7 @@ There are no template links in this template.
 |Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller status |<p>MIB: CPQIDA-MIB</p><p>Cache Module/Operations Status. This describes the status of the cache module and/or cache operations.</p><p>Note that for some controller models, a cache module board that physically attaches to the controller or chipset may not be an available option.</p><p>The status can be:</p><p>Other (1)</p><p> Indicates that the instrument agent does not recognize the status of the cache module. You may need to upgrade the instrument agent.</p><p>Invalid (2)</p><p> Indicates that a cache module board has not been installed in this system or is present but not configured.</p><p>Enabled (3)</p><p> Indicates that cache operations are currently configured and enabled for at least one logical drive.</p><p>Temporarily Disabled (4)</p><p> Indicates that cache operations have been temporarily disabled. View the cache module board error code object to determine why the write cache operations have been temporarily disabled.</p><p>Permanently Disabled (5)</p><p> Indicates that cache operations have been permanently disabled. View the cache module board error code object to determine why the write cache operations have been disabled.</p><p>Cache Module Flash Memory Not Attached (6)</p><p> Indicates that the flash memory component of the flash backed cache module is not attached. This status will be set when the flash memory is not attached and the Supercap is attached. This value is only used on flash backed cache modules that support removable flash memory.</p><p>Cache Module Degraded Failsafe Speed (7)</p><p> Indicates that the cache module board is currently degraded and operating at a failsafe speed. View variables cpqDaCacheMemoryDataWidth and cpqDaCacheMemoryTransferRate to obtain the cache module board`s current memory data width and memory transfer rate.</p><p>Cache Module Critical Failure (8)</p><p> Indicates that the cache module board has encountered a critical failure. The controller is currently operating in Zero Memory Raid mode.</p><p>Read Cache Could Not Be Mapped (9)</p><p> Indicates that the read cache memory in a split cache configuration could not be mapped by the operating system and as a result is not available. This status may be caused by virtual space limitations in certain operating systems and is only applicable to B-Series controllers.</p> |SNMP |hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery status |<p>MIB: CPQIDA-MIB</p><p>Cache Module Board Backup Power Status. This monitors the status of each backup power source on the board.</p><p>The backup power source can only recharge when the system has power applied. The type of backup power source used is indicated by cpqDaAccelBackupPowerSource.</p><p>The following values are valid:</p><p>Other (1)  Indicates that the instrument agent does not recognize  backup power status.  You may need to update your software.</p><p>Ok (2)  The backup power source is fully charged.</p><p>Recharging (3)  The array controller has one or more cache module backup power  sources that are recharging.</p><p>Cache module operations such as Battery/Flash Backed Write Cache, Expansion, Extension and Migration are temporarily suspended until the backup power source is fully charged.</p><p>Cache module operations will automatically resume  when charging is complete.</p><p>Failed (4)  The battery pack is below the sufficient voltage level and  has not recharged in 36 hours.</p><p>Your Cache Module board  needs to be serviced.</p><p>Degraded (5)  The battery is still operating, however, one of the batteries  in the pack has failed to recharge properly.</p><p>Your Cache  Module board should be serviced as soon as possible.</p><p>NotPresent (6)  A backup power source is not present on the cache module board. Some controllers do not have backup power sources.</p><p>Capacitor Failed (7)  The flash backed cache module capacitor is below the sufficient voltage level and has not recharged in 10 minutes.  Your Cache Module board needs to be serviced.</p><p>                </p> |SNMP |hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Fans |Fan {#SNMPINDEX}: Fan status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the fan.</p><p>This value will be one of the following:</p><p>other(1)  Fan status detection is not supported by this system or driver.</p><p>ok(2)  The fan is operating properly.</p><p>degraded(2)  A redundant fan is not operating properly.</p><p>failed(4)  A non-redundant fan is not operating properly.</p> |SNMP |hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
+|General |SNMP traps (fallback) |<p>The item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |hp.server.location[sysLocation]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |hp.server.contact[sysContact]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |hp.server.objectid[sysObjectID]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -91,7 +91,7 @@ There are no template links in this template.
 |Physical_disks |{#DISK_LOCATION}: Physical disk S.M.A.R.T. status |<p>MIB: CPQIDA-MIB</p><p>Physical Drive S.M.A.R.T Status. The following values are defined:</p><p>other(1)  The agent is unable to determine if the status of S.M.A.R.T  predictive failure monitoring for this drive.</p><p>ok(2)  Indicates the drive is functioning properly.</p><p>replaceDrive(3)  Indicates that the drive has a S.M.A.R.T predictive failure  error and should be replaced.</p> |SNMP |hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk serial number |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Serial Number.</p><p>This is the serial number assigned to the physical drive.</p><p>This value is based upon the serial number as returned by the SCSI inquiry command</p><p>but may have been modified due to space limitations.  This can be used for identification purposes.</p> |SNMP |hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk model name |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Model. This is a text description of the physical drive.</p><p>The text that appears depends upon who manufactured the drive and the drive type.</p><p>If a drive fails, note the model to identify the type of drive necessary for replacement.</p><p>If a model number is not present, you may not have properly initialized the drive array to which the physical drive is attached for monitoring.</p> |SNMP |hp.server.hw.physicaldisk.model[cpqDaPhyDrvModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type. The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive’s media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |hp.server.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type. The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive's media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |hp.server.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Disk size |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Size in MB.</p><p>This is the size of the physical drive in megabytes.</p><p>This value is calculated using the value 1,048,576 (2^20) as a megabyte.</p><p>Drive manufacturers sometimes use the number 1,000,000 as a megabyte when giving drive capacities so this value may differ</p><p>from the advertised size of a drive. This field is only applicable for controllers which support SCSI drives,</p><p>and therefore is not supported by the IDA or IDA-2 controllers. The field will contain 0xFFFFFFFF if the drive capacity cannot be calculated</p><p>or if the controller does not support SCSI drives.</p> |SNMP |hp.server.hw.physicaldisk.size[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Power_supply |Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the power supply. This value will be one of the following:</p><p>other(1)  The status could not be determined or not present.</p><p>ok(2)  The power supply is operating normally.</p><p>degraded(3)  A temperature sensor, fan or other power supply component is  outside of normal operating range.</p><p>failed(4)  A power supply component detects a condition that could  permanently damage the system.</p> |SNMP |hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Status |Overall system health status |<p>MIB: CPQHLTH-MIB</p><p>The overall condition. This object represents the overall status of the server information represented by this MIB.</p> |SNMP |hp.server.status[cpqHeMibCondition]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -121,52 +121,52 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.CRIT}` |HIGH | |
-|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.CRIT:"cacheModCriticalFailure"}` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModDegradedFailsafeSpeed"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheReadCacheNotMapped"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModFlashMemNotAttached"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.STATUS.OK:"enabled"} and {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.STATUS.WARN:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"failed"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"capacitorFailed"}` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN:"degraded"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state</p> |
-|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT}` |AVERAGE | |
-|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
-|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`{TEMPLATE_NAME:hp.server.name[sysName].diff()}=1 and {TEMPLATE_NAME:hp.server.name[sysName].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:hp.server.hw.serialnumber[cpqSiSysSerialNum].diff()}=1 and {TEMPLATE_NAME:hp.server.hw.serialnumber[cpqSiSysSerialNum].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed |<p>Please check the physical adapter.</p> |`{TEMPLATE_NAME:hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}].last()}=3` |HIGH | |
-|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has lost link |<p>Please check the cable connections to this adapter.</p> |`{TEMPLATE_NAME:hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}].last()}=4` |AVERAGE |<p>**Depends on**:</p><p>- {#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed</p> |
-|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL}` |HIGH | |
-|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or {TEMPLATE_NAME:hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT}` |AVERAGE | |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].last()}={$PSU.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
-|System status is in critical state |<p>Please check the device for errors.</p> |`{TEMPLATE_NAME:hp.server.status[cpqHeMibCondition].last()}={$HEALTH.STATUS.CRIT}` |HIGH | |
-|System status is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:hp.server.status[cpqHeMibCondition].last()}={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
-|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:hp.server.uptime[sysUpTime].last()}<10m` |WARNING |<p>Manual close: YES</p> |
-|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 3` |WARNING | |
-|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 4` |HIGH | |
-|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].last()}={$VDISK.STATUS.CRIT}` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].last()}<>{$VDISK.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
+|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT}` |HIGH | |
+|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.CRIT:"cacheModCriticalFailure"}` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModDegradedFailsafeSpeed"} or last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheReadCacheNotMapped"} or last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModFlashMemNotAttached"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.STATUS.OK:"enabled"} and last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.STATUS.WARN:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"failed"} or last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"capacitorFailed"}` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN:"degraded"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state</p> |
+|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}])={$FAN.STATUS.CRIT}` |AVERAGE | |
+|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}])={$FAN.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.name[sysName],#1)<>last(/HPE ProLiant DL360 SNMP/hp.server.name[sysName],#2) and length(last(/HPE ProLiant DL360 SNMP/hp.server.name[sysName]))>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(/HPE ProLiant DL360 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum],#1)<>last(/HPE ProLiant DL360 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum],#2) and length(last(/HPE ProLiant DL360 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed |<p>Please check the physical adapter.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}])=3` |HIGH | |
+|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has lost link |<p>Please check the cable connections to this adapter.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}])=4` |AVERAGE |<p>**Depends on**:</p><p>- {#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed</p> |
+|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL}` |HIGH | |
+|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}])={$DISK.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or last(/HPE ProLiant DL360 SNMP/hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#1)<>last(/HPE ProLiant DL360 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#2) and length(last(/HPE ProLiant DL360 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}])={$PSU.STATUS.CRIT}` |AVERAGE | |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}])={$PSU.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
+|System status is in critical state |<p>Please check the device for errors.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.status[cpqHeMibCondition])={$HEALTH.STATUS.CRIT}` |HIGH | |
+|System status is in warning state |<p>Please check the device for warnings.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.status[cpqHeMibCondition])={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.uptime[sysUpTime])<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/HPE ProLiant DL360 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 3` |WARNING | |
+|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 4` |HIGH | |
+|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 3` |WARNING | |
+|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 4` |HIGH | |
+|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 3` |WARNING | |
+|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 4` |HIGH | |
+|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 3` |WARNING | |
+|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 4` |HIGH | |
+|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 3` |WARNING | |
+|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 4` |HIGH | |
+|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 1` |INFO |<p>Manual close: YES</p> |
+|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 3` |WARNING | |
+|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 4` |HIGH | |
+|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 3` |WARNING | |
+|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 4` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}])={$VDISK.STATUS.CRIT}` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors.</p> |`last(/HPE ProLiant DL360 SNMP/hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}])<>{$VDISK.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/hp/hp_dl360_snmp/template_server_hp_dl360_snmp.yaml b/templates/server/hp/hp_dl360_snmp/template_server_hp_dl360_snmp.yaml
index 153ce930593..d5f31ec5f73 100644
--- a/templates/server/hp/hp_dl360_snmp/template_server_hp_dl360_snmp.yaml
+++ b/templates/server/hp/hp_dl360_snmp/template_server_hp_dl360_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-28T06:42:14Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:45Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -20,7 +20,7 @@ zabbix_export:
         CPQSINFO-MIB
         CPQIDA-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -305,7 +305,7 @@ zabbix_export:
           history: 2w
           trends: '0'
           value_type: LOG
-          description: 'Item is used to collect all SNMP traps unmatched by other snmptrap items'
+          description: 'The item is used to collect all SNMP traps unmatched by other snmptrap items'
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
@@ -715,7 +715,7 @@ zabbix_export:
               description: |
                 MIB: CPQIDA-MIB
                 Drive Array Physical Drive Media Type. The following values are defined:
-                other(1)  The instrument agent is unable to determine the physical drive’s media type.
+                other(1)  The instrument agent is unable to determine the physical drive's media type.
                 rotatingPlatters(2)  The physical drive media is composed of rotating platters.
                 solidState(3)  The physical drive media is composed of solid state electronics.
               valuemap:
diff --git a/templates/server/hp/hp_dl380_snmp/README.md b/templates/server/hp/hp_dl380_snmp/README.md
index e505d15f092..6cae31150c6 100644
--- a/templates/server/hp/hp_dl380_snmp/README.md
+++ b/templates/server/hp/hp_dl380_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 This is a template for monitoring HPE ProLiant DL380 servers with HP iLO version 4 and later via Zabbix SNMP agent that works without any external scripts.
 
 ## Setup
@@ -54,13 +54,13 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
-|Temperature ambient discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |temp.ambient.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- B: {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
-|Temperature CPU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |temp.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
-|Temperature memory discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |temp.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
-|Temperature PSU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |temp.psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
-|Temperature I/O discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |temp.io.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
-|Temperature system discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |temp.system.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
+|Temperature discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |temp.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
+|Temperature ambient discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |temp.ambient.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
+|Temperature CPU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |temp.cpu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
+|Temperature memory discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |temp.memory.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
+|Temperature PSU discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |temp.psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
+|Temperature I/O discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |temp.io.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
+|Temperature system discovery |<p>Scanning table of Temperature Sensor Entries:</p><p>CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |temp.system.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
 |PSU discovery |<p>CPQHLTH-MIB::cpqHeFltTolPowerSupplyStatus</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |FAN discovery |<p>CPQHLTH-MIB::cpqHeFltTolFanCondition</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array controller discovery |<p>Scanning table of Array controllers: CPQIDA-MIB::cpqDaCntlrTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -78,7 +78,7 @@ There are no template links in this template.
 |Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller status |<p>MIB: CPQIDA-MIB</p><p>Cache Module/Operations Status. This describes the status of the cache module and/or cache operations.</p><p>Note that for some controller models, a cache module board that physically attaches to the controller or chipset may not be an available option.</p><p>The status can be:</p><p>Other (1)</p><p> Indicates that the instrument agent does not recognize the status of the cache module. You may need to upgrade the instrument agent.</p><p>Invalid (2)</p><p> Indicates that a cache module board has not been installed in this system or is present but not configured.</p><p>Enabled (3)</p><p> Indicates that cache operations are currently configured and enabled for at least one logical drive.</p><p>Temporarily Disabled (4)</p><p> Indicates that cache operations have been temporarily disabled. View the cache module board error code object to determine why the write cache operations have been temporarily disabled.</p><p>Permanently Disabled (5)</p><p> Indicates that cache operations have been permanently disabled. View the cache module board error code object to determine why the write cache operations have been disabled.</p><p>Cache Module Flash Memory Not Attached (6)</p><p> Indicates that the flash memory component of the flash backed cache module is not attached. This status will be set when the flash memory is not attached and the Supercap is attached. This value is only used on flash backed cache modules that support removable flash memory.</p><p>Cache Module Degraded Failsafe Speed (7)</p><p> Indicates that the cache module board is currently degraded and operating at a failsafe speed. View variables cpqDaCacheMemoryDataWidth and cpqDaCacheMemoryTransferRate to obtain the cache module board`s current memory data width and memory transfer rate.</p><p>Cache Module Critical Failure (8)</p><p> Indicates that the cache module board has encountered a critical failure. The controller is currently operating in Zero Memory Raid mode.</p><p>Read Cache Could Not Be Mapped (9)</p><p> Indicates that the read cache memory in a split cache configuration could not be mapped by the operating system and as a result is not available. This status may be caused by virtual space limitations in certain operating systems and is only applicable to B-Series controllers.</p> |SNMP |hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery status |<p>MIB: CPQIDA-MIB</p><p>Cache Module Board Backup Power Status. This monitors the status of each backup power source on the board.</p><p>The backup power source can only recharge when the system has power applied. The type of backup power source used is indicated by cpqDaAccelBackupPowerSource.</p><p>The following values are valid:</p><p>Other (1)  Indicates that the instrument agent does not recognize  backup power status.  You may need to update your software.</p><p>Ok (2)  The backup power source is fully charged.</p><p>Recharging (3)  The array controller has one or more cache module backup power  sources that are recharging.</p><p>Cache module operations such as Battery/Flash Backed Write Cache, Expansion, Extension and Migration are temporarily suspended until the backup power source is fully charged.</p><p>Cache module operations will automatically resume  when charging is complete.</p><p>Failed (4)  The battery pack is below the sufficient voltage level and  has not recharged in 36 hours.</p><p>Your Cache Module board  needs to be serviced.</p><p>Degraded (5)  The battery is still operating, however, one of the batteries  in the pack has failed to recharge properly.</p><p>Your Cache  Module board should be serviced as soon as possible.</p><p>NotPresent (6)  A backup power source is not present on the cache module board. Some controllers do not have backup power sources.</p><p>Capacitor Failed (7)  The flash backed cache module capacitor is below the sufficient voltage level and has not recharged in 10 minutes.  Your Cache Module board needs to be serviced.</p><p>                </p> |SNMP |hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Fans |Fan {#SNMPINDEX}: Fan status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the fan.</p><p>This value will be one of the following:</p><p>other(1)  Fan status detection is not supported by this system or driver.</p><p>ok(2)  The fan is operating properly.</p><p>degraded(2)  A redundant fan is not operating properly.</p><p>failed(4)  A non-redundant fan is not operating properly.</p> |SNMP |hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|General |SNMP traps (fallback) |<p>Item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
+|General |SNMP traps (fallback) |<p>The item is used to collect all SNMP traps unmatched by other snmptrap items</p> |SNMP_TRAP |snmptrap.fallback |
 |General |System location |<p>MIB: SNMPv2-MIB</p><p>The physical location of this node (e.g., `telephone closet, 3rd floor').  If the location is unknown, the value is the zero-length string.</p> |SNMP |hp.server.location[sysLocation]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |General |System contact details |<p>MIB: SNMPv2-MIB</p><p>The textual identification of the contact person for this managed node, together with information on how to contact this person.  If no contact information is known, the value is the zero-length string.</p> |SNMP |hp.server.contact[sysContact]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |General |System object ID |<p>MIB: SNMPv2-MIB</p><p>The vendor's authoritative identification of the network management subsystem contained in the entity.  This value is allocated within the SMI enterprises subtree (1.3.6.1.4.1) and provides an easy and unambiguous means for determining`what kind of box' is being managed.  For example, if vendor`Flintstones, Inc.' was assigned the subtree1.3.6.1.4.1.4242, it could assign the identifier 1.3.6.1.4.1.4242.1.1 to its `Fred Router'.</p> |SNMP |hp.server.objectid[sysObjectID]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -91,7 +91,7 @@ There are no template links in this template.
 |Physical_disks |{#DISK_LOCATION}: Physical disk S.M.A.R.T. status |<p>MIB: CPQIDA-MIB</p><p>Physical Drive S.M.A.R.T Status. The following values are defined:</p><p>other(1)  The agent is unable to determine if the status of S.M.A.R.T  predictive failure monitoring for this drive.</p><p>ok(2)  Indicates the drive is functioning properly.</p><p>replaceDrive(3)  Indicates that the drive has a S.M.A.R.T predictive failure  error and should be replaced.</p> |SNMP |hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk serial number |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Serial Number.</p><p>This is the serial number assigned to the physical drive.</p><p>This value is based upon the serial number as returned by the SCSI inquiry command</p><p>but may have been modified due to space limitations.  This can be used for identification purposes.</p> |SNMP |hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk model name |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Model. This is a text description of the physical drive.</p><p>The text that appears depends upon who manufactured the drive and the drive type.</p><p>If a drive fails, note the model to identify the type of drive necessary for replacement.</p><p>If a model number is not present, you may not have properly initialized the drive array to which the physical drive is attached for monitoring.</p> |SNMP |hp.server.hw.physicaldisk.model[cpqDaPhyDrvModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type. The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive’s media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |hp.server.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type. The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive's media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |hp.server.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Disk size |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Size in MB.</p><p>This is the size of the physical drive in megabytes.</p><p>This value is calculated using the value 1,048,576 (2^20) as a megabyte.</p><p>Drive manufacturers sometimes use the number 1,000,000 as a megabyte when giving drive capacities so this value may differ</p><p>from the advertised size of a drive. This field is only applicable for controllers which support SCSI drives,</p><p>and therefore is not supported by the IDA or IDA-2 controllers. The field will contain 0xFFFFFFFF if the drive capacity cannot be calculated</p><p>or if the controller does not support SCSI drives.</p> |SNMP |hp.server.hw.physicaldisk.size[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Power_supply |Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the power supply. This value will be one of the following:</p><p>other(1)  The status could not be determined or not present.</p><p>ok(2)  The power supply is operating normally.</p><p>degraded(3)  A temperature sensor, fan or other power supply component is  outside of normal operating range.</p><p>failed(4)  A power supply component detects a condition that could  permanently damage the system.</p> |SNMP |hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Status |Overall system health status |<p>MIB: CPQHLTH-MIB</p><p>The overall condition. This object represents the overall status of the server information represented by this MIB.</p> |SNMP |hp.server.status[cpqHeMibCondition]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -121,52 +121,52 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.CRIT}` |HIGH | |
-|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].last()}={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.CRIT:"cacheModCriticalFailure"}` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModDegradedFailsafeSpeed"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheReadCacheNotMapped"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModFlashMemNotAttached"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.STATUS.OK:"enabled"} and {TEMPLATE_NAME:hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK.ARRAY.CACHE.STATUS.WARN:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"failed"} or {TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"capacitorFailed"}` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults.</p> |`{TEMPLATE_NAME:hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].last()}={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN:"degraded"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state</p> |
-|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].last()}={$FAN.STATUS.CRIT}` |AVERAGE | |
-|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit.</p> |`{TEMPLATE_NAME:hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].last()}={$FAN.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
-|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`{TEMPLATE_NAME:hp.server.name[sysName].diff()}=1 and {TEMPLATE_NAME:hp.server.name[sysName].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:hp.server.hw.serialnumber[cpqSiSysSerialNum].diff()}=1 and {TEMPLATE_NAME:hp.server.hw.serialnumber[cpqSiSysSerialNum].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed |<p>Please check the physical adapter.</p> |`{TEMPLATE_NAME:hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}].last()}=3` |HIGH | |
-|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has lost link |<p>Please check the cable connections to this adapter.</p> |`{TEMPLATE_NAME:hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}].last()}=4` |AVERAGE |<p>**Depends on**:</p><p>- {#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed</p> |
-|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.FAIL}` |HIGH | |
-|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].last()}={$DISK.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or {TEMPLATE_NAME:hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].last()}={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].last()}={$PSU.STATUS.CRIT}` |AVERAGE | |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors.</p> |`{TEMPLATE_NAME:hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].last()}={$PSU.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
-|System status is in critical state |<p>Please check the device for errors.</p> |`{TEMPLATE_NAME:hp.server.status[cpqHeMibCondition].last()}={$HEALTH.STATUS.CRIT}` |HIGH | |
-|System status is in warning state |<p>Please check the device for warnings.</p> |`{TEMPLATE_NAME:hp.server.status[cpqHeMibCondition].last()}={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
-|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:hp.server.uptime[sysUpTime].last()}<10m` |WARNING |<p>Manual close: YES</p> |
-|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
-|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 3` |WARNING | |
-|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 4` |HIGH | |
-|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].last()}={$VDISK.STATUS.CRIT}` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors.</p> |`{TEMPLATE_NAME:hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].last()}<>{$VDISK.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
+|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT}` |HIGH | |
+|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN}` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.CRIT:"cacheModCriticalFailure"}` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModDegradedFailsafeSpeed"} or last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheReadCacheNotMapped"} or last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.STATUS.WARN:"cacheModFlashMemNotAttached"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.STATUS.OK:"enabled"} and last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.STATUS.WARN:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"failed"} or last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT:"capacitorFailed"}` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.WARN:"degraded"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state</p> |
+|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}])={$FAN.STATUS.CRIT}` |AVERAGE | |
+|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}])={$FAN.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
+|System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.name[sysName],#1)<>last(/HPE ProLiant DL380 SNMP/hp.server.name[sysName],#2) and length(last(/HPE ProLiant DL380 SNMP/hp.server.name[sysName]))>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(/HPE ProLiant DL380 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum],#1)<>last(/HPE ProLiant DL380 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum],#2) and length(last(/HPE ProLiant DL380 SNMP/hp.server.hw.serialnumber[cpqSiSysSerialNum]))>0` |INFO |<p>Manual close: YES</p> |
+|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed |<p>Please check the physical adapter.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}])=3` |HIGH | |
+|{#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has lost link |<p>Please check the cable connections to this adapter.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.net.if.status[cpqNicIfPhysAdapterStatus.{#SNMPINDEX}])=4` |AVERAGE |<p>**Depends on**:</p><p>- {#ADAPTER_NAME} port {#ADAPTER_INDEX}: Adapter has failed</p> |
+|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}])={$DISK.STATUS.FAIL}` |HIGH | |
+|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}])={$DISK.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDrive"} or last(/HPE ProLiant DL380 SNMP/hp.server.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}])={$DISK.SMART.STATUS.FAIL:"replaceDriveSSDWearOut"}` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#1)<>last(/HPE ProLiant DL380 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#2) and length(last(/HPE ProLiant DL380 SNMP/hp.server.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}])={$PSU.STATUS.CRIT}` |AVERAGE | |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}])={$PSU.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
+|System status is in critical state |<p>Please check the device for errors.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.status[cpqHeMibCondition])={$HEALTH.STATUS.CRIT}` |HIGH | |
+|System status is in warning state |<p>Please check the device for warnings.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.status[cpqHeMibCondition])={$HEALTH.STATUS.WARN}` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
+|{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.uptime[sysUpTime])<10m` |WARNING |<p>Manual close: YES</p> |
+|No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/HPE ProLiant DL380 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING | |
+|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 3` |WARNING | |
+|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 4` |HIGH | |
+|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 3` |WARNING | |
+|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 4` |HIGH | |
+|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 3` |WARNING | |
+|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 4` |HIGH | |
+|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 3` |WARNING | |
+|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 4` |HIGH | |
+|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 3` |WARNING | |
+|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 4` |HIGH | |
+|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 1` |INFO |<p>Manual close: YES</p> |
+|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 3` |WARNING | |
+|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 4` |HIGH | |
+|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 3` |WARNING | |
+|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 4` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}])={$VDISK.STATUS.CRIT}` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors.</p> |`last(/HPE ProLiant DL380 SNMP/hp.server.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}])<>{$VDISK.STATUS.OK}` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/hp/hp_dl380_snmp/template_server_hp_dl380_snmp.yaml b/templates/server/hp/hp_dl380_snmp/template_server_hp_dl380_snmp.yaml
index 0d3c7fffa8e..cb1371cce89 100644
--- a/templates/server/hp/hp_dl380_snmp/template_server_hp_dl380_snmp.yaml
+++ b/templates/server/hp/hp_dl380_snmp/template_server_hp_dl380_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-28T06:43:15Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:49Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -20,7 +20,7 @@ zabbix_export:
         CPQSINFO-MIB
         CPQIDA-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: 'Templates/Server hardware'
@@ -305,7 +305,7 @@ zabbix_export:
           history: 2w
           trends: '0'
           value_type: LOG
-          description: 'Item is used to collect all SNMP traps unmatched by other snmptrap items'
+          description: 'The item is used to collect all SNMP traps unmatched by other snmptrap items'
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
@@ -715,7 +715,7 @@ zabbix_export:
               description: |
                 MIB: CPQIDA-MIB
                 Drive Array Physical Drive Media Type. The following values are defined:
-                other(1)  The instrument agent is unable to determine the physical drive’s media type.
+                other(1)  The instrument agent is unable to determine the physical drive's media type.
                 rotatingPlatters(2)  The physical drive media is composed of rotating platters.
                 solidState(3)  The physical drive media is composed of solid state electronics.
               valuemap:
diff --git a/templates/server/hp_ilo_snmp/README.md b/templates/server/hp_ilo_snmp/README.md
index ddea1c923e3..a786b0ced3e 100644
--- a/templates/server/hp_ilo_snmp/README.md
+++ b/templates/server/hp_ilo_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 for HP iLO adapters that support SNMP get. Or via operating system, using SNMP HP subagent
 
 This template was tested on:
@@ -57,13 +57,13 @@ No specific Zabbix configuration is required.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature Discovery |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |tempDescr.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
-|Temperature Discovery Ambient |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |tempDescr.discovery.ambient<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- B: {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
-|Temperature Discovery CPU |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |tempDescr.discovery.cpu<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
-|Temperature Discovery Memory |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |tempDescr.discovery.memory<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
-|Temperature Discovery PSU |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |tempDescr.discovery.psu<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
-|Temperature Discovery I/O |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |tempDescr.discovery.io<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
-|Temperature Discovery System |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |tempDescr.discovery.system<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- A: {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
+|Temperature Discovery |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable</p> |SNMP |tempDescr.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `(4|8|9|12|13)`</p> |
+|Temperature Discovery Ambient |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with ambient(11) and 0.1 index filter</p> |SNMP |tempDescr.discovery.ambient<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SNMPINDEX} MATCHES_REGEX `0\.1`</p><p>- {#SENSOR_LOCALE} MATCHES_REGEX `11`</p> |
+|Temperature Discovery CPU |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with cpu(6) filter</p> |SNMP |tempDescr.discovery.cpu<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `6`</p> |
+|Temperature Discovery Memory |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with memory(7) filter</p> |SNMP |tempDescr.discovery.memory<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `7`</p> |
+|Temperature Discovery PSU |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with powerSupply(10) filter</p> |SNMP |tempDescr.discovery.psu<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `10`</p> |
+|Temperature Discovery I/O |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with ioBoard(5) filter</p> |SNMP |tempDescr.discovery.io<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `5`</p> |
+|Temperature Discovery System |<p>Scanning table of Temperature Sensor Entries: CPQHLTH-MIB::cpqHeTemperatureTable with system(3) filter</p> |SNMP |tempDescr.discovery.system<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p><p>**Filter**:</p>AND_OR <p>- {#SENSOR_LOCALE} MATCHES_REGEX `3`</p> |
 |PSU Discovery |<p>CPQHLTH-MIB::cpqHeFltTolPowerSupplyStatus</p> |SNMP |psu.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |FAN Discovery |<p>CPQHLTH-MIB::cpqHeFltTolFanCondition</p> |SNMP |fan.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Array Controller Discovery |<p>Scanning table of Array controllers: CPQIDA-MIB::cpqDaCntlrTable</p> |SNMP |array.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -77,8 +77,8 @@ No specific Zabbix configuration is required.
 |-----|----|-----------|----|---------------------|
 |Disk_arrays |{#CNTLR_LOCATION}: Disk array controller status |<p>MIB: CPQIDA-MIB</p><p>This value represents the overall condition of this controller,</p><p>and any associated logical drives,physical drives, and array accelerators.</p> |SNMP |system.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Disk_arrays |{#CNTLR_LOCATION}: Disk array controller model |<p>MIB: CPQIDA-MIB</p><p>Array Controller Model. The type of controller card.</p> |SNMP |system.hw.diskarray.model[cpqDaCntlrModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller status |<p>MIB: CPQIDA-MIB</p><p>Cache Module/Operations Status. This describes the status of the cache module and/or cache operations.</p><p>Note that for some controller models, a cache module board that physically attaches to the controller or chipset may not be an available option.</p><p>The status can be:</p><p>Other (1)</p><p> Indicates that the instrument agent does not recognize the status of the cache module. You may need to upgrade the instrument agent.</p><p>Invalid (2)</p><p> Indicates that a cache module board has not been installed in this system or is present but not configured.</p><p>Enabled (3)</p><p> Indicates that cache operations are currently configured and enabled for at least one logical drive.</p><p>Temporarily Disabled (4)</p><p> Indicates that cache operations have been temporarily disabled. View the cache module board error code object to determine why the write cache operations have been temporarily disabled.</p><p>Permanently Disabled (5)</p><p> Indicates that cache operations have been permanently disabled. View the cache module board error code object to determine why the write cache operations have been disabled.</p><p>Cache Module Flash Memory Not Attached (6)</p><p> Indicates that the flash memory component of the flash backed cache module is not attached. This status will be set when the flash memory is not attached and the Supercap is attached. This value is only used on flash backed cache modules that support removable flash memory.</p><p>Cache Module Degraded Failsafe Speed (7)</p><p> Indicates that the cache module board is currently degraded and operating at a failsafe speed. View variables cpqDaCacheMemoryDataWidth and cpqDaCacheMemoryTransferRate to obtain the cache module board`s current memory data width and memory transfer rate.</p><p>Cache Module Critical Failure (8)</p><p> Indicates that the cache module board has encountered a critical failure. The controller is currently operating in Zero Memory Raid mode.</p><p>Read Cache Could Not Be Mapped (9)</p><p> Indicates that the read cache memory in a split cache configuration could not be mapped by the operating system and as a result is not available. This status may be caused by virtual space limitations in certain operating systems and is only applicable to B-Series controllers.</p> |SNMP |system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery status |<p>MIB: CPQIDA-MIB</p><p>Cache Module Board Backup Power Status. This monitors the status of each backup power source on the board.</p><p>The backup power source can only recharge when the system has power applied. The type of backup power source used is indicated by cpqDaAccelBackupPowerSource.</p><p>The following values are valid:</p><p>Other (1)  Indicates that the instrument agent does not recognize  backup power status.  You may need to update your software.</p><p>Ok (2)  The backup power source is fully charged.</p><p>Recharging (3)  The array controller has one or more cache module backup power  sources that are recharging.</p><p>Cache module operations such as Battery/Flash Backed Write Cache, Expansion, Extension and Migration are temporarily suspended until the backup power source is fully charged.</p><p>Cache module operations will automatically resume  when charging is complete.</p><p>Failed (4)  The battery pack is below the sufficient voltage level and  has not recharged in 36 hours.</p><p>Your Cache Module board  needs to be serviced.</p><p>Degraded (5)  The battery is still operating, however, one of the batteries  in the pack has failed to recharge properly.</p><p>Your Cache  Module board should be serviced as soon as possible.</p><p>NotPresent (6)  A backup power source is not present on the cache module board. Some controllers do not have backup power sources.</p><p>Capacitor Failed (7)  The flash backed cache module capacitor is below the sufficient voltage level and has not recharged in 10 minutes.  Your Cache Module board needs to be serviced.</p><p>                </p> |SNMP |system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller status |<p>MIB: CPQIDA-MIB</p><p>Cache Module/Operations Status. This describes the status of the cache module and/or cache operations.</p><p>Note that for some controller models, a cache module board that physically attaches to the controller or chipset may not be an available option.</p><p>The status can be:</p><p>Other (1)</p><p> Indicates that the instrument agent does not recognize the status of the cache module. You may need to upgrade the instrument agent.</p><p>Invalid (2)</p><p> Indicates that a cache module board has not been installed in this system or is present but not configured.</p><p>Enabled (3)</p><p> Indicates that cache operations are currently configured and enabled for at least one logical drive.</p><p>Temporarily Disabled (4)</p><p> Indicates that cache operations have been temporarily disabled. View the cache module board error code object to determine why the write cache operations have been temporarily disabled.</p><p>Permanently Disabled (5)</p><p> Indicates that cache operations have been permanently disabled. View the cache module board error code object to determine why the write cache operations have been disabled.</p><p>Cache Module Flash Memory Not Attached (6)</p><p> Indicates that the flash memory component of the flash backed cache module is not attached. This status will be set when the flash memory is not attached and the Supercap is attached. This value is only used on flash backed cache modules that support removable flash memory.</p><p>Cache Module Degraded Failsafe Speed (7)</p><p> Indicates that the cache module board is currently degraded and operating at a failsafe speed. View variables cpqDaCacheMemoryDataWidth and cpqDaCacheMemoryTransferRate to obtain the cache module board`s current memory data width and memory transfer rate.</p><p>Cache Module Critical Failure (8)</p><p> Indicates that the cache module board has encountered a critical failure. The controller is currently operating in Zero Memory Raid mode.</p><p> </p><p>Read Cache Could Not Be Mapped (9)</p><p> Indicates that the read cache memory in a split cache configuration could not be mapped by the operating system and as a result is not available. This status may be caused by virtual space limitations in certain operating systems and is only applicable to B-Series controllers.</p> |SNMP |system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Disk_arrays |#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery status |<p>MIB: CPQIDA-MIB</p><p>Cache Module Board Backup Power Status. This monitors the status of each backup power source on the board.</p><p>The backup power source can only recharge when the system has power applied. The type of backup power source used is indicated by cpqDaAccelBackupPowerSource.</p><p>The following values are valid:</p><p>Other (1)  Indicates that the instrument agent does not recognize  backup power status.  You may need to update your software.</p><p>Ok (2)  The backup power source is fully charged.</p><p>Recharging (3)  The array controller has one or more cache module backup power  sources that are recharging.</p><p>Cache module operations such as Battery/Flash Backed Write Cache, Expansion, Extension and Migration are temporarily suspended until the backup power source is fully charged.</p><p>Cache module operations will automatically resume  when charging is complete.</p><p>Failed (4)  The battery pack is below the sufficient voltage level and  has not recharged in 36 hours.</p><p>Your Cache Module board  needs to be serviced.</p><p>Degraded (5)  The battery is still operating, however, one of the batteries  in the pack has failed to recharge properly.</p><p>Your Cache  Module board should be serviced as soon as possible.</p><p>NotPresent (6)  A backup power source is not present on the cache module board. Some controllers do not have backup power sources.</p><p>Capacitor Failed (7)  The flash backed cache module capacitor is below the sufficient voltage level and has not recharged in 10 minutes.  Your Cache Module board needs to be serviced.</p> |SNMP |system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Fans |Fan {#SNMPINDEX}: Fan status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the fan.</p><p>This value will be one of the following:</p><p>other(1)  Fan status detection is not supported by this system or driver.</p><p>ok(2)  The fan is operating properly.</p><p>degraded(2)  A redundant fan is not operating properly.</p><p>failed(4)  A non-redundant fan is not operating properly.</p> |SNMP |sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |Hardware model name |<p>MIB: CPQSINFO-MIB</p><p>The machine product name.The name of the machine used in this system.</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |Hardware serial number |<p>MIB: CPQSINFO-MIB</p><p>The serial number of the physical system unit. The string will be empty if the system does not report the serial number function.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -86,7 +86,7 @@ No specific Zabbix configuration is required.
 |Physical_disks |{#DISK_LOCATION}: Physical disk S.M.A.R.T. status |<p>MIB: CPQIDA-MIB</p><p>Physical Drive S.M.A.R.T Status.The following values are defined:</p><p>other(1)  The agent is unable to determine if the status of S.M.A.R.T  predictive failure monitoring for this drive.</p><p>ok(2)  Indicates the drive is functioning properly.</p><p>replaceDrive(3)  Indicates that the drive has a S.M.A.R.T predictive failure  error and should be replaced.</p> |SNMP |system.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk serial number |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Serial Number.</p><p>This is the serial number assigned to the physical drive.</p><p>This value is based upon the serial number as returned by the SCSI inquiry command</p><p>but may have been modified due to space limitations.  This can be used for identification purposes.</p> |SNMP |system.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Physical disk model name |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Model.This is a text description of the physical drive.</p><p>The text that appears depends upon who manufactured the drive and the drive type.</p><p>If a drive fails, note the model to identify the type of drive necessary for replacement.</p><p>If a model number is not present, you may not have properly initialized the drive array to which the physical drive is attached for monitoring.</p> |SNMP |system.hw.physicaldisk.model[cpqDaPhyDrvModel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type.The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive’s media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |system.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Physical_disks |{#DISK_LOCATION}: Physical disk media type |<p>MIB: CPQIDA-MIB</p><p>Drive Array Physical Drive Media Type.The following values are defined:</p><p>other(1)  The instrument agent is unable to determine the physical drive's media type.</p><p>rotatingPlatters(2)  The physical drive media is composed of rotating platters.</p><p>solidState(3)  The physical drive media is composed of solid state electronics.</p> |SNMP |system.hw.physicaldisk.media_type[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Physical_disks |{#DISK_LOCATION}: Disk size |<p>MIB: CPQIDA-MIB</p><p>Physical Drive Size in MB.</p><p>This is the size of the physical drive in megabytes.</p><p>This value is calculated using the value 1,048,576 (2^20) as a megabyte.</p><p>Drive manufacturers sometimes use the number 1,000,000 as a megabyte when giving drive capacities so this value may differ</p><p>from the advertised size of a drive. This field is only applicable for controllers which support SCSI drives,</p><p>and therefore is not supported by the IDA or IDA-2 controllers. The field will contain 0xFFFFFFFF if the drive capacity cannot be calculated</p><p>or if the controller does not support SCSI drives.</p> |SNMP |system.hw.physicaldisk.size[cpqDaPhyDrvMediaType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1048576`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Power_supply |Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply status |<p>MIB: CPQHLTH-MIB</p><p>The condition of the power supply. This value will be one of the following:</p><p>other(1)  The status could not be determined or not present.</p><p>ok(2)  The power supply is operating normally.</p><p>degraded(3)  A temperature sensor, fan or other power supply component is  outside of normal operating range.</p><p>failed(4)  A power supply component detects a condition that could  permanently damage the system.</p> |SNMP |sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Status |Overall system health status |<p>MIB: CPQHLTH-MIB</p><p>The overall condition. This object represents the overall status of the server information represented by this MIB.</p> |SNMP |system.status[cpqHeMibCondition.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -114,47 +114,47 @@ No specific Zabbix configuration is required.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults</p> |`{TEMPLATE_NAME:system.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CRIT_STATUS},eq)}=1` |HIGH | |
-|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults</p> |`{TEMPLATE_NAME:system.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_WARN_STATUS},eq)}=1` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults</p> |`{TEMPLATE_NAME:system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_CRIT_STATUS:"cacheModCriticalFailure"},eq)}=1` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults</p> |`{TEMPLATE_NAME:system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_WARN_STATUS:"cacheModDegradedFailsafeSpeed"},eq)}=1 or {TEMPLATE_NAME:system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_WARN_STATUS:"cacheReadCacheNotMapped"},eq)}=1 or {TEMPLATE_NAME:system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_WARN_STATUS:"cacheModFlashMemNotAttached"},eq)}=1` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults</p> |`{TEMPLATE_NAME:system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_OK_STATUS:"enabled"},ne)}=1 and {TEMPLATE_NAME:system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}].last()}<>{$DISK_ARRAY_CACHE_WARN_STATUS:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state! |<p>Please check the device for faults</p> |`{TEMPLATE_NAME:system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS:"failed"},eq)}=1 or {TEMPLATE_NAME:system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS:"capacitorFailed"},eq)}=1` |AVERAGE | |
-|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults</p> |`{TEMPLATE_NAME:system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}].count(#1,{$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS:"degraded"},eq)}=1` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state!</p> |
-|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].count(#1,{$FAN_CRIT_STATUS},eq)}=1` |AVERAGE | |
-|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}].count(#1,{$FAN_WARN_STATUS},eq)}=1` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</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> |
-|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors</p> |`{TEMPLATE_NAME:system.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].count(#1,{$DISK_FAIL_STATUS},eq)}=1` |HIGH | |
-|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors</p> |`{TEMPLATE_NAME:system.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}].count(#1,{$DISK_WARN_STATUS},eq)}=1` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`{TEMPLATE_NAME:system.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].count(#1,{$DISK_SMART_FAIL_STATUS:"replaceDrive"},eq)}=1 or {TEMPLATE_NAME:system.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}].count(#1,{$DISK_SMART_FAIL_STATUS:"replaceDriveSSDWearOut"},eq)}=1` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
-|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:system.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].diff()}=1 and {TEMPLATE_NAME:system.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`{TEMPLATE_NAME:sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].count(#1,{$PSU_CRIT_STATUS},eq)}=1` |AVERAGE | |
-|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`{TEMPLATE_NAME:sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}].count(#1,{$PSU_WARN_STATUS},eq)}=1` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
-|System status is in critical state |<p>Please check the device for errors</p> |`{TEMPLATE_NAME:system.status[cpqHeMibCondition.0].count(#1,{$HEALTH_CRIT_STATUS},eq)}=1` |HIGH | |
-|System status is in warning state |<p>Please check the device for warnings</p> |`{TEMPLATE_NAME:system.status[cpqHeMibCondition.0].count(#1,{$HEALTH_WARN_STATUS},eq)}=1` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
-|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 3` |WARNING | |
-|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"].last()} = 4` |HIGH | |
-|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 1` |INFO |<p>Manual close: YES</p> |
-|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 3` |WARNING | |
-|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`{TEMPLATE_NAME:sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}].last()} = 4` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors</p> |`{TEMPLATE_NAME:system.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].count(#1,{$VDISK_CRIT_STATUS},eq)}=1` |HIGH | |
-|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors</p> |`{TEMPLATE_NAME:system.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}].count(#1,{$VDISK_OK_STATUS},ne)}=1` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
+|{#CNTLR_LOCATION}: Disk array controller is in critical state |<p>Please check the device for faults</p> |`count(/HP iLO SNMP/system.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CRIT_STATUS}")=1` |HIGH | |
+|{#CNTLR_LOCATION}: Disk array controller is in warning state |<p>Please check the device for faults</p> |`count(/HP iLO SNMP/system.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_WARN_STATUS}")=1` |AVERAGE |<p>**Depends on**:</p><p>- {#CNTLR_LOCATION}: Disk array controller is in critical state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state! |<p>Please check the device for faults</p> |`count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_CRIT_STATUS:\"cacheModCriticalFailure\"}")=1` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state |<p>Please check the device for faults</p> |`count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheModDegradedFailsafeSpeed\"}")=1 or count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheReadCacheNotMapped\"}")=1 or count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheModFlashMemNotAttached\"}")=1` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller is not in optimal state |<p>Please check the device for faults</p> |`count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"ne","{$DISK_ARRAY_CACHE_OK_STATUS:\"enabled\"}")=1 and last(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK_ARRAY_CACHE_WARN_STATUS:"invalid"}` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state</p> |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state! |<p>Please check the device for faults</p> |`count(/HP iLO SNMP/system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS:\"failed\"}")=1 or count(/HP iLO SNMP/system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS:\"capacitorFailed\"}")=1` |AVERAGE | |
+|#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in warning state |<p>Please check the device for faults</p> |`count(/HP iLO SNMP/system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS:\"degraded\"}")=1` |WARNING |<p>**Depends on**:</p><p>- #{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state!</p> |
+|Fan {#SNMPINDEX}: Fan is in critical state |<p>Please check the fan unit</p> |`count(/HP iLO SNMP/sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1` |AVERAGE | |
+|Fan {#SNMPINDEX}: Fan is in warning state |<p>Please check the fan unit</p> |`count(/HP iLO SNMP/sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- Fan {#SNMPINDEX}: Fan is in critical state</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/HP iLO SNMP/system.hw.serialnumber,#1)<>last(/HP iLO SNMP/system.hw.serialnumber,#2) and length(last(/HP iLO SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|{#DISK_LOCATION}: Physical disk failed |<p>Please check physical disk for warnings or errors</p> |`count(/HP iLO SNMP/system.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS}")=1` |HIGH | |
+|{#DISK_LOCATION}: Physical disk is in warning state |<p>Please check physical disk for warnings or errors</p> |`count(/HP iLO SNMP/system.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}],#1,"eq","{$DISK_WARN_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Physical disk S.M.A.R.T. failed |<p>Disk probably requires replacement.</p> |`count(/HP iLO SNMP/system.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}],#1,"eq","{$DISK_SMART_FAIL_STATUS:\"replaceDrive\"}")=1 or count(/HP iLO SNMP/system.hw.physicaldisk.smart_status[cpqDaPhyDrvSmartStatus.{#SNMPINDEX}],#1,"eq","{$DISK_SMART_FAIL_STATUS:\"replaceDriveSSDWearOut\"}")=1` |HIGH |<p>**Depends on**:</p><p>- {#DISK_LOCATION}: Physical disk failed</p> |
+|{#DISK_LOCATION}: Disk has been replaced (new serial number received) |<p>Disk serial number has changed. Ack to close</p> |`last(/HP iLO SNMP/system.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#1)<>last(/HP iLO SNMP/system.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}],#2) and length(last(/HP iLO SNMP/system.hw.physicaldisk.serialnumber[cpqDaPhyDrvSerialNum.{#SNMPINDEX}]))>0` |INFO |<p>Manual close: YES</p> |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/HP iLO SNMP/sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
+|Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`count(/HP iLO SNMP/sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state</p> |
+|System status is in critical state |<p>Please check the device for errors</p> |`count(/HP iLO SNMP/system.status[cpqHeMibCondition.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1` |HIGH | |
+|System status is in warning state |<p>Please check the device for warnings</p> |`count(/HP iLO SNMP/system.status[cpqHeMibCondition.0],#1,"eq","{$HEALTH_WARN_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- System status is in critical state</p> |
+|{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 3` |WARNING | |
+|{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 4` |HIGH | |
+|Ambient: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Ambient: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 3` |WARNING | |
+|Ambient: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 4` |HIGH | |
+|CPU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 3` |WARNING | |
+|CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 4` |HIGH | |
+|Memory-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 3` |WARNING | |
+|Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 4` |HIGH | |
+|PSU-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 3` |WARNING | |
+|PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 4` |HIGH | |
+|I/O-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 1` |INFO |<p>Manual close: YES</p> |
+|I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 3` |WARNING | |
+|I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 4` |HIGH | |
+|System-{#SNMPINDEX}: Temperature could not be determined |<p>Temperature could not be determined.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 1` |INFO |<p>Manual close: YES</p> |
+|System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range |<p>If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 3` |WARNING | |
+|System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system. |<p>The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.</p> |`last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 4` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed |<p>Please check virtual disk for warnings or errors</p> |`count(/HP iLO SNMP/system.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}],#1,"eq","{$VDISK_CRIT_STATUS}")=1` |HIGH | |
+|Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk is not in OK state |<p>Please check virtual disk for warnings or errors</p> |`count(/HP iLO SNMP/system.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}],#1,"ne","{$VDISK_OK_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed</p> |
 
 ## Feedback
 
diff --git a/templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml b/templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml
index cd9fdc9e401..e3d6d8890a0 100644
--- a/templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml
+++ b/templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:38Z'
+  version: '6.0'
+  date: '2021-12-16T20:03:53Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -18,7 +18,7 @@ zabbix_export:
         CPQHLTH-MIB
         CPQIDA-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
@@ -253,7 +253,7 @@ zabbix_export:
                 
                 Cache Module Critical Failure (8)
                  Indicates that the cache module board has encountered a critical failure. The controller is currently operating in Zero Memory Raid mode.
-                
+                 
                 Read Cache Could Not Be Mapped (9)
                  Indicates that the read cache memory in a split cache configuration could not be mapped by the operating system and as a result is not available. This status may be caused by virtual space limitations in certain operating systems and is only applicable to B-Series controllers.
               valuemap:
@@ -463,7 +463,7 @@ zabbix_export:
               description: |
                 MIB: CPQIDA-MIB
                 Drive Array Physical Drive Media Type.The following values are defined:
-                other(1)  The instrument agent is unable to determine the physical drive’s media type.
+                other(1)  The instrument agent is unable to determine the physical drive's media type.
                 rotatingPlatters(2)  The physical drive media is composed of rotating platters.
                 solidState(3)  The physical drive media is composed of solid state electronics.
               valuemap:
diff --git a/templates/server/ibm_imm_snmp/README.md b/templates/server/ibm_imm_snmp/README.md
index e63d17a99db..7a971d180cb 100644
--- a/templates/server/ibm_imm_snmp/README.md
+++ b/templates/server/ibm_imm_snmp/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 for IMM2 and IMM1 IBM serverX hardware
 
 This template was tested on:
@@ -23,73 +23,73 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name                      | Description | Default  |
-|---------------------------|-------------|----------|
-| {$DISK_OK_STATUS}         | <p>-</p>    | `Normal` |
-| {$FAN_OK_STATUS}          | <p>-</p>    | `Normal` |
-| {$HEALTH_CRIT_STATUS}     | <p>-</p>    | `2`      |
-| {$HEALTH_DISASTER_STATUS} | <p>-</p>    | `0`      |
-| {$HEALTH_WARN_STATUS}     | <p>-</p>    | `4`      |
-| {$PSU_OK_STATUS}          | <p>-</p>    | `Normal` |
-| {$TEMP_CRIT:"Ambient"}    | <p>-</p>    | `35`     |
-| {$TEMP_CRIT_LOW}          | <p>-</p>    | `5`      |
-| {$TEMP_CRIT}              | <p>-</p>    | `60`     |
-| {$TEMP_WARN:"Ambient"}    | <p>-</p>    | `30`     |
-| {$TEMP_WARN}              | <p>-</p>    | `50`     |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$DISK_OK_STATUS} |<p>-</p> |`Normal` |
+|{$FAN_OK_STATUS} |<p>-</p> |`Normal` |
+|{$HEALTH_CRIT_STATUS} |<p>-</p> |`2` |
+|{$HEALTH_DISASTER_STATUS} |<p>-</p> |`0` |
+|{$HEALTH_WARN_STATUS} |<p>-</p> |`4` |
+|{$PSU_OK_STATUS} |<p>-</p> |`Normal` |
+|{$TEMP_CRIT:"Ambient"} |<p>-</p> |`35` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"Ambient"} |<p>-</p> |`30` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
-| Name         |
-|--------------|
-| Generic SNMP |
+|Name|
+|----|
+|Generic SNMP |
 
 ## Discovery rules
 
-| Name                          | Description                                            | Type | Key and additional info                                                                                           |
-|-------------------------------|--------------------------------------------------------|------|-------------------------------------------------------------------------------------------------------------------|
-| Temperature Discovery         | <p>Scanning IMM-MIB::tempTable</p>                     | SNMP | tempDescr.discovery<p>**Filter**:</p>AND_OR <p>- B: {#SNMPVALUE} MATCHES_REGEX `(DIMM|PSU|PCH|RAID|RR|PCI).*`</p> |
-| Temperature Discovery Ambient | <p>Scanning IMM-MIB::tempTable with Ambient filter</p> | SNMP | tempDescr.discovery.ambient<p>**Filter**:</p>AND_OR <p>- B: {#SNMPVALUE} MATCHES_REGEX `Ambient.*`</p>            |
-| Temperature Discovery CPU     | <p>Scanning IMM-MIB::tempTable with CPU filter</p>     | SNMP | tempDescr.discovery.cpu<p>**Filter**:</p>AND_OR <p>- B: {#SNMPVALUE} MATCHES_REGEX `CPU [0-9]* Temp`</p>          |
-| PSU Discovery                 | <p>IMM-MIB::powerFruName</p>                           | SNMP | psu.discovery                                                                                                     |
-| FAN Discovery                 | <p>IMM-MIB::fanDescr</p>                               | SNMP | fan.discovery                                                                                                     |
-| Physical Disk Discovery       | <p>-</p>                                               | SNMP | physicalDisk.discovery                                                                                            |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature Discovery |<p>Scanning IMM-MIB::tempTable</p> |SNMP |tempDescr.discovery<p>**Filter**:</p>AND_OR <p>- {#SNMPVALUE} MATCHES_REGEX `(DIMM|PSU|PCH|RAID|RR|PCI).*`</p> |
+|Temperature Discovery Ambient |<p>Scanning IMM-MIB::tempTable with Ambient filter</p> |SNMP |tempDescr.discovery.ambient<p>**Filter**:</p>AND_OR <p>- {#SNMPVALUE} MATCHES_REGEX `Ambient.*`</p> |
+|Temperature Discovery CPU |<p>Scanning IMM-MIB::tempTable with CPU filter</p> |SNMP |tempDescr.discovery.cpu<p>**Filter**:</p>AND_OR <p>- {#SNMPVALUE} MATCHES_REGEX `CPU [0-9]* Temp`</p> |
+|PSU Discovery |<p>IMM-MIB::powerFruName</p> |SNMP |psu.discovery |
+|FAN Discovery |<p>IMM-MIB::fanDescr</p> |SNMP |fan.discovery |
+|Physical Disk Discovery |<p>-</p> |SNMP |physicalDisk.discovery |
 
 ## Items collected
 
-| Group          | Name                                    | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Type | Key and additional info                                                                                                    |
-|----------------|-----------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------|
-| Fans           | {#FAN_DESCR}: Fan status                | <p>MIB: IMM-MIB</p><p>A description of the fan component status.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | SNMP | sensor.fan.status[fanHealthStatus.{#SNMPINDEX}]                                                                            |
-| Fans           | {#FAN_DESCR}: Fan speed, %              | <p>MIB: IMM-MIB</p><p>Fan speed expressed in percent(%) of maximum RPM.</p><p>An octet string expressed as 'ddd% of maximum' where:d is a decimal digit or blank space for a leading zero.</p><p>If the fan is determined not to be running or the fan speed cannot be determined, the string will indicate 'Offline'.</p>                                                                                                                                                                                                                                        | SNMP | sensor.fan.speed.percentage[fanSpeed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- REGEX: `(\d{1,3}) *%( of maximum)? \1`</p> |
-| Inventory      | Hardware model name                     | <p>MIB: IMM-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | SNMP | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                         |
-| Inventory      | Hardware serial number                  | <p>MIB: IMM-MIB</p><p>Machine serial number VPD information</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | SNMP | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                  |
-| Physical_disks | {#SNMPINDEX}: Physical disk status      | <p>MIB: IMM-MIB</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | SNMP | system.hw.physicaldisk.status[diskHealthStatus.{#SNMPINDEX}]                                                               |
-| Physical_disks | {#SNMPINDEX}: Physical disk part number | <p>MIB: IMM-MIB</p><p>disk module FRU name.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | SNMP | system.hw.physicaldisk.part_number[diskFruName.{#SNMPINDEX}]                                                               |
-| Power_supply   | {#PSU_DESCR}: Power supply status       | <p>MIB: IMM-MIB</p><p>A description of the power module status.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | SNMP | sensor.psu.status[powerHealthStatus.{#SNMPINDEX}]                                                                          |
-| Status         | Overall system health status            | <p>MIB: IMM-MIB</p><p>Indicates status of system health for the system in which the IMM resides. Value of 'nonRecoverable' indicates a severe error has occurred and the system may not be functioning. A value of 'critical' indicates that a error has occurred but the system is currently functioning properly. A value of 'nonCritical' indicates that a condition has occurred that may change the state of the system in the future but currently the system is working properly. A value of 'normal' indicates that the system is operating normally.</p> | SNMP | system.status[systemHealthStat.0]                                                                                          |
-| Temperature    | {#SNMPVALUE}: Temperature               | <p>MIB: IMM-MIB</p><p>Temperature readings of testpoint: {#SNMPVALUE}</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | SNMP | sensor.temp.value[tempReading.{#SNMPINDEX}]                                                                                |
-| Temperature    | Ambient: Temperature                    | <p>MIB: IMM-MIB</p><p>Temperature readings of testpoint: Ambient</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | SNMP | sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}]                                                                        |
-| Temperature    | CPU: Temperature                        | <p>MIB: IMM-MIB</p><p>Temperature readings of testpoint: CPU</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | SNMP | sensor.temp.value[tempReading.CPU.{#SNMPINDEX}]                                                                            |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Fans |{#FAN_DESCR}: Fan status |<p>MIB: IMM-MIB</p><p>A description of the fan component status.</p> |SNMP |sensor.fan.status[fanHealthStatus.{#SNMPINDEX}] |
+|Fans |{#FAN_DESCR}: Fan speed, % |<p>MIB: IMM-MIB</p><p>Fan speed expressed in percent(%) of maximum RPM.</p><p>An octet string expressed as 'ddd% of maximum' where:d is a decimal digit or blank space for a leading zero.</p><p>If the fan is determined not to be running or the fan speed cannot be determined, the string will indicate 'Offline'.</p> |SNMP |sensor.fan.speed.percentage[fanSpeed.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- REGEX: `(\d{1,3}) *%( of maximum)? \1`</p> |
+|Inventory |Hardware model name |<p>MIB: IMM-MIB</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: IMM-MIB</p><p>Machine serial number VPD information</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Physical_disks |{#SNMPINDEX}: Physical disk status |<p>MIB: IMM-MIB</p> |SNMP |system.hw.physicaldisk.status[diskHealthStatus.{#SNMPINDEX}] |
+|Physical_disks |{#SNMPINDEX}: Physical disk part number |<p>MIB: IMM-MIB</p><p>disk module FRU name.</p> |SNMP |system.hw.physicaldisk.part_number[diskFruName.{#SNMPINDEX}] |
+|Power_supply |{#PSU_DESCR}: Power supply status |<p>MIB: IMM-MIB</p><p>A description of the power module status.</p> |SNMP |sensor.psu.status[powerHealthStatus.{#SNMPINDEX}] |
+|Status |Overall system health status |<p>MIB: IMM-MIB</p><p>Indicates status of system health for the system in which the IMM resides. Value of 'nonRecoverable' indicates a severe error has occurred and the system may not be functioning. A value of 'critical' indicates that a error has occurred but the system is currently functioning properly. A value of 'nonCritical' indicates that a condition has occurred that may change the state of the system in the future but currently the system is working properly. A value of 'normal' indicates that the system is operating normally.</p> |SNMP |system.status[systemHealthStat.0] |
+|Temperature |{#SNMPVALUE}: Temperature |<p>MIB: IMM-MIB</p><p>Temperature readings of testpoint: {#SNMPVALUE}</p> |SNMP |sensor.temp.value[tempReading.{#SNMPINDEX}] |
+|Temperature |Ambient: Temperature |<p>MIB: IMM-MIB</p><p>Temperature readings of testpoint: Ambient</p> |SNMP |sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}] |
+|Temperature |CPU: Temperature |<p>MIB: IMM-MIB</p><p>Temperature readings of testpoint: CPU</p> |SNMP |sensor.temp.value[tempReading.CPU.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                      | Description                                                                                          | Expression                                                                                                                                                                                                                                    | Severity | Dependencies and additional info                                                                            |
-|---------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------|
-| {#FAN_DESCR}: Fan is not in normal state                                  | <p>Please check the fan unit</p>                                                                     | `{TEMPLATE_NAME:sensor.fan.status[fanHealthStatus.{#SNMPINDEX}].count(#1,{$FAN_OK_STATUS},ne)}=1`                                                                                                                                             | INFO     |                                                                                                             |
-| 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>                                                                                    |
-| {#SNMPINDEX}: Physical disk is not in OK state                            | <p>Please check physical disk for warnings or errors</p>                                             | `{TEMPLATE_NAME:system.hw.physicaldisk.status[diskHealthStatus.{#SNMPINDEX}].count(#1,{$DISK_OK_STATUS},ne)}=1`                                                                                                                               | WARNING  |                                                                                                             |
-| {#PSU_DESCR}: Power supply is not in normal state                         | <p>Please check the power supply unit for errors</p>                                                 | `{TEMPLATE_NAME:sensor.psu.status[powerHealthStatus.{#SNMPINDEX}].count(#1,{$PSU_OK_STATUS},ne)}=1`                                                                                                                                           | INFO     |                                                                                                             |
-| System is in unrecoverable state!                                         | <p>Please check the device for faults</p>                                                            | `{TEMPLATE_NAME:system.status[systemHealthStat.0].count(#1,{$HEALTH_DISASTER_STATUS},eq)}=1`                                                                                                                                                  | HIGH     |                                                                                                             |
-| System status is in critical state                                        | <p>Please check the device for errors</p>                                                            | `{TEMPLATE_NAME:system.status[systemHealthStat.0].count(#1,{$HEALTH_CRIT_STATUS},eq)}=1`                                                                                                                                                      | HIGH     | <p>**Depends on**:</p><p>- System is in unrecoverable state!</p>                                            |
-| System status is in warning state                                         | <p>Please check the device for warnings</p>                                                          | `{TEMPLATE_NAME:system.status[systemHealthStat.0].count(#1,{$HEALTH_WARN_STATUS},eq)}=1`                                                                                                                                                      | WARNING  | <p>**Depends on**:</p><p>- System is in unrecoverable state!</p><p>- System status is in critical state</p> |
-| {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""}    | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[tempReading.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`                                       | WARNING  | <p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p>      |
-| {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}   | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[tempReading.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`                                       | HIGH     |                                                                                                             |
-| {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}                | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[tempReading.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3`                               | AVERAGE  |                                                                                                             |
-| Ambient: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"Ambient"}-3`         | WARNING  | <p>**Depends on**:</p><p>- Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p>    |
-| Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"Ambient"}-3`         | HIGH     |                                                                                                             |
-| Ambient: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"Ambient"}+3` | AVERAGE  |                                                                                                             |
-| 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[tempReading.CPU.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.CPU.{#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[tempReading.CPU.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.CPU.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"CPU"}-3`                         | HIGH     |                                                                                                             |
-| CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}                      | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[tempReading.CPU.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[tempReading.CPU.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"CPU"}+3`                 | AVERAGE  |                                                                                                             |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#FAN_DESCR}: Fan is not in normal state |<p>Please check the fan unit</p> |`count(/IBM IMM SNMP/sensor.fan.status[fanHealthStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1` |INFO | |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/IBM IMM SNMP/system.hw.serialnumber,#1)<>last(/IBM IMM SNMP/system.hw.serialnumber,#2) and length(last(/IBM IMM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|{#SNMPINDEX}: Physical disk is not in OK state |<p>Please check physical disk for warnings or errors</p> |`count(/IBM IMM SNMP/system.hw.physicaldisk.status[diskHealthStatus.{#SNMPINDEX}],#1,"ne","{$DISK_OK_STATUS}")=1` |WARNING | |
+|{#PSU_DESCR}: Power supply is not in normal state |<p>Please check the power supply unit for errors</p> |`count(/IBM IMM SNMP/sensor.psu.status[powerHealthStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1` |INFO | |
+|System is in unrecoverable state! |<p>Please check the device for faults</p> |`count(/IBM IMM SNMP/system.status[systemHealthStat.0],#1,"eq","{$HEALTH_DISASTER_STATUS}")=1` |HIGH | |
+|System status is in critical state |<p>Please check the device for errors</p> |`count(/IBM IMM SNMP/system.status[systemHealthStat.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1` |HIGH |<p>**Depends on**:</p><p>- System is in unrecoverable state!</p> |
+|System status is in warning state |<p>Please check the device for warnings</p> |`count(/IBM IMM SNMP/system.status[systemHealthStat.0],#1,"eq","{$HEALTH_WARN_STATUS}")=1` |WARNING |<p>**Depends on**:</p><p>- System is in unrecoverable state!</p><p>- System status is in critical state</p> |
+|{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
+|Ambient: Temperature is above warning threshold: >{$TEMP_WARN:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}`<p>Recovery expression:</p>`max(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Ambient"}-3` |WARNING |<p>**Depends on**:</p><p>- Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}</p> |
+|Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}`<p>Recovery expression:</p>`max(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3` |HIGH | |
+|Ambient: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"} |<p>-</p> |`avg(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}`<p>Recovery expression:</p>`min(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Ambient"}+3` |AVERAGE | |
+|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(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#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(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml b/templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml
index e18c93499ab..2f4ea15f036 100644
--- a/templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml
+++ b/templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:38Z'
+  version: '6.0'
+  date: '2021-12-17T06:14:04Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -34,7 +34,7 @@ zabbix_export:
           Version: IMM1
           Device: IMM1 servers (M2,M3 generations)
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/server/supermicro_aten_snmp/README.md b/templates/server/supermicro_aten_snmp/README.md
index e7bd4942059..3a8241ef31a 100644
--- a/templates/server/supermicro_aten_snmp/README.md
+++ b/templates/server/supermicro_aten_snmp/README.md
@@ -3,10 +3,11 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 for BMC ATEN IPMI controllers of Supermicro servers
 https://www.supermicro.com/solutions/IPMI.cfm
 
+
 This template was tested on:
 
 - Supermicro X10DRI
@@ -21,39 +22,39 @@ No specific Zabbix configuration is required.
 
 ### Macros used
 
-| Name             | Description | Default |
-|------------------|-------------|---------|
-| {$TEMP_CRIT_LOW} | <p>-</p>    | `5`     |
-| {$TEMP_CRIT}     | <p>-</p>    | `60`    |
-| {$TEMP_WARN}     | <p>-</p>    | `50`    |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
 
 ## Template links
 
-| Name         |
-|--------------|
-| Generic SNMP |
+|Name|
+|----|
+|Generic SNMP |
 
 ## Discovery rules
 
-| Name                  | Description                                                                                    | Type | Key and additional info                                                                                                                      |
-|-----------------------|------------------------------------------------------------------------------------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------|
-| Temperature Discovery | <p>Scanning ATEN-IPMI-MIB::sensorTable with filter: not connected temp sensors (Value = 0)</p> | SNMP | tempDescr.discovery<p>**Filter**:</p>AND <p>- B: {#SNMPVALUE} MATCHES_REGEX `[1-9]+`</p><p>- A: {#SENSOR_DESCR} MATCHES_REGEX `.*Temp.*`</p> |
-| FAN Discovery         | <p>Scanning ATEN-IPMI-MIB::sensorTable with filter: not connected FAN sensors (Value = 0)</p>  | SNMP | fan.discovery<p>**Filter**:</p>AND <p>- B: {#SNMPVALUE} MATCHES_REGEX `[1-9]+`</p><p>- A: {#SENSOR_DESCR} MATCHES_REGEX `FAN.*`</p>          |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Temperature Discovery |<p>Scanning ATEN-IPMI-MIB::sensorTable with filter: not connected temp sensors (Value = 0)</p> |SNMP |tempDescr.discovery<p>**Filter**:</p>AND <p>- {#SNMPVALUE} MATCHES_REGEX `[1-9]+`</p><p>- {#SENSOR_DESCR} MATCHES_REGEX `.*Temp.*`</p> |
+|FAN Discovery |<p>Scanning ATEN-IPMI-MIB::sensorTable with filter: not connected FAN sensors (Value = 0)</p> |SNMP |fan.discovery<p>**Filter**:</p>AND <p>- {#SNMPVALUE} MATCHES_REGEX `[1-9]+`</p><p>- {#SENSOR_DESCR} MATCHES_REGEX `FAN.*`</p> |
 
 ## Items collected
 
-| Group       | Name                          | Description                                                                                                                                                                                                                      | Type | Key and additional info                                 |
-|-------------|-------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------------------------------------------------------|
-| Fans        | {#SENSOR_DESCR}: Fan speed, % | <p>MIB: ATEN-IPMI-MIB</p><p>A textual string containing information about the interface.</p><p>This string should include the name of the manufacturer, the product name and the version of the interface hardware/software.</p> | SNMP | sensor.fan.speed.percentage[sensorReading.{#SNMPINDEX}] |
-| Temperature | {#SENSOR_DESCR}: Temperature  | <p>MIB: ATEN-IPMI-MIB</p><p>A textual string containing information about the interface.</p><p>This string should include the name of the manufacturer, the product name and the version of the interface hardware/software.</p> | SNMP | sensor.temp.value[sensorReading.{#SNMPINDEX}]           |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Fans |{#SENSOR_DESCR}: Fan speed, % |<p>MIB: ATEN-IPMI-MIB</p><p>A textual string containing information about the interface.</p><p>This string should include the name of the manufacturer, the product name and the version of the interface hardware/software.</p> |SNMP |sensor.fan.speed.percentage[sensorReading.{#SNMPINDEX}] |
+|Temperature |{#SENSOR_DESCR}: Temperature |<p>MIB: ATEN-IPMI-MIB</p><p>A textual string containing information about the interface.</p><p>This string should include the name of the manufacturer, the product name and the version of the interface hardware/software.</p> |SNMP |sensor.temp.value[sensorReading.{#SNMPINDEX}] |
 
 ## Triggers
 
-| Name                                                                       | Description                                                                                          | Expression                                                                                                                                                                                                          | Severity | Dependencies and additional info                                                                          |
-|----------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------|
-| {#SENSOR_DESCR}: Temperature is above warning threshold: >{$TEMP_WARN:""}  | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[sensorReading.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[sensorReading.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3`         | WARNING  | <p>**Depends on**:</p><p>- {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
-| {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""} | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> | `{TEMPLATE_NAME:sensor.temp.value[sensorReading.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[sensorReading.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3`         | HIGH     |                                                                                                           |
-| {#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""}              | <p>-</p>                                                                                             | `{TEMPLATE_NAME:sensor.temp.value[sensorReading.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[sensorReading.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:""}+3` | AVERAGE  |                                                                                                           |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|{#SENSOR_DESCR}: Temperature is above warning threshold: >{$TEMP_WARN:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}`<p>Recovery expression:</p>`max(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)<{$TEMP_WARN:""}-3` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}</p> |
+|{#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}`<p>Recovery expression:</p>`max(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3` |HIGH | |
+|{#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""} |<p>-</p> |`avg(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}`<p>Recovery expression:</p>`min(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:""}+3` |AVERAGE | |
 
 ## Feedback
 
diff --git a/templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml b/templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml
index 9e656e73646..7515ad1dfa8 100644
--- a/templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml
+++ b/templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:36Z'
+  version: '6.0'
+  date: '2021-12-17T06:14:05Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         ATEN-IPMI-MIB
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/tel/asterisk_http/README.md b/templates/tel/asterisk_http/README.md
index 587ccd28ee2..3b52a1638b6 100644
--- a/templates/tel/asterisk_http/README.md
+++ b/templates/tel/asterisk_http/README.md
@@ -3,7 +3,7 @@
 
 ## Overview
 
-For Zabbix version: 5.4 and higher  
+For Zabbix version: 6.0 and higher  
 The template for monitoring Asterisk over HTTP that works without any external scripts.  
 It collects metrics by polling the Asterisk Manager API remotely using an HTTP agent and JS preprocessing.  
 All metrics are collected at once, thanks to Zabbix's bulk data collection.
@@ -11,7 +11,6 @@ All metrics are collected at once, thanks to Zabbix's bulk data collection.
 
 This template was tested on:
 
-- Zabbix, version 5.4 and later
 - Asterisk, version 13 and later
 
 ## Setup
@@ -63,7 +62,7 @@ There are no template links in this template.
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Asterisk |Asterisk: Service status |<p>Asterisk Manager API port avalability.</p> |SIMPLE |net.tcp.service["tcp","{HOST.CONN}","{$AMI.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
+|Asterisk |Asterisk: Service status |<p>Asterisk Manager API port availability.</p> |SIMPLE |net.tcp.service["tcp","{HOST.CONN}","{$AMI.PORT}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
 |Asterisk |Asterisk: Service response time |<p>Asterisk Manager API performance.</p> |SIMPLE |net.tcp.service.perf["tcp","{HOST.CONN}","{$AMI.PORT}"] |
 |Asterisk |Asterisk: Version |<p>Service version</p> |DEPENDENT |asterisk.version<p>**Preprocessing**:</p><p>- JSONPATH: `$.version`</p> |
 |Asterisk |Asterisk: Uptime |<p>System uptime in 'N days, hh:mm:ss' format.</p> |DEPENDENT |asterisk.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$.uptime`</p> |
@@ -71,7 +70,7 @@ There are no template links in this template.
 |Asterisk |Asterisk: Active channels |<p>The number of active channels at the moment.</p> |DEPENDENT |asterisk.active_channels<p>**Preprocessing**:</p><p>- JSONPATH: `$.active_channels`</p> |
 |Asterisk |Asterisk: Active calls |<p>The number of active calls at the moment.</p> |DEPENDENT |asterisk.active_calls<p>**Preprocessing**:</p><p>- JSONPATH: `$.active_calls`</p> |
 |Asterisk |Asterisk: Calls processed |<p>The number of calls processed after the last service restart.</p> |DEPENDENT |asterisk.calls_processed<p>**Preprocessing**:</p><p>- JSONPATH: `$.calls_processed`</p> |
-|Asterisk |Asterisk: Calls processed per second |<p>The number of calls processed per second.</p> |DEPENDENT |asterisk.calls_processed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.calls_processed`</p><p>- CHANGE_PER_SECOND |
+|Asterisk |Asterisk: Calls processed per second |<p>The number of calls processed per second.</p> |DEPENDENT |asterisk.calls_processed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.calls_processed`</p><p>- CHANGE_PER_SECOND</p> |
 |Asterisk |Asterisk: Total queues |<p>The number of configured queues.</p> |DEPENDENT |asterisk.total_queues<p>**Preprocessing**:</p><p>- JSONPATH: `$.queue.total`</p> |
 |Asterisk |Asterisk: SIP monitored online |<p>The number of monitored online SIP peers.</p> |DEPENDENT |asterisk.sip.monitored_online<p>**Preprocessing**:</p><p>- JSONPATH: `$.sip.monitored_online`</p> |
 |Asterisk |Asterisk: SIP monitored offline |<p>The number of monitored offline SIP peers.</p> |DEPENDENT |asterisk.sip.monitored_offline<p>**Preprocessing**:</p><p>- JSONPATH: `$.sip.monitored_offline`</p> |
@@ -103,22 +102,22 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Asterisk: Service is down |<p>-</p> |`{TEMPLATE_NAME:net.tcp.service["tcp","{HOST.CONN}","{$AMI.PORT}"].last()}=0` |AVERAGE |<p>Manual close: YES</p> |
-|Asterisk: Service response time is too high (over {$AMI.RESPONSE_TIME.MAX.WARN} for 5m) |<p>-</p> |`{TEMPLATE_NAME:net.tcp.service.perf["tcp","{HOST.CONN}","{$AMI.PORT}"].min(5m)}>{$AMI.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Asterisk: Service is down</p> |
-|Asterisk: Version has changed (new version: {ITEM.VALUE}) |<p>Asterisk version has changed. Ack to close.</p> |`{TEMPLATE_NAME:asterisk.version.diff()}=1 and {TEMPLATE_NAME:asterisk.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Asterisk: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:asterisk.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Asterisk: Failed to fetch AMI page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`{TEMPLATE_NAME:asterisk.uptime.nodata(30m)}=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Asterisk: Service is down</p> |
-|Asterisk: has been reloaded (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:asterisk.uptime_reload.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Asterisk: Total number of active channels of SIP trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"SIP"} for 10m) |<p>The SIP trunks may not be able to process new calls.</p> |`{TEMPLATE_NAME:asterisk.sip.active_channels.min(10m)}>={$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"SIP"}` |WARNING | |
-|Asterisk: Total number of active channels of IAX trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"IAX"} for 10m) |<p>The IAX trunks may not be able to process new calls.</p> |`{TEMPLATE_NAME:asterisk.iax.active_channels.min(10m)}>={$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"IAX"}` |WARNING | |
-|Asterisk: Total number of active channels of PJSIP trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"PJSIP"} for 10m) |<p>The PJSIP trunks may not be able to process new calls.</p> |`{TEMPLATE_NAME:asterisk.pjsip.active_channels.min(10m)}>={$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"PJSIP"}` |WARNING | |
-|SIP trunk "{#OBJECTNAME}": SIP trunk {#OBJECTNAME} has a state {ITEM.VALUE} |<p>The SIP trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.</p> |`{TEMPLATE_NAME:asterisk.sip.trunk.status[{#OBJECTNAME}].last()}="UNKNOWN" or {TEMPLATE_NAME:asterisk.sip.trunk.status[{#OBJECTNAME}].last()}="UNREACHABLE"` |AVERAGE | |
-|SIP trunk "{#OBJECTNAME}": Number of the SIP trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m) |<p>The SIP trunk may not be able to process new calls.</p> |`{TEMPLATE_NAME:asterisk.sip.trunk.active_channels[{#OBJECTNAME}].min(10m)}>={$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"}` |WARNING | |
-|IAX trunk "{#OBJECTNAME}": IAX trunk {#OBJECTNAME} has a state {ITEM.VALUE} |<p>The IAX trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.</p> |`{TEMPLATE_NAME:asterisk.iax.trunk.status[{#OBJECTNAME}].last()}="UNKNOWN" or {TEMPLATE_NAME:asterisk.iax.trunk.status[{#OBJECTNAME}].last()}="UNREACHABLE"` |AVERAGE | |
-|IAX trunk "{#OBJECTNAME}": Number of the IAX trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m) |<p>The IAX trunk may not be able to process new calls.</p> |`{TEMPLATE_NAME:asterisk.iax.trunk.active_channels[{#OBJECTNAME}].min(10m)}>={$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"}` |WARNING | |
-|PJSIP trunk "{#OBJECTNAME}": PJSIP trunk {#OBJECTNAME} has a state Unavailable |<p>The PJSIP trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.</p> |`{TEMPLATE_NAME:asterisk.pjsip.trunk.devicestate[{#OBJECTNAME}].last()}="Unavailable"` |AVERAGE | |
-|PJSIP trunk "{#OBJECTNAME}": Number of the PJSIP trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m) |<p>The PJSIP trunk may not be able to process new calls.</p> |`{TEMPLATE_NAME:asterisk.pjsip.trunk.active_channels[{#OBJECTNAME}].min(10m)}>={$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"}` |WARNING | |
-|"{#QUEUE}": Number of callers in the queue "{#QUEUE}" is too high (over {$AMI.QUEUE_CALLERS.MAX.WARN:"{#QUEUE}"} for 10m) |<p>There is a large number of calls in the queue.</p> |`{TEMPLATE_NAME:asterisk.queue.callers[{#QUEUE}].min(10m)}>{$AMI.QUEUE_CALLERS.MAX.WARN:"{#QUEUE}"}` |WARNING | |
+|Asterisk: Service is down |<p>-</p> |`last(/Asterisk by HTTP/net.tcp.service["tcp","{HOST.CONN}","{$AMI.PORT}"])=0` |AVERAGE |<p>Manual close: YES</p> |
+|Asterisk: Service response time is too high (over {$AMI.RESPONSE_TIME.MAX.WARN} for 5m) |<p>-</p> |`min(/Asterisk by HTTP/net.tcp.service.perf["tcp","{HOST.CONN}","{$AMI.PORT}"],5m)>{$AMI.RESPONSE_TIME.MAX.WARN}` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Asterisk: Service is down</p> |
+|Asterisk: Version has changed (new version: {ITEM.VALUE}) |<p>Asterisk version has changed. Ack to close.</p> |`last(/Asterisk by HTTP/asterisk.version,#1)<>last(/Asterisk by HTTP/asterisk.version,#2) and length(last(/Asterisk by HTTP/asterisk.version))>0` |INFO |<p>Manual close: YES</p> |
+|Asterisk: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Asterisk by HTTP/asterisk.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Asterisk: Failed to fetch AMI page (or no data for 30m) |<p>Zabbix has not received data for items for the last 30 minutes.</p> |`nodata(/Asterisk by HTTP/asterisk.uptime,30m)=1` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Asterisk: Service is down</p> |
+|Asterisk: has been reloaded (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Asterisk by HTTP/asterisk.uptime_reload)<10m` |INFO |<p>Manual close: YES</p> |
+|Asterisk: Total number of active channels of SIP trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"SIP"} for 10m) |<p>The SIP trunks may not be able to process new calls.</p> |`min(/Asterisk by HTTP/asterisk.sip.active_channels,10m)>={$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"SIP"}` |WARNING | |
+|Asterisk: Total number of active channels of IAX trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"IAX"} for 10m) |<p>The IAX trunks may not be able to process new calls.</p> |`min(/Asterisk by HTTP/asterisk.iax.active_channels,10m)>={$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"IAX"}` |WARNING | |
+|Asterisk: Total number of active channels of PJSIP trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"PJSIP"} for 10m) |<p>The PJSIP trunks may not be able to process new calls.</p> |`min(/Asterisk by HTTP/asterisk.pjsip.active_channels,10m)>={$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"PJSIP"}` |WARNING | |
+|SIP trunk "{#OBJECTNAME}": SIP trunk {#OBJECTNAME} has a state {ITEM.VALUE} |<p>The SIP trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.</p> |`last(/Asterisk by HTTP/asterisk.sip.trunk.status[{#OBJECTNAME}])="UNKNOWN" or last(/Asterisk by HTTP/asterisk.sip.trunk.status[{#OBJECTNAME}])="UNREACHABLE"` |AVERAGE | |
+|SIP trunk "{#OBJECTNAME}": Number of the SIP trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m) |<p>The SIP trunk may not be able to process new calls.</p> |`min(/Asterisk by HTTP/asterisk.sip.trunk.active_channels[{#OBJECTNAME}],10m)>={$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"}` |WARNING | |
+|IAX trunk "{#OBJECTNAME}": IAX trunk {#OBJECTNAME} has a state {ITEM.VALUE} |<p>The IAX trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.</p> |`last(/Asterisk by HTTP/asterisk.iax.trunk.status[{#OBJECTNAME}])="UNKNOWN" or last(/Asterisk by HTTP/asterisk.iax.trunk.status[{#OBJECTNAME}])="UNREACHABLE"` |AVERAGE | |
+|IAX trunk "{#OBJECTNAME}": Number of the IAX trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m) |<p>The IAX trunk may not be able to process new calls.</p> |`min(/Asterisk by HTTP/asterisk.iax.trunk.active_channels[{#OBJECTNAME}],10m)>={$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"}` |WARNING | |
+|PJSIP trunk "{#OBJECTNAME}": PJSIP trunk {#OBJECTNAME} has a state Unavailable |<p>The PJSIP trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.</p> |`last(/Asterisk by HTTP/asterisk.pjsip.trunk.devicestate[{#OBJECTNAME}])="Unavailable"` |AVERAGE | |
+|PJSIP trunk "{#OBJECTNAME}": Number of the PJSIP trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m) |<p>The PJSIP trunk may not be able to process new calls.</p> |`min(/Asterisk by HTTP/asterisk.pjsip.trunk.active_channels[{#OBJECTNAME}],10m)>={$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"}` |WARNING | |
+|"{#QUEUE}": Number of callers in the queue "{#QUEUE}" is too high (over {$AMI.QUEUE_CALLERS.MAX.WARN:"{#QUEUE}"} for 10m) |<p>There is a large number of calls in the queue.</p> |`min(/Asterisk by HTTP/asterisk.queue.callers[{#QUEUE}],10m)>{$AMI.QUEUE_CALLERS.MAX.WARN:"{#QUEUE}"}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/tel/asterisk_http/template_tel_asterisk_http.yaml b/templates/tel/asterisk_http/template_tel_asterisk_http.yaml
index f43fe3dc497..f100feca491 100644
--- a/templates/tel/asterisk_http/template_tel_asterisk_http.yaml
+++ b/templates/tel/asterisk_http/template_tel_asterisk_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-26T13:57:31Z'
+  version: '6.0'
+  date: '2021-12-14T17:44:29Z'
   groups:
     -
       uuid: 1d12408342854fd5a4436dd6d5d1bd4a
@@ -25,7 +25,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/410060-discussion-thread-for-official-zabbix-template-asterisk
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.40
       groups:
         -
           name: Templates/Telephony
@@ -434,7 +434,6 @@ zabbix_export:
                   catch (e) {}
                   
                   return JSON.stringify(asterisk);
-                  
           url: '{$AMI.URL}'
           query_fields:
             -
@@ -904,7 +903,7 @@ zabbix_export:
           type: SIMPLE
           key: 'net.tcp.service["tcp","{HOST.CONN}","{$AMI.PORT}"]'
           history: 7d
-          description: 'Asterisk Manager API port avalability.'
+          description: 'Asterisk Manager API port availability.'
           valuemap:
             name: 'Service state'
           preprocessing:
diff --git a/tests/libs/zbxcommon/calculate_item_nextcheck.c b/tests/libs/zbxcommon/calculate_item_nextcheck.c
index 13b1d5cd425..9c43c2177bd 100644
--- a/tests/libs/zbxcommon/calculate_item_nextcheck.c
+++ b/tests/libs/zbxcommon/calculate_item_nextcheck.c
@@ -27,8 +27,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: get_item_type                                                    *
- *                                                                            *
  * Purpose: get item type from its string representation                      *
  *                                                                            *
  * Parameters: item_type - [IN] the item type                                 *
diff --git a/tests/libs/zbxcommon/replace_key_params_dyn.c b/tests/libs/zbxcommon/replace_key_params_dyn.c
index 94a32550070..1f286a865f6 100644
--- a/tests/libs/zbxcommon/replace_key_params_dyn.c
+++ b/tests/libs/zbxcommon/replace_key_params_dyn.c
@@ -26,8 +26,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: replace_key_param_cb                                             *
- *                                                                            *
  * Comments: auxiliary function for zbx_mock_test_entry()                     *
  *                                                                            *
  ******************************************************************************/
diff --git a/tests/libs/zbxdbcache/dc_check_maintenance_period.c b/tests/libs/zbxdbcache/dc_check_maintenance_period.c
index e8c899d7b78..a942ff7577f 100644
--- a/tests/libs/zbxdbcache/dc_check_maintenance_period.c
+++ b/tests/libs/zbxdbcache/dc_check_maintenance_period.c
@@ -87,11 +87,6 @@ static void	get_maintenance(zbx_dc_maintenance_t *maintenance)
 	maintenance->active_until = (int)ts.sec;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_dc_maintenance_period_t	period;
diff --git a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
index f6e4d413fa6..be351068c26 100644
--- a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
+++ b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
@@ -33,11 +33,6 @@
 
 #include "configcache_mock.h"
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	char		*returned_params;
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.c b/tests/libs/zbxdbcache/dc_item_poller_type_update.c
index 8fd604fc728..656f1750f50 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update.c
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.c
@@ -179,11 +179,6 @@ static void	read_test(const zbx_mock_handle_t *handle, test_config_t *test_confi
 	test_config->test_number = (zbx_uint32_t)strtol(str, NULL, 10);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_mock_error_t	mock_error;
diff --git a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
index 29f1bed54d4..f4faf31a7cd 100644
--- a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
+++ b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
@@ -115,11 +115,6 @@ static void	get_maintenance(zbx_dc_maintenance_t *maintenance)
 	get_maintenance_tags(zbx_mock_get_parameter_handle("in.maintenance.tags"), &maintenance->tags);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	zbx_vector_ptr_t	tags;
diff --git a/tests/libs/zbxdbcache/is_item_processed_by_server.c b/tests/libs/zbxdbcache/is_item_processed_by_server.c
index 76082c022b2..a047d0a7e23 100644
--- a/tests/libs/zbxdbcache/is_item_processed_by_server.c
+++ b/tests/libs/zbxdbcache/is_item_processed_by_server.c
@@ -25,11 +25,6 @@
 #include "common.h"
 #include "dbcache.h"
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	int		type, expected_result;
diff --git a/tests/libs/zbxdbcache/zbx_vc_add_values.c b/tests/libs/zbxdbcache/zbx_vc_add_values.c
index c9501bf57e2..9a22562ae09 100644
--- a/tests/libs/zbxdbcache/zbx_vc_add_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_add_values.c
@@ -29,11 +29,6 @@
 
 extern zbx_uint64_t	CONFIG_VALUE_CACHE_SIZE;
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	int				err, seconds, count, item_status, item_active_range, item_db_cached_from,
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_value.c b/tests/libs/zbxdbcache/zbx_vc_get_value.c
index 0f7d323b8b6..35d4af0f242 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_value.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_value.c
@@ -29,11 +29,6 @@
 
 extern zbx_uint64_t	CONFIG_VALUE_CACHE_SIZE;
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	char				*error = NULL;
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.c b/tests/libs/zbxdbcache/zbx_vc_get_values.c
index 254992a1e07..c90ca2de676 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_values.c
@@ -29,11 +29,6 @@
 
 extern zbx_uint64_t	CONFIG_VALUE_CACHE_SIZE;
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	char				*error = NULL;
diff --git a/tests/libs/zbxhistory/zbx_history_get_values.c b/tests/libs/zbxhistory/zbx_history_get_values.c
index e4bab02157e..ddc8e74fcdb 100644
--- a/tests/libs/zbxhistory/zbx_history_get_values.c
+++ b/tests/libs/zbxhistory/zbx_history_get_values.c
@@ -102,8 +102,6 @@ void	__wrap_zbx_clean_events(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_history_dump                                          *
- *                                                                            *
  * Purpose: dumps history record vector contents to standard output           *
  *                                                                            *
  ******************************************************************************/
@@ -125,8 +123,6 @@ static void	zbx_vcmock_history_dump(unsigned char value_type, const zbx_vector_h
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_read_history_value                                    *
- *                                                                            *
  * Purpose: reads history value and timestamp from input data                 *
  *                                                                            *
  * Parameters: hvalue     - [IN] handle to the history record mapping         *
@@ -190,8 +186,6 @@ static void	zbx_vcmock_read_history_value(zbx_mock_handle_t hvalue, unsigned cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_read_values                                           *
- *                                                                            *
  * Purpose: reads historical values from input data                           *
  *                                                                            *
  * Parameters: hdata      - [IN] handle to the history values in input data   *
@@ -214,8 +208,6 @@ void	zbx_vcmock_read_values(zbx_mock_handle_t hdata, unsigned char value_type, z
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_check_records                                         *
- *                                                                            *
  * Purpose: Compares two history record vectors and throw assertion if either *
  *          values or timestamps don't match                                  *
  *                                                                            *
@@ -272,8 +264,6 @@ void	zbx_vcmock_check_records(const char *prefix, unsigned char value_type,
 
 /******************************************************************************
  *                                                                            *
- * Function: vc_history_record_compare_desc_func                              *
- *                                                                            *
  * Purpose: compares two cache values by their timestamps                     *
  *                                                                            *
  * Parameters: d1   - [IN] the first value                                    *
@@ -295,11 +285,6 @@ static int	vc_history_record_compare_desc_func(const zbx_history_record_t *d1, c
 	return d2->timestamp.sec - d1->timestamp.sec;
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	char				*error = NULL;
diff --git a/tests/libs/zbxprometheus/prometheus_filter_init.c b/tests/libs/zbxprometheus/prometheus_filter_init.c
index d6f1b21cc06..2a4dc291624 100644
--- a/tests/libs/zbxprometheus/prometheus_filter_init.c
+++ b/tests/libs/zbxprometheus/prometheus_filter_init.c
@@ -66,11 +66,6 @@ static void	test_match(const char *prefix, zbx_mock_handle_t hmatch, zbx_prometh
 	zbx_mock_assert_str_eq(buffer, zbx_mock_get_object_member_string(hmatch, "op"), match->op);
 }
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	const char			*filter;
diff --git a/tests/libs/zbxprometheus/prometheus_parse_row.c b/tests/libs/zbxprometheus/prometheus_parse_row.c
index 01f97270f65..140cc0b7d45 100644
--- a/tests/libs/zbxprometheus/prometheus_parse_row.c
+++ b/tests/libs/zbxprometheus/prometheus_parse_row.c
@@ -26,11 +26,6 @@
 #include "zbxalgo.h"
 #include "prometheus_test.h"
 
-/******************************************************************************
- *                                                                            *
- * Function: zbx_mock_test_entry                                              *
- *                                                                            *
- ******************************************************************************/
 void	zbx_mock_test_entry(void **state)
 {
 	const char		*data;
diff --git a/tests/mocks/valuecache/valuecache_mock.c b/tests/mocks/valuecache/valuecache_mock.c
index 829dd651e23..955bed8fecf 100644
--- a/tests/mocks/valuecache/valuecache_mock.c
+++ b/tests/mocks/valuecache/valuecache_mock.c
@@ -73,8 +73,6 @@ static int	history_compare(const void *d1, const void *d2)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_read_history_value                                    *
- *                                                                            *
  * Purpose: reads history value and timestamp from input data                 *
  *                                                                            *
  * Parameters: hvalue     - [IN] handle to the history record mapping         *
@@ -142,8 +140,6 @@ static void	zbx_vcmock_read_history_value(zbx_mock_handle_t hvalue, unsigned cha
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_ds_read_item                                          *
- *                                                                            *
  * Purpose: reads value cache data store item                                 *
  *                                                                            *
  * Parameters: hvalue - [IN] handle to the history record mapping             *
@@ -167,8 +163,6 @@ static void	zbx_vcmock_ds_read_item(zbx_mock_handle_t hitem, zbx_vcmock_ds_item_
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_ds_clone_record                                       *
- *                                                                            *
  * Purpose: duplicates history record                                         *
  *                                                                            *
  * Parameters: src        - [IN] source history record                        *
@@ -207,8 +201,6 @@ static void	zbx_vcmock_ds_clone_record(const zbx_history_record_t *src, unsigned
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_read_values                                           *
- *                                                                            *
  * Purpose: reads historical values from input data                           *
  *                                                                            *
  * Parameters: hdata      - [IN] handle to the history values in input data   *
@@ -231,8 +223,6 @@ void	zbx_vcmock_read_values(zbx_mock_handle_t hdata, unsigned char value_type, z
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_ds_init                                               *
- *                                                                            *
  * Purpose: initializes history data storage                                  *
  *                                                                            *
  * Comments: History data storage is used to emulate history storage backend. *
@@ -268,8 +258,6 @@ void	zbx_vcmock_ds_init(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_ds_destroy                                            *
- *                                                                            *
  * Purpose: destroys history data storage                                     *
  *                                                                            *
  ******************************************************************************/
@@ -287,8 +275,6 @@ void	zbx_vcmock_ds_destroy(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_history_dump                                          *
- *                                                                            *
  * Purpose: dumps history record vector contents to standard output           *
  *                                                                            *
  ******************************************************************************/
@@ -310,8 +296,6 @@ static void	zbx_vcmock_history_dump(unsigned char value_type, const zbx_vector_h
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_ds_dump                                               *
- *                                                                            *
  * Purpose: dumps history data store to standard output                       *
  *                                                                            *
  ******************************************************************************/
@@ -330,8 +314,6 @@ void	zbx_vcmock_ds_dump(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_ds_first_item                                         *
- *                                                                            *
  * Purpose: returns first item in value cache mock data source                *
  *                                                                            *
  ******************************************************************************/
@@ -345,8 +327,6 @@ zbx_vcmock_ds_item_t	*zbx_vcmock_ds_first_item(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_get_cache_mode                                        *
- *                                                                            *
  * Purpose: converts value cache mode from text format                        *
  *                                                                            *
  ******************************************************************************/
@@ -364,8 +344,6 @@ int	zbx_vcmock_str_to_cache_mode(const char *mode)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_str_to_item_status                                    *
- *                                                                            *
  * Purpose: converts value cache item status from text format                 *
  *                                                                            *
  ******************************************************************************/
@@ -379,8 +357,6 @@ int	zbx_vcmock_str_to_item_status(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_check_records                                         *
- *                                                                            *
  * Purpose: Compares two history record vectors and throw assertion if either *
  *          values or timestamps don't match                                  *
  *                                                                            *
@@ -437,8 +413,6 @@ void	zbx_vcmock_check_records(const char *prefix, unsigned char value_type,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_get_dc_history                                        *
- *                                                                            *
  * Purpose: reads ZBX_DC_HISTORY vector from input data                       *
  *                                                                            *
  * Parameters: handle  - [IN] the history data handle in input data           *
@@ -477,8 +451,6 @@ void	zbx_vcmock_get_dc_history(zbx_mock_handle_t handle, zbx_vector_ptr_t *histo
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_free_dc_history                                       *
- *                                                                            *
  * Purpose: frees ZBX_DC_HISTORY structure                                    *
  *                                                                            *
  ******************************************************************************/
@@ -708,8 +680,6 @@ int	__wrap_zbx_elastic_version_get(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_set_available_mem                                     *
- *                                                                            *
  * Purpose:  sets the available memory for the wrapped memory allocator       *
  *                                                                            *
  ******************************************************************************/
@@ -720,8 +690,6 @@ void	zbx_vcmock_set_available_mem(size_t size)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_mem_get_available                                     *
- *                                                                            *
  * Purpose:  retrieves the memory available in the wrapped memory allocator   *
  *                                                                            *
  ******************************************************************************/
@@ -732,8 +700,6 @@ size_t	zbx_vcmock_get_available_mem(void)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_set_cache_size                                        *
- *                                                                            *
  * Purpose: sets the available size in value cache if the specified key is    *
  *          present in input data                                             *
  *                                                                            *
@@ -759,8 +725,6 @@ void	zbx_vcmock_set_cache_size(zbx_mock_handle_t hitem, const char *key)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_get_request_params                                    *
- *                                                                            *
  * Purpose: gets value cache precache or requests parameters from input data  *
  *                                                                            *
  ******************************************************************************/
@@ -782,8 +746,6 @@ void	zbx_vcmock_get_request_params(zbx_mock_handle_t handle, zbx_uint64_t *itemi
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_set_mode                                              *
- *                                                                            *
  * Purpose: sets value cache mode if the specified key is present in input    *
  *          data                                                              *
  *                                                                            *
@@ -824,8 +786,6 @@ void	__wrap_zbx_timespec(zbx_timespec_t *ts)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_set_time                                              *
- *                                                                            *
  * Purpose: sets the current time. The key must be present in input data or   *
  *          the test case will fail                                           *
  *                                                                            *
@@ -843,8 +803,6 @@ void	zbx_vcmock_set_time(zbx_mock_handle_t hitem, const char *key)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_vcmock_get_ts                                                *
- *                                                                            *
  * Purpose: returns the mocked current time                                   *
  *                                                                            *
  ******************************************************************************/
diff --git a/tests/zabbix_server/preprocessor/zbx_item_preproc.c b/tests/zabbix_server/preprocessor/zbx_item_preproc.c
index 4152cebb021..15154cbd45a 100644
--- a/tests/zabbix_server/preprocessor/zbx_item_preproc.c
+++ b/tests/zabbix_server/preprocessor/zbx_item_preproc.c
@@ -148,8 +148,6 @@ static void	read_step(const char *path, zbx_preproc_op_t *op)
 
 /******************************************************************************
  *                                                                            *
- * Function: is_step_supported                                                *
- *                                                                            *
  * Purpose: checks if the preprocessing step is supported based on build      *
  *          configuration or other settings                                   *
  *                                                                            *
diff --git a/tests/zbxmockdata.c b/tests/zbxmockdata.c
index e22dd438050..d8eb61755b4 100644
--- a/tests/zbxmockdata.c
+++ b/tests/zbxmockdata.c
@@ -207,8 +207,6 @@ static void	zbx_yaml_replace_node_rec(yaml_document_t *doc, yaml_node_t *parent,
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_yaml_replace_node                                            *
- *                                                                            *
  * Purpose: replaces node occurrences in mappings and sequences with the new  *
  *          node index                                                        *
  *                                                                            *
@@ -240,8 +238,6 @@ static void	zbx_yaml_replace_node(yaml_document_t *doc, int old_index, int new_i
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_yaml_include_rec                                             *
- *                                                                            *
  * Purpose: recursively include yaml documents from first level 'include'     *
  *          mapping scalar value or sequence                                  *
  *                                                                            *
@@ -281,8 +277,6 @@ static void	zbx_yaml_include_rec(yaml_document_t *doc, int *index)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_yaml_check_include                                           *
- *                                                                            *
  * Purpose: includes another yaml document if include tag is set              *
  *                                                                            *
  * Comments: The document is included by recursively copying its contents     *
@@ -977,8 +971,6 @@ zbx_mock_error_t	zbx_mock_int(zbx_mock_handle_t object, int *value)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mock_string_ex                                               *
- *                                                                            *
  * Purpose: return string object contents                                     *
  *                                                                            *
  * Comments: The object can be either scalar value or a mapping. In the first *
diff --git a/tests/zbxmockjson.c b/tests/zbxmockjson.c
index 0f85d7bcd09..37d687c5dd8 100644
--- a/tests/zbxmockjson.c
+++ b/tests/zbxmockjson.c
@@ -154,8 +154,6 @@ static void	json_flatten_contents(struct zbx_json_parse *jp, const char *prefix,
 
 /******************************************************************************
  *                                                                            *
- * Function: json_flatten                                                     *
- *                                                                            *
  * Purpose: flattens json into vector of key (json path), value pairs, sorted *
  *          by keys                                                           *
  *                                                                            *
@@ -168,8 +166,6 @@ static void	json_flatten(struct zbx_json_parse *jp, zbx_vector_ptr_pair_t *props
 
 /******************************************************************************
  *                                                                            *
- * Function: __zbx_mock_assert_json_eq                                        *
- *                                                                            *
  * Purpose: compares returned json with expected                              *
  *                                                                            *
  * Comments: The comparison is done by first flattening both jsons into       *
diff --git a/tests/zbxmocktime.c b/tests/zbxmocktime.c
index 6e38fcf2de6..dec98b83923 100644
--- a/tests/zbxmocktime.c
+++ b/tests/zbxmocktime.c
@@ -37,8 +37,6 @@
 
 /******************************************************************************
  *                                                                            *
- * Function: ts_get_component_end                                             *
- *                                                                            *
  * Purpose: finds the next character after numeric time component             *
  *                                                                            *
  * Parameters: text - [IN] the text                                           *
@@ -59,8 +57,6 @@ static const char	*ts_get_component_end(const char *text)
 
 /******************************************************************************
  *                                                                            *
- * Function: ts_get_date                                                      *
- *                                                                            *
  * Purpose: parses year, month and day from date component having             *
  *          YYYY-MM-DD format                                                 *
  *                                                                            *
@@ -116,8 +112,6 @@ static zbx_mock_error_t	ts_get_date(const char *text, int *year, int *month, int
 
 /******************************************************************************
  *                                                                            *
- * Function: ts_get_time                                                      *
- *                                                                            *
  * Purpose: parses hours, minutes and seconds from time component having      *
  *          HH:MM:SS format                                                   *
  *                                                                            *
@@ -173,8 +167,6 @@ static zbx_mock_error_t	ts_get_time(const char *text, int *hours, int *minutes,
 
 /******************************************************************************
  *                                                                            *
- * Function: ts_get_ns                                                        *
- *                                                                            *
  * Purpose: parses nanoseconds from time component having .NNNNNNNNN format   *
  *                                                                            *
  * Parameters: text  - [IN] the text                                          *
@@ -209,8 +201,6 @@ static zbx_mock_error_t	ts_get_ns(const char *text, int *ns, const char **pnext)
 
 /******************************************************************************
  *                                                                            *
- * Function: ts_get_tz                                                        *
- *                                                                            *
  * Purpose: parses timezone offset seconds from timezone component having     *
  *         (+|-)HH[:MM] format                                                *
  *                                                                            *
@@ -254,8 +244,6 @@ static zbx_mock_error_t	ts_get_tz(const char *text, int *sec, const char **pnext
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_time_to_localtime                                            *
- *                                                                            *
  * Purpose: converts timestamp to a broken-down time representation and       *
  *          timezone offset (in seconds).                                     *
  *                                                                            *
@@ -294,8 +282,6 @@ static zbx_mock_error_t	zbx_time_to_localtime(time_t timestamp, struct tm *local
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_tz_format                                                    *
- *                                                                            *
  * Purpose: formats timezone to +hh:mm format                                 *
  *                                                                            *
  * Parameters: buffer - [OUT] the output buffer                               *
@@ -334,8 +320,6 @@ zbx_mock_time_parser_state_t;
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_strtime_to_timespec                                          *
- *                                                                            *
  * Purpose: converts YAML space separated timestamp having                    *
  *          YYYY-MM-DD hh:mm:ss.nnnnnnnnn TZ format to zabbix timespec        *
  *                                                                            *
@@ -489,8 +473,6 @@ zbx_mock_error_t	zbx_strtime_to_timespec(const char *strtime, zbx_timespec_t *ts
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_time_to_strtime                                              *
- *                                                                            *
  * Purpose: converts time to YAML space separated timestamp in                *
  *          YYYY-MM-DD hh:mm:ss TZ format                                     *
  *                                                                            *
@@ -531,8 +513,6 @@ zbx_mock_error_t	zbx_time_to_strtime(time_t timestamp, char *buffer, size_t size
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_timespec_to_strtime                                          *
- *                                                                            *
  * Purpose: converts timespec (seconds + nanoseconds) to YAML space separated *
  *          timestamp in YYYY-MM-DD hh:mm:ss.nnnnnnnnn TZ format              *
  *                                                                            *
diff --git a/tests/zbxmockutil.c b/tests/zbxmockutil.c
index ab56f896079..187980dba8e 100644
--- a/tests/zbxmockutil.c
+++ b/tests/zbxmockutil.c
@@ -82,8 +82,6 @@ zbx_mock_handle_t	zbx_mock_get_object_member_handle(zbx_mock_handle_t object, co
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mock_str_to_token_type                                       *
- *                                                                            *
  * Purpose: converts token type from text format                              *
  *                                                                            *
  ******************************************************************************/
@@ -113,8 +111,6 @@ void	zbx_mock_str_to_token_type(const char *str, int *out)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mock_str_to_value_type                                       *
- *                                                                            *
  * Purpose: converts item value type from text format                         *
  *                                                                            *
  ******************************************************************************/
@@ -141,8 +137,6 @@ unsigned char	zbx_mock_str_to_value_type(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mock_str_to_item_type                                        *
- *                                                                            *
  * Purpose: converts item type from text format                               *
  *                                                                            *
  ******************************************************************************/
@@ -204,8 +198,6 @@ int	zbx_mock_str_to_item_type(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mock_str_to_variant                                          *
- *                                                                            *
  * Purpose: converts variant from text format                                 *
  *                                                                            *
  ******************************************************************************/
@@ -305,8 +297,6 @@ int	zbx_mock_get_object_member_int(zbx_mock_handle_t object, const char *name)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mock_str_to_return_code                                      *
- *                                                                            *
  * Purpose: converts common function return code from text format             *
  *                                                                            *
  ******************************************************************************/
@@ -348,8 +338,6 @@ int	zbx_mock_str_to_return_code(const char *str)
 
 /******************************************************************************
  *                                                                            *
- * Function: zbx_mock_str_to_value_type                                       *
- *                                                                            *
  * Purpose: converts item value type from text format                         *
  *                                                                            *
  ******************************************************************************/
diff --git a/ui/app/controllers/CControllerLatest.php b/ui/app/controllers/CControllerLatest.php
index 348ae099352..329ae4e20cd 100644
--- a/ui/app/controllers/CControllerLatest.php
+++ b/ui/app/controllers/CControllerLatest.php
@@ -72,7 +72,7 @@ abstract class CControllerLatest extends CController {
 
 		// Select hosts for subsequent selection of items.
 		$hosts = API::Host()->get([
-			'output' => ['hostid', 'name', 'status'],
+			'output' => ['hostid', 'name', 'status', 'maintenanceid', 'maintenance_status', 'maintenance_type'],
 			'groupids' => $groupids,
 			'hostids' => $filter['hostids'] ? $filter['hostids'] : null,
 			'monitored_hosts' => true,
@@ -168,6 +168,29 @@ abstract class CControllerLatest extends CController {
 			timeUnitToSeconds(CSettingsHelper::get(CSettingsHelper::HISTORY_PERIOD))
 		);
 
+		$hosts_on_page = array_intersect_key($prepared_data['hosts'],
+			array_column($prepared_data['items'], 'hostid', 'hostid')
+		);
+
+		$maintenanceids = [];
+
+		foreach ($hosts_on_page as $host) {
+			if ($host['status'] == HOST_STATUS_MONITORED &&	$host['maintenance_status'] == HOST_MAINTENANCE_STATUS_ON) {
+				$maintenanceids[$host['maintenanceid']] = true;
+			}
+		}
+
+		$db_maintenances = [];
+
+		if ($maintenanceids) {
+			$db_maintenances = API::Maintenance()->get([
+				'output' => ['name', 'description'],
+				'maintenanceids' => array_keys($maintenanceids),
+				'preservekeys' => true
+			]);
+		}
+
+		$prepared_data['maintenances'] = $db_maintenances;
 		$prepared_data['items'] = $items;
 		$prepared_data['history'] = $history;
 	}
diff --git a/ui/app/partials/js/configuration.valuemap.js.php b/ui/app/partials/js/configuration.valuemap.js.php
index 9f5f2da32dd..5fd96766c4d 100644
--- a/ui/app/partials/js/configuration.valuemap.js.php
+++ b/ui/app/partials/js/configuration.valuemap.js.php
@@ -35,7 +35,7 @@
 		let valuemap_table = event.target.closest('table');
 
 		valuemap_table.querySelectorAll('[name$="[name]"]').forEach((elm) => valuemap_names.push(elm.value));
-		PopUp("popup.valuemap.edit", {valuemap_names: valuemap_names}, null, event.target);
+		PopUp('popup.valuemap.edit', {valuemap_names}, {trigger_element: event.target});
 	}
 })();
 </script>
@@ -89,7 +89,7 @@ var AddValueMap = class {
 					valuemap_names.push(element.value);
 				}
 			});
-			PopUp('popup.valuemap.edit', {...this.data, valuemap_names, edit: 1}, null, e.target);
+			PopUp('popup.valuemap.edit', {...this.data, valuemap_names, edit: 1}, {trigger_element: e.target});
 		});
 
 		cell.appendChild(this.createHiddenInput('[name]', this.data.name));
diff --git a/ui/app/partials/js/scheduledreport.subscription.js.php b/ui/app/partials/js/scheduledreport.subscription.js.php
index 50ade8cfcb3..8b48c6c470f 100644
--- a/ui/app/partials/js/scheduledreport.subscription.js.php
+++ b/ui/app/partials/js/scheduledreport.subscription.js.php
@@ -88,20 +88,20 @@
 				recipient = document.createElement('a');
 				recipient.href = 'javascript:void(0);';
 				recipient.addEventListener('click', (event) => {
-					const popup_options = Object.assign(this.data, {
+					const parameters = Object.assign(this.data, {
 						edit: 1,
 						old_recipientid: this.data.recipientid
 					});
 
 					if (this.data.recipient_type == <?= ZBX_REPORT_RECIPIENT_TYPE_USER ?>) {
-						popup_options.exclude = recipient.parentNode.parentNode.querySelector('[name*=exclude]').value;
-						popup_options.userids = Array.from(userids);
+						parameters.exclude = recipient.parentNode.parentNode.querySelector('[name*=exclude]').value;
+						parameters.userids = Array.from(userids);
 					}
 					else {
-						popup_options.usrgrpids = Array.from(usrgrpids);
+						parameters.usrgrpids = Array.from(usrgrpids);
 					}
 
-					PopUp('popup.scheduledreport.subscription.edit', popup_options, null, event.target);
+					PopUp('popup.scheduledreport.subscription.edit', parameters, {trigger_element: event.target});
 				});
 			}
 			else {
@@ -239,12 +239,10 @@
 			}
 
 			elem.addEventListener('click', (event) => {
-				const popup_options = {
+				PopUp('popup.scheduledreport.subscription.edit', {
 					recipient_type: <?= ZBX_REPORT_RECIPIENT_TYPE_USER ?>,
 					userids: Array.from(userids)
-				};
-
-				PopUp('popup.scheduledreport.subscription.edit', popup_options, null, event.target);
+				}, {trigger_element: event.target});
 			});
 		}
 
@@ -256,12 +254,10 @@
 			}
 
 			elem.addEventListener('click', (event) => {
-				const popup_options = {
+				PopUp('popup.scheduledreport.subscription.edit', {
 					recipient_type: <?= ZBX_REPORT_RECIPIENT_TYPE_USER_GROUP ?>,
 					usrgrpids: Array.from(usrgrpids)
-				};
-
-				PopUp('popup.scheduledreport.subscription.edit', popup_options, null, event.target);
+				}, {trigger_element: event.target});
 			});
 		}
 	}
diff --git a/ui/app/partials/monitoring.latest.view.html.php b/ui/app/partials/monitoring.latest.view.html.php
index 071214c218d..96f82dfcc89 100644
--- a/ui/app/partials/monitoring.latest.view.html.php
+++ b/ui/app/partials/monitoring.latest.view.html.php
@@ -198,6 +198,21 @@ foreach ($data['items'] as $itemid => $item) {
 		->addClass($host['status'] == HOST_STATUS_NOT_MONITORED ? ZBX_STYLE_RED : null)
 		->setMenuPopup(CMenuPopupHelper::getHost($item['hostid']));
 
+	$maintenance_icon = '';
+
+	if ($host['status'] == HOST_STATUS_MONITORED && $host['maintenance_status'] == HOST_MAINTENANCE_STATUS_ON) {
+		if (array_key_exists($host['maintenanceid'], $data['maintenances'])) {
+			$maintenance = $data['maintenances'][$host['maintenanceid']];
+			$maintenance_icon = makeMaintenanceIcon($host['maintenance_type'], $maintenance['name'],
+				$maintenance['description']
+			);
+		}
+		else {
+			$maintenance_icon = makeMaintenanceIcon($host['maintenance_type'],
+				_('Inaccessible maintenance'), ''
+			);
+		}
+	}
 
 	$item_icons = [];
 	if ($item['status'] == ITEM_STATUS_ACTIVE && $item['error'] !== '') {
@@ -233,7 +248,7 @@ foreach ($data['items'] as $itemid => $item) {
 
 		$table_row = new CRow([
 			$checkbox,
-			$host_name,
+			[$host_name, $maintenance_icon],
 			(new CCol([$item_name, $item_key]))->addClass($state_css),
 			(new CCol($item_delay))->addClass($state_css),
 			(new CCol($item_history))->addClass($state_css),
@@ -250,7 +265,7 @@ foreach ($data['items'] as $itemid => $item) {
 	else {
 		$table_row = new CRow([
 			$checkbox,
-			$host_name,
+			[$host_name, $maintenance_icon],
 			(new CCol($item_name))->addClass($state_css),
 			(new CCol($last_check))->addClass($state_css),
 			(new CCol($last_value))->addClass($state_css),
diff --git a/ui/app/views/administration.mediatype.list.php b/ui/app/views/administration.mediatype.list.php
index 33b5e6b3fe8..3d10b4d3103 100644
--- a/ui/app/views/administration.mediatype.list.php
+++ b/ui/app/views/administration.mediatype.list.php
@@ -34,7 +34,7 @@ $widget = (new CWidget())
 			->addItem(new CRedirectButton(_('Create media type'), 'zabbix.php?action=mediatype.edit'))
 			->addItem(
 				(new CButton('', _('Import')))
-					->onClick('return PopUp("popup.import", {rules_preset: "mediatype"}, null, this);')
+					->onClick('return PopUp("popup.import", {rules_preset: "mediatype"});')
 					->removeId()
 			)
 		))
@@ -147,9 +147,12 @@ foreach ($data['mediatypes'] as $mediaType) {
 		->addClass(ZBX_STYLE_BTN_LINK)
 		->removeId()
 		->setEnabled(MEDIA_TYPE_STATUS_ACTIVE == $mediaType['status'])
-		->onClick('return PopUp("popup.mediatypetest.edit",'.json_encode([
-			'mediatypeid' => $mediaType['mediatypeid']
-		]).', "mediatypetest_edit", this);');
+		->onClick('
+			return PopUp("popup.mediatypetest.edit", '.json_encode(['mediatypeid' => $mediaType['mediatypeid']]).', {
+				dialogue_id: "mediatypetest_edit",
+				dialogue_class: "modal-popup-medium"
+			});'
+		);
 
 	$name = new CLink($mediaType['name'], '?action=mediatype.edit&mediatypeid='.$mediaType['mediatypeid']);
 
diff --git a/ui/app/views/administration.user.edit.php b/ui/app/views/administration.user.edit.php
index dfa305d67ac..279f84ec085 100644
--- a/ui/app/views/administration.user.edit.php
+++ b/ui/app/views/administration.user.edit.php
@@ -307,7 +307,7 @@ if ($data['action'] === 'user.edit' || CWebUser::$data['type'] > USER_TYPE_ZABBI
 				->addClass(ZBX_STYLE_RED);
 		}
 
-		$popup_options = [
+		$parameters = [
 			'dstfrm' => $user_form->getName(),
 			'media' => $index,
 			'mediatypeid' => $media['mediatypeid'],
@@ -316,8 +316,6 @@ if ($data['action'] === 'user.edit' || CWebUser::$data['type'] > USER_TYPE_ZABBI
 			'severity' => $media['severity'],
 			'active' => $media['active']
 		];
-
-
 		$media_severity = [];
 
 		for ($severity = TRIGGER_SEVERITY_NOT_CLASSIFIED; $severity < TRIGGER_SEVERITY_COUNT; $severity++) {
@@ -354,7 +352,7 @@ if ($data['action'] === 'user.edit' || CWebUser::$data['type'] > USER_TYPE_ZABBI
 					new CHorList([
 						(new CButton(null, _('Edit')))
 							->addClass(ZBX_STYLE_BTN_LINK)
-							->onClick('return PopUp("popup.media",'.json_encode($popup_options).', null, this);'),
+							->onClick('return PopUp("popup.media", '.json_encode($parameters).');'),
 						(new CButton(null, _('Remove')))
 							->addClass(ZBX_STYLE_BTN_LINK)
 							->onClick('javascript: removeMedia('.$index.');')
@@ -368,11 +366,7 @@ if ($data['action'] === 'user.edit' || CWebUser::$data['type'] > USER_TYPE_ZABBI
 		(new CDiv([
 			$media_table_info,
 			(new CButton(null, _('Add')))
-				->onClick('return PopUp("popup.media",'.
-					json_encode([
-						'dstfrm' => $user_form->getName()
-					]).', null, this);'
-				)
+				->onClick('return PopUp("popup.media", '.json_encode(['dstfrm' => $user_form->getName()]).');')
 				->addClass(ZBX_STYLE_BTN_LINK)
 		]))
 			->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
diff --git a/ui/app/views/configuration.correlation.edit.php b/ui/app/views/configuration.correlation.edit.php
index f432dc821ae..0a0bb1c420f 100644
--- a/ui/app/views/configuration.correlation.edit.php
+++ b/ui/app/views/configuration.correlation.edit.php
@@ -97,9 +97,12 @@ if ($data['conditions']) {
 
 $condition_table->addRow([
 	(new CSimpleButton(_('Add')))
-		->onClick('return PopUp("popup.condition.event.corr",'.json_encode([
-			'type' => ZBX_POPUP_CONDITION_TYPE_EVENT_CORR
-		]).', null, this);')
+		->onClick(
+			'return PopUp("popup.condition.event.corr", '.
+				json_encode(['type' => ZBX_POPUP_CONDITION_TYPE_EVENT_CORR]).',
+				{dialogue_class: "modal-popup-medium"}
+			);'
+		)
 		->addClass(ZBX_STYLE_BTN_LINK)
 ]);
 
diff --git a/ui/app/views/configuration.host.list.php b/ui/app/views/configuration.host.list.php
index a7abd331b63..5cb3d2ed4e5 100644
--- a/ui/app/views/configuration.host.list.php
+++ b/ui/app/views/configuration.host.list.php
@@ -40,7 +40,7 @@ $widget = (new CWidget())
 			)
 			->addItem(
 				(new CButton('form', _('Import')))
-					->onClick('return PopUp("popup.import", {rules_preset: "host"}, null, this);')
+					->onClick('return PopUp("popup.import", {rules_preset: "host"});')
 					->removeId()
 			)
 		))->setAttribute('aria-label', _('Content controls'))
@@ -514,7 +514,9 @@ $form->addItem([
 		],
 		'popup.massupdate.host' => [
 			'content' => (new CButton('', _('Mass update')))
-				->onClick("return openMassupdatePopup(this, 'popup.massupdate.host');")
+				->onClick(
+					"return openMassupdatePopup('popup.massupdate.host', {}, {dialogue_class: 'modal-popup-static'});"
+				)
 				->addClass(ZBX_STYLE_BTN_ALT)
 				->addClass('no-chkbxrange')
 		],
diff --git a/ui/app/views/js/administration.audit.settings.edit.js.php b/ui/app/views/js/administration.audit.settings.edit.js.php
index 95ff0945f4c..aeaaa876345 100644
--- a/ui/app/views/js/administration.audit.settings.edit.js.php
+++ b/ui/app/views/js/administration.audit.settings.edit.js.php
@@ -39,6 +39,7 @@
 		$("#resetDefaults").click(function() {
 			overlayDialogue({
 				'title': <?= json_encode(_('Reset confirmation')) ?>,
+				'class': 'position-middle',
 				'content': $('<span>').text(<?= json_encode(_('Reset all fields to default values?')) ?>),
 				'buttons': [
 					{
diff --git a/ui/app/views/js/administration.gui.edit.js.php b/ui/app/views/js/administration.gui.edit.js.php
index 408d697e98c..e7e49f89868 100644
--- a/ui/app/views/js/administration.gui.edit.js.php
+++ b/ui/app/views/js/administration.gui.edit.js.php
@@ -29,6 +29,7 @@
 		$("#resetDefaults").click(function() {
 			overlayDialogue({
 				'title': <?= json_encode(_('Reset confirmation')) ?>,
+				'class': 'position-middle',
 				'content': $('<span>').text(<?= json_encode(_('Reset all fields to default values?')) ?>),
 				'buttons': [
 					{
diff --git a/ui/app/views/js/administration.housekeeping.edit.js.php b/ui/app/views/js/administration.housekeeping.edit.js.php
index c8f64e7d313..12d9e19fa34 100644
--- a/ui/app/views/js/administration.housekeeping.edit.js.php
+++ b/ui/app/views/js/administration.housekeeping.edit.js.php
@@ -65,6 +65,7 @@
 		$("#resetDefaults").click(function() {
 			overlayDialogue({
 				'title': <?= json_encode(_('Reset confirmation')) ?>,
+				'class': 'position-middle',
 				'content': $('<span>').text(<?= json_encode(_('Reset all fields to default values?')) ?>),
 				'buttons': [
 					{
diff --git a/ui/app/views/js/administration.mediatype.edit.js.php b/ui/app/views/js/administration.mediatype.edit.js.php
index ecb992abe17..fed3485a4f6 100644
--- a/ui/app/views/js/administration.mediatype.edit.js.php
+++ b/ui/app/views/js/administration.mediatype.edit.js.php
@@ -161,7 +161,10 @@
 
 			switch ($btn.data('action')) {
 				case 'add':
-					PopUp('popup.mediatype.message', params, null, $btn);
+					PopUp('popup.mediatype.message', params, {
+						dialogue_class: 'modal-popup-medium',
+						trigger_element: this
+					});
 					break;
 
 				case 'edit':
@@ -179,7 +182,10 @@
 						}
 					});
 
-					PopUp('popup.mediatype.message', params, null, $btn);
+					PopUp('popup.mediatype.message', params, {
+						dialogue_class: 'modal-popup-medium',
+						trigger_element: this
+					});
 					break;
 			}
 		});
diff --git a/ui/app/views/js/administration.miscconfig.edit.js.php b/ui/app/views/js/administration.miscconfig.edit.js.php
index 1256ae71ba4..094f35bd40a 100644
--- a/ui/app/views/js/administration.miscconfig.edit.js.php
+++ b/ui/app/views/js/administration.miscconfig.edit.js.php
@@ -39,6 +39,7 @@ $default_inventory_mode = DB::getDefault('config', 'default_inventory_mode');
 		$("#resetDefaults").click(function() {
 			overlayDialogue({
 				'title': <?= json_encode(_('Reset confirmation')) ?>,
+				'class': 'position-middle',
 				'content': $('<span>').text(<?= json_encode(_('Reset all fields to default values?')) ?>),
 				'buttons': [
 					{
diff --git a/ui/app/views/js/administration.proxy.list.js.php b/ui/app/views/js/administration.proxy.list.js.php
index ce7a1dfa7c5..630e41b4c05 100644
--- a/ui/app/views/js/administration.proxy.list.js.php
+++ b/ui/app/views/js/administration.proxy.list.js.php
@@ -36,7 +36,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/app/views/js/administration.trigdisplay.edit.js.php b/ui/app/views/js/administration.trigdisplay.edit.js.php
index 69cf094193b..e534fe9a723 100644
--- a/ui/app/views/js/administration.trigdisplay.edit.js.php
+++ b/ui/app/views/js/administration.trigdisplay.edit.js.php
@@ -45,6 +45,7 @@
 		$("#resetDefaults").click(function() {
 			overlayDialogue({
 				'title': <?= json_encode(_('Reset confirmation')) ?>,
+				'class': 'position-middle',
 				'content': $('<span>').text(<?= json_encode(_('Reset all fields to default values?')) ?>),
 				'buttons': [
 					{
diff --git a/ui/app/views/js/administration.userrole.edit.js.php b/ui/app/views/js/administration.userrole.edit.js.php
index 2f0e7dcf27e..6dd214b4adb 100644
--- a/ui/app/views/js/administration.userrole.edit.js.php
+++ b/ui/app/views/js/administration.userrole.edit.js.php
@@ -209,7 +209,7 @@
 			const overlay = PopUp('popup.services', {
 				title: <?= json_encode(_('Add services')) ?>,
 				exclude_serviceids
-			}, 'services', document.activeElement);
+			}, {dialogueid: 'services'});
 
 			overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 				const data = [];
diff --git a/ui/app/views/js/configuration.discovery.edit.js.php b/ui/app/views/js/configuration.discovery.edit.js.php
index 6b2a694f77f..20c7fd6135a 100644
--- a/ui/app/views/js/configuration.discovery.edit.js.php
+++ b/ui/app/views/js/configuration.discovery.edit.js.php
@@ -261,7 +261,10 @@
 
 			switch ($btn.data('action')) {
 				case 'add':
-					PopUp('popup.discovery.check', {}, null, $btn);
+					PopUp('popup.discovery.check', {}, {
+						dialogue_class: 'modal-popup-medium',
+						trigger_element: this
+					});
 					break;
 
 				case 'edit':
@@ -280,7 +283,10 @@
 						}
 					});
 
-					PopUp('popup.discovery.check', params, null, $btn);
+					PopUp('popup.discovery.check', params, {
+						dialogue_class: 'modal-popup-medium',
+						trigger_element: this
+					});
 					break;
 			}
 		});
diff --git a/ui/app/views/js/configuration.host.list.js.php b/ui/app/views/js/configuration.host.list.js.php
index 4ce23a3b5fd..6c10418d9b7 100644
--- a/ui/app/views/js/configuration.host.list.js.php
+++ b/ui/app/views/js/configuration.host.list.js.php
@@ -81,7 +81,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/app/views/js/monitoring.dashboard.view.js.php b/ui/app/views/js/monitoring.dashboard.view.js.php
index 33e6fbcf605..89670959428 100644
--- a/ui/app/views/js/monitoring.dashboard.view.js.php
+++ b/ui/app/views/js/monitoring.dashboard.view.js.php
@@ -264,7 +264,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/app/views/js/monitoring.host.view.js.php b/ui/app/views/js/monitoring.host.view.js.php
index 726b4a72c6c..861ce516b76 100644
--- a/ui/app/views/js/monitoring.host.view.js.php
+++ b/ui/app/views/js/monitoring.host.view.js.php
@@ -266,7 +266,10 @@
 			this._removePopupMessage();
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			this.unscheduleRefresh();
 
diff --git a/ui/app/views/js/monitoring.latest.view.js.php b/ui/app/views/js/monitoring.latest.view.js.php
index 75137ff8b0c..3f00d05d0be 100644
--- a/ui/app/views/js/monitoring.latest.view.js.php
+++ b/ui/app/views/js/monitoring.latest.view.js.php
@@ -277,7 +277,10 @@
 			this._removePopupMessage();
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			this.unscheduleRefresh();
 
diff --git a/ui/app/views/js/monitoring.map.view.js.php b/ui/app/views/js/monitoring.map.view.js.php
index 8daf03df911..76a9c55bc6c 100644
--- a/ui/app/views/js/monitoring.map.view.js.php
+++ b/ui/app/views/js/monitoring.map.view.js.php
@@ -39,7 +39,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/app/views/js/monitoring.problem.view.js.php b/ui/app/views/js/monitoring.problem.view.js.php
index ea0cb995310..656769481ce 100644
--- a/ui/app/views/js/monitoring.problem.view.js.php
+++ b/ui/app/views/js/monitoring.problem.view.js.php
@@ -236,7 +236,10 @@
 			clearMessages();
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/app/views/js/monitoring.web.view.js.php b/ui/app/views/js/monitoring.web.view.js.php
index e62fe3b752b..50d496304d6 100644
--- a/ui/app/views/js/monitoring.web.view.js.php
+++ b/ui/app/views/js/monitoring.web.view.js.php
@@ -53,7 +53,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/app/views/js/popup.generic.js.php b/ui/app/views/js/popup.generic.js.php
index 9d536819ff8..8f315637ad6 100644
--- a/ui/app/views/js/popup.generic.js.php
+++ b/ui/app/views/js/popup.generic.js.php
@@ -45,10 +45,12 @@ window.popup_generic = {
 
 		jQuery('.multiselect', overlay.$dialogue).each(function (i, ms) {
 			jQuery(ms).on('change', {overlay: overlay}, function (e) {
-				const groups = jQuery(this).multiSelect('getData').map(i => i.id);
-				const options = groups.length ? {groupid: groups[0]} : {filter_groupid_rst: 1, groupid: []};
+				const groups = jQuery(this).multiSelect('getData').map((item) => item.id);
+				const parameters = groups.length ? {groupid: groups[0]} : {filter_groupid_rst: 1, groupid: []};
 
-				PopUp(e.data.overlay.action, {...e.data.overlay.options, ...options}, e.data.overlay.dialogueid);
+				PopUp(e.data.overlay.action, {...e.data.overlay.options, ...parameters}, {
+					dialogueid: e.data.overlay.dialogueid
+				});
 			});
 		});
 	},
@@ -58,10 +60,12 @@ window.popup_generic = {
 
 		jQuery('.multiselect', overlay.$dialogue).each(function (i, ms) {
 			jQuery(ms).on('change', {overlay: overlay}, function (e) {
-				const hosts = jQuery(this).multiSelect('getData').map(i => i.id);
-				const options = hosts.length ? {hostid: hosts[0]} : {filter_hostid_rst: 1, hostid: []};
+				const hosts = jQuery(this).multiSelect('getData').map((item) => item.id);
+				const parameters = hosts.length ? {hostid: hosts[0]} : {filter_hostid_rst: 1, hostid: []};
 
-				PopUp(e.data.overlay.action, {...e.data.overlay.options, ...options}, e.data.overlay.dialogueid);
+				PopUp(e.data.overlay.action, {...e.data.overlay.options, ...parameters}, {
+					dialogueid: e.data.overlay.dialogueid
+				});
 			});
 		});
 	},
diff --git a/ui/app/views/js/popup.host.edit.js.php b/ui/app/views/js/popup.host.edit.js.php
index 976753adfb2..553b5342464 100644
--- a/ui/app/views/js/popup.host.edit.js.php
+++ b/ui/app/views/js/popup.host.edit.js.php
@@ -93,22 +93,28 @@ window.host_edit_popup = {
 
 	clone() {
 		this.overlay.setLoading();
-		const options = host_edit.preprocessFormFields(getFormFields(this.form));
-		delete options.sid;
-		options.clone = 1;
+		const parameters = host_edit.preprocessFormFields(getFormFields(this.form));
+		delete parameters.sid;
+		parameters.clone = 1;
 
 		this.removeEventListeners();
-		PopUp('popup.host.edit', options, 'host_edit');
+		PopUp('popup.host.edit', parameters, {
+			dialogueid: 'host_edit',
+			dialogue_class: 'modal-popup-large'
+		});
 	},
 
 	fullClone() {
 		this.overlay.setLoading();
-		const options = host_edit.preprocessFormFields(getFormFields(this.form));
-		delete options.sid;
-		options.full_clone = 1;
+		const parameters = host_edit.preprocessFormFields(getFormFields(this.form));
+		delete parameters.sid;
+		parameters.full_clone = 1;
 
 		this.removeEventListeners();
-		PopUp('popup.host.edit', options, 'host_edit');
+		PopUp('popup.host.edit', parameters, {
+			dialogueid: 'host_edit',
+			dialogue_class: 'modal-popup-large'
+		});
 	},
 
 	delete(hostid) {
diff --git a/ui/app/views/js/popup.import.js.php b/ui/app/views/js/popup.import.js.php
index d705bf723d7..a7199a3e3b9 100644
--- a/ui/app/views/js/popup.import.js.php
+++ b/ui/app/views/js/popup.import.js.php
@@ -43,6 +43,7 @@ function isDeleteMissingChecked(import_overlay) {
 
 function confirmSubmit(import_overlay, compare_overlay) {
 	overlayDialogue({
+		class: 'position-middle',
 		content: jQuery('<span>')
 					.text(<?= json_encode(_('Delete all elements that are not present in the import file?')) ?>),
 		buttons: [
@@ -94,7 +95,7 @@ function openImportComparePopup(overlay) {
 		else {
 			overlayDialogue({
 				title: response.header,
-				class: `modal-popup${response.no_changes ? '' : ' modal-popup-fullscreen'}`,
+				class: response.no_changes ? '' : 'modal-popup-fullscreen',
 				content: response.body,
 				buttons: response.buttons,
 				script_inline: response.script_inline,
@@ -143,6 +144,7 @@ function submitImportPopup(overlay) {
 function updateWarning(obj, content) {
 	if (jQuery(obj).is(':checked')) {
 		overlayDialogue({
+			class: 'position-middle',
 			content: jQuery('<span>').text(content),
 			buttons: [
 				{
diff --git a/ui/app/views/js/popup.massupdate.js.php b/ui/app/views/js/popup.massupdate.js.php
index b5cc310fde5..ec1cb547f4c 100644
--- a/ui/app/views/js/popup.massupdate.js.php
+++ b/ui/app/views/js/popup.massupdate.js.php
@@ -334,17 +334,17 @@ $('#tabs').on('tabsactivate', (event, ui) => {
 		}
 	}
 
-	function openAddfromPopup(elm) {
+	function openAddfromPopup(element) {
 		let disable_names = [];
-		let valuemap_table = elm.closest('table');
+		let valuemap_table = element.closest('table');
 
-		valuemap_table.querySelectorAll('[name$="[name]"]').forEach((elm) => disable_names.push(elm.value));
+		valuemap_table.querySelectorAll('[name$="[name]"]').forEach((element) => disable_names.push(element.value));
 		PopUp('popup.generic', {
 			srctbl: 'valuemaps',
 			srcfld1: 'valuemapid',
 			disable_names: disable_names,
 			editable: true
-		}, null, elm);
+		}, {dialogue_class: 'modal-popup-generic', trigger_element: element});
 	}
 
 	function toggleVisible(obj, data_type) {
@@ -421,7 +421,7 @@ function submitPopup(overlay) {
 		overlayDialogue({
 			'title': <?= json_encode(_('Warning')) ?>,
 			'type': 'popup',
-			'class': 'modal-popup modal-popup-medium',
+			'class': 'position-middle',
 			'content': $('<span>').text(warning_message),
 			'buttons': [
 				{
diff --git a/ui/app/views/js/popup.mediatypetest.edit.js.php b/ui/app/views/js/popup.mediatypetest.edit.js.php
index 14660086409..8e35a7429c6 100644
--- a/ui/app/views/js/popup.mediatypetest.edit.js.php
+++ b/ui/app/views/js/popup.mediatypetest.edit.js.php
@@ -107,7 +107,7 @@ function openLogPopup(opener) {
 	overlayDialogue({
 		'title': <?= json_encode(_('Media type test log')) ?>,
 		'content': $content,
-		'class': 'modal-popup modal-popup-generic debug-modal',
+		'class': 'modal-popup modal-popup-generic debug-modal position-middle',
 		'footer': $footer,
 		'buttons': [
 			{
diff --git a/ui/app/views/js/popup.scriptexec.js.php b/ui/app/views/js/popup.scriptexec.js.php
index 560bab5e36e..3c2c56211ae 100644
--- a/ui/app/views/js/popup.scriptexec.js.php
+++ b/ui/app/views/js/popup.scriptexec.js.php
@@ -46,7 +46,7 @@ $(document).ready(function() {
 		overlayDialogue({
 			'title': <?= json_encode(_('Script execution log')) ?>,
 			'content': $content,
-			'class': 'modal-popup modal-popup-generic debug-modal',
+			'class': 'modal-popup modal-popup-generic debug-modal position-middle',
 			'footer': $footer,
 			'buttons': [
 				{
diff --git a/ui/app/views/js/popup.service.edit.js.php b/ui/app/views/js/popup.service.edit.js.php
index 161f112d68f..51617b7175a 100644
--- a/ui/app/views/js/popup.service.edit.js.php
+++ b/ui/app/views/js/popup.service.edit.js.php
@@ -245,12 +245,12 @@ window.service_edit_popup = {
 	},
 
 	editStatusRule(row = null) {
-		let popup_params;
+		let parameters;
 
 		if (row !== null) {
 			const row_index = row.dataset.row_index;
 
-			popup_params = {
+			parameters = {
 				edit: '1',
 				row_index,
 				new_status: row.querySelector(`[name="status_rules[${row_index}][new_status]"`).value,
@@ -266,12 +266,10 @@ window.service_edit_popup = {
 				row_index++;
 			}
 
-			popup_params = {row_index};
+			parameters = {row_index};
 		}
 
-		const overlay = PopUp('popup.service.statusrule.edit', popup_params, 'service_status_rule_edit',
-			document.activeElement
-		);
+		const overlay = PopUp('popup.service.statusrule.edit', parameters, {dialogueid: 'service_status_rule_edit'});
 
 		overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 			if (row !== null) {
@@ -381,7 +379,7 @@ window.service_edit_popup = {
 		const overlay = PopUp('popup.services', {
 			title: <?= json_encode(_('Add child services')) ?>,
 			exclude_serviceids
-		}, 'services', document.activeElement);
+		}, {dialogueid: 'services'});
 
 		overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 			for (const service of e.detail) {
@@ -411,7 +409,7 @@ window.service_edit_popup = {
 		const overlay = PopUp('popup.services', {
 			title: <?= json_encode(_('Add parent services')) ?>,
 			exclude_serviceids
-		}, 'services', document.activeElement);
+		}, {dialogueid: 'services'});
 
 		overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 			const data = [];
diff --git a/ui/app/views/js/popup.services.js.php b/ui/app/views/js/popup.services.js.php
index 38c7d54d3f2..d425a433ef6 100644
--- a/ui/app/views/js/popup.services.js.php
+++ b/ui/app/views/js/popup.services.js.php
@@ -43,7 +43,10 @@ window.services_popup = {
 		filter_form.addEventListener('submit', (e) => {
 			e.preventDefault();
 
-			PopUp('popup.services', getFormFields(filter_form), 'services', e.target);
+			PopUp('popup.services', getFormFields(filter_form), {
+				dialogueid: 'services',
+				trigger_element: e.target
+			});
 		}, {passive: false});
 
 		filter_form.addEventListener('reset', (e) => {
@@ -51,7 +54,10 @@ window.services_popup = {
 
 			filter_form.elements.filter_name.value = '';
 
-			PopUp('popup.services', getFormFields(filter_form), 'services', e.target);
+			PopUp('popup.services', getFormFields(filter_form), {
+				dialogueid: 'services',
+				trigger_element: e.target
+			});
 		}, {passive: false});
 
 		this.form.addEventListener('click', (e) => {
diff --git a/ui/app/views/js/popup.sla.edit.js.php b/ui/app/views/js/popup.sla.edit.js.php
index a69ccf316af..00631378d38 100644
--- a/ui/app/views/js/popup.sla.edit.js.php
+++ b/ui/app/views/js/popup.sla.edit.js.php
@@ -153,9 +153,9 @@ window.sla_edit_popup = {
 			popup_params = {row_index};
 		}
 
-		const overlay = PopUp('popup.sla.excludeddowntime.edit', popup_params, 'sla_excluded_downtime_edit',
-			document.activeElement
-		);
+		const overlay = PopUp('popup.sla.excludeddowntime.edit', popup_params, {
+			dialogueid: 'sla_excluded_downtime_edit'
+		});
 
 		overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 			if (row !== null) {
diff --git a/ui/app/views/js/reports.scheduledreport.edit.js.php b/ui/app/views/js/reports.scheduledreport.edit.js.php
index 57b76f4c853..7694976c991 100644
--- a/ui/app/views/js/reports.scheduledreport.edit.js.php
+++ b/ui/app/views/js/reports.scheduledreport.edit.js.php
@@ -71,6 +71,7 @@
 		e.preventDefault();
 
 		overlayDialogue({
+			'class': 'modal-popup position-middle',
 			'content': <?= json_encode(_('Report generated by other users will be changed to the current user.')) ?>,
 			'buttons': [
 				{
@@ -141,20 +142,23 @@
 		if (test_btn !== null) {
 			test_btn.addEventListener('click', (event) => {
 				const form = event.target.closest('form');
-				const popup_options = {
+				const parameters = {
 					period: form.elements['period'].value,
 					now: Math.floor(Date.now() / 1000)
 				};
 
 				if (typeof form.elements['dashboardid'] !== 'undefined') {
-					popup_options.dashboardid = form.elements['dashboardid'].value;
+					parameters.dashboardid = form.elements['dashboardid'].value;
 				}
 
 				document.querySelectorAll('#name, #subject, #message').forEach((elem) => {
-					popup_options[elem.id] = elem.value.trim();
+					parameters[elem.id] = elem.value.trim();
 				});
 
-				PopUp('popup.scheduledreport.test', popup_options, null, event.target);
+				PopUp('popup.scheduledreport.test', parameters, {
+					dialogue_class: 'modal-popup-medium',
+					trigger_element: event.target
+				});
 			});
 		}
 	});
diff --git a/ui/app/views/js/search.js.php b/ui/app/views/js/search.js.php
index ce7a1dfa7c5..630e41b4c05 100644
--- a/ui/app/views/js/search.js.php
+++ b/ui/app/views/js/search.js.php
@@ -36,7 +36,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/app/views/js/service.list.js.php b/ui/app/views/js/service.list.js.php
index 543239fba85..fad320471d7 100644..100755
--- a/ui/app/views/js/service.list.js.php
+++ b/ui/app/views/js/service.list.js.php
@@ -82,11 +82,11 @@
 		initActionButtons() {
 			document.addEventListener('click', (e) => {
 				if (e.target.matches('.js-create-service, .js-add-child-service')) {
-					const options = e.target.dataset.serviceid !== undefined
+					const parameters = e.target.dataset.serviceid !== undefined
 						? {parent_serviceids: [e.target.dataset.serviceid]}
 						: {};
 
-					this.edit(options);
+					this.edit(parameters);
 				}
 				else if (e.target.classList.contains('js-edit-service')) {
 					this.edit({serviceid: e.target.dataset.serviceid});
@@ -95,7 +95,10 @@
 					this.delete(e.target, [e.target.dataset.serviceid]);
 				}
 				else if (e.target.classList.contains('js-massupdate-service')) {
-					openMassupdatePopup(e.target, 'popup.massupdate.service', {location_url: this.back_url});
+					openMassupdatePopup('popup.massupdate.service', {location_url: this.back_url}, {
+						dialogue_class: 'modal-popup-static',
+						trigger_element: e.target
+					});
 				}
 				else if (e.target.classList.contains('js-massdelete-service')) {
 					this.delete(e.target, Object.values(chkbxRange.getSelectedIds()));
@@ -109,10 +112,13 @@
 			}
 		},
 
-		edit(options = {}) {
+		edit(parameters = {}) {
 			this.pauseRefresh();
 
-			const overlay = PopUp('popup.service.edit', options, 'service_edit', document.activeElement);
+			const overlay = PopUp('popup.service.edit', parameters, {
+				dialogueid: 'service_edit',
+				dialogue_class: 'modal-popup-medium'
+			});
 			const dialogue = overlay.$dialogue[0];
 
 			dialogue.addEventListener('dialogue.submit', (e) => {
diff --git a/ui/app/views/js/sla.list.js.php b/ui/app/views/js/sla.list.js.php
index 955efc1c501..031b5f4a3a3 100644
--- a/ui/app/views/js/sla.list.js.php
+++ b/ui/app/views/js/sla.list.js.php
@@ -83,10 +83,11 @@
 			});
 		},
 
-		edit(options = {}) {
-			const overlay = PopUp('popup.sla.edit', options, 'sla_edit', document.activeElement);
-
-			overlay.$dialogue[0].classList.add(<?= json_encode(ZBX_STYLE_STICKED_TO_TOP) ?>);
+		edit(parameters = {}) {
+			const overlay = PopUp('popup.sla.edit', parameters, {
+				dialogueid: 'sla_edit',
+				dialogue_class: 'modal-popup-static'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 				postMessageOk(e.detail.title);
diff --git a/ui/app/views/js/slareport.list.js.php b/ui/app/views/js/slareport.list.js.php
index 7ba3d6a7504..63dbff77f79 100644
--- a/ui/app/views/js/slareport.list.js.php
+++ b/ui/app/views/js/slareport.list.js.php
@@ -38,7 +38,7 @@
 			const overlay = PopUp('popup.services', {
 				title: <?= json_encode(_('Service')) ?>,
 				multiple: 0
-			}, 'services', document.activeElement);
+			}, {dialogueid: 'services'});
 
 			overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 				const data = [];
diff --git a/ui/app/views/monitoring.latest.view.php b/ui/app/views/monitoring.latest.view.php
index 0799ec494ad..1f93252a67d 100644
--- a/ui/app/views/monitoring.latest.view.php
+++ b/ui/app/views/monitoring.latest.view.php
@@ -63,7 +63,7 @@ else {
 
 $widget->addItem(new CPartial('monitoring.latest.view.html', array_intersect_key($data,
 	array_flip(['filter', 'sort_field', 'sort_order', 'view_curl', 'paging', 'hosts', 'items', 'history', 'config',
-		'tags'
+		'tags', 'maintenances'
 	])
 )));
 
diff --git a/ui/app/views/monitoring.widget.navtreeitem.edit.php b/ui/app/views/monitoring.widget.navtreeitem.edit.php
index 588544c077e..accedaf91f9 100644
--- a/ui/app/views/monitoring.widget.navtreeitem.edit.php
+++ b/ui/app/views/monitoring.widget.navtreeitem.edit.php
@@ -47,15 +47,15 @@ $form_list = (new CFormList())
 		(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
 		(new CButton('select', _('Select')))
 			->addClass(ZBX_STYLE_BTN_GREY)
-			->onClick('return PopUp("popup.generic",'.
-				json_encode([
+			->onClick(
+				'return PopUp("popup.generic", '.json_encode([
 					'srctbl' => 'sysmaps',
 					'srcfld1' => 'sysmapid',
 					'srcfld2' => 'name',
 					'dstfrm' => $form->getName(),
 					'dstfld1' => 'sysmapid',
 					'dstfld2' => 'sysmapname'
-				]).', null, this);'
+				]).', {dialogue_class: "modal-popup-generic"});'
 			)
 	]);
 
diff --git a/ui/app/views/popup.condition.common.php b/ui/app/views/popup.condition.common.php
index bcac36d09ef..1415ca943af 100644
--- a/ui/app/views/popup.condition.common.php
+++ b/ui/app/views/popup.condition.common.php
@@ -402,8 +402,8 @@ switch ($data['type']) {
 					(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
 					(new CButton('btn1', _('Select')))
 						->addClass(ZBX_STYLE_BTN_GREY)
-						->onClick('return PopUp("popup.generic",'.
-							json_encode([
+						->onClick(
+							'return PopUp("popup.generic", '. json_encode([
 								'srctbl' => 'dchecks',
 								'srcfld1' => 'dcheckid',
 								'srcfld2' => 'name',
@@ -411,7 +411,7 @@ switch ($data['type']) {
 								'dstfld1' => 'dcheck_new_condition_value',
 								'dstfld2' => 'dcheck',
 								'writeonly' => '1'
-							]).', null, this);'
+							]).', {dialogue_class: "modal-popup-generic"});'
 						)
 				];
 
diff --git a/ui/app/views/popup.dashboard.share.edit.php b/ui/app/views/popup.dashboard.share.edit.php
index 32a6fc87e5a..da6cd375138 100644
--- a/ui/app/views/popup.dashboard.share.edit.php
+++ b/ui/app/views/popup.dashboard.share.edit.php
@@ -34,14 +34,14 @@ $table_user_groups = (new CTable())
 		(new CRow(
 			(new CCol(
 				(new CButton(null, _('Add')))
-					->onClick('return PopUp("popup.generic",'.
-						json_encode([
+					->onClick(
+						'return PopUp("popup.generic", '. json_encode([
 							'srctbl' => 'usrgrp',
 							'srcfld1' => 'usrgrpid',
 							'srcfld2' => 'name',
 							'dstfrm' => $form->getName(),
 							'multiselect' => '1'
-						]).', null, this);'
+						]).', {dialogue_class: "modal-popup-generic"});'
 					)
 					->addClass(ZBX_STYLE_BTN_LINK)
 			))->setColSpan(3)
@@ -55,14 +55,14 @@ $table_users = (new CTable())
 		(new CRow(
 			(new CCol(
 				(new CButton(null, _('Add')))
-					->onClick('return PopUp("popup.generic",'.
-						json_encode([
+					->onClick(
+						'return PopUp("popup.generic", '.json_encode([
 							'srctbl' => 'users',
 							'srcfld1' => 'userid',
 							'srcfld2' => 'fullname',
 							'dstfrm' => $form->getName(),
 							'multiselect' => '1'
-						]).', null, this);'
+						]).', {dialogue_class: "modal-popup-generic"});'
 					)
 					->addClass(ZBX_STYLE_BTN_LINK)
 			))->setColSpan(3)
diff --git a/ui/app/views/popup.massupdate.item.php b/ui/app/views/popup.massupdate.item.php
index 30c118c60cd..60dab355873 100644
--- a/ui/app/views/popup.massupdate.item.php
+++ b/ui/app/views/popup.massupdate.item.php
@@ -420,8 +420,8 @@ if ($data['single_host_selected']) {
 		$master_item[] = (new CButton('button', _('Select')))
 			->addClass(ZBX_STYLE_BTN_GREY)
 			->removeId()
-			->onClick('return PopUp("popup.generic",'.
-				json_encode([
+			->onClick(
+				'return PopUp("popup.generic", '.json_encode([
 					'srctbl' => 'items',
 					'srcfld1' => 'itemid',
 					'srcfld2' => 'name',
@@ -431,15 +431,15 @@ if ($data['single_host_selected']) {
 					'only_hostid' => $data['hostid'],
 					'with_webitems' => 1,
 					'normal_only' => 1
-				]).', null, this);'
+				]).', {dialogue_class: "modal-popup-generic"});'
 			);
 
 		$master_item[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN);
 		$master_item[] = (new CButton('button', _('Select prototype')))
 			->addClass(ZBX_STYLE_BTN_GREY)
 			->removeId()
-			->onClick('return PopUp("popup.generic",'.
-				json_encode([
+			->onClick(
+				'return PopUp("popup.generic", '.json_encode([
 					'srctbl' => 'item_prototypes',
 					'srcfld1' => 'itemid',
 					'srcfld2' => 'name',
@@ -447,7 +447,7 @@ if ($data['single_host_selected']) {
 					'dstfld1' => 'master_itemid',
 					'dstfld2' => 'master_itemname',
 					'parent_discoveryid' => $data['parent_discoveryid']
-				]).', null, this);'
+				]).', {dialogue_class: "modal-popup-generic"});'
 			);
 	}
 
diff --git a/ui/app/views/popup.massupdate.trigger.php b/ui/app/views/popup.massupdate.trigger.php
index 5f49062fb6d..4bed8a3afaf 100644
--- a/ui/app/views/popup.massupdate.trigger.php
+++ b/ui/app/views/popup.massupdate.trigger.php
@@ -99,8 +99,8 @@ $dependencies_table = (new CTable())
 $bttn_prototype = '';
 if ($data['prototype']) {
 	$bttn_prototype = (new CButton('add_dep_trigger_prototype', _('Add prototype')))
-	->onClick('return PopUp("popup.generic",'.
-		json_encode([
+	->onClick(
+		'return PopUp("popup.generic", '.json_encode([
 			'srctbl' => 'trigger_prototypes',
 			'srcfld1' => 'triggerid',
 			'dstfrm' => 'massupdate',
@@ -110,7 +110,7 @@ if ($data['prototype']) {
 			'multiselect' => '1',
 			'objname' => 'triggers',
 			'parent_discoveryid' => $data['parent_discoveryid']
-		]).', null, this);'
+		]).', {dialogue_class: "modal-popup-generic"});'
 	)
 	->addClass(ZBX_STYLE_BTN_LINK);
 }
@@ -122,8 +122,8 @@ $dependencies_form_list->addRow(
 		$dependencies_table,
 		new CHorList([
 			(new CButton('btn1', _('Add')))
-				->onClick('return PopUp("popup.generic",'.
-					json_encode([
+				->onClick(
+					'return PopUp("popup.generic", '.json_encode([
 						'srctbl' => 'triggers',
 						'srcfld1' => 'triggerid',
 						'dstfrm' => 'massupdate',
@@ -135,7 +135,7 @@ $dependencies_form_list->addRow(
 						'with_triggers' => '1',
 						'normal_only' => '1',
 						'noempty' => '1'
-					]).', null, this);'
+					]).', {dialogue_class: "modal-popup-generic"});'
 				)
 				->addClass(ZBX_STYLE_BTN_LINK),
 			$bttn_prototype
diff --git a/ui/app/views/popup.triggerexpr.php b/ui/app/views/popup.triggerexpr.php
index df500d82989..b3fd1e181f6 100644
--- a/ui/app/views/popup.triggerexpr.php
+++ b/ui/app/views/popup.triggerexpr.php
@@ -75,15 +75,15 @@ if ($data['item_required']) {
 		(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
 		(new CButton('select', _('Select')))
 			->addClass(ZBX_STYLE_BTN_GREY)
-			->onClick('return PopUp("popup.generic",'.json_encode($popup_options).', null, this);')
+			->onClick('return PopUp("popup.generic", '.json_encode($popup_options).');')
 	];
 
 	if ($data['parent_discoveryid'] !== '') {
 		$item[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN);
 		$item[] = (new CButton('select', _('Select prototype')))
 			->addClass(ZBX_STYLE_BTN_GREY)
-			->onClick('return PopUp("popup.generic",'.
-				json_encode([
+			->onClick(
+				'return PopUp("popup.generic", '.json_encode([
 					'srctbl' => 'item_prototypes',
 					'srcfld1' => 'itemid',
 					'srcfld2' => 'name',
@@ -91,7 +91,7 @@ if ($data['item_required']) {
 					'dstfld1' => 'itemid',
 					'dstfld2' => 'item_description',
 					'parent_discoveryid' => $data['parent_discoveryid']
-				]).', null, this);'
+				]).', {dialogue_class: "modal-popup-generic"});'
 			)
 			->removeId();
 	}
diff --git a/ui/app/views/popup.view.php b/ui/app/views/popup.view.php
index 8f0894f0d5d..3df667e76b7 100644
--- a/ui/app/views/popup.view.php
+++ b/ui/app/views/popup.view.php
@@ -26,7 +26,7 @@
 (new CWidget())->show();
 
 (new CScriptTag(
-	'PopUp("'.$data['popup']['action'].'", '.json_encode($data['popup']['options']).', null, null);'.
+	'PopUp("'.$data['popup']['action'].'", '.json_encode($data['popup']['options']).');'.
 
 	'$.subscribe("acknowledge.create", function(event, response, overlay) {'.
 		'clearMessages();'.
diff --git a/ui/assets/styles/blue-theme.css b/ui/assets/styles/blue-theme.css
index 79f1850707b..1e6c007d814 100644
--- a/ui/assets/styles/blue-theme.css
+++ b/ui/assets/styles/blue-theme.css
@@ -2530,6 +2530,9 @@ div.dashboard-grid-widget-slareport .date-vertical {
   writing-mode: vertical-lr;
   transform: rotate(180deg); }
 
+.overlay-dialogue.modal-popup .dashboard-grid-widget-svggraph .table-forms-container, .overlay-dialogue.modal-popup .dashboard-grid-widget-svggraph .browser-warning-container {
+  border: 1px solid #dfe4e7; }
+
 .link-action {
   border-bottom: 1px dotted;
   cursor: pointer;
@@ -4411,7 +4414,7 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       overflow: auto;
       overflow-x: hidden;
       width: 100%;
-      max-height: calc(100vh - 190px);
+      max-height: calc(100vh - 220px);
       max-width: inherit;
       margin: 0 -10px 8px;
       padding: 2px 10px;
@@ -4445,26 +4448,42 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       float: right;
       top: -13px;
       right: -8px; }
-  .overlay-dialogue.sticked-to-top {
-    top: 50px; }
   .overlay-dialogue.modal-popup {
+    top: 50px;
     max-width: 1024px; }
-    .overlay-dialogue.modal-popup.modal-popup-medium {
-      min-width: 450px; }
     .overlay-dialogue.modal-popup.modal-popup-small {
       max-width: 450px;
       width: 100%; }
+    .overlay-dialogue.modal-popup.modal-popup-medium {
+      min-width: 450px; }
+    .overlay-dialogue.modal-popup.modal-popup-large {
+      width: 100%; }
+    .overlay-dialogue.modal-popup.modal-popup-generic {
+      min-width: 650px; }
     .overlay-dialogue.modal-popup.modal-popup-static {
       max-width: 700px;
       width: 100%; }
     .overlay-dialogue.modal-popup.modal-popup-preprocessing {
       max-width: 900px;
       width: 100%; }
-    .overlay-dialogue.modal-popup.modal-popup-generic {
-      min-width: 650px; }
+      .overlay-dialogue.modal-popup.modal-popup-preprocessing .preprocessing-list .step-name {
+        flex: 0 0 180px; }
+      .overlay-dialogue.modal-popup.modal-popup-preprocessing .preprocessing-list {
+        min-width: unset;
+        max-width: unset; }
     .overlay-dialogue.modal-popup.modal-popup-fullscreen {
       width: calc(100vw - 40px);
       max-width: calc(100vw - 40px); }
+    .overlay-dialogue.modal-popup .table-forms-container, .overlay-dialogue.modal-popup .browser-warning-container {
+      border: none; }
+    .overlay-dialogue.modal-popup .ui-tabs-nav {
+      position: sticky;
+      top: 0;
+      background: #ffffff;
+      z-index: 3; }
+    .overlay-dialogue.modal-popup .textarea-flexible {
+      max-height: 200px;
+      overflow-y: auto; }
   .overlay-dialogue .hintbox-wrap {
     overflow: auto;
     max-height: 240px;
diff --git a/ui/assets/styles/dark-theme.css b/ui/assets/styles/dark-theme.css
index 657956feb2d..7da47c66010 100644
--- a/ui/assets/styles/dark-theme.css
+++ b/ui/assets/styles/dark-theme.css
@@ -2543,6 +2543,9 @@ div.dashboard-grid-widget-slareport .date-vertical {
   writing-mode: vertical-lr;
   transform: rotate(180deg); }
 
+.overlay-dialogue.modal-popup .dashboard-grid-widget-svggraph .table-forms-container, .overlay-dialogue.modal-popup .dashboard-grid-widget-svggraph .browser-warning-container {
+  border: 1px solid #303030; }
+
 .link-action {
   border-bottom: 1px dotted;
   cursor: pointer;
@@ -4422,7 +4425,7 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       overflow: auto;
       overflow-x: hidden;
       width: 100%;
-      max-height: calc(100vh - 190px);
+      max-height: calc(100vh - 220px);
       max-width: inherit;
       margin: 0 -10px 8px;
       padding: 2px 10px;
@@ -4456,26 +4459,42 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       float: right;
       top: -13px;
       right: -8px; }
-  .overlay-dialogue.sticked-to-top {
-    top: 50px; }
   .overlay-dialogue.modal-popup {
+    top: 50px;
     max-width: 1024px; }
-    .overlay-dialogue.modal-popup.modal-popup-medium {
-      min-width: 450px; }
     .overlay-dialogue.modal-popup.modal-popup-small {
       max-width: 450px;
       width: 100%; }
+    .overlay-dialogue.modal-popup.modal-popup-medium {
+      min-width: 450px; }
+    .overlay-dialogue.modal-popup.modal-popup-large {
+      width: 100%; }
+    .overlay-dialogue.modal-popup.modal-popup-generic {
+      min-width: 650px; }
     .overlay-dialogue.modal-popup.modal-popup-static {
       max-width: 700px;
       width: 100%; }
     .overlay-dialogue.modal-popup.modal-popup-preprocessing {
       max-width: 900px;
       width: 100%; }
-    .overlay-dialogue.modal-popup.modal-popup-generic {
-      min-width: 650px; }
+      .overlay-dialogue.modal-popup.modal-popup-preprocessing .preprocessing-list .step-name {
+        flex: 0 0 180px; }
+      .overlay-dialogue.modal-popup.modal-popup-preprocessing .preprocessing-list {
+        min-width: unset;
+        max-width: unset; }
     .overlay-dialogue.modal-popup.modal-popup-fullscreen {
       width: calc(100vw - 40px);
       max-width: calc(100vw - 40px); }
+    .overlay-dialogue.modal-popup .table-forms-container, .overlay-dialogue.modal-popup .browser-warning-container {
+      border: none; }
+    .overlay-dialogue.modal-popup .ui-tabs-nav {
+      position: sticky;
+      top: 0;
+      background: #2b2b2b;
+      z-index: 3; }
+    .overlay-dialogue.modal-popup .textarea-flexible {
+      max-height: 200px;
+      overflow-y: auto; }
   .overlay-dialogue .hintbox-wrap {
     overflow: auto;
     max-height: 240px;
diff --git a/ui/assets/styles/hc-dark.css b/ui/assets/styles/hc-dark.css
index 9c8a39ee2df..968e90cd210 100644
--- a/ui/assets/styles/hc-dark.css
+++ b/ui/assets/styles/hc-dark.css
@@ -2519,6 +2519,9 @@ div.dashboard-grid-widget-slareport .date-vertical {
   writing-mode: vertical-lr;
   transform: rotate(180deg); }
 
+.overlay-dialogue.modal-popup .dashboard-grid-widget-svggraph .table-forms-container, .overlay-dialogue.modal-popup .dashboard-grid-widget-svggraph .browser-warning-container {
+  border: 1px solid #444444; }
+
 .link-action {
   border-bottom: 1px dotted;
   cursor: pointer;
@@ -4377,7 +4380,7 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       overflow: auto;
       overflow-x: hidden;
       width: 100%;
-      max-height: calc(100vh - 190px);
+      max-height: calc(100vh - 220px);
       max-width: inherit;
       margin: 0 -10px 8px;
       padding: 2px 10px;
@@ -4411,26 +4414,42 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       float: right;
       top: -13px;
       right: -8px; }
-  .overlay-dialogue.sticked-to-top {
-    top: 50px; }
   .overlay-dialogue.modal-popup {
+    top: 50px;
     max-width: 1024px; }
-    .overlay-dialogue.modal-popup.modal-popup-medium {
-      min-width: 450px; }
     .overlay-dialogue.modal-popup.modal-popup-small {
       max-width: 450px;
       width: 100%; }
+    .overlay-dialogue.modal-popup.modal-popup-medium {
+      min-width: 450px; }
+    .overlay-dialogue.modal-popup.modal-popup-large {
+      width: 100%; }
+    .overlay-dialogue.modal-popup.modal-popup-generic {
+      min-width: 650px; }
     .overlay-dialogue.modal-popup.modal-popup-static {
       max-width: 700px;
       width: 100%; }
     .overlay-dialogue.modal-popup.modal-popup-preprocessing {
       max-width: 900px;
       width: 100%; }
-    .overlay-dialogue.modal-popup.modal-popup-generic {
-      min-width: 650px; }
+      .overlay-dialogue.modal-popup.modal-popup-preprocessing .preprocessing-list .step-name {
+        flex: 0 0 180px; }
+      .overlay-dialogue.modal-popup.modal-popup-preprocessing .preprocessing-list {
+        min-width: unset;
+        max-width: unset; }
     .overlay-dialogue.modal-popup.modal-popup-fullscreen {
       width: calc(100vw - 40px);
       max-width: calc(100vw - 40px); }
+    .overlay-dialogue.modal-popup .table-forms-container, .overlay-dialogue.modal-popup .browser-warning-container {
+      border: none; }
+    .overlay-dialogue.modal-popup .ui-tabs-nav {
+      position: sticky;
+      top: 0;
+      background: #070707;
+      z-index: 3; }
+    .overlay-dialogue.modal-popup .textarea-flexible {
+      max-height: 200px;
+      overflow-y: auto; }
   .overlay-dialogue .hintbox-wrap {
     overflow: auto;
     max-height: 240px;
diff --git a/ui/assets/styles/hc-light.css b/ui/assets/styles/hc-light.css
index d8cd57b61dc..22799dda954 100644
--- a/ui/assets/styles/hc-light.css
+++ b/ui/assets/styles/hc-light.css
@@ -2519,6 +2519,9 @@ div.dashboard-grid-widget-slareport .date-vertical {
   writing-mode: vertical-lr;
   transform: rotate(180deg); }
 
+.overlay-dialogue.modal-popup .dashboard-grid-widget-svggraph .table-forms-container, .overlay-dialogue.modal-popup .dashboard-grid-widget-svggraph .browser-warning-container {
+  border: 1px solid #9f9f9f; }
+
 .link-action {
   border-bottom: 1px dotted;
   cursor: pointer;
@@ -4377,7 +4380,7 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       overflow: auto;
       overflow-x: hidden;
       width: 100%;
-      max-height: calc(100vh - 190px);
+      max-height: calc(100vh - 220px);
       max-width: inherit;
       margin: 0 -10px 8px;
       padding: 2px 10px;
@@ -4411,26 +4414,42 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       float: right;
       top: -13px;
       right: -8px; }
-  .overlay-dialogue.sticked-to-top {
-    top: 50px; }
   .overlay-dialogue.modal-popup {
+    top: 50px;
     max-width: 1024px; }
-    .overlay-dialogue.modal-popup.modal-popup-medium {
-      min-width: 450px; }
     .overlay-dialogue.modal-popup.modal-popup-small {
       max-width: 450px;
       width: 100%; }
+    .overlay-dialogue.modal-popup.modal-popup-medium {
+      min-width: 450px; }
+    .overlay-dialogue.modal-popup.modal-popup-large {
+      width: 100%; }
+    .overlay-dialogue.modal-popup.modal-popup-generic {
+      min-width: 650px; }
     .overlay-dialogue.modal-popup.modal-popup-static {
       max-width: 700px;
       width: 100%; }
     .overlay-dialogue.modal-popup.modal-popup-preprocessing {
       max-width: 900px;
       width: 100%; }
-    .overlay-dialogue.modal-popup.modal-popup-generic {
-      min-width: 650px; }
+      .overlay-dialogue.modal-popup.modal-popup-preprocessing .preprocessing-list .step-name {
+        flex: 0 0 180px; }
+      .overlay-dialogue.modal-popup.modal-popup-preprocessing .preprocessing-list {
+        min-width: unset;
+        max-width: unset; }
     .overlay-dialogue.modal-popup.modal-popup-fullscreen {
       width: calc(100vw - 40px);
       max-width: calc(100vw - 40px); }
+    .overlay-dialogue.modal-popup .table-forms-container, .overlay-dialogue.modal-popup .browser-warning-container {
+      border: none; }
+    .overlay-dialogue.modal-popup .ui-tabs-nav {
+      position: sticky;
+      top: 0;
+      background: #f3f3f3;
+      z-index: 3; }
+    .overlay-dialogue.modal-popup .textarea-flexible {
+      max-height: 200px;
+      overflow-y: auto; }
   .overlay-dialogue .hintbox-wrap {
     overflow: auto;
     max-height: 240px;
diff --git a/ui/include/classes/widgets/CWidgetConfig.php b/ui/include/classes/widgets/CWidgetConfig.php
index b043b5372fc..bf2d1325bd4 100644
--- a/ui/include/classes/widgets/CWidgetConfig.php
+++ b/ui/include/classes/widgets/CWidgetConfig.php
@@ -204,8 +204,7 @@ class CWidgetConfig {
 				'js_class' => $js_clases[$type],
 				'iterator' => self::isIterator($type),
 				'reference_field' => self::getReferenceField($type),
-				'foreign_reference_fields' => self::getForeignReferenceFields($type),
-				'dialogue_stick_to_top' => self::getDialogueStickToTop($type)
+				'foreign_reference_fields' => self::getForeignReferenceFields($type)
 			];
 		}
 
@@ -346,23 +345,6 @@ class CWidgetConfig {
 	}
 
 	/**
-	 * Check if widget dialogue should be sticked to top instead of being centered vertically.
-	 *
-	 * @param string $type  Widget type - 'WIDGET_*' constant.
-	 *
-	 * @return bool
-	 */
-	public static function getDialogueStickToTop(string $type): bool {
-		switch ($type) {
-			case WIDGET_SVG_GRAPH:
-				return true;
-
-			default:
-				return false;
-		}
-	}
-
-	/**
 	 * Check if widget has padding or not.
 	 *
 	 * @static
diff --git a/ui/include/classes/widgets/CWidgetHelper.php b/ui/include/classes/widgets/CWidgetHelper.php
index 383d4b1d5d8..218e9fbe1b3 100644
--- a/ui/include/classes/widgets/CWidgetHelper.php
+++ b/ui/include/classes/widgets/CWidgetHelper.php
@@ -450,8 +450,9 @@ class CWidgetHelper {
 			(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
 			(new CButton('select', _('Select')))
 				->addClass(ZBX_STYLE_BTN_GREY)
-				->onClick('return PopUp("popup.generic",'.
-					json_encode($field->getPopupOptions($form_name)).', null, this);')
+				->onClick('return PopUp("popup.generic", '.json_encode($field->getPopupOptions($form_name)).',
+					{dialogue_class: "modal-popup-generic"}
+				);')
 		];
 	}
 
diff --git a/ui/include/classes/widgets/views/js/widget.slareport.form.view.js.php b/ui/include/classes/widgets/views/js/widget.slareport.form.view.js.php
index f803163d1e2..b1ed5647bf0 100755
--- a/ui/include/classes/widgets/views/js/widget.slareport.form.view.js.php
+++ b/ui/include/classes/widgets/views/js/widget.slareport.form.view.js.php
@@ -45,7 +45,7 @@ window.widget_slareport = {
 				title: <?= json_encode(_('Service')) ?>,
 				exclude_serviceids,
 				multiple: 0
-			}, 'services', document.activeElement);
+			}, {dialogueid: 'services'});
 
 			overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 				const data = [];
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index 5797db376f4..381c0a1884f 100644
--- a/ui/include/defines.inc.php
+++ b/ui/include/defines.inc.php
@@ -18,7 +18,7 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-define('ZABBIX_VERSION',		'6.0.0beta2');
+define('ZABBIX_VERSION',		'6.0.0rc1');
 define('ZABBIX_API_VERSION',	'6.0.0');
 define('ZABBIX_EXPORT_VERSION',	'6.0');
 
@@ -1972,7 +1972,6 @@ define('ZBX_STYLE_STATUS_NA_BG', 'status-na-bg');
 define('ZBX_STYLE_STATUS_RED', 'status-red');
 define('ZBX_STYLE_STATUS_WARNING_BG', 'status-warning-bg');
 define('ZBX_STYLE_STATUS_YELLOW', 'status-yellow');
-define('ZBX_STYLE_STICKED_TO_TOP', 'sticked-to-top');
 define('ZBX_STYLE_SVG_GRAPH', 'svg-graph');
 define('ZBX_STYLE_SVG_GRAPH_PREVIEW', 'svg-graph-preview');
 define('ZBX_STYLE_SUBFILTER', 'subfilter');
diff --git a/ui/include/views/configuration.action.edit.php b/ui/include/views/configuration.action.edit.php
index bb2e50b3a0c..d0cee10ca1a 100644
--- a/ui/include/views/configuration.action.edit.php
+++ b/ui/include/views/configuration.action.edit.php
@@ -133,10 +133,12 @@ $action_tab->addRow(new CLabel(_('Type of calculation'), 'label-evaltype'), [
 
 $condition_table->addRow([
 	(new CSimpleButton(_('Add')))
-		->onClick('return PopUp("popup.condition.actions",'.json_encode([
-			'type' => ZBX_POPUP_CONDITION_TYPE_ACTION,
-			'source' => $data['eventsource']
-		]).', null, this);')
+		->onClick(
+			'return PopUp("popup.condition.actions", '.json_encode([
+				'type' => ZBX_POPUP_CONDITION_TYPE_ACTION,
+				'source' => $data['eventsource']
+			]).', {dialogue_class: "modal-popup-medium"});'
+		)
 		->addClass(ZBX_STYLE_BTN_LINK)
 ]);
 
diff --git a/ui/include/views/configuration.graph.edit.php b/ui/include/views/configuration.graph.edit.php
index 23d7cabb813..d765d887825 100644
--- a/ui/include/views/configuration.graph.edit.php
+++ b/ui/include/views/configuration.graph.edit.php
@@ -195,8 +195,8 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 		// Select item button.
 		$yaxisMinData[] = (new CButton('yaxis_min', _('Select')))
 			->addClass(ZBX_STYLE_BTN_GREY)
-			->onClick('return PopUp("popup.generic",jQuery.extend('.
-				json_encode([
+			->onClick(
+				'return PopUp("popup.generic", jQuery.extend('.json_encode([
 					'srctbl' => 'items',
 					'srcfld1' => 'itemid',
 					'srcfld2' => 'name',
@@ -206,8 +206,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 					'with_webitems' => '1',
 					'numeric' => '1',
 					'writeonly' => '1'
-				]).
-					',getOnlyHostParam()), null, this);'
+				]).', getOnlyHostParam()), {dialogue_class: "modal-popup-generic"});'
 			)
 			->setEnabled(!$readonly);
 
@@ -216,8 +215,8 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 			$yaxisMinData[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN);
 			$yaxisMinData[] = (new CButton('yaxis_min_prototype', _('Select prototype')))
 				->addClass(ZBX_STYLE_BTN_GREY)
-				->onClick('return PopUp("popup.generic",'.
-					json_encode([
+				->onClick(
+					'return PopUp("popup.generic", '.json_encode([
 						'srctbl' => 'item_prototypes',
 						'srcfld1' => 'itemid',
 						'srcfld2' => 'name',
@@ -226,7 +225,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 						'dstfld2' => 'ymin_name',
 						'parent_discoveryid' => $data['parent_discoveryid'],
 						'numeric' => '1'
-					]).', null, this);'
+					]).', {dialogue_class: "modal-popup-generic"});'
 				)
 				->setEnabled(!$readonly);
 		}
@@ -271,8 +270,8 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 		// Select item button.
 		$yaxisMaxData[] = (new CButton('yaxis_max', _('Select')))
 			->addClass(ZBX_STYLE_BTN_GREY)
-			->onClick('return PopUp("popup.generic",jQuery.extend('.
-				json_encode([
+			->onClick(
+				'return PopUp("popup.generic", jQuery.extend('.json_encode([
 					'srctbl' => 'items',
 					'srcfld1' => 'itemid',
 					'srcfld2' => 'name',
@@ -282,8 +281,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 					'with_webitems' => '1',
 					'numeric' => '1',
 					'writeonly' => '1'
-				]).
-					',getOnlyHostParam()), null, this);'
+				]).', getOnlyHostParam()), {dialogue_class: "modal-popup-generic"});'
 			)
 			->setEnabled(!$readonly);
 
@@ -292,8 +290,8 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 			$yaxisMaxData[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN);
 			$yaxisMaxData[] = (new CButton('yaxis_max_prototype', _('Select prototype')))
 				->addClass(ZBX_STYLE_BTN_GREY)
-				->onClick('return PopUp("popup.generic",'.
-					json_encode([
+				->onClick(
+					'return PopUp("popup.generic", '.json_encode([
 						'srctbl' => 'item_prototypes',
 						'srcfld1' => 'itemid',
 						'srcfld2' => 'name',
@@ -302,7 +300,7 @@ if ($this->data['graphtype'] == GRAPH_TYPE_NORMAL || $this->data['graphtype'] ==
 						'dstfld2' => 'ymax_name',
 						'parent_discoveryid' => $data['parent_discoveryid'],
 						'numeric' => '1'
-					]).', null, this);'
+					]).', {dialogue_class: "modal-popup-generic"});'
 				)
 				->setEnabled(!$readonly);
 		}
@@ -358,7 +356,7 @@ $items_table = (new CTable())
 		$readonly ? null : (new CTableColumn(_('Action')))->addClass('table-col-action')
 	]);
 
-$popup_options_add = [
+$parameters_add = [
 	'srctbl' => 'items',
 	'srcfld1' => 'itemid',
 	'srcfld2' => 'name',
@@ -369,13 +367,13 @@ $popup_options_add = [
 	'with_webitems' => '1'
 ];
 if ($data['normal_only']) {
-	$popup_options_add['normal_only'] = '1';
+	$parameters_add['normal_only'] = '1';
 }
 if ($data['hostid']) {
-	$popup_options_add['hostid'] = $data['hostid'];
+	$parameters_add['hostid'] = $data['hostid'];
 }
 
-$popup_options_add_prototype = [
+$parameters_add_prototype = [
 	'srctbl' => 'item_prototypes',
 	'srcfld1' => 'itemid',
 	'srcfld2' => 'name',
@@ -386,10 +384,10 @@ $popup_options_add_prototype = [
 	'graphtype' => $data['graphtype']
 ];
 if ($data['normal_only']) {
-	$popup_options_add_prototype['normal_only'] = '1';
+	$parameters_add_prototype['normal_only'] = '1';
 }
 if ($data['parent_discoveryid']) {
-	$popup_options_add_prototype['parent_discoveryid'] = $data['parent_discoveryid'];
+	$parameters_add_prototype['parent_discoveryid'] = $data['parent_discoveryid'];
 }
 
 $items_table->addRow(
@@ -399,15 +397,17 @@ $items_table->addRow(
 			: (new CCol(
 				new CHorList([
 					(new CButton('add_item', _('Add')))
-						->onClick('return PopUp("popup.generic",jQuery.extend('.
-							json_encode($popup_options_add).',getOnlyHostParam()), null, this);'
+						->onClick(
+							'return PopUp("popup.generic",
+								jQuery.extend('.json_encode($parameters_add).', getOnlyHostParam())
+							);'
 						)
 						->addClass(ZBX_STYLE_BTN_LINK),
 					$data['parent_discoveryid']
 						? (new CButton('add_protoitem', _('Add prototype')))
-							->onClick('return PopUp("popup.generic",'.
-								json_encode($popup_options_add_prototype).', null, this);'
-							)
+							->onClick('return PopUp("popup.generic", '.json_encode($parameters_add_prototype).',
+								{dialogue_class: "modal-popup-generic"}
+							);')
 							->addClass(ZBX_STYLE_BTN_LINK)
 						: null
 				])
diff --git a/ui/include/views/configuration.item.edit.php b/ui/include/views/configuration.item.edit.php
index 0d791e44627..da13e56bb0b 100644
--- a/ui/include/views/configuration.item.edit.php
+++ b/ui/include/views/configuration.item.edit.php
@@ -103,14 +103,13 @@ if (!$readonly) {
 	$key_controls[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN);
 	$key_controls[] = (new CButton('keyButton', _('Select')))
 		->addClass(ZBX_STYLE_BTN_GREY)
-		->onClick('return PopUp("popup.generic",jQuery.extend('.
-			json_encode([
+		->onClick(
+			'return PopUp("popup.generic", jQuery.extend('.json_encode([
 				'srctbl' => 'help_items',
 				'srcfld1' => 'key',
 				'dstfrm' => $form->getName(),
 				'dstfld1' => 'key'
-			]).
-				',{itemtype: jQuery("#type").val()}), null, this);'
+			]).', {itemtype: jQuery("#type").val()}), {dialogue_class: "modal-popup-generic"});'
 		);
 }
 
diff --git a/ui/include/views/configuration.item.list.php b/ui/include/views/configuration.item.list.php
index 69610350722..52794cf5894 100644
--- a/ui/include/views/configuration.item.list.php
+++ b/ui/include/views/configuration.item.list.php
@@ -307,7 +307,11 @@ $button_list += [
 	'item.masscopyto' => ['name' => _('Copy')],
 	'popup.massupdate.item' => [
 		'content' => (new CButton('', _('Mass update')))
-			->onClick("return openMassupdatePopup(this, 'popup.massupdate.item');")
+			->onClick(
+				"return openMassupdatePopup('popup.massupdate.item', {}, {
+					dialogue_class: 'modal-popup-preprocessing'
+				});"
+			)
 			->addClass(ZBX_STYLE_BTN_ALT)
 			->removeAttribute('id')
 	],
diff --git a/ui/include/views/configuration.item.prototype.edit.php b/ui/include/views/configuration.item.prototype.edit.php
index f34585417c4..b90e85fcac6 100644
--- a/ui/include/views/configuration.item.prototype.edit.php
+++ b/ui/include/views/configuration.item.prototype.edit.php
@@ -88,14 +88,13 @@ if (!$readonly) {
 	$key_controls[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN);
 	$key_controls[] = (new CButton('keyButton', _('Select')))
 		->addClass(ZBX_STYLE_BTN_GREY)
-		->onClick('return PopUp("popup.generic",jQuery.extend('.
-			json_encode([
+		->onClick(
+			'return PopUp("popup.generic", jQuery.extend('.json_encode([
 				'srctbl' => 'help_items',
 				'srcfld1' => 'key',
 				'dstfrm' => $form->getName(),
 				'dstfld1' => 'key'
-			]).
-				',{itemtype: jQuery("#type").val()}), null, this);'
+			]).', {itemtype: jQuery("#type").val()}), {dialogue_class: "modal-popup-generic"});'
 		);
 }
 
@@ -528,8 +527,8 @@ if (!$readonly) {
 	$master_item[] = (new CButton('button', _('Select')))
 		->addClass(ZBX_STYLE_BTN_GREY)
 		->removeId()
-		->onClick('return PopUp("popup.generic",'.
-			json_encode([
+		->onClick(
+			'return PopUp("popup.generic", '.json_encode([
 				'srctbl' => 'items',
 				'srcfld1' => 'itemid',
 				'srcfld2' => 'name',
@@ -540,14 +539,14 @@ if (!$readonly) {
 				'excludeids' => [$data['itemid']],
 				'with_webitems' => 1,
 				'normal_only' => 1
-			]).', null, this);'
+			]).', {dialogue_class: "modal-popup-generic"});'
 		);
 	$master_item[] = (new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN);
 	$master_item[] = (new CButton('button', _('Select prototype')))
 		->addClass(ZBX_STYLE_BTN_GREY)
 		->removeId()
-		->onClick('return PopUp("popup.generic",'.
-			json_encode([
+		->onClick(
+			'return PopUp("popup.generic", '.json_encode([
 				'srctbl' => 'item_prototypes',
 				'srcfld1' => 'itemid',
 				'srcfld2' => 'name',
@@ -556,7 +555,7 @@ if (!$readonly) {
 				'dstfld2' => 'master_itemname',
 				'parent_discoveryid' => $data['parent_discoveryid'],
 				'excludeids' => [$data['itemid']]
-			]).', null, this);'
+			]).', {dialogue_class: "modal-popup-generic"});'
 		);
 }
 
diff --git a/ui/include/views/configuration.item.prototype.list.php b/ui/include/views/configuration.item.prototype.list.php
index 00807179396..1635a551790 100644
--- a/ui/include/views/configuration.item.prototype.list.php
+++ b/ui/include/views/configuration.item.prototype.list.php
@@ -194,7 +194,11 @@ $itemForm->addItem([
 			],
 			'popup.massupdate.itemprototype' => [
 				'content' => (new CButton('', _('Mass update')))
-					->onClick("return openMassupdatePopup(this, 'popup.massupdate.itemprototype');")
+					->onClick(
+						"return openMassupdatePopup('popup.massupdate.itemprototype', {}, {
+							dialogue_class: 'modal-popup-preprocessing'
+						});"
+					)
 					->addClass(ZBX_STYLE_BTN_ALT)
 					->removeAttribute('id')
 			],
diff --git a/ui/include/views/configuration.template.list.php b/ui/include/views/configuration.template.list.php
index a5011a4ad40..8790c0cefd9 100644
--- a/ui/include/views/configuration.template.list.php
+++ b/ui/include/views/configuration.template.list.php
@@ -96,7 +96,7 @@ $widget = (new CWidget())
 			)
 			->addItem(
 				(new CButton('form', _('Import')))
-					->onClick('return PopUp("popup.import", {rules_preset: "template"}, null, this);')
+					->onClick('return PopUp("popup.import", {rules_preset: "template"});')
 					->removeId()
 			)
 		))->setAttribute('aria-label', _('Content controls'))
@@ -277,7 +277,11 @@ $form->addItem([
 			],
 			'popup.massupdate.template' => [
 				'content' => (new CButton('', _('Mass update')))
-					->onClick("return openMassupdatePopup(this, 'popup.massupdate.template');")
+					->onClick(
+						"return openMassupdatePopup('popup.massupdate.template', {}, {
+							dialogue_class: 'modal-popup-static'
+						});"
+					)
 					->addClass(ZBX_STYLE_BTN_ALT)
 					->removeAttribute('id')
 			],
diff --git a/ui/include/views/configuration.trigger.prototype.edit.php b/ui/include/views/configuration.trigger.prototype.edit.php
index de7bc5d02f6..992a3228b80 100644
--- a/ui/include/views/configuration.trigger.prototype.edit.php
+++ b/ui/include/views/configuration.trigger.prototype.edit.php
@@ -110,9 +110,11 @@ if ($data['hostid']) {
 }
 $add_expression_button = (new CButton('insert', ($data['expression_constructor'] == IM_TREE) ? _('Edit') : _('Add')))
 	->addClass(ZBX_STYLE_BTN_GREY)
-	->onClick('return PopUp("popup.triggerexpr",jQuery.extend('.
-		json_encode($popup_options).
-			',{expression: jQuery(\'[name="'.$data['expression_field_name'].'"]\').val()}), null, this);'
+	->onClick(
+		'return PopUp("popup.triggerexpr", jQuery.extend('.json_encode($popup_options).', {
+				expression: jQuery(\'[name="'.$data['expression_field_name'].'"]\').val()
+			}), {dialogue_class: "modal-popup-generic"}
+		);'
 	)
 	->removeId();
 if ($data['limited']) {
@@ -262,8 +264,11 @@ if ($data['expression_constructor'] == IM_TREE) {
 	}
 
 	$testButton = (new CButton('test_expression', _('Test')))
-		->onClick('return PopUp("popup.testtriggerexpr",{expression: this.form.elements["expression"].value}, null,'.
-					'this);')
+		->onClick(
+			'return PopUp("popup.testtriggerexpr", {expression: this.form.elements["expression"].value}, {
+				dialogue_class: "modal-popup-generic"
+			});'
+		)
 		->addClass(ZBX_STYLE_BTN_LINK)
 		->removeId();
 	if (!$allowed_testing) {
@@ -305,15 +310,16 @@ $add_recovery_expression_button = (new CButton('insert',
 		($data['recovery_expression_constructor'] == IM_TREE) ? _('Edit') : _('Add'))
 	)
 	->addClass(ZBX_STYLE_BTN_GREY)
-	->onClick('return PopUp("popup.triggerexpr",jQuery.extend('.
-		json_encode([
+	->onClick(
+		'return PopUp("popup.triggerexpr", jQuery.extend('.json_encode([
 			'srctbl' => $data['recovery_expression_field_name'],
 			'srcfld1' => $data['recovery_expression_field_name'],
 			'dstfrm' => $triggersForm->getName(),
 			'dstfld1' => $data['recovery_expression_field_name'],
 			'parent_discoveryid' => $data['parent_discoveryid']
-		]).
-			',{expression: jQuery(\'[name="'.$data['recovery_expression_field_name'].'"]\').val()}), null, this);'
+		]).', {expression: jQuery(\'[name="'.$data['recovery_expression_field_name'].'"]\').val()}),
+			{dialogue_class: "modal-popup-generic"}
+		);'
 	);
 
 if ($data['limited']) {
@@ -458,8 +464,11 @@ if ($data['recovery_expression_constructor'] == IM_TREE) {
 	}
 
 	$testButton = (new CButton('test_expression', _('Test')))
-		->onClick('return PopUp("popup.testtriggerexpr",'.
-			'{expression: this.form.elements["recovery_expression"].value}, null, this);')
+		->onClick(
+			'return PopUp("popup.testtriggerexpr", {expression: this.form.elements["recovery_expression"].value}, {
+				dialogue_class: "modal-popup-generic"
+			});'
+		)
 		->addClass(ZBX_STYLE_BTN_LINK)
 		->removeId();
 	if (!$allowed_testing) {
@@ -609,8 +618,8 @@ $dependenciesFormList->addRow(_('Dependencies'),
 		$dependenciesTable,
 		new CHorList([
 			(new CButton('add_dep_trigger', _('Add')))
-				->onClick('return PopUp("popup.generic",'.
-					json_encode([
+				->onClick(
+					'return PopUp("popup.generic", '.json_encode([
 						'srctbl' => 'triggers',
 						'srcfld1' => 'triggerid',
 						'reference' => 'deptrigger',
@@ -619,18 +628,18 @@ $dependenciesFormList->addRow(_('Dependencies'),
 						'normal_only' => '1',
 						'noempty' => '1',
 						'hostid' => $data['hostid']
-					]).', null, this);'
+					]).', {dialogue_class: "modal-popup-generic"});'
 				)
 				->addClass(ZBX_STYLE_BTN_LINK),
 			(new CButton('add_dep_trigger_prototype', _('Add prototype')))
-				->onClick('return PopUp("popup.generic",'.
-					json_encode([
+				->onClick(
+					'return PopUp("popup.generic", '.json_encode([
 						'srctbl' => 'trigger_prototypes',
 						'srcfld1' => 'triggerid',
 						'reference' => 'deptrigger',
 						'multiselect' => '1',
 						'parent_discoveryid' => $data['parent_discoveryid']
-					]).', null, this);'
+					]).', {dialogue_class: "modal-popup-generic"});'
 				)
 				->addClass(ZBX_STYLE_BTN_LINK)
 		])
diff --git a/ui/include/views/configuration.trigger.prototype.list.php b/ui/include/views/configuration.trigger.prototype.list.php
index 5b263cf59c8..cb2ab03a3f6 100644
--- a/ui/include/views/configuration.trigger.prototype.list.php
+++ b/ui/include/views/configuration.trigger.prototype.list.php
@@ -200,7 +200,11 @@ $triggersForm->addItem([
 			],
 			'popup.massupdate.triggerprototype' => [
 				'content' => (new CButton('', _('Mass update')))
-					->onClick("return openMassupdatePopup(this, 'popup.massupdate.triggerprototype');")
+					->onClick(
+						"return openMassupdatePopup('popup.massupdate.triggerprototype', {}, {
+							dialogue_class: 'modal-popup-static'
+						});"
+					)
 					->addClass(ZBX_STYLE_BTN_ALT)
 					->removeAttribute('id')
 			],
diff --git a/ui/include/views/configuration.triggers.edit.php b/ui/include/views/configuration.triggers.edit.php
index 57c340e73e9..1b5c0bcbc67 100644
--- a/ui/include/views/configuration.triggers.edit.php
+++ b/ui/include/views/configuration.triggers.edit.php
@@ -149,8 +149,11 @@ $expression_row = [
 	(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
 	(new CButton('insert', ($data['expression_constructor'] == IM_TREE) ? _('Edit') : _('Add')))
 		->addClass(ZBX_STYLE_BTN_GREY)
-		->onClick('return PopUp("popup.triggerexpr",jQuery.extend('.json_encode($popup_options).
-			',{expression: jQuery(\'[name="'.$data['expression_field_name'].'"]\').val()}), null, this);'
+		->onClick(
+			'return PopUp("popup.triggerexpr", jQuery.extend('.json_encode($popup_options).',
+					{expression: jQuery(\'[name="'.$data['expression_field_name'].'"]\').val()}
+				), {dialogue_class: "modal-popup-generic"}
+			);'
 		)
 		->setEnabled(!$readonly)
 		->removeId()
@@ -285,8 +288,11 @@ if ($data['expression_constructor'] == IM_TREE) {
 	}
 
 	$testButton = (new CButton('test_expression', _('Test')))
-		->onClick('return PopUp("popup.testtriggerexpr",{expression: this.form.elements["expression"].value}, null,'.
-					'this);')
+		->onClick(
+			'return PopUp("popup.testtriggerexpr", {expression: this.form.elements["expression"].value}, {
+				dialogue_class: "modal-popup-generic"
+			});'
+		)
 		->addClass(ZBX_STYLE_BTN_LINK)
 		->removeId();
 
@@ -349,9 +355,11 @@ $recovery_expression_row = [
 	(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
 	(new CButton('insert', ($data['recovery_expression_constructor'] == IM_TREE) ? _('Edit') : _('Add')))
 		->addClass(ZBX_STYLE_BTN_GREY)
-		->onClick('return PopUp("popup.triggerexpr",jQuery.extend('.
-			json_encode($popup_options).
-				',{expression: jQuery(\'[name="'.$data['recovery_expression_field_name'].'"]\').val()}), null, this);'
+		->onClick(
+			'return PopUp("popup.triggerexpr", jQuery.extend('.json_encode($popup_options).',
+					{expression: jQuery(\'[name="'.$data['recovery_expression_field_name'].'"]\').val()}
+				), {dialogue_class: "modal-popup-generic"}
+			);'
 		)
 		->setEnabled(!$readonly)
 		->removeId()
@@ -483,8 +491,11 @@ if ($data['recovery_expression_constructor'] == IM_TREE) {
 	}
 
 	$testButton = (new CButton('test_expression', _('Test')))
-		->onClick('return PopUp("popup.testtriggerexpr",'.
-			'{expression: this.form.elements["recovery_expression"].value}, null, this);')
+		->onClick(
+			'return PopUp("popup.testtriggerexpr", {expression: this.form.elements["recovery_expression"].value}, {
+				dialogue_class: "modal-popup-generic"
+			});'
+		)
 		->addClass(ZBX_STYLE_BTN_LINK)
 		->removeId();
 
@@ -623,8 +634,8 @@ $dependenciesFormList->addRow(_('Dependencies'),
 		$readonly
 			? null
 			: (new CButton('bnt1', _('Add')))
-				->onClick('return PopUp("popup.generic",'.
-					json_encode([
+				->onClick(
+					'return PopUp("popup.generic", '.json_encode([
 						'srctbl' => 'triggers',
 						'srcfld1' => 'triggerid',
 						'reference' => 'deptrigger',
@@ -632,7 +643,7 @@ $dependenciesFormList->addRow(_('Dependencies'),
 						'multiselect' => '1',
 						'with_triggers' => '1',
 						'noempty' => '1'
-					]).', null, this);'
+					]).', {dialogue_class: "modal-popup-generic"});'
 				)
 				->addClass(ZBX_STYLE_BTN_LINK)
 	]))
diff --git a/ui/include/views/configuration.triggers.list.php b/ui/include/views/configuration.triggers.list.php
index bef238d5ca8..02b0260e0bf 100644
--- a/ui/include/views/configuration.triggers.list.php
+++ b/ui/include/views/configuration.triggers.list.php
@@ -242,7 +242,7 @@ foreach ($data['triggers'] as $tnum => $trigger) {
 			$dep_trigger = $data['dep_triggers'][$dependency['triggerid']];
 
 			$dep_trigger_desc = CHtml::encode(
-				implode(', ', zbx_objectValues($dep_trigger['hosts'], 'name')).NAME_DELIMITER.$dep_trigger['description']
+				implode(', ', array_column($dep_trigger['hosts'], 'name')).NAME_DELIMITER.$dep_trigger['description']
 			);
 
 			$trigger_deps[] = (new CLink($dep_trigger_desc,
@@ -343,7 +343,11 @@ $triggers_form->addItem([
 			'trigger.masscopyto' => ['name' => _('Copy')],
 			'popup.massupdate.trigger' => [
 				'content' => (new CButton('', _('Mass update')))
-					->onClick("return openMassupdatePopup(this, 'popup.massupdate.trigger');")
+					->onClick(
+						"return openMassupdatePopup('popup.massupdate.trigger', {}, {
+							dialogue_class: 'modal-popup-static'
+						});"
+					)
 					->addClass(ZBX_STYLE_BTN_ALT)
 					->removeAttribute('id')
 			],
diff --git a/ui/include/views/js/common.item.edit.js.php b/ui/include/views/js/common.item.edit.js.php
index 851b46c1028..a405a608406 100644
--- a/ui/include/views/js/common.item.edit.js.php
+++ b/ui/include/views/js/common.item.edit.js.php
@@ -196,6 +196,7 @@
 			else {
 				overlayDialogue({
 					'title': <?= json_encode(_('Error')); ?>,
+					'class': 'modal-popup position-middle',
 					'content': $('<span>').html(<?=
 						json_encode(_('Failed to parse URL.').'<br><br>'._('URL is not properly encoded.'));
 					?>),
diff --git a/ui/include/views/js/configuration.action.edit.js.php b/ui/include/views/js/configuration.action.edit.js.php
index 76d20b7f4c8..e2a981bec16 100644
--- a/ui/include/views/js/configuration.action.edit.js.php
+++ b/ui/include/views/js/configuration.action.edit.js.php
@@ -345,9 +345,9 @@
 	}
 
 	/**
-	 * @param {Node} return_focus
+	 * @param {Node} trigger_element
 	 */
-	OperationViewMessage.prototype.showUserPopup = function(return_focus) {
+	OperationViewMessage.prototype.showUserPopup = function(trigger_element) {
 		PopUp('popup.generic', {
 			'srctbl': 'users',
 			'srcfld1': 'userid',
@@ -355,13 +355,13 @@
 			'dstfrm': 'popup.operation',
 			'dstfld1': 'operation-message-users-footer',
 			'multiselect': '1'
-		}, null, return_focus);
+		}, {dialogue_class: 'modal-popup-generic', trigger_element});
 	};
 
 	/**
-	 * @param {Node} return_focus
+	 * @param {Node} trigger_element
 	 */
-	OperationViewMessage.prototype.showUserGroupPopup = function(return_focus) {
+	OperationViewMessage.prototype.showUserGroupPopup = function(trigger_element) {
 		PopUp('popup.generic', {
 			'srctbl': 'usrgrp',
 			'srcfld1': 'usrgrpid',
@@ -369,7 +369,7 @@
 			'dstfrm': 'popup.operation',
 			'dstfld1': 'operation-message-user-groups-footer',
 			'multiselect': '1'
-		}, null, return_focus);
+		}, {dialogue_class: 'modal-popup-generic', trigger_element});
 	};
 
 	/**
@@ -829,13 +829,13 @@
 	};
 
 	/**
-	 * @param {Node} return_focus
+	 * @param {Node} trigger_element
 	 */
-	OperationViewCondition.prototype.showConditionsPopup = function(return_focus) {
+	OperationViewCondition.prototype.showConditionsPopup = function(trigger_element) {
 		PopUp('popup.condition.operations', {
 			'type': operation_details.ZBX_POPUP_CONDITION_TYPE_ACTION_OPERATION,
 			'source': operation_details.EVENT_SOURCE_TRIGGERS
-		}, null, return_focus);
+		}, {dialogue_class: 'modal-popup-medium', trigger_element: trigger_element});
 	};
 
 	/**
@@ -958,13 +958,13 @@
 	};
 
 	/**
-	 * @param {Node}   return_focus  The node a popup returns focus to when it closes.
+	 * @param {Node}   trigger_element  The node a popup returns focus to when it closes.
 	 * @param {number} eventsource
 	 * @param {number} recovery_phase
 	 * @param {number} actionid
 	 */
-	function OperationPopup(return_focus, eventsource, recovery_phase, actionid) {
-		this.return_focus = return_focus;
+	function OperationPopup(trigger_element, eventsource, recovery_phase, actionid) {
+		this.trigger_element = trigger_element;
 		this.eventsource = eventsource;
 		this.recovery_phase = recovery_phase;
 		this.actionid = actionid;
@@ -1079,7 +1079,7 @@
 			title: t('Cancel'),
 			class: 'btn-alt',
 			cancel: true,
-			action: () => this.return_focus.focus()
+			action: () => this.trigger_element.focus()
 		}];
 
 		this.view.setConfig(res.popup_config);
diff --git a/ui/include/views/js/configuration.graph.edit.js.php b/ui/include/views/js/configuration.graph.edit.js.php
index 6ae3f1d0050..5fb77a32cae 100644
--- a/ui/include/views/js/configuration.graph.edit.js.php
+++ b/ui/include/views/js/configuration.graph.edit.js.php
@@ -393,7 +393,7 @@
 		var size = jQuery('#itemsTable tr.sortable').length;
 
 		for (var i = 0; i < size; i++) {
-			var popup_options = {
+			var parameters = {
 				srcfld1: 'itemid',
 				srcfld2: 'name',
 				dstfrm: 'graphForm',
@@ -404,26 +404,27 @@
 				writeonly: 1
 			};
 			if (jQuery('#items_' + i + '_flags').val() == graphs.ZBX_FLAG_DISCOVERY_PROTOTYPE) {
-				popup_options['srctbl'] = 'item_prototypes',
-				popup_options['srcfld3'] = 'flags',
-				popup_options['dstfld3'] = 'items_' + i + '_flags',
-				popup_options['parent_discoveryid'] = graphs.parent_discoveryid;
+				parameters['srctbl'] = 'item_prototypes',
+				parameters['srcfld3'] = 'flags',
+				parameters['dstfld3'] = 'items_' + i + '_flags',
+				parameters['parent_discoveryid'] = graphs.parent_discoveryid;
 			}
 			else {
-				popup_options['srctbl'] = 'items';
+				parameters['srctbl'] = 'items';
 			}
 
 			if (graphs.normal_only !== '') {
-				popup_options['normal_only'] = '1';
+				parameters['normal_only'] = '1';
 			}
 
 			if (!graphs.parent_discoveryid && graphs.hostid) {
-				popup_options['hostid'] = graphs.hostid;
+				parameters['hostid'] = graphs.hostid;
 			}
 
-			var nameLink = 'PopUp("popup.generic",'
-				+ 'jQuery.extend('+ JSON.stringify(popup_options) +',getOnlyHostParam()), null, this);';
-			jQuery('#items_' + i + '_name').attr('onclick', nameLink);
+			jQuery('#items_' + i + '_name').attr('onclick', 'PopUp("popup.generic", '
+				+ 'jQuery.extend(' + JSON.stringify(parameters) +',getOnlyHostParam()),'
+				+ '{dialogue_class: "modal-popup-generic", trigger_element: this});'
+			);
 		}
 	}
 
diff --git a/ui/include/views/js/configuration.host.discovery.edit.overr.js.php b/ui/include/views/js/configuration.host.discovery.edit.overr.js.php
index 1b007d7ae0a..53b358bfae7 100644
--- a/ui/include/views/js/configuration.host.discovery.edit.overr.js.php
+++ b/ui/include/views/js/configuration.host.discovery.edit.overr.js.php
@@ -708,10 +708,10 @@ insert_javascript_for_visibilitybox();
 	 * Opens override popup - edit or create form.
 	 * Note: a callback this.onStepOverlayReadyCb is called from within popup form once it is parsed.
 	 *
-	 * @param {number} step     Override index.
-	 * @param {object} refocus  A node to set focus to, when popup is closed.
+	 * @param {number} step             Override index.
+	 * @param {Node}   trigger_element  A node to set focus to, when popup is closed.
 	 */
-	Override.prototype.open = function(no, refocus) {
+	Override.prototype.open = function(no, trigger_element) {
 		return PopUp('popup.lldoverride', {
 			no:                 no,
 			templated:          lldoverrides.templated,
@@ -723,7 +723,7 @@ insert_javascript_for_visibilitybox();
 			overrides_filters:  this.data.overrides_filters,
 			operations:         this.data.operations,
 			overrides_names:    lldoverrides.overrides.getOverrideNames()
-		}, null, refocus);
+		}, {dialogue_class: 'modal-popup-generic', trigger_element});
 	};
 
 	/**
@@ -1005,11 +1005,11 @@ insert_javascript_for_visibilitybox();
 	 * Opens override popup - edit or create form.
 	 * Note: a callback this.onStepOverlayReadyCb is called from within popup form once it is parsed.
 	 *
-	 * @param {number}  step     Override index.
-	 * @param {object}  refocus  A node to set focus to, when popup is closed.
+	 * @param {number} step             Override index.
+	 * @param {Node}   trigger_element  A node to set focus to, when popup is closed.
 	 */
-	Operation.prototype.open = function(no, refocus) {
-		var params = {
+	Operation.prototype.open = function(no, trigger_element) {
+		var parameters = {
 			no:                 no,
 			templated:          lldoverrides.templated,
 			operationobject:    this.data.operationobject,
@@ -1019,11 +1019,11 @@ insert_javascript_for_visibilitybox();
 
 		window.lldoverrides.actions.forEach(function(action) {
 			if (action in this.data) {
-				params[action] = this.data[action];
+				parameters[action] = this.data[action];
 			}
 		}.bind(this));
 
-		return PopUp('popup.lldoperation', params, null, refocus);
+		return PopUp('popup.lldoperation', parameters, {dialogue_class: 'modal-popup-generic', trigger_element});
 	};
 
 	/**
diff --git a/ui/include/views/js/configuration.hostgroups.list.js.php b/ui/include/views/js/configuration.hostgroups.list.js.php
index ce7a1dfa7c5..630e41b4c05 100644
--- a/ui/include/views/js/configuration.hostgroups.list.js.php
+++ b/ui/include/views/js/configuration.hostgroups.list.js.php
@@ -36,7 +36,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/include/views/js/configuration.httpconf.edit.js.php b/ui/include/views/js/configuration.httpconf.edit.js.php
index 0c831e329f1..7350cc1deec 100644
--- a/ui/include/views/js/configuration.httpconf.edit.js.php
+++ b/ui/include/views/js/configuration.httpconf.edit.js.php
@@ -774,10 +774,10 @@
 	 * Opens step popup - edit or create form.
 	 * Note: a callback this.onStepOverlayReadyCb is called from within popup form once it is parsed.
 	 *
-	 * @param {int}  no       Step index.
-	 * @param {Node} refocus  A node to set focus to, when popup is closed.
+	 * @param {int}  no               Step index.
+	 * @param {Node} trigger_element  A node to set focus to, when popup is closed.
 	 */
-	Step.prototype.open = function(no, refocus) {
+	Step.prototype.open = function(no, trigger_element) {
 		return PopUp('popup.httpstep', {
 			no:               no,
 			httpstepid:       this.data.httpstepid,
@@ -793,7 +793,7 @@
 			retrieve_mode:    this.data.retrieve_mode,
 			follow_redirects: this.data.follow_redirects,
 			steps_names:      httpconf.steps.getStepNames()
-		}, null, refocus);
+		}, {dialogue_class: 'modal-popup-generic', trigger_element});
 	};
 
 	/**
@@ -921,6 +921,7 @@
 	StepEditForm.prototype.errorDialog = function(msg, trigger_elmnt) {
 		overlayDialogue({
 			'title': httpconf.msg.error,
+			'class': 'modal-popup position-middle',
 			'content': jQuery('<span>').html(msg),
 			'buttons': [{
 				title: httpconf.msg.ok,
diff --git a/ui/include/views/js/configuration.maintenance.edit.js.php b/ui/include/views/js/configuration.maintenance.edit.js.php
index 45425763f66..3cd5b2d1009 100644
--- a/ui/include/views/js/configuration.maintenance.edit.js.php
+++ b/ui/include/views/js/configuration.maintenance.edit.js.php
@@ -66,19 +66,17 @@
 
 		// Maintenance periods.
 		$('#maintenance_periods').on('click', '[data-action]', function() {
-			var btn = $(this),
-				rows = $('#maintenance_periods table > tbody > tr'),
-				params;
+			var button = $(this),
+				rows = $('#maintenance_periods table > tbody > tr');
 
-			switch (btn.data('action')) {
+			switch (button.data('action')) {
 				case 'remove':
-					btn.closest('tr').remove();
+					button.closest('tr').remove();
 					break;
 
 				case 'edit':
-					var row = btn.closest('tr');
-
-					params = {
+					var row = button.closest('tr');
+					var parameters = {
 						update: 1,
 						index: row.find('[type="hidden"]:first').attr('name').match(/\[(\d+)\]/)[1]
 					};
@@ -88,11 +86,14 @@
 							name = $input.attr('name').match(/\[([^\]]+)]$/);
 
 						if (name) {
-							params[name[1]] = $input.val();
+							parameters[name[1]] = $input.val();
 						}
 					});
 
-					PopUp("popup.maintenance.period", params, null, btn);
+					PopUp('popup.maintenance.period', parameters, {
+						dialogue_class: 'modal-popup-medium',
+						trigger_element: this
+					});
 					break;
 
 				case 'add':
@@ -104,11 +105,10 @@
 						);
 					});
 
-					params = {
-						index: index + 1
-					}
-
-					PopUp("popup.maintenance.period", params, null, btn);
+					PopUp('popup.maintenance.period', {index: index + 1}, {
+						dialogue_class: 'modal-popup-medium',
+						trigger_element: this
+					});
 					break;
 			}
 		});
diff --git a/ui/include/views/js/inventory.host.view.js.php b/ui/include/views/js/inventory.host.view.js.php
index 7110cdf898e..37a0de1f25a 100644
--- a/ui/include/views/js/inventory.host.view.js.php
+++ b/ui/include/views/js/inventory.host.view.js.php
@@ -29,7 +29,10 @@
 		editHost({hostid}) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', {hostid}, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostCreate, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostUpdate, {once: true});
diff --git a/ui/include/views/js/itemtest.js.php b/ui/include/views/js/itemtest.js.php
index a85a301ec96..252d314f6b7 100644
--- a/ui/include/views/js/itemtest.js.php
+++ b/ui/include/views/js/itemtest.js.php
@@ -251,17 +251,17 @@
 	/**
 	 * Creates item test modal dialog.
 	 *
-	 * @param {array}  step_nums          List of step numbers to collect.
-	 * @param {bool}   show_final_result  Either the final result should be displayed.
-	 * @param {bool}   get_value          Either to show 'get value from host' section.
-	 * @param {object} trigger_elmnt      UI element triggered function.
-	 * @param {int}    step_obj_nr        Value defines which 'test' button was pressed to open test item dialog:
+	 * @param {array} step_nums          List of step numbers to collect.
+	 * @param {bool}  show_final_result  Either the final result should be displayed.
+	 * @param {bool}  get_value          Either to show 'get value from host' section.
+	 * @param {Node}  trigger_element    UI element that triggered function.
+	 * @param {int}   step_obj_nr        Value defines which 'test' button was pressed to open test item dialog:
 	 *                                     - 'test' button in edit form footer (-2);
 	 *                                     - 'test all' button in preprocessinf tab (-1);
 	 *                                     - 'test' button to test single preprocessing step (step index).
 	 */
-	function openItemTestDialog(step_nums, show_final_result, get_value, trigger_elmnt, step_obj_nr) {
-		var $row = jQuery(trigger_elmnt).closest('.preprocessing-list-item, .preprocessing-list-foot, .tfoot-buttons'),
+	function openItemTestDialog(step_nums, show_final_result, get_value, trigger_element, step_obj_nr) {
+		var $row = jQuery(trigger_element).closest('.preprocessing-list-item, .preprocessing-list-foot, .tfoot-buttons'),
 			item_properties = getItemTestProperties('form[name="itemForm"]'),
 			cached_values = $row.data('test-data') || [];
 
@@ -280,6 +280,6 @@
 			show_final_result: show_final_result ? 1 : 0,
 			get_value: get_value ? 1 : 0,
 			data: cached_values
-		}), 'item-test', trigger_elmnt);
+		}), {dialogueid: 'item-test', trigger_element});
 	}
 </script>
diff --git a/ui/include/views/js/monitoring.sysmaps.js.php b/ui/include/views/js/monitoring.sysmaps.js.php
index f1e9158554e..f929a4cc364 100644
--- a/ui/include/views/js/monitoring.sysmaps.js.php
+++ b/ui/include/views/js/monitoring.sysmaps.js.php
@@ -215,16 +215,15 @@ function createFontSelect(string $name): CSelect {
 						(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
 						(new CButton(null, _('Select')))
 							->addClass(ZBX_STYLE_BTN_GREY)
-							->onClick('return PopUp("popup.generic",jQuery.extend('.
-								json_encode([
+							->onClick(
+								'return PopUp("popup.generic", jQuery.extend('.json_encode([
 									'srctbl' => 'sysmaps',
 									'srcfld1' => 'sysmapid',
 									'srcfld2' => 'name',
 									'dstfrm' => 'selementForm',
 									'dstfld1' => 'sysmapid',
 									'dstfld2' => 'elementNameMap'
-								]).
-									',{excludeids: [#{sysmapid}]}), null, this);'
+								]).', {excludeids: [#{sysmapid}]}), {dialogue_class: "modal-popup-generic"});'
 							)
 					], 'mapSelectRow')
 					->addRow(_('Tags'),
@@ -794,8 +793,8 @@ function createFontSelect(string $name): CSelect {
 								->setId('linkTriggerscontainer'),
 							(new CButton(null, _('Add')))
 								->addClass(ZBX_STYLE_BTN_LINK)
-								->onClick('return PopUp("popup.generic",'.
-									json_encode([
+								->onClick(
+									'return PopUp("popup.generic", '.json_encode([
 										'srctbl' => 'triggers',
 										'srcfld1' => 'triggerid',
 										'reference' => 'linktrigger',
@@ -803,7 +802,7 @@ function createFontSelect(string $name): CSelect {
 										'real_hosts' => '1',
 										'with_triggers' => '1',
 										'noempty' => '1'
-									]).', null, this);'
+									]).', {dialogue_class: "modal-popup-generic"});'
 								)
 						]))
 							->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
diff --git a/ui/include/views/js/reports.toptriggers.js.php b/ui/include/views/js/reports.toptriggers.js.php
index 8af01b8c788..04d3aa4213e 100644
--- a/ui/include/views/js/reports.toptriggers.js.php
+++ b/ui/include/views/js/reports.toptriggers.js.php
@@ -35,7 +35,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/include/views/js/tr_events.js.php b/ui/include/views/js/tr_events.js.php
index f9ee3d2fe9a..cabff4c6ef3 100644
--- a/ui/include/views/js/tr_events.js.php
+++ b/ui/include/views/js/tr_events.js.php
@@ -42,7 +42,10 @@
 		openHostPopup(host_data) {
 			const original_url = location.href;
 
-			const overlay = PopUp('popup.host.edit', host_data, 'host_edit', document.activeElement);
+			const overlay = PopUp('popup.host.edit', host_data, {
+				dialogueid: 'host_edit',
+				dialogue_class: 'modal-popup-large'
+			});
 
 			overlay.$dialogue[0].addEventListener('dialogue.create', this.events.hostSuccess, {once: true});
 			overlay.$dialogue[0].addEventListener('dialogue.update', this.events.hostSuccess, {once: true});
diff --git a/ui/include/views/monitoring.sysmap.edit.php b/ui/include/views/monitoring.sysmap.edit.php
index f361d350362..c0345f7682c 100644
--- a/ui/include/views/monitoring.sysmap.edit.php
+++ b/ui/include/views/monitoring.sysmap.edit.php
@@ -323,14 +323,14 @@ $user_group_shares_table = (new CTable())
 	->setAttribute('style', 'width: 100%;');
 
 $add_user_group_btn = ([(new CButton(null, _('Add')))
-	->onClick('return PopUp("popup.generic",'.
-		json_encode([
+	->onClick(
+		'return PopUp("popup.generic", '.json_encode([
 			'srctbl' => 'usrgrp',
 			'srcfld1' => 'usrgrpid',
 			'srcfld2' => 'name',
 			'dstfrm' => $form->getName(),
 			'multiselect' => '1'
-		]).', null, this);'
+		]).', {dialogue_class: "modal-popup-generic"});'
 	)
 	->addClass(ZBX_STYLE_BTN_LINK)]);
 
@@ -351,7 +351,7 @@ foreach ($data['sysmap']['userGroups'] as $user_group) {
 	];
 }
 
-$js_insert = 'window.addPopupValues('.zbx_jsvalue(['object' => 'usrgrpid', 'values' => $user_groups]).');';
+$js_insert = 'window.addPopupValues('.json_encode(['object' => 'usrgrpid', 'values' => $user_groups]).');';
 
 // User sharing table.
 $user_shares_table = (new CTable())
@@ -360,14 +360,14 @@ $user_shares_table = (new CTable())
 	->setAttribute('style', 'width: 100%;');
 
 $add_user_btn = ([(new CButton(null, _('Add')))
-	->onClick('return PopUp("popup.generic",'.
-		json_encode([
+	->onClick(
+		'return PopUp("popup.generic", '.json_encode([
 			'srctbl' => 'users',
 			'srcfld1' => 'userid',
 			'srcfld2' => 'fullname',
 			'dstfrm' => $form->getName(),
 			'multiselect' => '1'
-		]).', null, this);'
+		]).', {dialogue_class: "modal-popup-generic"});'
 	)
 	->addClass(ZBX_STYLE_BTN_LINK)]);
 
diff --git a/ui/include/views/monitoring.sysmap.list.php b/ui/include/views/monitoring.sysmap.list.php
index 2fb8d5bb23a..216f50552b3 100644
--- a/ui/include/views/monitoring.sysmap.list.php
+++ b/ui/include/views/monitoring.sysmap.list.php
@@ -32,7 +32,7 @@ $widget = (new CWidget())
 				->addItem((new CSubmit('form', _('Create map')))->setEnabled($data['allowed_edit']))
 				->addItem(
 					(new CButton('form', _('Import')))
-						->onClick('return PopUp("popup.import", {rules_preset: "map"}, null, this);')
+						->onClick('return PopUp("popup.import", {rules_preset: "map"});')
 						->setEnabled($data['allowed_edit'])
 						->removeId()
 				)
diff --git a/ui/js/class.dashboard.js b/ui/js/class.dashboard.js
index 8f9019517e1..3c403d64978 100644
--- a/ui/js/class.dashboard.js
+++ b/ui/js/class.dashboard.js
@@ -934,7 +934,10 @@ class CDashboard extends CBaseComponent {
 			auto_start: this._data.auto_start
 		};
 
-		PopUp('dashboard.properties.edit', properties, 'dashboard_properties', document.activeElement);
+		PopUp('dashboard.properties.edit', properties, {
+			dialogueid: 'dashboard_properties',
+			dialogue_class: 'modal-popup-generic'
+		});
 	}
 
 	applyProperties() {
@@ -1000,7 +1003,10 @@ class CDashboard extends CBaseComponent {
 	editDashboardPageProperties(properties = {}) {
 		properties.dashboard_display_period = this._data.display_period;
 
-		PopUp('dashboard.page.properties.edit', properties, 'dashboard_page_properties', document.activeElement);
+		PopUp('dashboard.page.properties.edit', properties, {
+			dialogueid: 'dashboard_page_properties',
+			dialogue_class: 'modal-popup-generic'
+		});
 	}
 
 	applyDashboardPageProperties() {
@@ -1087,17 +1093,14 @@ class CDashboard extends CBaseComponent {
 		const overlay = PopUp('dashboard.widget.edit', {
 			templateid: this._data.templateid ?? undefined,
 			...properties
-		}, 'widget_properties', document.activeElement);
+		}, {
+			dialogueid: 'widget_properties',
+			dialogue_class: 'modal-popup-generic'
+		});
 
 		overlay.xhr.then(() => {
 			const form = overlay.$dialogue.$body[0].querySelector('form');
 			const original_properties = overlay.data.original_properties;
-			const dialogue_stick_to_top = this._widget_defaults[original_properties.type].dialogue_stick_to_top;
-
-			if (dialogue_stick_to_top !== overlay.$dialogue[0].classList.contains('sticked-to-top')) {
-				overlay.$dialogue[0].classList.toggle('sticked-to-top', dialogue_stick_to_top);
-				overlay.centerDialog();
-			}
 
 			if (original_properties.unique_id === null) {
 				this._new_widget_dashboard_page = this._selected_dashboard_page;
diff --git a/ui/js/class.overlay.js b/ui/js/class.overlay.js
index a7f8af3c076..d2e228e9e55 100644
--- a/ui/js/class.overlay.js
+++ b/ui/js/class.overlay.js
@@ -114,10 +114,10 @@ Overlay.prototype.centerDialog = function() {
 	});
 
 	this.$dialogue.css({
-		'left': Math.max(0, parseInt((jQuery(window).width() - this.$dialogue.outerWidth(true)) / 2)) + 'px',
-		'top': this.$dialogue.hasClass('sticked-to-top')
-			? ''
-			: Math.max(0, parseInt((jQuery(window).height() - this.$dialogue.outerHeight(true)) / 2)) + 'px'
+		'left': Math.max(0, Math.floor((jQuery(window).width() - this.$dialogue.outerWidth(true)) / 2)) + 'px',
+		'top': this.$dialogue.hasClass('position-middle')
+			? Math.max(0, Math.floor((jQuery(window).height() - this.$dialogue.outerHeight(true)) / 2)) + 'px'
+			: ''
 	});
 
 	var size = {
diff --git a/ui/js/class.tabfilteritem.js b/ui/js/class.tabfilteritem.js
index 17f1d248dc6..3f3e1539786 100644
--- a/ui/js/class.tabfilteritem.js
+++ b/ui/js/class.tabfilteritem.js
@@ -131,10 +131,10 @@ class CTabFilterItem extends CBaseComponent {
 	/**
 	 * Open tab filter configuration popup.
 	 *
-	 * @param {object}      params    Object of params to be passed to ajax call when opening popup.
-	 * @param {HTMLElement} edit_elm  HTML element to broadcast popup update or delete event.
+	 * @param {object} params    Object of params to be passed to ajax call when opening popup.
+	 * @param {Node}   trigger_element  DOM element to broadcast popup update or delete event.
 	 */
-	openPropertiesDialog(params, edit_elm) {
+	openPropertiesDialog(params, trigger_element) {
 		let defaults = {
 			idx: this._idx_namespace,
 			idx2: this._index,
@@ -150,7 +150,10 @@ class CTabFilterItem extends CBaseComponent {
 		}
 
 		this.updateUnsavedState();
-		return PopUp('popup.tabfilter.edit', {...defaults, ...params}, 'tabfilter_dialogue', edit_elm);
+
+		return PopUp('popup.tabfilter.edit', { ...defaults, ...params },
+			{dialogueid: 'tabfilter_dialogue', trigger_element}
+		);
 	}
 
 	/**
diff --git a/ui/js/common.js b/ui/js/common.js
index 8eb35986d86..3c5f061cdce 100644
--- a/ui/js/common.js
+++ b/ui/js/common.js
@@ -325,58 +325,36 @@ function getPosition(obj) {
 /**
  * Opens popup content in overlay dialogue.
  *
- * @param {string} action          Popup controller related action.
- * @param {array|object}  options  (optional) Array with key/value pairs that will be used as query for popup request.
- * @param {string} dialogueid      (optional) id of overlay dialogue.
- * @param {object} trigger_elmnt   (optional) UI element which was clicked to open overlay dialogue.
+ * @param {string}           action           Popup controller related action.
+ * @param {array|object}     parameters       Array with key/value pairs that will be used as query for popup request.
+ *
+ * @param {string}           dialogue_class   CSS class, usually based on .modal-popup and .modal-popup-{size}.
+ * @param {string|null}      dialogueid       ID of overlay dialogue.
+ * @param {HTMLElement|null} trigger_element  UI element which was clicked to open overlay dialogue.
  *
  * @returns {Overlay}
  */
-function PopUp(action, options, dialogueid, trigger_elmnt) {
+function PopUp(action, parameters, {
+	dialogueid = null,
+	dialogue_class = '',
+	trigger_element = document.activeElement
+} = {}) {
 	var overlay = overlays_stack.getById(dialogueid);
-	if (!overlay) {
-		var wide_popup_actions = ['popup.generic', 'popup.dashboard.share.edit', 'dashboard.page.properties.edit',
-				'dashboard.properties.edit', 'dashboard.widget.edit', 'popup.media', 'popup.lldoperation',
-				'popup.lldoverride', 'popup.preproctest.edit', 'popup.triggerexpr', 'popup.httpstep',
-				'popup.testtriggerexpr', 'popup.triggerwizard'
-			],
-			medium_popup_actions = ['popup.maintenance.period', 'popup.condition.actions', 'popup.condition.operations',
-				'popup.condition.event.corr', 'popup.discovery.check', 'popup.mediatypetest.edit',
-				'popup.mediatype.message', 'popup.host.edit', 'popup.scriptexec', 'popup.scheduledreport.test',
-				'popup.service.edit', 'popup.sla.edit'
-			],
-			static_popup_actions = ['popup.massupdate.template', 'popup.massupdate.host', 'popup.massupdate.trigger',
-				'popup.massupdate.triggerprototype', 'popup.massupdate.service'
-			],
-			preprocessing_popup_actions = ['popup.massupdate.item', 'popup.massupdate.itemprototype'],
-			dialogue_class = '';
-
-		if (wide_popup_actions.indexOf(action) !== -1) {
-			dialogue_class = ' modal-popup-generic';
-		}
-		else if (medium_popup_actions.indexOf(action) !== -1) {
-			dialogue_class = ' modal-popup-medium';
-		}
-		else if (static_popup_actions.indexOf(action) !== -1) {
-			dialogue_class = ' modal-popup-static';
-		}
-		else if (preprocessing_popup_actions.indexOf(action) !== -1) {
-			dialogue_class = ' modal-popup-preprocessing';
-		}
 
+	if (!overlay) {
 		overlay = overlayDialogue({
-			'dialogueid': dialogueid,
-			'title': '',
-			'content': jQuery('<div>', {'height': '68px', class: 'is-loading'}),
-			'class': 'modal-popup' + dialogue_class,
-			'buttons': [],
-			'element': trigger_elmnt,
-			'type': 'popup'
+			dialogueid,
+			title: '',
+			content: jQuery('<div>', {'height': '68px', class: 'is-loading'}),
+			class: 'modal-popup ' + dialogue_class,
+			buttons: [],
+			element: trigger_element,
+			type: 'popup'
 		});
 	}
 
 	overlay
-		.load(action, options)
+		.load(action, parameters)
 		.then(function(resp) {
 			if (typeof resp.errors !== 'undefined') {
 				overlay.setProperties({
@@ -429,23 +407,23 @@ function PopUp(action, options, dialogueid, trigger_elmnt) {
 /**
  * Open "Update problem" dialog and manage URL change.
  *
- * @param {Object}  options
- * @param {array}  options['eventids']  Eventids to update.
- * @param {object} trigger_elmnt        (optional) UI element which was clicked to open overlay dialogue.
+ * @param {Object} parameters
+ * @param {array}  parameters['eventids']  Eventids to update.
+ * @param {object} trigger_element        (optional) UI element which was clicked to open overlay dialogue.
  *
  * @returns {Overlay}
  */
-function acknowledgePopUp(options, trigger_elmnt) {
-	var overlay = PopUp('popup.acknowledge.edit', options, null, trigger_elmnt),
+function acknowledgePopUp(parameters, trigger_element) {
+	var overlay = PopUp('popup.acknowledge.edit', parameters, {trigger_element}),
 		backurl = location.href;
 
-	overlay.trigger_parents = $(trigger_elmnt).parents();
+	overlay.trigger_parents = $(trigger_element).parents();
 
 	overlay.xhr.then(function() {
 		var url = new Curl('zabbix.php', false);
 		url.setArgument('action', 'popup');
 		url.setArgument('popup_action', 'acknowledge.edit');
-		url.setArgument('eventids', options.eventids);
+		url.setArgument('eventids', parameters.eventids);
 
 		history.replaceState({}, '', url.getUrl());
 	});
@@ -567,15 +545,16 @@ function removeFromOverlaysStack(dialogueid, return_focus) {
  * @param {string} action	(optional) action value that is used in CRouter. Default value is 'popup.generic'.
  */
 function reloadPopup(form, action) {
-	var dialogueid = jQuery(form).closest('[data-dialogueid]').attr('data-dialogueid'),
+	var dialogueid = form.closest('[data-dialogueid]').dataset.dialogueid,
+		dialogue_class = jQuery(form).closest('[data-dialogueid]').prop('class'),
 		action = action || 'popup.generic',
-		options = {};
+		parameters = {};
 
-	jQuery(form.elements).each(function() {
-		options[this.name] = this.value;
-	});
+	for (const input of form.elements) {
+		parameters[input.name] = input.value;
+	};
 
-	PopUp(action, options, dialogueid);
+	PopUp(action, parameters, {dialogueid, dialogue_class});
 }
 
 /**
@@ -1023,30 +1002,33 @@ Function.prototype.bindAsEventListener = function (context) {
 	};
 };
 
-function openMassupdatePopup(elem, popup_name, data = {}) {
-	const form = elem.closest('form');
+function openMassupdatePopup(action, parameters = {}, {
+	dialogue_class = '',
+	trigger_element = document.activeElement
+}) {
+	const form = trigger_element.closest('form');
 
-	data.ids = chkbxRange.getSelectedIds();
+	parameters.ids = chkbxRange.getSelectedIds();
 
-	switch (popup_name) {
+	switch (action) {
 		case 'popup.massupdate.item':
-			data['context'] = form.querySelector('#context').value;
-			data['prototype'] = 0;
+			parameters.context = form.querySelector('#context').value;
+			parameters.prototype = 0;
 			break;
 
 		case 'popup.massupdate.trigger':
-			data['context'] = form.querySelector('#context').value;
+			parameters.context = form.querySelector('#context').value;
 			break;
 
 		case 'popup.massupdate.itemprototype':
 		case 'popup.massupdate.triggerprototype':
-			data['parent_discoveryid'] = form.querySelector('#parent_discoveryid').value;
-			data['context'] = form.querySelector('#context').value;
-			data['prototype'] = 1;
+			parameters.parent_discoveryid = form.querySelector('#parent_discoveryid').value;
+			parameters.context = form.querySelector('#context').value;
+			parameters.prototype = 1;
 			break;
 	}
 
-	return PopUp(popup_name, data, null, elem);
+	return PopUp(action, parameters, {dialogue_class, trigger_element});
 }
 
 /**
diff --git a/ui/js/functions.js b/ui/js/functions.js
index dfeaa3f0774..a2a1c08ae96 100644
--- a/ui/js/functions.js
+++ b/ui/js/functions.js
@@ -501,6 +501,7 @@ function overlayDialogueDestroy(dialogueid) {
  *
  * @param {object} params                                   Modal window params.
  * @param {string} params.title                             Modal window title.
+ * @param {string} params.class                             Modal window CSS class, ofthen based on .modal-popup*.
  * @param {object} params.content                           Window content.
  * @param {object} params.footer                           	Window footer content.
  * @param {object} params.controls                          Window controls.
@@ -517,7 +518,7 @@ function overlayDialogueDestroy(dialogueid) {
  * @param string   params.dialogueid            (optional)  Unique dialogue identifier to reuse existing overlay dialog
  *                                                          or create a new one if value is not set.
  * @param string   params.script_inline         (optional)  Custom javascript code to execute when initializing dialog.
- * @param {object} trigger_elmnt                (optional)  UI element which triggered opening of overlay dialogue.
+ * @param {Node|null} trigger_elmnt                         UI element which triggered opening of overlay dialogue.
  *
  * @return {Overlay}
  */
@@ -546,11 +547,11 @@ function overlayDialogue(params, trigger_elmnt) {
  *
  * @param string scriptid			Script ID.
  * @param string confirmation		Confirmation text.
- * @param {object} trigger_elmnt	UI element that was clicked to open overlay dialogue.
+ * @param {Node} trigger_element	UI element that was clicked to open overlay dialogue.
  * @param string hostid				Host ID.
  * @param string eventid			Event ID.
  */
-function executeScript(scriptid, confirmation, trigger_elmnt, hostid = null, eventid = null) {
+function executeScript(scriptid, confirmation, trigger_element, hostid = null, eventid = null) {
 	var execute = function() {
 		var popup_options = {scriptid: scriptid};
 
@@ -563,7 +564,7 @@ function executeScript(scriptid, confirmation, trigger_elmnt, hostid = null, eve
 		}
 
 		if (Object.keys(popup_options).length === 2) {
-			PopUp('popup.scriptexec', popup_options, null, trigger_elmnt);
+			PopUp('popup.scriptexec', popup_options, {dialogue_class: 'modal-popup-medium', trigger_element});
 		}
 	};
 
@@ -573,7 +574,7 @@ function executeScript(scriptid, confirmation, trigger_elmnt, hostid = null, eve
 			'content': jQuery('<span>')
 				.addClass('confirmation-msg')
 				.text(confirmation),
-			'class': 'modal-popup modal-popup-small',
+			'class': 'modal-popup modal-popup-small position-middle',
 			'buttons': [
 				{
 					'title': t('Cancel'),
@@ -590,7 +591,7 @@ function executeScript(scriptid, confirmation, trigger_elmnt, hostid = null, eve
 					}
 				}
 			]
-		}, trigger_elmnt);
+		}, trigger_element);
 
 		return false;
 	}
diff --git a/ui/js/menupopup.js b/ui/js/menupopup.js
index cadfc0a9cfb..1ebede8976e 100644
--- a/ui/js/menupopup.js
+++ b/ui/js/menupopup.js
@@ -102,11 +102,11 @@ function getMenuPopupHistory(options) {
  * @param {bool}   options['allowed_ui_problems']     Whether user has access to problems page.
  * @param {bool}   options['allowed_ui_hosts']        Whether user has access to monitoring hosts pages.
  * @param {bool}   options['allowed_ui_conf_hosts']   Whether user has access to configuration hosts page.
- * @param {object} trigger_elmnt                      UI element which triggered opening of overlay dialogue.
+ * @param {Node}   trigger_element                    UI element which triggered opening of overlay dialogue.
  *
  * @return array
  */
-function getMenuPopupHost(options, trigger_elmnt) {
+function getMenuPopupHost(options, trigger_element) {
 	var sections = [];
 
 	// go to section
@@ -267,7 +267,7 @@ function getMenuPopupHost(options, trigger_elmnt) {
 	if (typeof options.scripts !== 'undefined') {
 		sections.push({
 			label: t('Scripts'),
-			items: getMenuPopupScriptData(options.scripts, trigger_elmnt, options.hostid)
+			items: getMenuPopupScriptData(options.scripts, trigger_element, options.hostid)
 		});
 	}
 
@@ -468,15 +468,13 @@ function getMenuPopupMapElementImage(options) {
  * @param {bool}   options['can_edit_dashboards']
  * @param {bool}   options['can_view_reports']
  * @param {bool}   options['can_create_reports']
- * @param {object} trigger_elmnt                   UI element which triggered opening of overlay dialogue.
+ * @param {object} trigger_element                   UI element which triggered opening of overlay dialogue.
  *
  * @return array
  */
-function getMenuPopupDashboard(options, trigger_elmnt) {
+function getMenuPopupDashboard(options, trigger_element) {
 	const sections = [];
-	const popup_options = {
-		dashboardid: options.dashboardid
-	};
+	const parameters = {dashboardid: options.dashboardid};
 
 	// Dashboard actions.
 	if (options.can_edit_dashboards) {
@@ -500,7 +498,11 @@ function getMenuPopupDashboard(options, trigger_elmnt) {
 					clickCallback: function () {
 						jQuery(this).closest('.menu-popup').menuPopup('close', null);
 
-						PopUp('popup.dashboard.share.edit', popup_options, 'dashboard_share_edit', trigger_elmnt);
+						PopUp('popup.dashboard.share.edit', parameters, {
+							dialogueid: 'dashboard_share_edit',
+							dialogue_class: 'modal-popup-generic',
+							trigger_element
+						});
 					},
 					disabled: !options.editable
 				},
@@ -537,7 +539,7 @@ function getMenuPopupDashboard(options, trigger_elmnt) {
 				clickCallback: function () {
 					jQuery(this).closest('.menu-popup').menuPopup('close', null);
 
-					PopUp('popup.scheduledreport.list', popup_options, null, trigger_elmnt);
+					PopUp('popup.scheduledreport.list', parameters, {trigger_element});
 				},
 				disabled: !options.has_related_reports
 			}
@@ -549,7 +551,7 @@ function getMenuPopupDashboard(options, trigger_elmnt) {
 				clickCallback: function () {
 					jQuery(this).closest('.menu-popup').menuPopup('close', null);
 
-					PopUp('popup.scheduledreport.edit', popup_options, null, trigger_elmnt);
+					PopUp('popup.scheduledreport.edit', parameters, {trigger_element});
 				}
 			});
 		}
@@ -575,11 +577,11 @@ function getMenuPopupDashboard(options, trigger_elmnt) {
  * @param {object} options['configuration']           Link to trigger configuration page (optional).
  * @param {bool}   options['showEvents']              Show Problems item enabled. Default: false.
  * @param {string} options['url']                     Trigger URL link (optional).
- * @param {object} trigger_elmnt                      UI element which triggered opening of overlay dialogue.
+ * @param {object} trigger_element                      UI element which triggered opening of overlay dialogue.
  *
  * @return array
  */
-function getMenuPopupTrigger(options, trigger_elmnt) {
+function getMenuPopupTrigger(options, trigger_element) {
 	var sections = [],
 		items = [];
 
@@ -611,7 +613,7 @@ function getMenuPopupTrigger(options, trigger_elmnt) {
 			clickCallback: function() {
 				jQuery(this).closest('.menu-popup-top').menuPopup('close', null);
 
-				acknowledgePopUp({eventids: [options.eventid]}, trigger_elmnt);
+				acknowledgePopUp({eventids: [options.eventid]}, trigger_element);
 			}
 		};
 	}
@@ -670,7 +672,7 @@ function getMenuPopupTrigger(options, trigger_elmnt) {
 	if (typeof options.scripts !== 'undefined') {
 		sections.push({
 			label: t('Scripts'),
-			items: getMenuPopupScriptData(options.scripts, trigger_elmnt, null, options.eventid)
+			items: getMenuPopupScriptData(options.scripts, trigger_element, null, options.eventid)
 		});
 	}
 
@@ -688,11 +690,11 @@ function getMenuPopupTrigger(options, trigger_elmnt) {
  * @param string options['triggers'][n]['triggerid']
  * @param string options['triggers'][n]['name']
  * @param string options['context']                   Additional parameter in URL to identify main section.
- * @param {object} trigger_elmnt                      UI element that was clicked to open overlay dialogue.
+ * @param {object} trigger_element                      UI element that was clicked to open overlay dialogue.
  *
  * @return array
  */
-function getMenuPopupItem(options, trigger_elmnt) {
+function getMenuPopupItem(options, trigger_element) {
 	var items = [];
 
 	if (typeof options.show_triggers !== 'undefined' && options.show_triggers) {
@@ -702,9 +704,10 @@ function getMenuPopupItem(options, trigger_elmnt) {
 			clickCallback: function() {
 				jQuery(this).closest('.menu-popup').menuPopup('close', null);
 
-				return PopUp('popup.triggerwizard', {
-					itemid: options.itemid
-				}, null, trigger_elmnt);
+				return PopUp('popup.triggerwizard', {itemid: options.itemid}, {
+					dialogue_class: 'modal-popup-generic',
+					trigger_element
+				});
 			}
 		});
 
@@ -723,9 +726,10 @@ function getMenuPopupItem(options, trigger_elmnt) {
 						jQuery(this).closest('.menu-popup-top').menuPopup('close', null);
 
 						return PopUp('popup.triggerwizard', {
-							itemid: options.itemid,
-							triggerid: trigger.triggerid
-						}, null, trigger_elmnt);
+								itemid: options.itemid,
+								triggerid: trigger.triggerid
+							}, {dialogue_class: 'modal-popup-generic', trigger_element}
+						);
 					}
 				});
 			});
@@ -944,13 +948,13 @@ function getMenuPopupTriggerMacro(options) {
  * Build script menu tree.
  *
  * @param array scripts           Script names amd nenu paths.
- * @param {object} trigger_elmnt  UI element which triggered opening of overlay dialogue.
+ * @param {Node} trigger_element  UI element which triggered opening of overlay dialogue.
  * @param array hostid            Host ID.
  * @param array eventid           Event ID.
  *
  * @returns array
  */
-function getMenuPopupScriptData(scripts, trigger_elmnt, hostid, eventid) {
+function getMenuPopupScriptData(scripts, trigger_element, hostid, eventid) {
 	var tree = {};
 
 	var appendTreeItem = function(tree, name, items, params) {
@@ -1022,7 +1026,7 @@ function getMenuPopupScriptData(scripts, trigger_elmnt, hostid, eventid) {
 		return items;
 	};
 
-	return getMenuPopupScriptItems(tree, trigger_elmnt);
+	return getMenuPopupScriptItems(tree, trigger_element);
 }
 
 jQuery(function($) {
diff --git a/ui/js/multilineinput.js b/ui/js/multilineinput.js
index 84f44d77726..55be1c73fe7 100644
--- a/ui/js/multilineinput.js
+++ b/ui/js/multilineinput.js
@@ -129,7 +129,7 @@
 
 		overlayDialogue({
 			'title': obj.options.title,
-			'class': 'multilineinput-modal',
+			'class': 'modal-popup multilineinput-modal',
 			'content': $content,
 			'footer': $footer,
 			'buttons': [
diff --git a/ui/js/multiselect.js b/ui/js/multiselect.js
index 0836d317c0e..52dfaffd0dc 100644
--- a/ui/js/multiselect.js
+++ b/ui/js/multiselect.js
@@ -453,19 +453,23 @@
 
 				if (ms.options.popup.parameters !== undefined) {
 					ms.select_button.on('click', function(event) {
-						var popup_options = ms.options.popup.parameters;
+						var parameters = ms.options.popup.parameters;
 
 						if (ms.options.popup.filter_preselect_fields) {
-							popup_options = jQuery.extend(popup_options, getFilterPreselectField($obj, MS_ACTION_POPUP));
+							parameters = jQuery.extend(parameters, getFilterPreselectField($obj, MS_ACTION_POPUP));
 						}
 
-						if (typeof popup_options['disable_selected'] !== 'undefined' && popup_options['disable_selected']) {
-							popup_options['disableids'] = Object.keys(ms.values.selected);
+						if (typeof parameters['disable_selected'] !== 'undefined' && parameters['disable_selected']) {
+							parameters['disableids'] = Object.keys(ms.values.selected);
 						}
 
-						// Click used instead focus because in patternselect listen only click.
+						// Click used instead focus because in patternselect only click is listened for.
 						$('input[type="text"]', $obj).click();
-						return PopUp('popup.generic', popup_options, null, event.target);
+
+						return PopUp('popup.generic', parameters, {
+							dialogue_class: 'modal-popup-generic',
+							trigger_element: event.target
+						});
 					});
 				}
 
diff --git a/ui/js/pages/popup.condition.common.js b/ui/js/pages/popup.condition.common.js
index be667517429..292be8ea16b 100644
--- a/ui/js/pages/popup.condition.common.js
+++ b/ui/js/pages/popup.condition.common.js
@@ -97,9 +97,7 @@ function validateConditionPopup(overlay) {
 }
 
 function selectServices() {
-	const overlay = PopUp('popup.services', {
-		title: t('Add parent services'),
-	}, 'services', document.activeElement);
+	const overlay = PopUp('popup.services', {title: t('Add parent services')}, {dialogue_id: 'services'});
 
 	overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 		const data = [];
diff --git a/ui/js/widgets/class.widget.navtree.js b/ui/js/widgets/class.widget.navtree.js
index af0f814b73c..2edc9923e75 100755
--- a/ui/js/widgets/class.widget.navtree.js
+++ b/ui/js/widgets/class.widget.navtree.js
@@ -190,7 +190,7 @@ class CWidgetNavTree extends CWidget {
 					srcfld1: 'sysmapid',
 					srcfld2: 'name',
 					multiselect: '1'
-				}, null, e.target);
+				}, {dialogue_class: 'modal-popup-generic', trigger_element: e.target});
 			},
 
 			editItem: (e) => {
@@ -846,6 +846,7 @@ class CWidgetNavTree extends CWidget {
 
 				overlayDialogue({
 					'title': t('Edit tree element'),
+					'class': 'modal-popup',
 					'content': resp.body,
 					'buttons': [
 						{
diff --git a/ui/locale/bg/LC_MESSAGES/frontend.po b/ui/locale/bg/LC_MESSAGES/frontend.po
index d27b937b7b8..338946c5b2c 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2013-01-12 23:52+0300\n"
 "Last-Translator: Fahri <fahri_hasan@hotmail.com>\n"
 "Language-Team: \n"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -335,7 +335,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 секунди"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D преглед"
 
@@ -381,7 +381,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -471,27 +471,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Достъпът отказан!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -563,35 +563,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -720,24 +720,24 @@ msgstr "Активно до"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -773,13 +773,13 @@ msgstr "Активно до"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -797,38 +797,38 @@ msgstr "Активно до"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -855,7 +855,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -885,16 +885,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Добави прототип"
 
@@ -941,7 +941,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1029,7 +1029,7 @@ msgstr "Интерфейси на агента"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1037,11 +1037,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1068,8 +1068,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1085,8 +1085,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1102,13 +1102,13 @@ msgstr "Във всички връзки трябва да са уточнени
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1129,19 +1129,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Позволени хостове"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1158,21 +1158,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1186,7 +1186,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1231,11 +1231,11 @@ msgstr "Грешка в приложението."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Прилагане"
@@ -1363,11 +1363,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1461,8 +1461,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Метод на автентификация"
 
@@ -1525,8 +1525,8 @@ msgstr "Автоматично"
 msgid "Automatic icon mapping"
 msgstr "Автоматично съответствие на икона"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Автоматичен избор на икона"
 
@@ -1593,12 +1593,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Фон"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1606,9 +1606,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Фоново изображение"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1616,8 +1616,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "База данни за търсене (Base DN)"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1660,15 +1660,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1679,8 +1679,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Дебела линия"
 
@@ -1688,19 +1688,19 @@ msgstr "Дебела линия"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1713,7 +1713,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Долен"
@@ -1796,7 +1796,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Изчислено"
 
@@ -1820,22 +1820,22 @@ msgstr "Обратно повикване"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3435,8 +3435,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Символ"
 
@@ -3464,7 +3464,7 @@ msgstr "Шаси"
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Проверката вече съществува."
 
@@ -3585,8 +3585,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Изчисти историята и динамиката на промените"
 
@@ -3614,22 +3614,22 @@ msgstr "Часовник"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Клониране"
@@ -3637,28 +3637,28 @@ msgstr "Клониране"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Затвори"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Затвори израз конструктора"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3672,7 +3672,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3686,11 +3686,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3699,7 +3699,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3787,9 +3787,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Условия"
@@ -3975,13 +3975,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Свържи се с"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4073,8 +4073,8 @@ msgstr "Информация за контакти"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4154,13 +4154,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Номер за контакт"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Координати"
 
@@ -4177,7 +4177,7 @@ msgstr "Копирай"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4316,10 +4316,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4524,7 +4524,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4538,8 +4538,8 @@ msgstr "Персонализирани графики"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4705,8 +4705,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Пунктирана линия"
 
@@ -4724,7 +4724,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Преглед на данни"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4908,11 +4908,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -4954,7 +4954,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Продължителност по подразбиране на стъпка от операцията"
 
@@ -4988,7 +4988,7 @@ msgstr "Закъснение с"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4997,7 +4997,7 @@ msgstr "Закъснение с"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5005,47 +5005,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Изтриване"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Изтриване и изчистване"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Изтриване и изчистване на избраните шаблони? (Внимание: всички свързани хостове ще бъдат изчистени!)"
 
@@ -5053,11 +5053,11 @@ msgstr "Изтриване и изчистване на избраните ша�
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Изтриване и изчистване на шаблона? (Внимание: всички свързани хостове ще бъдат изчистени!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Изтриване на текущото действие?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5070,10 +5070,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "Изтриване на правилото за откриване?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Изтриване на израза?"
 
@@ -5098,11 +5098,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr "Изтриване съответствие на икона?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Изтриване на елемент на данните?"
 
@@ -5144,11 +5144,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5207,7 +5207,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr "Изтриване на избрания хост?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Изтриване на избраните хостове?"
 
@@ -5215,11 +5215,11 @@ msgstr "Изтриване на избраните хостове?"
 msgid "Delete selected image?"
 msgstr "Изтриване на избраното изображение?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Изтриване на избраните елементи на данните?"
 
@@ -5235,7 +5235,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr "Изтриване на избраните карти?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Изтриване на избраните методи на уведомление?"
 
@@ -5267,11 +5267,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Изтриване на избраните скриптове?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5279,19 +5279,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Изтриване на избраните шаблони?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Изтриване на избраните тригери?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Изтриване на избрания потребител?"
 
@@ -5307,11 +5307,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr "Изтриване на шаблон?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Изтриване на тригер?"
 
@@ -5337,7 +5337,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Разделител"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5352,10 +5352,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Зависимости"
 
@@ -5392,7 +5392,7 @@ msgstr "Състояние на разгръщане"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5402,13 +5402,13 @@ msgstr "Състояние на разгръщане"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Описание"
@@ -5418,10 +5418,10 @@ msgstr "Описание"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Подробности"
@@ -5462,7 +5462,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5513,11 +5513,11 @@ msgstr "Изключване на хост, който се наблюдава �
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5546,7 +5546,7 @@ msgstr "Изключване на избраните хостове?"
 msgid "Disable selected items?"
 msgstr "Изключване на избраните елементи на данните?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Изключване на избраните методи на уведомление?"
 
@@ -5580,7 +5580,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5608,7 +5608,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Изключено"
 
@@ -5634,9 +5634,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5832,7 +5832,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr "Покажи тригерите OK за"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5840,13 +5840,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5870,15 +5870,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5892,8 +5892,8 @@ msgstr "Желаете ли да замени условния израз?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5903,8 +5903,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5914,8 +5914,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5923,8 +5923,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Точка"
 
@@ -5953,16 +5953,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "Време на прекъсване"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Стил на рисуване"
 
@@ -6013,7 +6013,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Продължителност"
 
@@ -6036,29 +6036,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Всеки URL адрес трябва да има уникално име. Моля, уверете се, че има само едно URL с това име "
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Редактиране"
@@ -6112,12 +6112,12 @@ msgstr ""
 msgid "Element"
 msgstr "Елемент"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Име на елемент"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6173,7 +6173,7 @@ msgstr "Празен входен параметър."
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6253,11 +6253,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6287,7 +6287,7 @@ msgstr "Активиране на избраните хостове?"
 msgid "Enable selected items?"
 msgstr "Активиране на избраните елементи на данните?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Активиране на избраните методи на уведомление?"
 
@@ -6309,8 +6309,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6332,7 +6332,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6348,7 +6348,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6362,14 +6362,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Активно"
 
@@ -6422,8 +6422,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6601,7 +6601,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6622,8 +6622,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Изпълнение на скрипт"
 
@@ -6637,13 +6637,13 @@ msgstr "Потвърждение на изпълнение"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6713,15 +6713,15 @@ msgstr "Експортиране в CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6734,10 +6734,10 @@ msgstr "Изразяване"
 msgid "Expression cannot be empty"
 msgstr "Изразът не може да бъде празен"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Конструктор на изразяване"
 
@@ -6805,7 +6805,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6939,8 +6939,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6951,7 +6950,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7048,7 +7048,7 @@ msgid "Fit to map"
 msgstr "Въведете в картата на мрежата"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Фиксирано"
 
@@ -7060,9 +7060,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7070,22 +7070,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7093,8 +7093,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Формула"
 
@@ -7130,7 +7130,7 @@ msgstr "Петък"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "От"
 
@@ -7145,7 +7145,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Достъп до уеб интерфейс"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Съобщения в уеб интерфейс"
 
@@ -7161,7 +7161,7 @@ msgid "Full clone"
 msgstr "Пълен клонинг"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Функция"
 
@@ -7579,8 +7579,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP автентикация"
 
@@ -7591,8 +7591,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
@@ -7629,10 +7629,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7648,7 +7648,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7754,7 +7754,7 @@ msgid "History cleared"
 msgstr "История изчистена"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Изчистването на историята може да отнеме много време. Да се продължи ли?"
 
@@ -7769,8 +7769,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7787,8 +7787,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Хоризонтален"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Хоризонтално подравняване"
 
@@ -7907,7 +7907,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7993,9 +7993,9 @@ msgstr "Хост групи"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Хост интерфейс"
 
@@ -8283,8 +8283,8 @@ msgstr "IPMI интирфейс"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI сензор"
 
@@ -8298,19 +8298,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Икона"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Икона (по подразбиране)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Икона (изключено)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Икона (поддръжка)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Икона (проблем)"
 
@@ -8362,7 +8362,7 @@ msgstr "Съответствие на икона"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Икони"
 
@@ -8506,7 +8506,7 @@ msgstr "Изображения"
 msgid "Images for all maps will be updated!"
 msgstr "Изображенията за всички карти ще бъдат обновени!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Веднага"
 
@@ -8590,6 +8590,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9474,10 +9475,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Инфо"
@@ -9544,8 +9545,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9661,9 +9662,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Интервал"
@@ -10100,7 +10101,7 @@ msgstr "Италиански (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Елемент на данните"
 
@@ -10363,8 +10364,8 @@ msgstr "JMX агент"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10382,8 +10383,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10422,8 +10423,8 @@ msgstr "Японски (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10462,9 +10463,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Ключ"
@@ -10530,13 +10531,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Етикет"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Разположение на етикет"
 
@@ -10683,9 +10684,9 @@ msgstr "Латвийски (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10696,7 +10697,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "От лявата страна"
@@ -10729,25 +10730,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Ограничение за елементи на търсене/филтър"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Линия"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10769,9 +10770,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Индикатори на връзка"
 
@@ -10802,8 +10803,8 @@ msgstr "Свързани шаблони"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10905,8 +10906,8 @@ msgstr "Местонахождение (дължина)"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Дневник (лог)"
 
@@ -10919,8 +10920,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Формат за време в дневника (логове)"
 
@@ -11046,7 +11047,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Поддръжка"
 
@@ -11206,7 +11207,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11284,19 +11285,19 @@ msgstr ""
 msgid "Mass update"
 msgstr "Общо актуализиране"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Общо актуализиране на елементите"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11380,8 +11381,8 @@ msgid "May"
 msgstr "Май"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Уведомления"
 
@@ -11507,8 +11508,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 #, fuzzy
 msgid "Message timeout"
 msgstr "Време преди изключване на съобщенията"
@@ -11527,7 +11528,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Съобщения"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Съобщения"
 
@@ -11626,11 +11627,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr "Липсващо поле \"name\" за графика."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11798,8 +11799,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11965,7 +11966,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11985,15 +11986,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12002,16 +12003,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12291,7 +12292,7 @@ msgstr "Няма подробности"
 msgid "No discovery rule IDs given."
 msgstr "Не уточнено ID на правило за откриване."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12347,8 +12348,8 @@ msgstr "Няма изображение"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Не е открит интерфейс"
 
@@ -12652,7 +12653,7 @@ msgstr "Не е уточнен файла с обществен ключ."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12698,8 +12699,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12707,17 +12708,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Нищо"
@@ -12813,7 +12814,7 @@ msgstr "Доклад за нотификациите"
 msgid "Notifications"
 msgstr "Нотификации"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12987,8 +12988,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Числен (с плаваща точка)"
 
@@ -12998,8 +12999,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Числен (цяло положително)"
 
@@ -13007,8 +13008,8 @@ msgstr "Числен (цяло положително)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13020,13 +13021,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "ОК"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13087,7 +13088,7 @@ msgstr "Изкл"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13116,7 +13117,7 @@ msgstr "Вкл"
 msgid "On status change triggers blink for"
 msgstr "Мигане на тригери при промяна на състоянието "
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Веднъж"
 
@@ -13237,11 +13238,11 @@ msgstr "Операцията няма шаблон за да функциони�
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Операции"
@@ -13287,7 +13288,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13302,11 +13303,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13401,8 +13402,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13619,8 +13620,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМ"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13702,8 +13703,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13751,8 +13752,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13783,12 +13784,12 @@ msgstr "Пасивен"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13821,12 +13822,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13839,7 +13840,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13882,8 +13883,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Период"
@@ -13904,9 +13905,9 @@ msgid "Periods"
 msgstr "Периоди"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13917,7 +13918,7 @@ msgstr "Периоди"
 msgid "Permissions"
 msgstr "Права за достъп"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права за достъп може да бъдат назначен само за потребителски групи."
 
@@ -13939,12 +13940,12 @@ msgstr "Поставяне на алгоритъм"
 msgid "Plain text"
 msgstr "Обикновен текст"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Възпроизвеждане"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Възпроизвеждане на звук"
 
@@ -13974,8 +13975,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Моля, изберете два елемента"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13985,14 +13985,15 @@ msgstr "Моля, изберете два елемента"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -14000,7 +14001,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Полски (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Попълнете полето: данни за инвентаризация на хост"
 
@@ -14062,16 +14063,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14169,8 +14170,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Файл с личен ключ"
 
@@ -14200,7 +14201,7 @@ msgstr "Ниво на привилегия"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Проблем"
 
@@ -14389,16 +14390,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Обществен ключ"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Файл с обществен ключ"
 
@@ -14412,8 +14413,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14463,8 +14464,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14490,14 +14491,14 @@ msgstr "Само за четене"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14511,14 +14512,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Четене-писане"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14564,7 +14565,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14573,10 +14574,10 @@ msgid "Recovery"
 msgstr "Възстановяване"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14586,7 +14587,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14598,8 +14599,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14705,7 +14706,7 @@ msgstr "Отдалечена команда"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14736,13 +14737,13 @@ msgstr "Отдалечена команда"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14750,25 +14751,25 @@ msgstr "Отдалечена команда"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14796,14 +14797,14 @@ msgstr "Отдалечена команда"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14878,10 +14879,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Смени"
 
@@ -14899,7 +14900,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14938,15 +14939,15 @@ msgstr "Отчети"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14955,8 +14956,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14983,8 +14984,8 @@ msgstr "Необходима производителност на сървър�
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Необходими кодове за състояние"
 
@@ -14997,11 +14998,11 @@ msgstr "Необходим низ"
 msgid "Reset"
 msgstr "Нулиране"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Възстановяване на всички полета за стойности по подразбиране?"
 
@@ -15018,11 +15019,11 @@ msgstr "Потвърждаване на нулиране"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Възстанови по подразбиране"
 
@@ -15126,8 +15127,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15200,9 +15201,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15210,7 +15211,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Отдясно"
@@ -15226,8 +15227,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15417,8 +15418,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15497,8 +15498,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15523,38 +15524,38 @@ msgstr "SSH агент"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15673,9 +15674,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15700,8 +15701,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Скрипт"
 
@@ -15833,10 +15834,10 @@ msgstr "Име на сигурност"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Изберете"
@@ -15846,9 +15847,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Изберете прототип"
 
@@ -15869,7 +15870,7 @@ msgstr "Избраните действия са изтрити"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Избрани елементи"
 
@@ -16219,8 +16220,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16323,7 +16324,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16423,8 +16424,8 @@ msgstr "Проста графика"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16469,7 +16470,7 @@ msgstr "Област / район"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16580,9 +16581,9 @@ msgstr "Скорост"
 msgid "Stacked"
 msgstr "Подредени"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16603,7 +16604,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Започни в"
 
@@ -16798,14 +16799,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Стъпка с име \\\"%1$s\\\" вече съществува."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Стъпки"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Спри"
 
@@ -16828,10 +16829,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17067,8 +17068,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17127,28 +17128,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Цел"
@@ -17309,14 +17310,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Тест"
@@ -17374,10 +17375,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Текст"
 
@@ -17530,8 +17531,8 @@ msgstr "Този месец"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17635,9 +17636,9 @@ msgstr "Период от време"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Смяна на времето"
 
@@ -17655,8 +17656,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Просрочване на времето"
 
@@ -17682,7 +17683,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Към"
 
@@ -17706,7 +17707,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Горен край"
@@ -17758,8 +17759,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17770,7 +17770,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17778,9 +17779,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Грешка при транспорт."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17792,8 +17793,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17811,9 +17812,9 @@ msgstr "Динамика на промените"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Тригер"
@@ -17915,7 +17916,7 @@ msgstr "Преглед на тригери"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Тригер прототип"
@@ -17981,7 +17982,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Важност на тригер "
 
@@ -18088,23 +18089,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Тип"
@@ -18113,12 +18114,12 @@ msgstr "Тип"
 msgid "Type (Full details)"
 msgstr "Тип (Пълни подробности)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Тип (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18129,10 +18130,10 @@ msgstr "Тип на изчислението"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Тип на информацията"
 
@@ -18156,11 +18157,11 @@ msgstr "НЕИЗВЕСТЕН"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18181,7 +18182,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18206,7 +18207,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18309,15 +18310,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18326,8 +18327,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Единици за измерване"
 
@@ -18353,7 +18354,7 @@ msgstr "Единици за измерване"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -18496,12 +18497,12 @@ msgstr "Достъпен"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18521,18 +18522,18 @@ msgstr "Достъпен"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18553,13 +18554,13 @@ msgstr "Актуализиране на съществуващото"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Интервал за актуализиране"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18699,7 +18700,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Потребителят не може да добави себе си към изключена група или група с изключен GUI достъп."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18811,10 +18812,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Потребителско име"
 
@@ -18882,7 +18883,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19259,12 +19260,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19326,8 +19327,8 @@ msgstr "Стойност на реализациите \"%1$s\" вече същ�
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Стойност на реализациите"
@@ -19444,8 +19445,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Вертикален"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Вертикално подравняване"
 
@@ -19649,8 +19650,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19661,12 +19661,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19742,8 +19743,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19755,11 +19756,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19773,8 +19774,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19794,12 +19795,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Y ос МАКС стойност"
 
@@ -19813,18 +19814,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y ос МАКС стойност трябва да бъде по-голяма от стойността на Y ос МИН."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Y ос МИН стойност"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Мястото на Y ос"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19844,11 +19845,11 @@ msgstr "m/d/Y h:i:s A"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20880,10 +20881,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20912,8 +20913,8 @@ msgstr "хост"
 msgid "host group"
 msgstr "хост група"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20946,7 +20947,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21120,8 +21121,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21385,10 +21386,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21435,7 +21436,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21465,7 +21466,7 @@ msgstr ""
 msgid "of"
 msgstr "на"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21488,7 +21489,7 @@ msgstr "на"
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21660,8 +21661,8 @@ msgstr "с"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21799,8 +21800,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22087,17 +22088,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/ca/LC_MESSAGES/frontend.po b/ui/locale/ca/LC_MESSAGES/frontend.po
index f182d477e69..8ee1e1fde34 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2021-03-19 18:10+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -179,10 +179,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -227,9 +227,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "Queda %1$s intent"
 msgstr[1] "Queden %1$s intents"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -334,7 +334,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr ""
 
@@ -380,7 +380,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -470,27 +470,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr ""
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -562,35 +562,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -719,24 +719,24 @@ msgstr ""
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -772,13 +772,13 @@ msgstr ""
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -796,38 +796,38 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -854,7 +854,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -875,7 +875,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -884,16 +884,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -903,7 +903,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr ""
 
@@ -940,7 +940,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1028,7 +1028,7 @@ msgstr ""
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1036,11 +1036,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1067,8 +1067,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1084,8 +1084,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1101,13 +1101,13 @@ msgstr ""
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1128,19 +1128,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr ""
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1157,21 +1157,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1185,7 +1185,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1230,11 +1230,11 @@ msgstr ""
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr ""
@@ -1362,11 +1362,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1460,8 +1460,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr ""
 
@@ -1523,8 +1523,8 @@ msgstr ""
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr ""
 
@@ -1591,12 +1591,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1604,9 +1604,9 @@ msgstr ""
 msgid "Background image"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1614,8 +1614,8 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1658,15 +1658,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1677,8 +1677,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr ""
 
@@ -1686,19 +1686,19 @@ msgstr ""
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1711,7 +1711,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr ""
@@ -1794,7 +1794,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr ""
 
@@ -1818,22 +1818,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3424,8 +3424,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr ""
 
@@ -3453,7 +3453,7 @@ msgstr ""
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr ""
 
@@ -3574,8 +3574,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr ""
 
@@ -3603,22 +3603,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr ""
@@ -3626,28 +3626,28 @@ msgstr ""
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3661,7 +3661,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3675,11 +3675,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3688,7 +3688,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3776,9 +3776,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr ""
@@ -3963,13 +3963,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4061,8 +4061,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4142,13 +4142,13 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr ""
 
@@ -4165,7 +4165,7 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4304,10 +4304,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4511,7 +4511,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4525,8 +4525,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4692,8 +4692,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr ""
 
@@ -4711,7 +4711,7 @@ msgstr ""
 msgid "Data overview"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4895,11 +4895,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr ""
 
@@ -4941,7 +4941,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr ""
 
@@ -4975,7 +4975,7 @@ msgstr ""
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4984,7 +4984,7 @@ msgstr ""
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4992,47 +4992,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr ""
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -5040,11 +5040,11 @@ msgstr ""
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5057,10 +5057,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr ""
 
@@ -5084,11 +5084,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr ""
 
@@ -5130,11 +5130,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5193,7 +5193,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr ""
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr ""
 
@@ -5201,11 +5201,11 @@ msgstr ""
 msgid "Delete selected image?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr ""
 
@@ -5221,7 +5221,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr ""
 
@@ -5253,11 +5253,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5265,19 +5265,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5293,11 +5293,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr ""
 
@@ -5323,7 +5323,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5338,10 +5338,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr ""
 
@@ -5378,7 +5378,7 @@ msgstr ""
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5388,13 +5388,13 @@ msgstr ""
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr ""
@@ -5404,10 +5404,10 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr ""
@@ -5448,7 +5448,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5499,11 +5499,11 @@ msgstr ""
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5532,7 +5532,7 @@ msgstr ""
 msgid "Disable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr ""
 
@@ -5566,7 +5566,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5594,7 +5594,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr ""
 
@@ -5620,9 +5620,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5817,7 +5817,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5825,13 +5825,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5855,15 +5855,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5877,8 +5877,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5888,8 +5888,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5899,8 +5899,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5908,8 +5908,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr ""
 
@@ -5938,16 +5938,16 @@ msgstr ""
 msgid "Downtime"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr ""
 
@@ -5998,7 +5998,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr ""
 
@@ -6021,29 +6021,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr ""
@@ -6097,12 +6097,12 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6158,7 +6158,7 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6238,11 +6238,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6272,7 +6272,7 @@ msgstr ""
 msgid "Enable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr ""
 
@@ -6294,8 +6294,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6317,7 +6317,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6333,7 +6333,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6347,14 +6347,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr ""
 
@@ -6407,8 +6407,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6585,7 +6585,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6606,8 +6606,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr ""
 
@@ -6621,13 +6621,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6697,15 +6697,15 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6718,10 +6718,10 @@ msgstr ""
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr ""
 
@@ -6789,7 +6789,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6923,8 +6923,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6935,7 +6934,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7032,7 +7032,7 @@ msgid "Fit to map"
 msgstr ""
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr ""
 
@@ -7044,9 +7044,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7054,22 +7054,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7077,8 +7077,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr ""
 
@@ -7114,7 +7114,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr ""
 
@@ -7129,7 +7129,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7145,7 +7145,7 @@ msgid "Full clone"
 msgstr ""
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr ""
 
@@ -7562,8 +7562,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr ""
 
@@ -7574,8 +7574,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7612,10 +7612,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7631,7 +7631,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7737,7 +7737,7 @@ msgid "History cleared"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -7752,8 +7752,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7770,8 +7770,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr ""
 
@@ -7890,7 +7890,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7976,9 +7976,9 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr ""
 
@@ -8266,8 +8266,8 @@ msgstr ""
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr ""
 
@@ -8281,19 +8281,19 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr ""
 
@@ -8340,7 +8340,7 @@ msgstr ""
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr ""
 
@@ -8484,7 +8484,7 @@ msgstr ""
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr ""
 
@@ -8568,6 +8568,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9452,10 +9453,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr ""
@@ -9522,8 +9523,8 @@ msgstr ""
 msgid "Insert"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9639,9 +9640,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr ""
@@ -10078,7 +10079,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr ""
 
@@ -10341,8 +10342,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10360,8 +10361,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10400,8 +10401,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10440,9 +10441,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr ""
@@ -10508,13 +10509,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr ""
 
@@ -10661,9 +10662,9 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10674,7 +10675,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr ""
@@ -10707,25 +10708,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10747,9 +10748,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr ""
 
@@ -10780,8 +10781,8 @@ msgstr ""
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10883,8 +10884,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr ""
 
@@ -10897,8 +10898,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr ""
 
@@ -11024,7 +11025,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr ""
 
@@ -11184,7 +11185,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11262,19 +11263,19 @@ msgstr ""
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11358,8 +11359,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11483,8 +11484,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr ""
 
@@ -11502,7 +11503,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr ""
 
@@ -11601,11 +11602,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11773,8 +11774,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11940,7 +11941,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11960,15 +11961,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11977,16 +11978,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12266,7 +12267,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12322,8 +12323,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12627,7 +12628,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12673,8 +12674,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12682,17 +12683,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr ""
@@ -12788,7 +12789,7 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12962,8 +12963,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr ""
 
@@ -12973,8 +12974,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr ""
 
@@ -12982,8 +12983,8 @@ msgstr ""
 msgid "OEM"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12995,13 +12996,13 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13062,7 +13063,7 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13091,7 +13092,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr ""
 
@@ -13212,11 +13213,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr ""
@@ -13262,7 +13263,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13277,11 +13278,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13376,8 +13377,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13594,8 +13595,8 @@ msgstr ""
 msgid "PROBLEM"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13677,8 +13678,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13726,8 +13727,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13758,12 +13759,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13796,12 +13797,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13814,7 +13815,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13857,8 +13858,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr ""
@@ -13879,9 +13880,9 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13892,7 +13893,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13914,12 +13915,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr ""
 
@@ -13949,8 +13950,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13960,14 +13960,15 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13975,7 +13976,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -14037,16 +14038,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14143,8 +14144,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr ""
 
@@ -14174,7 +14175,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr ""
 
@@ -14363,16 +14364,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr ""
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr ""
 
@@ -14386,8 +14387,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14437,8 +14438,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14464,14 +14465,14 @@ msgstr ""
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14485,14 +14486,14 @@ msgstr ""
 msgid "Read-write"
 msgstr ""
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14538,7 +14539,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14547,10 +14548,10 @@ msgid "Recovery"
 msgstr ""
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14560,7 +14561,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14572,8 +14573,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14679,7 +14680,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14710,13 +14711,13 @@ msgstr ""
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14724,25 +14725,25 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14770,14 +14771,14 @@ msgstr ""
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14852,10 +14853,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr ""
 
@@ -14873,7 +14874,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14912,15 +14913,15 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14929,8 +14930,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14957,8 +14958,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr ""
 
@@ -14971,11 +14972,11 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -14992,11 +14993,11 @@ msgstr ""
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr ""
 
@@ -15100,8 +15101,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15174,9 +15175,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15184,7 +15185,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr ""
@@ -15200,8 +15201,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15391,8 +15392,8 @@ msgstr ""
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr ""
 
@@ -15471,8 +15472,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15497,38 +15498,38 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15647,9 +15648,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15674,8 +15675,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr ""
 
@@ -15807,10 +15808,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr ""
@@ -15820,9 +15821,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15843,7 +15844,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr ""
 
@@ -16192,8 +16193,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16296,7 +16297,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16396,8 +16397,8 @@ msgstr ""
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16442,7 +16443,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16553,9 +16554,9 @@ msgstr ""
 msgid "Stacked"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16576,7 +16577,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16771,14 +16772,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr ""
 
@@ -16801,10 +16802,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17040,8 +17041,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17100,28 +17101,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr ""
@@ -17282,14 +17283,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr ""
@@ -17347,10 +17348,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr ""
 
@@ -17503,8 +17504,8 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17608,9 +17609,9 @@ msgstr ""
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17628,8 +17629,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr ""
 
@@ -17655,7 +17656,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr ""
 
@@ -17679,7 +17680,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr ""
@@ -17731,8 +17732,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17743,7 +17743,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17751,9 +17752,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17765,8 +17766,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17784,9 +17785,9 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr ""
@@ -17888,7 +17889,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr ""
@@ -17954,7 +17955,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
@@ -18061,23 +18062,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr ""
@@ -18086,12 +18087,12 @@ msgstr ""
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr ""
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18102,10 +18103,10 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr ""
 
@@ -18129,11 +18130,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr ""
@@ -18154,7 +18155,7 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18179,7 +18180,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr ""
@@ -18282,15 +18283,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18299,8 +18300,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr ""
 
@@ -18326,7 +18327,7 @@ msgstr ""
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18469,12 +18470,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18494,18 +18495,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18526,13 +18527,13 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18671,7 +18672,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18783,10 +18784,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr ""
 
@@ -18854,7 +18855,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19231,12 +19232,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19298,8 +19299,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr ""
@@ -19416,8 +19417,8 @@ msgstr ""
 msgid "Vertical"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr ""
 
@@ -19620,8 +19621,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19632,12 +19632,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19713,8 +19714,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr ""
 
@@ -19726,11 +19727,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19744,8 +19745,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19765,12 +19766,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr ""
 
@@ -19784,18 +19785,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19815,11 +19816,11 @@ msgstr ""
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20850,10 +20851,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20882,8 +20883,8 @@ msgstr ""
 msgid "host group"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20916,7 +20917,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21090,8 +21091,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21355,10 +21356,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21405,7 +21406,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21435,7 +21436,7 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21458,7 +21459,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21630,8 +21631,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21768,8 +21769,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22056,17 +22057,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/cs/LC_MESSAGES/frontend.po b/ui/locale/cs/LC_MESSAGES/frontend.po
index b9a7f910ee3..48edaa930e3 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -188,10 +188,10 @@ msgstr[0] "%1$s zpráva"
 msgstr[1] "%1$s zpráv"
 msgstr[2] "%1$s zpráv"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -241,9 +241,9 @@ msgstr[0] "Zůstává %1$s pokus"
 msgstr[1] "Zůstávají %1$s pokusy"
 msgstr[2] "Zůstává %1$s pokusů"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -352,7 +352,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 sekund"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D pohled"
 
@@ -398,7 +398,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "PŘIDEJ PŘEPIS"
 
@@ -491,27 +491,27 @@ msgstr "Přístup odmítnut"
 msgid "Access denied!"
 msgstr "Přístup odepřen!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -583,35 +583,35 @@ msgstr "Potvrzené VYŘEŠENÉ události"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -742,24 +742,24 @@ msgstr "Aktivní do"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -795,13 +795,13 @@ msgstr "Aktivní do"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -819,38 +819,38 @@ msgstr "Aktivní do"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -877,7 +877,7 @@ msgstr "Přidat podřízený prvek"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -898,7 +898,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Přidat více map"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "Přidej nový set dat"
 
@@ -907,16 +907,16 @@ msgstr "Přidej nový set dat"
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "Přidej nový přepis"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Přidat prototyp"
 
@@ -963,7 +963,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Přidat widget"
@@ -1051,7 +1051,7 @@ msgstr "Rozhraní agenta"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1059,11 +1059,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1090,8 +1090,8 @@ msgstr "Přidej prvky mapy"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1107,8 +1107,8 @@ msgid "All dashboards"
 msgstr "Všechny panely"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Všechny skupiny"
 
@@ -1124,13 +1124,13 @@ msgstr "Veškeré odkazy by měly mít zadáno \"Jméno\" a \"URL\""
 msgid "All maps"
 msgstr "Všechny mapy"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Všechny problémy"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Všechny problémy, pokud se jejich hodnoty rovnají tagu"
 
@@ -1151,19 +1151,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Povolit manuální zavření"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Povolení hosté"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1180,21 +1180,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "A"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1208,7 +1208,7 @@ msgstr "A"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "A/Nebo"
 
@@ -1253,11 +1253,11 @@ msgstr "Chyba aplikace."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Použít"
@@ -1389,11 +1389,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Minimálně jedna operace musí existovat."
 
@@ -1487,8 +1487,8 @@ msgstr "Ověření selhalo: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Autentizační metoda"
 
@@ -1550,8 +1550,8 @@ msgstr "Automaticky"
 msgid "Automatic icon mapping"
 msgstr "Automatické přiřazení ikony"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Automatický výběr ikony"
 
@@ -1618,12 +1618,12 @@ msgstr "Zpět"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Pozadí"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1631,9 +1631,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Obrázek na pozadí"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1641,8 +1641,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Kořenový DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1685,15 +1685,15 @@ msgstr "Modrá"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Tělo"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Tělo a záhlaví"
 
@@ -1704,8 +1704,8 @@ msgstr "Tělo a záhlaví"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Tučná čára"
 
@@ -1713,19 +1713,19 @@ msgstr "Tučná čára"
 msgid "Boolean to decimal"
 msgstr "Boolean hodnoty až desítkové hodnoty"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Rámeček"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Styl ohraničení"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Šířka okraje"
 
@@ -1738,7 +1738,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Dole"
@@ -1821,7 +1821,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Vypočítaná"
 
@@ -1845,22 +1845,22 @@ msgstr "Odvolat"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3508,8 +3508,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Znak"
 
@@ -3537,7 +3537,7 @@ msgstr "Šasí"
 msgid "Chassis information. Returns string"
 msgstr "Informace o šasi. Vráti řetězec"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Kontrola již existuje."
 
@@ -3658,8 +3658,8 @@ msgid "Clear history"
 msgstr "Vyčistit historii"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Vyčistit historii a trendy"
 
@@ -3687,22 +3687,22 @@ msgstr "Hodiny"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Vytvořit kopii"
@@ -3710,28 +3710,28 @@ msgstr "Vytvořit kopii"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Zavřít"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Zavřít kunstruktéra výrazu"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Zavřít novou událost"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Zavřít starou událost"
@@ -3745,7 +3745,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Zhroucení"
@@ -3759,11 +3759,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3772,7 +3772,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3860,9 +3860,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Podmínky"
@@ -4047,13 +4047,13 @@ msgstr "Gratulace! Právě jste úspěšně nainstalovali Zabbix frontend."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Připojit k"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "Spojení"
@@ -4145,8 +4145,8 @@ msgstr "Kontakt"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4226,13 +4226,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Číslo smlouvy"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "Převeď na JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Poloha"
 
@@ -4249,7 +4249,7 @@ msgstr "Kopírovat"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Korelace"
 
@@ -4392,10 +4392,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4599,7 +4599,7 @@ msgid "Custom"
 msgstr "Vlastní"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4613,8 +4613,8 @@ msgstr "Vlastní grafy"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Vlastní intervaly"
 
@@ -4781,8 +4781,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "Dashboardy"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Čárkovaná čára"
 
@@ -4800,7 +4800,7 @@ msgstr "Data nejsou správně zakódována."
 msgid "Data overview"
 msgstr "Přehled dat"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4984,11 +4984,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Výchozí"
 
@@ -5030,7 +5030,7 @@ msgstr "Výchozí přihlašovací formulář"
 msgid "Default media type"
 msgstr "Výchozí typ média"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Předvolené trvání provozního kroku"
 
@@ -5064,7 +5064,7 @@ msgstr "Zpožděno o"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5073,7 +5073,7 @@ msgstr "Zpožděno o"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5081,47 +5081,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Smazat"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Smazat a pročistit"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Smazat a vyčistit zvolené šablony? (Upozornění: tímto smažete vybrané šablony a pročistíte všechny připojené hostitele!)"
 
@@ -5129,11 +5129,11 @@ msgstr "Smazat a vyčistit zvolené šablony? (Upozornění: tímto smažete vyb
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Smazat a vyčistit šablonu? (Pozor: všechny připojené hosty budou také vyčištěné!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Smazat aktuální akci?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Smazat aktuální korelaci?"
 
@@ -5146,10 +5146,10 @@ msgstr "Smazat dashboard?"
 msgid "Delete discovery rule?"
 msgstr "Smazat objevovací pravidlo?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Smazat výraz?"
 
@@ -5173,11 +5173,11 @@ msgstr "Smazat historii označených scénářů?"
 msgid "Delete icon map?"
 msgstr "Smazat mapovou ikonu?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Smazat prototyp položky?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Smazat položku?"
 
@@ -5219,11 +5219,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5282,7 +5282,7 @@ msgstr "Smazat označené prototypy hosta?"
 msgid "Delete selected host?"
 msgstr "Smazat vybraného hostitele?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Smazat vybrané hostitele?"
 
@@ -5290,11 +5290,11 @@ msgstr "Smazat vybrané hostitele?"
 msgid "Delete selected image?"
 msgstr "Smazat vybraný obrázek?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Smazat označené prototypy položek?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Smazat vybrané položky?"
 
@@ -5310,7 +5310,7 @@ msgstr "Smazat vybrané mapy?"
 msgid "Delete selected maps?"
 msgstr "Smazat vybrané mapy?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Smazat vybrané typy médií?"
 
@@ -5342,11 +5342,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Smazat vybrané skripty?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5354,19 +5354,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Smazat vybrané tvary?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Smazat vybrané šablony?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Smazat označené prototypy spouštěčů?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Smazat vybrané spouštěče?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Smazat vybraného uživatele?"
 
@@ -5382,11 +5382,11 @@ msgstr "Smazat označené scénáře?"
 msgid "Delete template?"
 msgstr "Smazat šablonu?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Smazat prototyp spouštěče?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Smazat spouštěč?"
 
@@ -5412,7 +5412,7 @@ msgstr "Smazané: Prototyp hosta \"%1$s\" na \"%2$s\"."
 msgid "Delimiter"
 msgstr "Oddělovač"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5427,10 +5427,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Závislosti"
 
@@ -5467,7 +5467,7 @@ msgstr "Stav nasazení"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5477,13 +5477,13 @@ msgstr "Stav nasazení"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Popis"
@@ -5493,10 +5493,10 @@ msgstr "Popis"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detaily"
@@ -5537,7 +5537,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Velikost adresáře (v bajtech). Vrací celé číslo"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5588,11 +5588,11 @@ msgstr "Zakázat hostitele sledované přes vybrané proxy?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5621,7 +5621,7 @@ msgstr "Zakázat vybrané hostitele?"
 msgid "Disable selected items?"
 msgstr "Zakázat vybrané položky?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Zakázat označené media typy?"
 
@@ -5655,7 +5655,7 @@ msgstr "Zakázat označené scénáře?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5683,7 +5683,7 @@ msgstr "Zakázat označené scénáře?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Zakázáno"
 
@@ -5709,9 +5709,9 @@ msgstr "Zlikvidovat hodnotu"
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5910,7 +5910,7 @@ msgstr "Zapisovaní statistiky disku. Vráti celé číslo pro položky v sektor
 msgid "Display OK triggers for"
 msgstr "Zobrazovat spouštěče v stavu OK po dobu"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Zobrazit graf"
 
@@ -5918,13 +5918,13 @@ msgstr "Zobrazit graf"
 msgid "Display problems"
 msgstr "Problémy se zobrazením"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Zobrazit skládaný graf"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5948,15 +5948,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5970,8 +5970,8 @@ msgstr "Přejete si změnit podmínkový výraz?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5981,8 +5981,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5992,8 +5992,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -6001,8 +6001,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr "Neshoduje se s regulárním výrazem"
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Tečka"
 
@@ -6031,16 +6031,16 @@ msgstr "Stáhnout konfigurační soubor"
 msgid "Downtime"
 msgstr "Prostoj"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "Návrh"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Styl vykreslení"
 
@@ -6091,7 +6091,7 @@ msgstr "Duplicitní userid \"%1$s\" u uživatele mapy \"%2$s\"."
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Trvání"
 
@@ -6114,29 +6114,29 @@ msgstr "Dynamické položky"
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Upravit"
@@ -6190,12 +6190,12 @@ msgstr "Chyba elasticsearch: %1$s."
 msgid "Element"
 msgstr "Prvek"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Název prvku"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Elipsa"
 
@@ -6251,7 +6251,7 @@ msgstr "Prázdná vstupní parametr."
 msgid "Empty map ID."
 msgstr "Prázdné ID mapy."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6331,11 +6331,11 @@ msgstr "Povolit interní údržbu"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6365,7 +6365,7 @@ msgstr "Povolit označené hosty?"
 msgid "Enable selected items?"
 msgstr "Povolit vybrané položky?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Povolit označené typy médií?"
 
@@ -6387,8 +6387,8 @@ msgstr "Povolit označené scénáře?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "Zapnout pasti"
 
@@ -6410,7 +6410,7 @@ msgstr "Zapnout pasti"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6426,7 +6426,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6440,14 +6440,14 @@ msgstr "Zapnout pasti"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Povoleno"
 
@@ -6500,8 +6500,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6679,7 +6679,7 @@ msgstr "Spustí WMI dotaz a vrátí první vybraný objekt. Vráti celé, deseti
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6700,8 +6700,8 @@ msgstr "Provedené"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Vykonaný skript"
 
@@ -6715,13 +6715,13 @@ msgstr "Potvrzení vykonání"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Rozbalit"
@@ -6791,15 +6791,15 @@ msgstr "Exportovat do CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6812,10 +6812,10 @@ msgstr "Výraz"
 msgid "Expression cannot be empty"
 msgstr "Výraz nemůže být prázdný"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Konstruktér výrazu"
 
@@ -6883,7 +6883,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Nepodařilo se vytvořit dashboard"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Adresa URL nebyla úspěšně analyzována."
@@ -7017,8 +7017,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Informace o čase souboru. Vráti celé číslo (Unix timestamp)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -7029,7 +7028,8 @@ msgstr "Informace o čase souboru. Vráti celé číslo (Unix timestamp)"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "Vyplň"
 
@@ -7126,7 +7126,7 @@ msgid "Fit to map"
 msgstr "Přizpůsobit mapě"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Pevná"
 
@@ -7138,9 +7138,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7148,22 +7148,22 @@ msgstr "Flexibilní"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Následovat přesměrování"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Písmo"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Velikost písma"
 
@@ -7171,8 +7171,8 @@ msgstr "Velikost písma"
 msgid "Form data"
 msgstr "Formulářová data"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Vzorec"
 
@@ -7208,7 +7208,7 @@ msgstr "Pátek"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Od"
 
@@ -7223,7 +7223,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Frontend přístup"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Povolit frontend zprávy"
 
@@ -7239,7 +7239,7 @@ msgid "Full clone"
 msgstr "Vytvořit úplnou kopii"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funkce"
 
@@ -7658,8 +7658,8 @@ msgstr "HTTP agent"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP autentizace"
 
@@ -7670,8 +7670,8 @@ msgstr "HTTP přihlašovací formulář"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
@@ -7708,10 +7708,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "HTTP záhlaví"
 
@@ -7727,7 +7727,7 @@ msgstr "Hebrejština (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7833,7 +7833,7 @@ msgid "History cleared"
 msgstr "Historie byla pročištěna"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Pročištění historie může chvíli trvat. Pokračovat?"
 
@@ -7848,8 +7848,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Období uložení historie"
 
@@ -7866,8 +7866,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Vodorovný"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Vodorovné zarovnání"
 
@@ -7989,7 +7989,7 @@ msgstr[2] "Hosty povoleny"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8075,9 +8075,9 @@ msgstr "Skupina hostů"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Rozhraní hosta"
 
@@ -8366,8 +8366,8 @@ msgstr "IPMI rozhraní"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI senzor"
 
@@ -8381,19 +8381,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ikona"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ikona (výchozí)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ikona (zakázáno)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ikona (údržba)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ikona (problém)"
 
@@ -8440,7 +8440,7 @@ msgstr "Mapování ikon"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Ikona s ID \"%1$s\" není dostupná."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Ikony"
 
@@ -8586,7 +8586,7 @@ msgstr "Obrázky"
 msgid "Images for all maps will be updated!"
 msgstr "Obrázky pro všechny mapy budou aktualizované!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Ihned"
 
@@ -8670,6 +8670,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9554,10 +9555,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9624,8 +9625,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Vložit"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Vložit výraz"
 
@@ -9741,9 +9742,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Interval"
@@ -10180,7 +10181,7 @@ msgstr "Italsky (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Položka"
 
@@ -10447,8 +10448,8 @@ msgstr "JMX agent"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX endpoint"
 
@@ -10466,8 +10467,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "JSON data"
 
@@ -10506,8 +10507,8 @@ msgstr "Japonsky (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr "JavaScript"
@@ -10546,9 +10547,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Klíč"
@@ -10614,13 +10615,13 @@ msgstr "LLD makra"
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Popisek"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Umístění popisku"
 
@@ -10773,9 +10774,9 @@ msgstr "Litevsky (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10786,7 +10787,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Vlevo"
@@ -10819,25 +10820,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Omezení počtu položek pro vyhledávání/filtr"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Čára"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Typ řádku"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Šířka řádku"
 
@@ -10859,9 +10860,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Ukazatel stavu spojnice"
 
@@ -10892,8 +10893,8 @@ msgstr "Připojené šablony"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Propojení"
 
@@ -10995,8 +10996,8 @@ msgstr "Zeměpisná délka umístění"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -11009,8 +11010,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Log monitoring. Vrátí log"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Formát času pro logování"
 
@@ -11136,7 +11137,7 @@ msgstr "Hlavní navigace"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Servisní okna"
 
@@ -11296,7 +11297,7 @@ msgstr "Mapa stromu navigace"
 msgid "Map owner cannot be empty."
 msgstr "Vlastník mapy nemůže být prázdný."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Tvar mapy"
 
@@ -11374,19 +11375,19 @@ msgstr "Maska"
 msgid "Mass update"
 msgstr "Hromadná aktualizace"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Hromadná aktualizace elementů"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Hromadné aktualizace tvarů"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Master položka"
 
@@ -11471,8 +11472,8 @@ msgid "May"
 msgstr "Květen"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Média"
 
@@ -11599,8 +11600,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Časový limit zprávy"
 
@@ -11618,7 +11619,7 @@ msgstr "Zpráva/Příkaz"
 msgid "Messages"
 msgstr "Zprávy"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Zprávy"
 
@@ -11718,11 +11719,11 @@ msgstr "Chybějící pole \"name\" pro prototyp grafu."
 msgid "Missing \"name\" field for graph."
 msgstr "Chybějící pole \"name\" pro graf."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "Chybějící údaje"
 
@@ -11894,8 +11895,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Násobek"
 
@@ -12061,7 +12062,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -12081,15 +12082,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12098,16 +12099,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12387,7 +12388,7 @@ msgstr "Bez podrobností"
 msgid "No discovery rule IDs given."
 msgstr "Žádné stanovené ID pravidla nálezu"
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12443,8 +12444,8 @@ msgstr "Žádný obrázek"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Nenalezené žádné rozhraní"
 
@@ -12748,7 +12749,7 @@ msgstr "Žádný specifikovaný soubor s veřejným klíčem."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Žádná obnova"
 
@@ -12794,8 +12795,8 @@ msgstr "Non-boolean flags jsou zastaralé."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12803,17 +12804,17 @@ msgstr "Non-boolean flags jsou zastaralé."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Žádná"
@@ -12909,7 +12910,7 @@ msgstr "Protokol zpráv"
 msgid "Notifications"
 msgstr "Zprávy"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -13083,8 +13084,8 @@ msgstr "Číselné systémy"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Číslo (float)"
 
@@ -13094,8 +13095,8 @@ msgstr "Číselné (celá čísla)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Číslo (unsigned)"
 
@@ -13103,8 +13104,8 @@ msgstr "Číslo (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13116,13 +13117,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "OK událost uzavřena"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "OK událost generována"
 
@@ -13183,7 +13184,7 @@ msgstr "Vypnuté"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13212,7 +13213,7 @@ msgstr "Na"
 msgid "On status change triggers blink for"
 msgstr "Při změně stavu spouštěč blikat po dobu"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Jednou"
 
@@ -13334,11 +13335,11 @@ msgstr "Operace nemá šablonu na vykonání."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operace"
@@ -13384,7 +13385,7 @@ msgstr "Možnosti"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13399,11 +13400,11 @@ msgstr "Možnosti"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Nebo"
 
@@ -13498,8 +13499,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Přepsané"
@@ -13716,8 +13717,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLÉM"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "PROBLEM režim generování událostí"
 
@@ -13799,8 +13800,8 @@ msgstr "Parametr \"%1$s\" je zastaralý."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parametry"
 
@@ -13848,8 +13849,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Analyzovat"
 
@@ -13880,12 +13881,12 @@ msgstr "Pasivní"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13918,12 +13919,12 @@ msgid "Paste"
 msgstr "Vložit"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13936,7 +13937,7 @@ msgstr "Vlož bez externích odkazů"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "Přerušené operace pro potlačené problémy"
 
@@ -13979,8 +13980,8 @@ msgstr "Vykonat DNS dotaz. Vrátí řetězec s požadovaným typem informace"
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Období"
@@ -14001,9 +14002,9 @@ msgid "Periods"
 msgstr "Periody"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -14014,7 +14015,7 @@ msgstr "Periody"
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Oprávnění může být přiřazené jen uživatelské skupině, ne uživateli."
 
@@ -14036,12 +14037,12 @@ msgstr "Algoritmus umísťování"
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Přehrát"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Přehrávat zvuk"
 
@@ -14071,8 +14072,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Vyberte, prosím, dva prvky"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14082,14 +14082,15 @@ msgstr "Vyberte, prosím, dva prvky"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "Velikost bodu"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Body"
 
@@ -14097,7 +14098,7 @@ msgstr "Body"
 msgid "Polish (pl_PL)"
 msgstr "Polsky (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Vyplň pole host inventáře"
 
@@ -14159,16 +14160,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Předzpracování"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Postup předzpracování"
 
@@ -14265,8 +14266,8 @@ msgstr "Privátní"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Soubor se soukromým klíčem"
 
@@ -14296,7 +14297,7 @@ msgstr "Úroveň oprávnění"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problém"
 
@@ -14486,16 +14487,16 @@ msgstr "Veřejný"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Veřejný klíč"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Soubor s veřejným klíčem"
 
@@ -14509,8 +14510,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Pole dotazů"
 
@@ -14560,8 +14561,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Nezpracované údaje"
 
@@ -14587,14 +14588,14 @@ msgstr "Pouze čtení"
 msgid "Read-only"
 msgstr "Pouze pro čtení"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14608,14 +14609,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Čtení a zápis"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14661,7 +14662,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14670,10 +14671,10 @@ msgid "Recovery"
 msgstr "Obnovení"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Obnovený výraz"
@@ -14683,7 +14684,7 @@ msgstr "Obnovený výraz"
 msgid "Recovery expression syntax error."
 msgstr "Obnovení po chybě syntaxe výrazu."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Obnovení operací"
 
@@ -14695,8 +14696,8 @@ msgstr "Obnovení operací"
 msgid "Recovery time"
 msgstr "Doba obnovy"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Obdélník"
 
@@ -14803,7 +14804,7 @@ msgstr "Vzdálený příkaz"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14834,13 +14835,13 @@ msgstr "Vzdálený příkaz"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14848,25 +14849,25 @@ msgstr "Vzdálený příkaz"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14894,14 +14895,14 @@ msgstr "Vzdálený příkaz"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14976,10 +14977,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Nahradit"
 
@@ -14997,7 +14998,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -15036,15 +15037,15 @@ msgstr "Protokoly"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "Obsah dotazu"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "Typ obsahu dotazu"
 
@@ -15053,8 +15054,8 @@ msgid "Request sent successfully"
 msgstr "Požadavek byl úspěšně poslán"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "Typ dotazu"
 
@@ -15081,8 +15082,8 @@ msgstr "Požadovaný výkon serveru - nové hodnoty za sekundu"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Požadovaný stavový kód"
 
@@ -15095,11 +15096,11 @@ msgstr "Požadovaný řetězec"
 msgid "Reset"
 msgstr "Reset"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Nastavit všechny pole na výchozí hodnoty?"
 
@@ -15116,11 +15117,11 @@ msgstr "Potvrzení obnovení"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Obnovit původní hodnoty"
 
@@ -15224,8 +15225,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "Režim načítání"
 
@@ -15298,9 +15299,9 @@ msgstr "Vrátí procento ztracených ICMP ping paketů."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15308,7 +15309,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Vpravo"
@@ -15324,8 +15325,8 @@ msgstr "Pravé Y"
 msgid "Right trim"
 msgstr "Správná úprava"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15518,8 +15519,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15598,8 +15599,8 @@ msgstr "SQL počet: %1$s (selecty: %2$s | vykonání: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL dotaz"
 
@@ -15624,38 +15625,38 @@ msgstr "SSH agent"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Soubor SSL certifikátu"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Soubor SSL klíče"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Heslo k SSL klíči"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL verifikace jména hosta"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL verifikace certifikátu hosta"
 
@@ -15777,9 +15778,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15804,8 +15805,8 @@ msgstr "Rozsah"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Skript"
 
@@ -15938,10 +15939,10 @@ msgstr "Bezpečnostní jméno"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Vybrat"
@@ -15951,9 +15952,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Označ prototyp"
 
@@ -15974,7 +15975,7 @@ msgstr "Označené akce smazané"
 msgid "Selected and all other problems of related triggers"
 msgstr "Vybrané a všechny další problémy vztahující se k spouštěčům"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Označené elementy"
 
@@ -16325,8 +16326,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "Závažnost byla zvýšena"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Tvar"
@@ -16429,7 +16430,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16529,8 +16530,8 @@ msgstr "Jednoduchý graf"
 msgid "Simple graph prototype"
 msgstr "Prototyp jednoduchého grafu"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Jednotlivé"
 
@@ -16575,7 +16576,7 @@ msgstr "Umístění stát / provincie"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Velikost"
 
@@ -16686,9 +16687,9 @@ msgstr "Rychlost"
 msgid "Stacked"
 msgstr "Skládaný"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "Schodiště"
 
@@ -16709,7 +16710,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Začátek v"
 
@@ -16904,14 +16905,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Krok s jménem \"%1$s\" již existuje."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Kroky"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Zastavit"
 
@@ -16934,10 +16935,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17173,8 +17174,8 @@ msgstr "Priorita značek na displeji"
 msgid "Tag filter"
 msgstr "Filtr značek"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Značka pro párování"
 
@@ -17233,28 +17234,28 @@ msgstr "Hodnota značky"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Značky"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Cíl"
@@ -17415,14 +17416,14 @@ msgstr "Šablony aktualizovány"
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17480,10 +17481,10 @@ msgstr "Testovací subjekt"
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Text"
 
@@ -17638,8 +17639,8 @@ msgstr "Tento měsíc"
 msgid "This month so far"
 msgstr "Prozatím tento měsíc"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17743,9 +17744,9 @@ msgstr "Časové období"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Časový posun"
 
@@ -17763,8 +17764,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Časový limit"
 
@@ -17790,7 +17791,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Do"
 
@@ -17814,7 +17815,7 @@ msgstr "Dnes prozatím"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Nahoře"
@@ -17866,8 +17867,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17878,7 +17878,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "Transparentnost"
 
@@ -17886,9 +17887,9 @@ msgstr "Transparentnost"
 msgid "Transport error."
 msgstr "Přenosová chyba."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "Zacházet jako s 0"
@@ -17900,8 +17901,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Perioda uložení trendů"
 
@@ -17919,9 +17920,9 @@ msgstr "Trendy"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Spouštěč"
@@ -18026,7 +18027,7 @@ msgstr "Přehled spouštěčů"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Prototyp spouštěče"
@@ -18093,7 +18094,7 @@ msgstr "Prototypy spouštěčů smazané"
 msgid "Trigger prototypes updated"
 msgstr "Prototypy spouštěčů aktualizované"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Závažnost spouštěče"
 
@@ -18200,23 +18201,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Typ"
@@ -18225,12 +18226,12 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr "Typ (Podrobně)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Typ (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18241,10 +18242,10 @@ msgstr "Způsob vyhodnocení"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Typ informace"
 
@@ -18268,11 +18269,11 @@ msgstr "NEZNÁMÝ"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18293,7 +18294,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL není správně zakódována."
@@ -18318,7 +18319,7 @@ msgstr "URL parametr jméno je prázdný."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URL"
@@ -18421,15 +18422,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18438,8 +18439,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Jednotky"
 
@@ -18465,7 +18466,7 @@ msgstr "Jednotky"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Neznámý"
@@ -18609,12 +18610,12 @@ msgstr "Dostupný"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18634,18 +18635,18 @@ msgstr "Dostupný"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18666,13 +18667,13 @@ msgstr "Aktualizovat existující"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Interval aktualizací"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "Aktualizace činností"
 
@@ -18811,7 +18812,7 @@ msgstr "Uživatelský řetězec agenta"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18926,10 +18927,10 @@ msgstr "Menu uživatele"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Uživatelské jméno"
 
@@ -18998,7 +18999,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Uživatelské sdílení má chybějící parametr: %1$s v mapě \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19376,12 +19377,12 @@ msgstr "Validace"
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19443,8 +19444,8 @@ msgstr "Mapa hodnot \"%1$s\" již existuje."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Mapování hodnot"
@@ -19561,8 +19562,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Svislý"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Svislé zarovnání"
 
@@ -19767,8 +19768,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19779,12 +19779,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19860,8 +19861,8 @@ msgstr "Nesprávné pole pro link mapy."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19873,11 +19874,11 @@ msgstr "Osa X"
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19891,8 +19892,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "XML data"
 
@@ -19912,12 +19913,12 @@ msgstr ""
 msgid "XPath"
 msgstr "XPath"
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Maximální hodnota na ose Y"
 
@@ -19931,18 +19932,18 @@ msgstr "MAX hodnota osy Y musí být větší než MIN hodnota osy Y"
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Maximální hodnota pro osu Y musí být větší než minimální hodnota pro osu."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Minimální hodnota na ose Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Strana osy Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Osa Y"
 
@@ -19962,11 +19963,11 @@ msgstr "d.m.Y H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20997,10 +20998,10 @@ msgstr "fuzzytime() - Rozdíl mezi hodnotou položky (časovou značkou) a časo
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "globálně nastavené údržby"
@@ -21029,8 +21030,8 @@ msgstr "host"
 msgid "host group"
 msgstr "skupina"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "vzorec hosta"
@@ -21063,7 +21064,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "včetně podskupin"
 
@@ -21237,8 +21238,8 @@ msgstr "položka"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "vzorec položky"
 
@@ -21502,10 +21503,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "název"
@@ -21552,7 +21553,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "žádný"
 
@@ -21582,7 +21583,7 @@ msgstr "číslo"
 msgid "of"
 msgstr "z"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21605,7 +21606,7 @@ msgstr "z"
 msgid "off"
 msgstr "pryč"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21777,8 +21778,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr "skript"
@@ -21915,8 +21916,8 @@ msgstr "zadaná pověření nejsou jedinečná"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22203,17 +22204,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/de/LC_MESSAGES/frontend.po b/ui/locale/de/LC_MESSAGES/frontend.po
index a51e5a4098c..bf6eccfac8e 100644
--- a/ui/locale/de/LC_MESSAGES/frontend.po
+++ b/ui/locale/de/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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] "%1$s Nachricht"
 msgstr[1] "%1$s Nachrichten"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "Noch %1$s Versuch"
 msgstr[1] "Noch %1$s Versuche"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -335,7 +335,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 Sekunden"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D-Ansicht"
 
@@ -381,7 +381,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -471,27 +471,27 @@ msgstr "Zugriff verweigert"
 msgid "Access denied!"
 msgstr "Zugriff verweigert!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr "Zugriff auf die API"
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "Zugriff auf UI ELemente"
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr "Zugriff zu Aktionen"
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr "Zugriff zu Modulen"
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr "Zugriff auf Dienste"
@@ -563,35 +563,35 @@ msgstr "RESOLVED Ereignisse bestätigen"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -720,24 +720,24 @@ msgstr "Aktiv bis"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -773,13 +773,13 @@ msgstr "Aktiv bis"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -797,38 +797,38 @@ msgstr "Aktiv bis"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -855,7 +855,7 @@ msgstr "Untergeordnetes Element hinzufügen"
 msgid "Add child service"
 msgstr "Untergeordneten Dienst hinzugefügt"
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr "Untergeordneten Dienste hinzugefügt"
 
@@ -876,7 +876,7 @@ msgstr "Fehlendes hinzugefügt"
 msgid "Add multiple maps"
 msgstr "Füge mehrere Karten hinzu"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "Neuen Datensatz hinzufügen"
 
@@ -885,16 +885,16 @@ msgstr "Neuen Datensatz hinzufügen"
 msgid "Add new interface"
 msgstr "Neue Schnittstelle hinufügen"
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "Neue Vorrangregel hinzufügen"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr "Seite hinzugefügt"
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr "Übergeordnete Dienste hinzufügen"
 
@@ -904,7 +904,7 @@ msgstr "Problemkommentare hinzufügen"
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Prototyp hinzufügen"
 
@@ -941,7 +941,7 @@ msgid "Add user group"
 msgstr "Benutzergruppe hinzufügen"
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Widget hinzufügen"
@@ -1029,7 +1029,7 @@ msgstr "Agent-Schnittstellen"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr "Zusammenfassung"
 
@@ -1037,11 +1037,11 @@ msgstr "Zusammenfassung"
 msgid "Aggregate functions"
 msgstr "Zusammenfassende Funktionen"
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr "Zusammenfassende funktion"
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr "Zusammenfassungsintervall"
 
@@ -1068,8 +1068,8 @@ msgstr "Kartenelemente ausrichten"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1085,8 +1085,8 @@ msgid "All dashboards"
 msgstr "Alle Übersichtsseiten"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Alle Gruppen"
 
@@ -1102,13 +1102,13 @@ msgstr "Alle Verknüpfungen sollten Angaben für \"Name\" und \"URL\" haben"
 msgid "All maps"
 msgstr "Alle Karten"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Alle Probleme"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Alle Probleme falls Marker Wert enthält"
 
@@ -1129,19 +1129,19 @@ msgid "Allow list"
 msgstr "Erlaubnisliste"
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Erlaube manuelles Schließen"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Zugelassene Hosts"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr "Erlaubte Methoden"
 
@@ -1158,21 +1158,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr "Menge des physischen Arbeitsspeichers des Hosts, die für die Sicherung der physischen Speicherseiten des Gastes verbraucht wird, <url> - URL des VMware-Dienstes, <uuid> - Hostname der virtuellen VMware-Maschine"
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "Und"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1186,7 +1186,7 @@ msgstr "Und"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "Und/Oder"
 
@@ -1232,11 +1232,11 @@ msgstr "Programmfehler."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Verwenden"
@@ -1367,11 +1367,11 @@ msgstr ""
 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:159
 msgid "At least one operation must be selected."
 msgstr "Mindestens eine Operation muss ausgewählt sein."
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Mindestens eine Operation muss existieren."
 
@@ -1465,8 +1465,8 @@ msgstr "Authentifizierung fehlgeschlagen: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Authentifizierungsmethode"
 
@@ -1528,8 +1528,8 @@ msgstr "Automatisch"
 msgid "Automatic icon mapping"
 msgstr "Automatische Symbolzuordnung"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Automatische Symbolauswahl"
 
@@ -1596,12 +1596,12 @@ msgstr "Zurück"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Hintergrund"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
@@ -1609,9 +1609,9 @@ msgstr "Hintergrundfarbe"
 msgid "Background image"
 msgstr "Hintergrundbild"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr "Balken"
 
@@ -1619,8 +1619,8 @@ msgstr "Balken"
 msgid "Base DN"
 msgstr "Base-DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr "Grundfarbe"
 
@@ -1663,15 +1663,15 @@ msgstr "Blau"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Hauptteil"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Hauptteil und Kopfzeilen"
 
@@ -1683,8 +1683,8 @@ msgid "Bold"
 msgstr ""
 
 # 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
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "fette Linie"
 
@@ -1692,19 +1692,19 @@ msgstr "fette Linie"
 msgid "Boolean to decimal"
 msgstr "Boolescher Wert zu dezimal"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Rahmen"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr "Randfarbe"
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Rahmentyp"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Rahmenbreite"
 
@@ -1717,7 +1717,7 @@ msgstr "Beide Passwörter müssen gleich sein."
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Unten"
@@ -1800,7 +1800,7 @@ msgid "CUID is expected"
 msgstr "CUID erwartet"
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Berechnet"
 
@@ -1824,22 +1824,22 @@ msgstr "Rückruf"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3431,8 +3431,8 @@ msgstr "Typ ändern"
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Zeichen"
 
@@ -3460,7 +3460,7 @@ msgstr "Gehäuse"
 msgid "Chassis information. Returns string"
 msgstr "Gehäuse Information. Liefert Zeichefolge"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Prüfung existiert bereits."
 
@@ -3581,8 +3581,8 @@ msgid "Clear history"
 msgstr "Verlauf löschen"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Verlauf und Trends leeren"
 
@@ -3610,22 +3610,22 @@ msgstr "Uhr"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Klonen"
@@ -3633,28 +3633,28 @@ msgstr "Klonen"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Schließen"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Ausdrucksgenerator schließen"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Schließe neues Ereignis"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Schließe alte Ereignisse"
@@ -3668,7 +3668,7 @@ msgid "Close problems"
 msgstr "Probleme schliessen"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Einklappen"
@@ -3682,11 +3682,11 @@ msgstr "Seitenbereich einklappen"
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr "Farbe"
 
@@ -3695,7 +3695,7 @@ msgstr "Farbe"
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3783,9 +3783,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr "Zustand \"%2$s\" verwendet in Formel \"%3$s\" für Vorrangregel \"%1$s\" ist nicht definiert."
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Voraussetzungen"
@@ -3970,13 +3970,13 @@ msgstr "Herzlichen Glückwunsch! Sie haben das Zabbix Frontend erfolgreich insta
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Verbinden mit"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "Verbunden"
@@ -4079,8 +4079,8 @@ msgstr "Kontakt"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4160,13 +4160,13 @@ msgstr "Vorrangregel fortsetzten"
 msgid "Contract number"
 msgstr "Vertragsnummer"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "Wandle nach JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Koordinaten"
 
@@ -4183,7 +4183,7 @@ msgstr "Kopieren"
 msgid "Copy to clipboard"
 msgstr "In Zwischenablage kopieren"
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Korrelation"
 
@@ -4323,10 +4323,10 @@ msgstr "Suchlaufregel erzeugen (über Vorlage)"
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4531,7 +4531,7 @@ msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4545,8 +4545,8 @@ msgstr "Benutzerdefinierte Diagramme"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Benutzerdefinierte Intervalle"
 
@@ -4714,8 +4714,8 @@ msgid "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
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Gestrichelte Linie"
 
@@ -4733,7 +4733,7 @@ msgstr "Daten sind nicht ordnungsgemäß codiert."
 msgid "Data overview"
 msgstr "Datenübersicht"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4917,11 +4917,11 @@ 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:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Standard"
 
@@ -4963,7 +4963,7 @@ msgstr "Standard-Anmeldeformular"
 msgid "Default media type"
 msgstr "Voreingesteller Medientyp"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Standarddauer eines Operationsschritts"
 
@@ -4997,7 +4997,7 @@ msgstr "Verspätung"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5006,7 +5006,7 @@ msgstr "Verspätung"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5014,47 +5014,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Löschen"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr "Alle Elemente löschen, die nicht in der Importdatei enthalten sind?"
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Löschen und leeren"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Ausgewählte Vorlagen löschen und leeren? (Warnung: leert Daten aller verbundenen Hosts!)"
 
@@ -5062,11 +5062,11 @@ msgstr "Ausgewählte Vorlagen löschen und leeren? (Warnung: leert Daten aller v
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Vorlage löschen und leeren? (Achtung: Alle verbundenen Hosts werden geleert!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Aktuelle Aktion löschen?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Aktuelle Korrelation löschen?"
 
@@ -5079,10 +5079,10 @@ msgstr "Übersichtsseite löschen?"
 msgid "Delete discovery rule?"
 msgstr "Suchlauf löschen?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Ausdruck löschen?"
 
@@ -5106,11 +5106,11 @@ msgstr "Protokoll des ausgewählten Web Szenarios löschen?"
 msgid "Delete icon map?"
 msgstr "Symbolzuordnung löschen?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Datenpunkt Prototyp löschen?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Datenpunkt löschen?"
 
@@ -5152,11 +5152,11 @@ msgstr "Ausgewähltes API-Token löschen?"
 msgid "Delete selected API tokens?"
 msgstr "Ausgewählte API Tokens löschen?"
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5215,7 +5215,7 @@ msgstr "Ausgewählten Host Prototyp löschen?"
 msgid "Delete selected host?"
 msgstr "Ausgewählte Hosts löschen?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Ausgewählte Hosts löschen?"
 
@@ -5223,11 +5223,11 @@ msgstr "Ausgewählte Hosts löschen?"
 msgid "Delete selected image?"
 msgstr "Ausgewählte Bilder löschen?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Ausgewählten Datenpunkt Prototyp löschen?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Ausgewählte Datenpunkte löschen?"
 
@@ -5243,7 +5243,7 @@ msgstr "Ausgewählte Karten löschen?"
 msgid "Delete selected maps?"
 msgstr "Ausgewählte Karten löschen?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Ausgewählte Medientypen löschen?"
 
@@ -5275,11 +5275,11 @@ msgstr "Ausgewählte geplante Berichte löschen?"
 msgid "Delete selected scripts?"
 msgstr "Ausgewählte Skripte löschen?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr "Ausgewählten Dienst löschen?"
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr "Ausgewählte Dienste löschen?"
 
@@ -5287,19 +5287,19 @@ msgstr "Ausgewählte Dienste löschen?"
 msgid "Delete selected shapes?"
 msgstr "Ausgewählten Formen löschen?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Ausgewählte Vorlagen löschen?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Ausgewählte Auslöser Prototypen löschen?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Ausgewählte Auslöser löschen?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Ausgewählten Benutzer löschen?"
 
@@ -5315,11 +5315,11 @@ msgstr "Ausgewählte Web Szenarios löschen?"
 msgid "Delete template?"
 msgstr "Vorlage löschen?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Auslöser-Prototyp löschen?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Auslöser löschen?"
 
@@ -5345,7 +5345,7 @@ msgstr "Gelöscht: Host-Prototyp \"%1$s\" auf \"%2$s\"."
 msgid "Delimiter"
 msgstr "Trennzeichen"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr "Abgelehnte Methoden"
 
@@ -5360,10 +5360,10 @@ msgid "Deny list"
 msgstr "Ablehnungsliste"
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
@@ -5400,7 +5400,7 @@ msgstr "Verteilungsstatus"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5410,13 +5410,13 @@ msgstr "Verteilungsstatus"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Beschreibung"
@@ -5426,10 +5426,10 @@ msgstr "Beschreibung"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Details"
@@ -5470,7 +5470,7 @@ msgstr "Verzeichnis"
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Verzeichnisgrösse (in bytes). Gibt Ganzzahl zurück. "
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5521,11 +5521,11 @@ msgstr "Hosts deaktivieren, die durch ausgewählte Proxys überwacht werden?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5554,7 +5554,7 @@ msgstr "Ausgewählte Hosts deaktivieren?"
 msgid "Disable selected items?"
 msgstr "Ausgewählte Datenpunkte deaktivieren?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Ausgewählte Medientypen deaktivieren?"
 
@@ -5588,7 +5588,7 @@ msgstr "Ausgewählte Web Szenarios löschen?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5616,7 +5616,7 @@ msgstr "Ausgewählte Web Szenarios löschen?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Deaktiviert"
 
@@ -5642,9 +5642,9 @@ msgstr "Wert verwerfen"
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr "Suche"
@@ -5841,7 +5841,7 @@ msgstr "Festplatten-Schreibstatistik. Gibt Ganzzahl für Anzahl der Sektoren und
 msgid "Display OK triggers for"
 msgstr "OK-Auslöser zeigen"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Diagramm anzeigen"
 
@@ -5849,13 +5849,13 @@ msgstr "Diagramm anzeigen"
 msgid "Display problems"
 msgstr "Probleme anzeigen"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Gestapeltes Diagramm angezeigt"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5879,15 +5879,15 @@ msgstr "Divisionsnenner"
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr "Keine Historie aufbewahren"
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr "Keine Trends aufbewahren"
 
@@ -5901,8 +5901,8 @@ msgstr "Wollen Sie den bedingten Ausdruck ersetzen?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr "Enthält nicht"
 
@@ -5912,8 +5912,8 @@ msgstr "Enthält nicht"
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr "Ist ungleich"
 
@@ -5923,8 +5923,8 @@ msgstr "Ist ungleich"
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr "Existiert nicht"
 
@@ -5932,8 +5932,8 @@ msgstr "Existiert nicht"
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Punkte"
 
@@ -5962,16 +5962,16 @@ msgstr "Konfigurationsdatei herunterladen"
 msgid "Downtime"
 msgstr "Downtime"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "Anzeige"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Anzeigestil"
 
@@ -6022,7 +6022,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Dauer"
 
@@ -6045,29 +6045,29 @@ msgstr "Dynamische Datenpunkte"
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr "Jeder Datenpunkt"
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -6124,12 +6124,12 @@ msgstr "Kartenelement"
 # Wird benutzt:
 # 1. bei Auswahl der Beschriftungsart eines Kartenelements
 # 2. als Spaltentitel in der Tabelle der Verbindungen eines Elements
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Name des Elements"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Ellipse"
 
@@ -6185,7 +6185,7 @@ msgstr "Leerer Eingabe-Parameter."
 msgid "Empty map ID."
 msgstr "Leere Karten-ID."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6265,11 +6265,11 @@ msgstr "Internen Bereinigungsdienst aktivieren"
 msgid "Enable selected API tokens?"
 msgstr "Ausgewählte API-Tokens aktivieren?"
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6299,7 +6299,7 @@ msgstr "Ausgewählte Hosts aktivieren?"
 msgid "Enable selected items?"
 msgstr "Ausgewählte Elemente aktivieren?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Ausgewählte Medien-Typen aktivieren?"
 
@@ -6321,8 +6321,8 @@ msgstr "Ausgewählte Web-Szenarien aktivieren?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "Trapper einschalten"
 
@@ -6344,7 +6344,7 @@ msgstr "Trapper einschalten"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6360,7 +6360,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6374,14 +6374,14 @@ msgstr "Trapper einschalten"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Aktiviert"
 
@@ -6434,8 +6434,8 @@ msgstr "Eintrag mit der UUID \"%1$s\" existiert bereits."
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6612,7 +6612,7 @@ msgstr "Führt eine WMI-Abfrage aus und gibt das erste ausgewählte Objekt zurü
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr "Jetzt ausführen"
@@ -6633,8 +6633,8 @@ msgstr "Ausgeführt"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Ausgeführtes Skript"
 
@@ -6648,13 +6648,13 @@ msgstr "Ausführbestätigung"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr "Existiert"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Erweitern"
@@ -6724,15 +6724,15 @@ msgstr "Exportieren als CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6745,10 +6745,10 @@ msgstr "Ausdruck"
 msgid "Expression cannot be empty"
 msgstr "Ausdruck darf nicht leer sein"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Ausdrucksgenerator"
 
@@ -6816,7 +6816,7 @@ msgstr "Anmeldung fehlgeschlagen"
 msgid "Failed to create dashboard"
 msgstr "Fehler bei Übersichtsseiten-Erstellung"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Fehler beim Parsen der URL."
@@ -6951,8 +6951,7 @@ msgstr "Dateigröße in Bytes (Standard) oder in Zeilenumbrüchen. Rückgabe Gan
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Datei-Zeitstempel. Gibt Ganzzahl zurück (Unix Zeitstempel)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6963,7 +6962,8 @@ msgstr "Datei-Zeitstempel. Gibt Ganzzahl zurück (Unix Zeitstempel)"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "Füllung"
 
@@ -7060,7 +7060,7 @@ msgid "Fit to map"
 msgstr "An Karte anpassen"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fest"
 
@@ -7072,9 +7072,9 @@ msgstr "Behobener Status"
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7082,22 +7082,22 @@ msgstr "Beliebig"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Weiterleitungen folgen"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Schriftart"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr "Schriftfarbe"
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Schriftgröße"
 
@@ -7105,8 +7105,8 @@ msgstr "Schriftgröße"
 msgid "Form data"
 msgstr "Formulardaten"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formel"
 
@@ -7142,7 +7142,7 @@ msgstr "Freitag"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Von"
 
@@ -7157,7 +7157,7 @@ msgstr "Frontend-URL"
 msgid "Frontend access"
 msgstr "Zugriff auf Oberfläche"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Benachrichtigung in Oberfläche"
 
@@ -7174,7 +7174,7 @@ msgid "Full clone"
 msgstr "Vollständig klonen"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funktion"
 
@@ -7593,8 +7593,8 @@ msgstr "HTTP Agent"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP-Authentifizierung"
 
@@ -7605,8 +7605,8 @@ msgstr "HTTP Loginformular"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP-Proxy"
 
@@ -7643,10 +7643,10 @@ msgstr "HashiCorp Tresor"
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Kopfbereiche"
 
@@ -7662,7 +7662,7 @@ msgstr "Hebräisch (He_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7769,7 +7769,7 @@ msgid "History cleared"
 msgstr "Verlauf geleert"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Es dauert eine Weile, den Verlauf zu leeren. Fortfahren?"
 
@@ -7784,8 +7784,8 @@ msgstr "Historienfunktionen"
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Speicherdauer Verlauf"
 
@@ -7802,8 +7802,8 @@ msgstr "Internetseite"
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Horizontale Ausrichtung"
 
@@ -7923,7 +7923,7 @@ msgstr[1] "Hosts aktiviert"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8009,9 +8009,9 @@ msgstr "Hostgruppen"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Hostschnittstelle"
 
@@ -8299,8 +8299,8 @@ msgstr "IPMI-Schnittstellen"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI-Sensor"
 
@@ -8314,19 +8314,19 @@ msgstr "IPMI-Sensor-IDs und andere sensorbezogene Parameter. Gibt JSON zurück."
 msgid "Icon"
 msgstr "Symbol"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Symbol (Standard)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Symbol (deaktiviert)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Symbol (in Wartung)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Symbol (Problem)"
 
@@ -8373,7 +8373,7 @@ msgstr "Symbol zuordnen"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Symbol mit ID \"%1$s\" ist nicht verfügbar."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Symbole"
 
@@ -8517,7 +8517,7 @@ msgstr "Bilder"
 msgid "Images for all maps will be updated!"
 msgstr "Die Bilder für alle Karten werden geändert!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Zurzeit"
 
@@ -8601,6 +8601,7 @@ msgid "Inaccessible item prototype"
 msgstr "Unerreichbarer Datenpunkt-Prototyp"
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9485,10 +9486,10 @@ msgstr "Unendlichkeit"
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9555,8 +9556,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Einfügen"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Ausdruck einfügen"
 
@@ -9672,9 +9673,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Intervall"
@@ -10111,7 +10112,7 @@ msgstr "Italienisch (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Datenpunkt"
 
@@ -10374,8 +10375,8 @@ msgstr "JMX-Agent"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX Endpunkt"
 
@@ -10393,8 +10394,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "JSON Daten"
 
@@ -10433,8 +10434,8 @@ msgstr "Japanisch (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr "JavaScript"
@@ -10473,9 +10474,9 @@ msgstr "Kerberos"
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Schlüssel"
@@ -10542,13 +10543,13 @@ msgstr "LLD Makros"
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Beschriftungstext"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Beschriftungsposition"
 
@@ -10695,9 +10696,9 @@ msgstr "Lettisch (lv_LV)"
 msgid "Layout"
 msgstr "Layout"
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10708,7 +10709,7 @@ msgstr "Layout"
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Links"
@@ -10741,25 +10742,25 @@ msgstr "Lizensiert unter "
 msgid "Limit for search and filter results"
 msgstr "Grenzen für Suche/Filter-Ergebnisse "
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Linie"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr "Linienfarbe"
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Linienart"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Strichstärke"
 
@@ -10781,9 +10782,9 @@ msgstr "Das Feld \"selementid1\" des Links verweist auf eine nicht existierende
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 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
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Indikatoren"
 
@@ -10814,8 +10815,8 @@ msgstr "Verbundene Vorlagen"
 msgid "Linked to templates"
 msgstr "Verbunden mit den Vorlagen"
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Links"
 
@@ -10917,8 +10918,8 @@ msgstr "Längengrad"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -10931,8 +10932,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Überwachung von Protokolldateien. Gibt Protokoll zurück"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Log-Zeitformat"
 
@@ -11058,7 +11059,7 @@ msgstr "Hauptnavigation"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Wartung"
 
@@ -11218,7 +11219,7 @@ msgstr "Navigationsbaum"
 msgid "Map owner cannot be empty."
 msgstr "Kartenbesitzer darf nicht leer sein."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Tafelform"
 
@@ -11297,19 +11298,19 @@ msgstr "Maske"
 msgid "Mass update"
 msgstr "Massenänderung"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Massenänderung von Elementen"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Massenaktualisierung der Formen"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11393,8 +11394,8 @@ msgid "May"
 msgstr "Mai"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Medien"
 
@@ -11518,8 +11519,8 @@ msgstr "Nachrichtenvorlage"
 msgid "Message templates"
 msgstr "Nachrichtenvorlage"
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Nachrichten-Timeout"
 
@@ -11537,7 +11538,7 @@ msgstr "Nachricht/Befehl"
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Nachrichtensystem"
 
@@ -11636,11 +11637,11 @@ msgstr "Fehlendes \"Namen\" Feld für den Diagramm-Prototypen"
 msgid "Missing \"name\" field for graph."
 msgstr "Feld \"name\" fehlt bei Diagramm."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "Fehlende Daten"
 
@@ -11808,8 +11809,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Mehrfach"
 
@@ -11975,7 +11976,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11995,15 +11996,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12012,16 +12013,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12301,7 +12302,7 @@ msgstr "Keine Details"
 msgid "No discovery rule IDs given."
 msgstr "Keine Suchlauf-IDs festgelegt."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr "Keine aktivierten Module gefunden."
@@ -12357,8 +12358,8 @@ msgstr "Kein Bild"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Keine Schnittstelle gefunden"
 
@@ -12662,7 +12663,7 @@ msgstr "Keine Datei mit öffentlichem Schlüssel angegeben."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Keine Aktualisierung"
 
@@ -12708,8 +12709,8 @@ msgstr "Nicht boolesche Markierungen sind veraltet."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12717,17 +12718,17 @@ msgstr "Nicht boolesche Markierungen sind veraltet."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Kein"
@@ -12825,7 +12826,7 @@ msgstr "Benachrichtigungs-Report"
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12999,8 +13000,8 @@ msgstr "Zahlensystem"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numerisch (float)"
 
@@ -13010,8 +13011,8 @@ msgstr "Numerisch (Ganzzahl)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numerisch (kein Vorzeichen)"
 
@@ -13019,8 +13020,8 @@ msgstr "Numerisch (kein Vorzeichen)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13032,13 +13033,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "OK Ereignis wird geschlossen"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "OK-Ereigniserzeugung"
 
@@ -13099,7 +13100,7 @@ msgstr "Aus"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13128,7 +13129,7 @@ msgstr "An"
 msgid "On status change triggers blink for"
 msgstr "Ändert sich der Zustand, blinken Auslöser"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Einmal"
 
@@ -13250,11 +13251,11 @@ msgstr "Operation hat keine zugeordneten Vorlagen zur Ausführung."
 msgid "Operational data"
 msgstr "Operative Daten"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operationen"
@@ -13300,7 +13301,7 @@ msgstr "Einstellungen"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13315,11 +13316,11 @@ msgstr "Einstellungen"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Oder"
 
@@ -13416,8 +13417,8 @@ msgstr "Ausgabe"
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr "Überlappende Widgets bei X:%3$d, Y:%4$d auf Seite #%2$d der Übersichtsseite \"%1$s\"."
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Überschrieben von"
@@ -13634,8 +13635,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLEM"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "PROBLEM Ereignisgenerierungsmodus"
 
@@ -13717,8 +13718,8 @@ msgstr "Parameter \"%1$s\" ist veraltet."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parameter"
 
@@ -13767,8 +13768,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Analysieren"
 
@@ -13799,12 +13800,12 @@ msgstr "Passiv"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13837,12 +13838,12 @@ msgid "Paste"
 msgstr "Einfügen"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13855,7 +13856,7 @@ msgstr "Ohne externe Links einfügen"
 msgid "Pattern"
 msgstr "Muster"
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "Pausieren von Vorgängen bei unterdrückten Problemen"
 
@@ -13898,8 +13899,8 @@ msgstr "Führt eine DNS-Abfrage durch. Gibt eine Zeichenkette mit dem gewünscht
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Zeitraum"
@@ -13920,9 +13921,9 @@ msgid "Periods"
 msgstr "Zeitspannen"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13933,7 +13934,7 @@ msgstr "Zeitspannen"
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Berechtigungen können nur Benutzergruppen zugewiesen werden."
 
@@ -13955,12 +13956,12 @@ msgstr "Platzierungs-Algorithmus"
 msgid "Plain text"
 msgstr "Klartext"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Abspielen"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Geräusch abspielen"
 
@@ -13990,8 +13991,7 @@ msgstr "Bitte aktivieren Sie die Richtlinie \"allow_url_fopen\"."
 msgid "Please select two elements"
 msgstr "Bitte zwei Elemente auswählen"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14001,14 +14001,15 @@ msgstr "Bitte zwei Elemente auswählen"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "Punktgröße"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Punkte"
 
@@ -14016,7 +14017,7 @@ msgstr "Punkte"
 msgid "Polish (pl_PL)"
 msgstr "Polnisch (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Befüllt das Inventarfeld des Hosts"
 
@@ -14078,16 +14079,16 @@ msgstr "Vorhersagefunktionen"
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Präprozessor"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Präprozessorschritte"
 
@@ -14184,8 +14185,8 @@ msgstr "Privat"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Datei mit privatem Schlüsel"
 
@@ -14216,7 +14217,7 @@ msgstr "Berechtigungsebene"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problem"
 
@@ -14405,16 +14406,16 @@ msgstr "Öffentlich"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Öffentlicher Schlüssel"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Datei mit öffentlichem Schlüssel"
 
@@ -14428,8 +14429,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Abfragefelder"
 
@@ -14479,8 +14480,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Primärdaten"
 
@@ -14506,14 +14507,14 @@ msgstr "Nur lesen"
 msgid "Read-only"
 msgstr "Nur lesen"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr "Nur-Lese-Zugriff auf Dienste"
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr "Nur-Lese-Zugriff auf Dienste mit Tag"
@@ -14527,14 +14528,14 @@ msgstr "Nur-Lese-Zugriff auf Dienste mit Tag"
 msgid "Read-write"
 msgstr "Lesen/Schreiben"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr "Lese- und Schreibzugriff auf Dienste"
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14580,7 +14581,7 @@ msgstr "Empfänger"
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14589,10 +14590,10 @@ msgid "Recovery"
 msgstr "Wiederherstellung"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Ausdruck der Wiederherstellung"
@@ -14602,7 +14603,7 @@ msgstr "Ausdruck der Wiederherstellung"
 msgid "Recovery expression syntax error."
 msgstr "Syntaxfehler des Wiederherstellungsausdrucks."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Wiederherstellungsmassnahmen"
 
@@ -14614,8 +14615,8 @@ msgstr "Wiederherstellungsmassnahmen"
 msgid "Recovery time"
 msgstr "Wiederherstellungszeit"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Rechteck"
 
@@ -14721,7 +14722,7 @@ msgstr "Befehl ausführen"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14752,13 +14753,13 @@ msgstr "Befehl ausführen"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14766,25 +14767,25 @@ msgstr "Befehl ausführen"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14812,14 +14813,14 @@ msgstr "Befehl ausführen"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14894,10 +14895,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Ersetzen"
 
@@ -14915,7 +14916,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr "Berichte, die von anderen Benutzern erstellt wurden, werden auf den aktuellen Benutzer geändert."
 
@@ -14954,15 +14955,15 @@ msgstr "Berichte"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14971,8 +14972,8 @@ msgid "Request sent successfully"
 msgstr "Anfrage erfolgreich gesendet"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "Typ der Anfrage"
 
@@ -14999,8 +15000,8 @@ msgstr "Erwartetes Datenaufkommen / Eingehende Werte pro Sekunde"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Geforderter HTTP-Statuscode"
 
@@ -15013,11 +15014,11 @@ msgstr "Geforderte Zeichenkette"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Alle Felder zurücksetzen auf Standard-Werte?"
 
@@ -15034,11 +15035,11 @@ msgstr "Bestätigung zurücksetzen"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
@@ -15143,8 +15144,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15217,9 +15218,9 @@ msgstr "Gibt den Prozentsatz der verlorenen ICMP-Ping-Pakete zurück."
 msgid "Revert changes"
 msgstr "Änderungen rückgängig machen"
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15227,7 +15228,7 @@ msgstr "Änderungen rückgängig machen"
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Rechts"
@@ -15243,8 +15244,8 @@ msgstr "Rechts Y"
 msgid "Right trim"
 msgstr "Rechter Beschnitt"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr "Rolle"
 
@@ -15436,8 +15437,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP-OID"
 
@@ -15516,8 +15517,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL Abfrage"
 
@@ -15542,38 +15543,38 @@ msgstr "SSH-Agent"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "SSL Zertifikatsdatei"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "SSL Schlüssel-Datei"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "SSL-Schlüssel Kennwort"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL Host verifizieren"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL Peer verifizieren"
 
@@ -15692,9 +15693,9 @@ msgstr "Geplante Berichte"
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15719,8 +15720,8 @@ msgstr "Umfang"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Skript"
 
@@ -15852,10 +15853,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Auswählen"
@@ -15865,9 +15866,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Wähle Prototyp"
 
@@ -15888,7 +15889,7 @@ msgstr "Ausgewählte Aktionen gelöscht"
 msgid "Selected and all other problems of related triggers"
 msgstr "Ausgewählte und alle anderen Probleme von verwandten Auslösern"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Ausgewählte Elemente"
 
@@ -16237,8 +16238,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "Schweregrad erhöht"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Form"
@@ -16342,7 +16343,7 @@ msgstr "Seitenbereich zeigen"
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16442,8 +16443,8 @@ msgstr "Einfaches Diagramm"
 msgid "Simple graph prototype"
 msgstr "Einfacher Diagramm-Prototyp"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Einfach"
 
@@ -16489,7 +16490,7 @@ msgstr "Bundesland / Provinz"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Grösse"
 
@@ -16600,9 +16601,9 @@ msgstr "Geschwindigkeit"
 msgid "Stacked"
 msgstr "Gestapelt"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "Treppenstufen"
 
@@ -16624,7 +16625,7 @@ msgid "Start date"
 msgstr "Anfangsdatum"
 
 # Spaltenüberschrift für Startzeitpunkt einer Operationsschritts
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Start bei"
 
@@ -16819,14 +16820,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Schritt namens \"%1$s\" existiert bereits."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Schritte"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Halt"
 
@@ -16849,10 +16850,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr "Speicherzeitraum"
 
@@ -17092,8 +17093,8 @@ msgstr "Priorität der Marker-Anzeige"
 msgid "Tag filter"
 msgstr "Marker-Filter"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Marker für den Abgleich"
 
@@ -17152,28 +17153,28 @@ msgstr "Maker-Wert"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Marker"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Ziel"
@@ -17334,14 +17335,14 @@ msgstr "Vorlagen aktualisiert"
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17399,10 +17400,10 @@ msgstr "Test-Thema"
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Text"
 
@@ -17555,8 +17556,8 @@ msgstr "Diesen Monat"
 msgid "This month so far"
 msgstr "Dieser Monat bis jetzt"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17660,9 +17661,9 @@ msgstr "Zeitspanne"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Zeitverschiebung"
 
@@ -17680,8 +17681,8 @@ msgstr "Zeitzone"
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Timeout"
 
@@ -17707,7 +17708,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Bis"
 
@@ -17731,7 +17732,7 @@ msgstr "Heute bis jetzt"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Oben"
@@ -17783,8 +17784,7 @@ msgstr "Forme SQL Anfrageergebnis für einen low-level Suchlauf in ein JSON Arra
 msgid "Transform SQL query result into a JSON array."
 msgstr "Transformiert das Ergebnis einer SQL-Abfrage in ein JSON-Array."
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17795,7 +17795,8 @@ msgstr "Transformiert das Ergebnis einer SQL-Abfrage in ein JSON-Array."
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17803,9 +17804,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Transportfehler."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "Als 0 behandeln"
@@ -17817,8 +17818,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Speicherdauer Tendenz"
 
@@ -17836,9 +17837,9 @@ msgstr "Trends"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Auslöser"
@@ -17940,7 +17941,7 @@ msgstr "Auslöser"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Auslöser-Prototyp"
@@ -18006,7 +18007,7 @@ msgstr "Auslöser-Prototypen gelöscht"
 msgid "Trigger prototypes updated"
 msgstr "Auslöser-Prototypen aktualisiert"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Auslöserpriorität"
 
@@ -18113,23 +18114,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Typ"
@@ -18138,12 +18139,12 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr "Typ (Alle Details)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Typ (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18154,10 +18155,10 @@ msgstr "Ermittlungsart"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Informationstyp"
 
@@ -18181,11 +18182,11 @@ msgstr "UNBEKANNT"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18206,7 +18207,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "Die URL ist nicht richtig kodiert."
@@ -18231,7 +18232,7 @@ msgstr "URL-Parametername ist leer."
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18334,15 +18335,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr "Unerwarteter Serverfehler."
 
@@ -18351,8 +18352,8 @@ msgstr "Unerwarteter Serverfehler."
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Einheit"
 
@@ -18378,7 +18379,7 @@ msgstr "Einheit"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -18522,12 +18523,12 @@ msgstr "Erreichbar"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18547,18 +18548,18 @@ msgstr "Erreichbar"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18579,13 +18580,13 @@ msgstr "Ändere existierende"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Aktualisierungsintervall"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "Vorgänge aktualisieren"
 
@@ -18724,7 +18725,7 @@ msgstr ""
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr "Der Benutzer kann seine eigene Rolle nicht ändern."
@@ -18836,10 +18837,10 @@ msgstr "Benutzermenu"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Benutzername"
 
@@ -18907,7 +18908,7 @@ msgstr "Benutzereinstellungen"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19284,12 +19285,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19351,8 +19352,8 @@ msgstr "Wertzuordnung \"%1$s\" exitstiert bereits."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Wertezuordnung"
@@ -19469,8 +19470,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "vertikal"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Vertikale Ausrichtung"
 
@@ -19674,8 +19675,7 @@ msgstr "Widget bei X:%3$d, Y:%4$d auf Seite #%2$d der Übersichtsseite \"%1$s\"
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "Das Widget ist zu klein für die angegebene Anzahl von Spalten und Zeilen."
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19686,12 +19686,13 @@ msgstr "Das Widget ist zu klein für die angegebene Anzahl von Spalten und Zeile
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19767,8 +19768,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19780,11 +19781,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19798,8 +19799,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19819,12 +19820,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Maximalwert Y-Achse"
 
@@ -19838,18 +19839,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Der Maximalwert der Y-Achse muss größer sein als der Minimalwert."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Mindestwert Y-Achse"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Y-Achse"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Y-Achse"
 
@@ -19869,11 +19870,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "J1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "J2"
 
@@ -20904,10 +20905,10 @@ msgstr "fuzzytime() - Die Differenz zwischen dem Elementwert (als Zeitstempel) u
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "globale Einstellungen Bereinigungsprozess"
@@ -20936,8 +20937,8 @@ msgstr "Host"
 msgid "host group"
 msgstr "Host-Gruppe"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20970,7 +20971,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "einschließlich Untergruppen"
 
@@ -21144,8 +21145,8 @@ msgstr "Datenpunkt"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21409,10 +21410,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "Name"
@@ -21459,7 +21460,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21489,7 +21490,7 @@ msgstr "Anzahl"
 msgid "of"
 msgstr "von"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21513,7 +21514,7 @@ msgid "off"
 msgstr "aus"
 
 # In den ersten beiden Vorkommen "am", wie ein Tag. 3. Vorkommen unklar
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21685,8 +21686,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21823,8 +21824,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22111,17 +22112,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/el/LC_MESSAGES/frontend.po b/ui/locale/el/LC_MESSAGES/frontend.po
index 8aacd020a92..efda5667331 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2014-10-03 08:43+0300\n"
 "Last-Translator: ΓΙΑΝΝΗΣ <yannis@computerstudio.gr>\n"
 "Language-Team: none\n"
@@ -184,10 +184,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -232,9 +232,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s προσπάθεια απέμεινε"
 msgstr[1] "%1$s προσπάθειες απέμειναν"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -339,7 +339,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 δευτερόλεπτα"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D προβολή"
 
@@ -385,7 +385,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -475,27 +475,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Απαγορευμένη πρόσβαση!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -567,35 +567,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -724,24 +724,24 @@ msgstr "Ενεργό έως"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -777,13 +777,13 @@ msgstr "Ενεργό έως"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -801,38 +801,38 @@ msgstr "Ενεργό έως"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -859,7 +859,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -880,7 +880,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -889,16 +889,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -908,7 +908,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Προσθήκη προτότυπου"
 
@@ -945,7 +945,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1033,7 +1033,7 @@ msgstr "Διεπαφές αντιπρόσωπου"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1041,11 +1041,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1072,8 +1072,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1089,8 +1089,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1106,13 +1106,13 @@ msgstr "Όλοι οι σύνδεσμοι πρέπει να έχουν \"Όνομ
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1133,19 +1133,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Επιτρεπόμενοι ξενιστές"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1162,21 +1162,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "Καί"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1190,7 +1190,7 @@ msgstr "Καί"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "Καί/Ή"
 
@@ -1235,11 +1235,11 @@ msgstr "Σφάλμα εφαρμογής."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Εφαρμογή"
@@ -1367,11 +1367,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1465,8 +1465,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Μέθοδος ταυτοποίησης"
 
@@ -1528,8 +1528,8 @@ msgstr "Αυτόματο"
 msgid "Automatic icon mapping"
 msgstr "Αυτόματη αντιστοίχιση εικονιδίου"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Αυτόματη επιλογή εικονιδίου"
 
@@ -1596,12 +1596,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Παρασκήνιο"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1609,9 +1609,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Εικόνα παρασκηνίου"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1619,8 +1619,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Βάση DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1663,15 +1663,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1682,8 +1682,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Έντονη γραμμή"
 
@@ -1691,19 +1691,19 @@ msgstr "Έντονη γραμμή"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1716,7 +1716,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Κάτω"
@@ -1799,7 +1799,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Υπολογισμένο"
 
@@ -1823,22 +1823,22 @@ msgstr "Επανάκληση"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3437,8 +3437,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Χαρακτήρας"
 
@@ -3466,7 +3466,7 @@ msgstr "Πλαίσιο"
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Ο Έλεγχος υπάρχει ήδη."
 
@@ -3587,8 +3587,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Εκκαθάριση ιστορικού και τάσεων"
 
@@ -3616,22 +3616,22 @@ msgstr "Ρολόι"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Κλώνος"
@@ -3639,28 +3639,28 @@ msgstr "Κλώνος"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Κλείσιμο κατασκευής έκφρασης"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3674,7 +3674,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3688,11 +3688,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3701,7 +3701,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3789,9 +3789,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Συνθήκες"
@@ -3976,13 +3976,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Σύνδεση με"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4074,8 +4074,8 @@ msgstr "Επαφή"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4155,13 +4155,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Αριθμός σύμβασης"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Συντεταγμένες"
 
@@ -4178,7 +4178,7 @@ msgstr "Αντιγραφή"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4317,10 +4317,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4524,7 +4524,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4538,8 +4538,8 @@ msgstr "Προσαρμοσμένα γραφήματα"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4705,8 +4705,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Διακεκομμένη γραμμή"
 
@@ -4724,7 +4724,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Επισκόπηση δεδομένων"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4908,11 +4908,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
@@ -4954,7 +4954,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Διάρκεια βήματος προεπιλεγμένης λειτουργίας"
 
@@ -4988,7 +4988,7 @@ msgstr "Καθυστερημένο από"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4997,7 +4997,7 @@ msgstr "Καθυστερημένο από"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5005,47 +5005,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Διαγραφή και καθαρισμός"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Διαγραφή και καθαρισμός επιλεγμένων σχεδιότυπων; (Προσοχή: όλοι οι συνδεδεμένοι ξενιστές θα καθαριστούν!)"
 
@@ -5053,11 +5053,11 @@ msgstr "Διαγραφή και καθαρισμός επιλεγμένων σχ
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Διαγραφή και καθαρισμός σχεδιότυπου; (Προσοχή: όλοι οι συνδεδεμένοι ξενιστές θα καθαριστούν!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Διαγραφή τρέχουσας ενέργειας;"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5070,10 +5070,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "Διαγραφή κανόνα εντοπισμού;"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Διαγραφή έκφρασης;"
 
@@ -5097,11 +5097,11 @@ msgstr "Διαγραφή ιστορικού επιλεγμένων σεναρί�
 msgid "Delete icon map?"
 msgstr "Διαγραφή αντιστοίχισης εικονιδίων;"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Διαγραφή πρωτότυπου συλλέκτη;"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Διαγραφή συλλέκτη;"
 
@@ -5143,11 +5143,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5206,7 +5206,7 @@ msgstr "Διαγραφή επιλεγμένων πρωτότυπων ξενισ�
 msgid "Delete selected host?"
 msgstr "Διαγραφή επιλεγμένου ξενιστή;"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Διαγραφή επιλεγμένων ξενιστών;"
 
@@ -5214,11 +5214,11 @@ msgstr "Διαγραφή επιλεγμένων ξενιστών;"
 msgid "Delete selected image?"
 msgstr "Διαγραφή επιλεγμένης εικόνας;"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Διαγραφή επιλεγμένων πρωτότυπων συλλεκτών;"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Διαγραφή επιλεγμένων συλλεκτών;"
 
@@ -5234,7 +5234,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr "Διαγραφή επιλεγμένων χαρτών;"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Διαγραφή επιλεγμένων τύπων μέσων;"
 
@@ -5266,11 +5266,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Διαγραφή επιλεγμένων δεσμών ενεργειών;"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5278,19 +5278,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Διαγραφή επιλεγμένων σχεδιότυπων;"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Διαγραφή επιλεγμένων πρωτότυπων εναυσμάτων;"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Διαγραφή επιλεγμένων εναυσμάτων;"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Διαγραφή επιλεγμένου χρήστη;"
 
@@ -5306,11 +5306,11 @@ msgstr "Διαγραφή επιλεγμένων σεναρίων ΙΣΤΟΥ;"
 msgid "Delete template?"
 msgstr "Διαγραφή σχεδιότυπου;"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Διαγραφή πρωτότυπου εναύσματος;"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Διαγραφή εναύσματος;"
 
@@ -5336,7 +5336,7 @@ msgstr "Διεγράφη: Πρωτότυπος ξενιστής \"%1$s\" σε \"
 msgid "Delimiter"
 msgstr "Οριοθέτης"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5351,10 +5351,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Εξαρτήσεις"
 
@@ -5391,7 +5391,7 @@ msgstr "Κατάσταση υλοποίησης"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5401,13 +5401,13 @@ msgstr "Κατάσταση υλοποίησης"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Περιγραφή"
@@ -5417,10 +5417,10 @@ msgstr "Περιγραφή"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Λεπτομέρειες"
@@ -5461,7 +5461,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5512,11 +5512,11 @@ msgstr "Απενεργοποίηση ξενιστών εποπτευόμενων
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5545,7 +5545,7 @@ msgstr "Απενεργοποίηση επιλεγμένων ξενιστών;"
 msgid "Disable selected items?"
 msgstr "Απενεργοποίηση επιλεγμένων συλλεκτών;"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Απενεργοποίηση επιλεγμένων τύπων μέσων;"
 
@@ -5579,7 +5579,7 @@ msgstr "Απενεργοποίηση επιλεγμένων σεναρίων ι�
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5607,7 +5607,7 @@ msgstr "Απενεργοποίηση επιλεγμένων σεναρίων ι�
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
@@ -5633,9 +5633,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5831,7 +5831,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr "Εμφάνιση εναυσμάτων OK για"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Εμφάνιση γραφήματος"
 
@@ -5839,13 +5839,13 @@ msgstr "Εμφάνιση γραφήματος"
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Εμφάνιση στοιβαγμένου γραφήματος"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5869,15 +5869,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5891,8 +5891,8 @@ msgstr "Θέλετε να αντικαταστήσετε την υπο συνθ�
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5902,8 +5902,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5913,8 +5913,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5922,8 +5922,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Τελεία"
 
@@ -5952,16 +5952,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "Χρόνος μη διαθεσιμότητας"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Τρόπος σχεδίασης"
 
@@ -6012,7 +6012,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Διάρκεια"
 
@@ -6035,29 +6035,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Κάθε URL πρέπει να έχει μοναδικό όνομα. Βεβαιωθείτε να υπάρχει μόνο ένα ονομαζόμενο URL"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Επεξεργασία"
@@ -6111,12 +6111,12 @@ msgstr ""
 msgid "Element"
 msgstr "Στοιχείο"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Όνομα στοιχείου"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6172,7 +6172,7 @@ msgstr "Κενή παράμετρος εισόδου."
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6252,11 +6252,11 @@ msgstr "Ενεργοποίηση εσωτερικής τακτοποίησης"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6286,7 +6286,7 @@ msgstr "Ενεργοποίηση επιλεγμένων ξενιστών;"
 msgid "Enable selected items?"
 msgstr "Ενεργοποίηση επιλεγμένων συλλεκτών;"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Ενεργοποίηση επιλεγμένων τύπων μέσων;"
 
@@ -6308,8 +6308,8 @@ msgstr "Ενεργοποίηση επιλεγμένων σεναρίων ιστ�
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6331,7 +6331,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6347,7 +6347,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6361,14 +6361,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
@@ -6421,8 +6421,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6600,7 +6600,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6621,8 +6621,8 @@ msgstr "Εκτελεσμένο"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Εκτελέσιμη δέσμη ενεργειών"
 
@@ -6636,13 +6636,13 @@ msgstr "Επιβεβαίωση εκτέλεσης"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6712,15 +6712,15 @@ msgstr "Εξαγωγή σε CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6733,10 +6733,10 @@ msgstr "Έκφραση"
 msgid "Expression cannot be empty"
 msgstr "Η Έκφραση δεν μπορεί να είναι κενή"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Κατασκευή έκφρασης"
 
@@ -6804,7 +6804,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6938,8 +6938,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6950,7 +6949,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7047,7 +7047,7 @@ msgid "Fit to map"
 msgstr "Προσαρμογή στο χάρτη"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Σταθερό"
 
@@ -7059,9 +7059,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7069,22 +7069,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Ακολουθήστε ανακατευθύνσεις"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7092,8 +7092,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Τύπος"
 
@@ -7129,7 +7129,7 @@ msgstr "Παρασκευή"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Από"
 
@@ -7144,7 +7144,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Πρόσβαση στο περιβάλλον ΙΣΤΟΥ"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Μηνύματα στο περιβάλλον ΙΣΤΟΥ"
 
@@ -7160,7 +7160,7 @@ msgid "Full clone"
 msgstr "Πλήρης κλώνος"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Συνάρτηση"
 
@@ -7577,8 +7577,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP ταυτοποίηση"
 
@@ -7589,8 +7589,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "Διαμεσολαβητής HTTP"
 
@@ -7627,10 +7627,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Επικεφαλίδες"
 
@@ -7646,7 +7646,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7752,7 +7752,7 @@ msgid "History cleared"
 msgstr "Ιστορικό καθαρίστηκε"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Η εκκαθάριση ιστορικού μπορεί να πάρει πολύ χρόνο. Συνέχεια;"
 
@@ -7767,8 +7767,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Ιστορικό περιόδου αποθήκευσης"
 
@@ -7785,8 +7785,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Οριζόντια"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Οριζόντια ευθυγράμμιση"
 
@@ -7905,7 +7905,7 @@ msgstr[1] "Ξενιστές ενεργοποιημένοι"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7991,9 +7991,9 @@ msgstr "Ομάδες ξενιστών"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Διεπαφή ξενιστή"
 
@@ -8282,8 +8282,8 @@ msgstr "Διεπαφές IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "Αισθητήρας IPMI"
 
@@ -8297,19 +8297,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Εικόνα"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Εικόνα (προκαθορισμένη)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Εικόνα (απενεργοποιημένη)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Εικόνα (συντήρηση)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Εικόνα (πρόβλημα)"
 
@@ -8356,7 +8356,7 @@ msgstr "Αντιστοιχία εικονιδίου"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Εικονίδια"
 
@@ -8500,7 +8500,7 @@ msgstr "Εικόνες"
 msgid "Images for all maps will be updated!"
 msgstr "Οι εικόνες όλων των χαρτών θα ενημερωθούν!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Άμεσα"
 
@@ -8584,6 +8584,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9468,10 +9469,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Πληροφορία"
@@ -9538,8 +9539,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Εισαγωγή έκφρασης"
 
@@ -9655,9 +9656,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Χρονικό διάστημα"
@@ -10094,7 +10095,7 @@ msgstr "Ιταλικά (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Συλλέκτης"
 
@@ -10358,8 +10359,8 @@ msgstr "Αντιπρόσωπος JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10377,8 +10378,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10417,8 +10418,8 @@ msgstr "Ιαπωνικά (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10457,9 +10458,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Κλειδί"
@@ -10525,13 +10526,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Επιγραφή"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Θέση επιγραφής"
 
@@ -10678,9 +10679,9 @@ msgstr "Λετονικά (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10691,7 +10692,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Αριστερά"
@@ -10724,25 +10725,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Όριο στοιχείων Αναζήτησης/Φίλτρου"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Γραμμή"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10764,9 +10765,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Σύνδεση δεικτών"
 
@@ -10797,8 +10798,8 @@ msgstr "Συνδεδεμένα σχεδιότυπα"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10900,8 +10901,8 @@ msgstr "Γεωγραφικό μήκος τοποθεσίας"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Καταγραφή"
 
@@ -10914,8 +10915,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Μορφότυπος καταγραφής ώρας"
 
@@ -11041,7 +11042,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Συντήρηση"
 
@@ -11201,7 +11202,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11279,19 +11280,19 @@ msgstr "Μάσκα"
 msgid "Mass update"
 msgstr "Μαζική ενημέρωση"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Μαζική ενημέρωση στοιχείων"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11375,8 +11376,8 @@ msgid "May"
 msgstr "Μάι"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Μέσα ενημέρωσης"
 
@@ -11501,8 +11502,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Χρονικό όριο μηνύματος"
 
@@ -11520,7 +11521,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Ανταλλαγή μηνυμάτων"
 
@@ -11619,11 +11620,11 @@ msgstr "Απουσία \"name\" πεδίου πρωτότυπου γραφήμα
 msgid "Missing \"name\" field for graph."
 msgstr "Απουσία \"name\" πεδίου γραφήματος."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11791,8 +11792,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11958,7 +11959,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11978,15 +11979,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11995,16 +11996,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12284,7 +12285,7 @@ msgstr "Χωρίς λεπτομέρειες"
 msgid "No discovery rule IDs given."
 msgstr "Δεν δόθηκαν IDs κανόνα εντοπισμού."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12340,8 +12341,8 @@ msgstr "Χωρίς εικόνα"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Δεν βρέθηκε διεπαφή"
 
@@ -12645,7 +12646,7 @@ msgstr "Δεν καθορίστηκε αρχείο δημοσίου κλειδι
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12691,8 +12692,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12700,17 +12701,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Ουδέν"
@@ -12806,7 +12807,7 @@ msgstr "Αναφορά ειδοποίησης"
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12980,8 +12981,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Αριθμητικό (κινητή υποδιαστολή)"
 
@@ -12991,8 +12992,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Αριθμητικό (απρόσημο)"
 
@@ -13000,8 +13001,8 @@ msgstr "Αριθμητικό (απρόσημο)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13013,13 +13014,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13080,7 +13081,7 @@ msgstr "Εκτός"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13109,7 +13110,7 @@ msgstr "Επί"
 msgid "On status change triggers blink for"
 msgstr "Σε αλλαγή κατάστασης τα εναύσματα αναβοσβήνουν για"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Άπαξ"
 
@@ -13230,11 +13231,11 @@ msgstr "Η λειτουργία δεν έχει σχεδιότυπο να λει
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Λειτουργίες"
@@ -13280,7 +13281,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13295,11 +13296,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Ή"
 
@@ -13394,8 +13395,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Επικαλυπτόμενο με"
@@ -13612,8 +13613,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "ΠΡΟΒΛΗΜΑ"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13695,8 +13696,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13744,8 +13745,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13776,12 +13777,12 @@ msgstr "Παθητικός"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13814,12 +13815,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13832,7 +13833,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13875,8 +13876,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Περίοδος"
@@ -13897,9 +13898,9 @@ msgid "Periods"
 msgstr "Περίοδοι"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13910,7 +13911,7 @@ msgstr "Περίοδοι"
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Τα δικαιώματα μπορούν να εκχωρηθούν μόνο σε ομάδες χρηστών."
 
@@ -13932,12 +13933,12 @@ msgstr "Αλγόριθμος τοποθέτησης"
 msgid "Plain text"
 msgstr "Απλό κείμενο"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Παίξε"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Παίξε ήχο"
 
@@ -13967,8 +13968,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Επιλέξτε δύο στοιχεία"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13978,14 +13978,15 @@ msgstr "Επιλέξτε δύο στοιχεία"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13993,7 +13994,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Πολωνικά (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Συμπληρώνει πεδίο απογραφής ξενιστή"
 
@@ -14055,16 +14056,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14162,8 +14163,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Αρχείο ιδιωτικού κλειδιού"
 
@@ -14193,7 +14194,7 @@ msgstr "Επίπεδο δικαιωμάτων"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Πρόβλημα"
 
@@ -14383,16 +14384,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Δημόσιο κλειδί"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Αρχείο δημόσιου κλειδιού"
 
@@ -14406,8 +14407,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14457,8 +14458,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14484,14 +14485,14 @@ msgstr "Μόνο ανάγνωση"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14505,14 +14506,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Ανάγνωση-εγγραφή"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14558,7 +14559,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14567,10 +14568,10 @@ msgid "Recovery"
 msgstr "Ανάκτηση"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14580,7 +14581,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14592,8 +14593,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14699,7 +14700,7 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14730,13 +14731,13 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14744,25 +14745,25 @@ msgstr "Απομακρυσμένη εντολή"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14790,14 +14791,14 @@ msgstr "Απομακρυσμένη εντολή"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14872,10 +14873,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Αντικατάσταση"
 
@@ -14893,7 +14894,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14932,15 +14933,15 @@ msgstr "Αναφορές"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14949,8 +14950,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14977,8 +14978,8 @@ msgstr "Απαιτούμενη απόδοση εξυπηρετητή, νέες �
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Απαιτούμενοι κωδικοί κατάστασης"
 
@@ -14991,11 +14992,11 @@ msgstr "Απαιτούμενη στοιχειοσειρά"
 msgid "Reset"
 msgstr "Επαναφορά"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Επαναφορά όλων των πεδίων στις προκαθορισμένες τιμές;"
 
@@ -15012,11 +15013,11 @@ msgstr "Επιβεβαίωση επαναφοράς"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Επαναφορά προκαθορισμένων"
 
@@ -15120,8 +15121,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15194,9 +15195,9 @@ msgstr "Επιστρέφει ποσοστό χαμένων πακέτων ICMP p
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15204,7 +15205,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Δεξιά"
@@ -15220,8 +15221,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15411,8 +15412,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15491,8 +15492,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Ερώτημα SQL"
 
@@ -15517,38 +15518,38 @@ msgstr "Αντιπρόσωπος SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "SSL αρχείο πιστοποιητικού"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "SSL αρχείο κλειδιού"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "SSL συνθηματικό κλειδιού"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL επαλήθευση ξενιστή"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL επαλήθευση ομότιμου"
 
@@ -15667,9 +15668,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15694,8 +15695,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Δέσμη ενεργειών"
 
@@ -15828,10 +15829,10 @@ msgstr "Όνομα ασφάλειας"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Επιλέξτε"
@@ -15841,9 +15842,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Επιλέξτε πρωτότυπο"
 
@@ -15864,7 +15865,7 @@ msgstr "Επιλεγμένες ενέργειες διεγράφησαν"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Επιλεγμένα στοιχεία"
 
@@ -16214,8 +16215,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16318,7 +16319,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16418,8 +16419,8 @@ msgstr "Απλό γράφημα"
 msgid "Simple graph prototype"
 msgstr "Απλό πρωτότυπο γράφημα"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16464,7 +16465,7 @@ msgstr "Κράτος / Επαρχία"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16575,9 +16576,9 @@ msgstr "Ταχύτητα"
 msgid "Stacked"
 msgstr "Στοιβαγμένο"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16598,7 +16599,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Έναρξη σε"
 
@@ -16793,14 +16794,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Βήμα ονόματος \"%1$s\" υπάρχει ήδη."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Βήματα"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Σταματώ"
 
@@ -16823,10 +16824,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17062,8 +17063,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17122,28 +17123,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Στόχος"
@@ -17304,14 +17305,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Δοκιμή"
@@ -17369,10 +17370,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Κείμενο"
 
@@ -17525,8 +17526,8 @@ msgstr "Αυτό το μήνα"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17630,9 +17631,9 @@ msgstr "Χρονική περίοδος"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Χρονική μετατόπιση"
 
@@ -17650,8 +17651,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Λήξη χρόνου"
 
@@ -17677,7 +17678,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Σε"
 
@@ -17701,7 +17702,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Κορυφή"
@@ -17753,8 +17754,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17765,7 +17765,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17773,9 +17774,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Σφάλμα μεταφοράς."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17787,8 +17788,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Περίοδος αποθήκευσης τάσεων"
 
@@ -17806,9 +17807,9 @@ msgstr "Τάσεις"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Έναυσμα"
@@ -17910,7 +17911,7 @@ msgstr "Επισκόπηση εναυσμάτων"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Πρωτότυπο έναυσμα"
@@ -17977,7 +17978,7 @@ msgstr "Πρωτότυπα εναύσματα διεγράφησαν"
 msgid "Trigger prototypes updated"
 msgstr "Πρωτότυπα εναύσματα ενημερώθηκαν"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Σοβαρότητα εναύσματος"
 
@@ -18084,23 +18085,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Τύπος"
@@ -18109,12 +18110,12 @@ msgstr "Τύπος"
 msgid "Type (Full details)"
 msgstr "Τύπος (Αναλυτικά στοιχεία)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Τύπος (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18125,10 +18126,10 @@ msgstr "Τύπος υπολογισμού"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Τύπος πληροφοριών"
 
@@ -18152,11 +18153,11 @@ msgstr "ΑΓΝΩΣΤΟ"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18177,7 +18178,7 @@ msgstr "URL Β"
 msgid "URL C"
 msgstr "URL Γ"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18202,7 +18203,7 @@ msgstr "Κενό όνομα παραμέτρου URL."
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18305,15 +18306,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18322,8 +18323,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Μονάδες"
 
@@ -18349,7 +18350,7 @@ msgstr "Μονάδες"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Άγνωστο"
@@ -18492,12 +18493,12 @@ msgstr "Ανοικτά"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18517,18 +18518,18 @@ msgstr "Ανοικτά"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18549,13 +18550,13 @@ msgstr "Ενημέρωση υφιστάμενων"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Διάστημα ενημέρωσης"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18694,7 +18695,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Χρήστης δεν αυτοπροστίθεται σε απενεργοποιημένη ομάδα ή ομάδα απενεργοποιημένης πρόσβασης GUI."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18806,10 +18807,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Όνομα χρήστη"
 
@@ -18877,7 +18878,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19254,12 +19255,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19321,8 +19322,8 @@ msgstr "Αντιστοιχία τιμής \"%1$s\" υπάρχει ήδη."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Αντιστοίχιση τιμής"
@@ -19439,8 +19440,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Κατακόρυφο"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Κατακόρυφη ευθυγράμμιση"
 
@@ -19643,8 +19644,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19655,12 +19655,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19736,8 +19737,8 @@ msgstr "Λάθος πεδία συνδέσμου χάρτη."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "Χ"
 
@@ -19749,11 +19750,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19767,8 +19768,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19788,12 +19789,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Ψ"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Μέγιστη τιμή άξονα Ψ"
 
@@ -19807,18 +19808,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Μέγιστη τιμή άξονα Y να είναι μεγαλύτερη της ΕΛΑΧ τιμής άξονα Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Ελάχιστη τιμή άξονα Ψ"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Πλευρά άξονα ψ"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19838,11 +19839,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20873,10 +20874,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "καθολικές ρυθμίσεις τακτοποίησης"
@@ -20905,8 +20906,8 @@ msgstr "ξενιστής"
 msgid "host group"
 msgstr "ομάδα ξενιστή"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20939,7 +20940,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21113,8 +21114,8 @@ msgstr "συλλέκτης"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21378,10 +21379,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21428,7 +21429,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21458,7 +21459,7 @@ msgstr ""
 msgid "of"
 msgstr "απο"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21481,7 +21482,7 @@ msgstr "απο"
 msgid "off"
 msgstr "εκτός"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21653,8 +21654,8 @@ msgstr "δ"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21791,8 +21792,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22079,17 +22080,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/es/LC_MESSAGES/frontend.po b/ui/locale/es/LC_MESSAGES/frontend.po
index 499f76947ec..ff3dca5db65 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2021-12-22 11:36+0300\n"
 "Last-Translator: cesar.fernandez <cesar.fernandez@mrinformatica.es>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] "%1$s mensaje"
 msgstr[1] "%1$s mensajes"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "Queda %1$s intento"
 msgstr[1] "Quedan %1$s intentos"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -335,7 +335,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 segundos"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "Vista 3D"
 
@@ -381,7 +381,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -471,27 +471,27 @@ msgstr "Acceso denegado"
 msgid "Access denied!"
 msgstr "¡Acceso negado!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -563,35 +563,35 @@ msgstr "Aceptar eventos RESUELTOS"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -720,24 +720,24 @@ msgstr "Activo hasta"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -773,13 +773,13 @@ msgstr "Activo hasta"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -797,38 +797,38 @@ msgstr "Activo hasta"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -855,7 +855,7 @@ msgstr "Agregar un elemento hijo"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Agregar varios mapas"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -885,16 +885,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Agregar prototipo"
 
@@ -941,7 +941,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Agregar widget"
@@ -1029,7 +1029,7 @@ msgstr "Interfaces del agente"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1037,11 +1037,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1068,8 +1068,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1085,8 +1085,8 @@ msgid "All dashboards"
 msgstr "Todos los tableros"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Todos los grupos"
 
@@ -1102,13 +1102,13 @@ msgstr "Todos los enlaces deben tener especificados \"Nombre\" y \"URL\""
 msgid "All maps"
 msgstr "Todos los mapas"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Todos los problemas"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Todos los problemas si los valores coinciden"
 
@@ -1129,19 +1129,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Permitir cierre manual"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Equipos permitidos"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1158,21 +1158,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "Y"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1186,7 +1186,7 @@ msgstr "Y"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "Y/O"
 
@@ -1231,11 +1231,11 @@ msgstr "Error de aplicación."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Aplicar"
@@ -1363,11 +1363,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Al menos debe existir una operación."
 
@@ -1461,8 +1461,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -1524,8 +1524,8 @@ msgstr "Automático"
 msgid "Automatic icon mapping"
 msgstr "Asignación automática de iconos"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Selección automática de iconos"
 
@@ -1592,12 +1592,12 @@ msgstr "Volver"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Fondo"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1605,9 +1605,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Imagen de fondo"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1615,8 +1615,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "DN Base"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1659,15 +1659,15 @@ msgstr "Azul"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1678,8 +1678,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Línea gruesa"
 
@@ -1687,19 +1687,19 @@ msgstr "Línea gruesa"
 msgid "Boolean to decimal"
 msgstr "Booleano a decimal"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Borde"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Tipo de borde"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Ancho del borde"
 
@@ -1712,7 +1712,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Debajo"
@@ -1795,7 +1795,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Calculado"
 
@@ -1819,22 +1819,22 @@ msgstr "Devolución de llamada"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3431,8 +3431,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Carácter"
 
@@ -3460,7 +3460,7 @@ msgstr "Chasis"
 msgid "Chassis information. Returns string"
 msgstr "Información del chasis. Devuelve una cadena"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Verifique si ya existe."
 
@@ -3581,8 +3581,8 @@ msgid "Clear history"
 msgstr "Limpiar histórico"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Limpiar historial y tendencias"
 
@@ -3610,22 +3610,22 @@ msgstr "Reloj"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Clonar"
@@ -3633,28 +3633,28 @@ msgstr "Clonar"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Cerrar"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Cerrar el constructor de expresiones"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Cerrar nuevo evento"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Cerrar eventos antiguos"
@@ -3668,7 +3668,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Plegar"
@@ -3682,11 +3682,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3695,7 +3695,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3783,9 +3783,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Condiciones"
@@ -3970,13 +3970,13 @@ msgstr "¡Felicidades! Has instalado la interfaz web de Zabbix satisfactoriament
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Conectado a"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4068,8 +4068,8 @@ msgstr "Contacto"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4149,13 +4149,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Número de contrato"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Coordenadas"
 
@@ -4172,7 +4172,7 @@ msgstr "Copiar"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Correlación"
 
@@ -4312,10 +4312,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4519,7 +4519,7 @@ msgid "Custom"
 msgstr "A medida"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4533,8 +4533,8 @@ msgstr "Personalizar gráficos"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Intervalos personalizados"
 
@@ -4700,8 +4700,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Línea discontinua"
 
@@ -4719,7 +4719,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Vistado general de los datos"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4903,11 +4903,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Por defecto"
 
@@ -4949,7 +4949,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Duración predeterminada del paso de operación"
 
@@ -4983,7 +4983,7 @@ msgstr "Demorado por"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4992,7 +4992,7 @@ msgstr "Demorado por"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5000,47 +5000,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Eliminar"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Eliminar y limpiar"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "¿Desea eliminar y limpiar las plantillas seleccionadas? (Advertencia: Todos los equipos enlazados serán purgados)"
 
@@ -5048,11 +5048,11 @@ msgstr "¿Desea eliminar y limpiar las plantillas seleccionadas? (Advertencia: T
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "¿Desea eliminar y limpiar la plantilla? (Advertencia: Todos los equipos enlazados serán purgados)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "¿Desea eliminar la acción actual?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "¿Borrar la correlación actual?"
 
@@ -5065,10 +5065,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "¿Desea eliminar la regla de descubrimiento?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "¿Desea eliminar la expresión?"
 
@@ -5092,11 +5092,11 @@ msgstr "¿Borrar el histórico de los escenarios web seleccionados?"
 msgid "Delete icon map?"
 msgstr "¿Desea eliminar la asignación de icono?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "¿Desea eliminar el prototipo de ítem?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "¿Desea eliminar el ítem?"
 
@@ -5138,11 +5138,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5201,7 +5201,7 @@ msgstr "¿Desea eliminar los prototipos de equipos seleccionados?"
 msgid "Delete selected host?"
 msgstr "¿Desea eliminar el equipo seleccionado?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "¿Desea eliminar los equipos seleccionados?"
 
@@ -5209,11 +5209,11 @@ msgstr "¿Desea eliminar los equipos seleccionados?"
 msgid "Delete selected image?"
 msgstr "¿Desea eliminar la imagen seleccionada?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "¿Desea eliminar los prototipos de ítems seleccionados?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "¿Desea eliminar los ítems seleccionados?"
 
@@ -5229,7 +5229,7 @@ msgstr "¿Borrar mapa seleccionado?"
 msgid "Delete selected maps?"
 msgstr "¿Desea eliminar los mapas seleccionados?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "¿Desea eliminar los tipos de medios seleccionados?"
 
@@ -5261,11 +5261,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "¿Desea eliminar los scripts seleccionados?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5273,19 +5273,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "¿Borrar las formas seleccionadas?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "¿Desea eliminar las plantillas seleccionadas?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "¿Desea eliminar los prototipos de disparadores seleccionados?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "¿Desea eliminar los disparadores seleccionados?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "¿Desea eliminar el usuario seleccionado?"
 
@@ -5301,11 +5301,11 @@ msgstr "¿Desea eliminar los escenarios web seleccionados?"
 msgid "Delete template?"
 msgstr "¿Desea eliminar la plantilla?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "¿Desea eliminar el prototipo de disparador?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "¿Desea eliminar el disparador?"
 
@@ -5331,7 +5331,7 @@ msgstr "Se ha eliminado el prototipo de equipo \"%1$s\" en \"%2$s\"."
 msgid "Delimiter"
 msgstr "Delimitador"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5346,10 +5346,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Dependencias"
 
@@ -5386,7 +5386,7 @@ msgstr "Estado de implementación"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5396,13 +5396,13 @@ msgstr "Estado de implementación"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Descripción"
@@ -5412,10 +5412,10 @@ msgstr "Descripción"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detalles"
@@ -5456,7 +5456,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Tamaño del directorio (en bytes). Devuelve un entero"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5507,11 +5507,11 @@ msgstr "¿Desea desactivar los equipos monitorizados por los proxies seleccionad
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5540,7 +5540,7 @@ msgstr "¿Desea desactivar los equipos seleccionados?"
 msgid "Disable selected items?"
 msgstr "¿Desea desactivar los ítems seleccionados?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "¿Desea desactivar los tipos de medios seleccionados?"
 
@@ -5574,7 +5574,7 @@ msgstr "¿Desea desactivar los escenarios web seleccionados?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5602,7 +5602,7 @@ msgstr "¿Desea desactivar los escenarios web seleccionados?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -5628,9 +5628,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5827,7 +5827,7 @@ msgstr "Estadísticas de escritura en disco. Devuelve un valor de tipo entero en
 msgid "Display OK triggers for"
 msgstr "Mostrar iniciadores OK para"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Mostrar gráfica"
 
@@ -5835,13 +5835,13 @@ msgstr "Mostrar gráfica"
 msgid "Display problems"
 msgstr "Mostrar problemas"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Mostrar gráfico apilado"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5865,15 +5865,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5887,8 +5887,8 @@ msgstr "¿Desea sustituir la expresión condicional?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5898,8 +5898,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5909,8 +5909,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5918,8 +5918,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Punto"
 
@@ -5948,16 +5948,16 @@ msgstr "Descargar el archivo de configuración"
 msgid "Downtime"
 msgstr "Tiempo inoperativo"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Estilo del trazado"
 
@@ -6008,7 +6008,7 @@ msgstr "Userid duplicado \"%1$s\" en usuarios para el mapa \"%2$s\"."
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Duración"
 
@@ -6031,29 +6031,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Editar"
@@ -6107,12 +6107,12 @@ msgstr ""
 msgid "Element"
 msgstr "Grupo"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Nombre del elemento"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6168,7 +6168,7 @@ msgstr "Vaciar parámetro de entrada."
 msgid "Empty map ID."
 msgstr "Vaciar identificador de mapa."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6248,11 +6248,11 @@ msgstr "Activar limpieza interna"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6282,7 +6282,7 @@ msgstr "¿Activar hosts seleccionados?"
 msgid "Enable selected items?"
 msgstr "¿Desea activar los ítems seleccionados?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "¿Desea activar los tipos de medios seleccionados?"
 
@@ -6304,8 +6304,8 @@ msgstr "¿Desea activar los escenarios web seleccionados?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6327,7 +6327,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6343,7 +6343,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6357,14 +6357,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Activado"
 
@@ -6417,8 +6417,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6595,7 +6595,7 @@ msgstr "Ejecutar la consulta WMI y devolver el primer objeto seleccionado. Devue
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6616,8 +6616,8 @@ msgstr "Ejecutado"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Script ejecutado"
 
@@ -6631,13 +6631,13 @@ msgstr "Confirmación de ejecución"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Expandir"
@@ -6708,15 +6708,15 @@ msgstr "Exportar a CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6729,10 +6729,10 @@ msgstr "Expresión"
 msgid "Expression cannot be empty"
 msgstr "La expresión no puede estar vacía"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Constructor de expresiones"
 
@@ -6800,7 +6800,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Falló la creación del tablero"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6934,8 +6934,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6946,7 +6945,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7043,7 +7043,7 @@ msgid "Fit to map"
 msgstr "Ajustar al mapa"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fijo"
 
@@ -7055,9 +7055,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7065,22 +7065,22 @@ msgstr "Flexible"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Seguir redirecciones"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Fuente"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Tamaño de la fuente"
 
@@ -7088,8 +7088,8 @@ msgstr "Tamaño de la fuente"
 msgid "Form data"
 msgstr "Datos de formulario"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Fórmula"
 
@@ -7125,7 +7125,7 @@ msgstr "Viernes"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Desde"
 
@@ -7140,7 +7140,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Acceso a la interfaz web"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Mensajes de la interfaz web"
 
@@ -7156,7 +7156,7 @@ msgid "Full clone"
 msgstr "Clonación completa"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Función"
 
@@ -7573,8 +7573,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Autenticación HTTP"
 
@@ -7585,8 +7585,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
@@ -7623,10 +7623,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Cabeceras"
 
@@ -7642,7 +7642,7 @@ msgstr "Hebreo (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7748,7 +7748,7 @@ msgid "History cleared"
 msgstr "Histórico eliminado"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Eliminar el histórico puede llevarse tiempo. ¿Continuar?"
 
@@ -7763,8 +7763,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Historial del periodo de almacenamiento"
 
@@ -7781,8 +7781,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Alineación horizontal"
 
@@ -7902,7 +7902,7 @@ msgstr[1] "Equipos habilitados"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7988,9 +7988,9 @@ msgstr "Grupos de equipos"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Interfaz de equipo"
 
@@ -8279,8 +8279,8 @@ msgstr "Interfaces IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr ""
 
@@ -8294,19 +8294,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Icono"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Icono (por defecto)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Icono (deshabilitado)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Icono (mantenimiento)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Icono (problema)"
 
@@ -8353,7 +8353,7 @@ msgstr "Asignación de icono"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "El icono con ID \"%1$s\" no está disponible."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Iconos"
 
@@ -8497,7 +8497,7 @@ msgstr "Imágenes"
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr ""
 
@@ -8581,6 +8581,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9467,10 +9468,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Información"
@@ -9537,8 +9538,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Insertar"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9654,9 +9655,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr ""
@@ -10093,7 +10094,7 @@ msgstr "Italiano (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Monitor"
 
@@ -10356,8 +10357,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10375,8 +10376,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10415,8 +10416,8 @@ msgstr "Japonés (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10455,9 +10456,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Monitor"
@@ -10523,13 +10524,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Etiqueta"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Posición de la etiqueta"
 
@@ -10676,9 +10677,9 @@ msgstr "Letón (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10689,7 +10690,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Izquierda"
@@ -10722,25 +10723,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Límite para resultados de búsqueda y filtros"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10762,9 +10763,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr ""
 
@@ -10795,8 +10796,8 @@ msgstr ""
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10898,8 +10899,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Registro"
 
@@ -10912,8 +10913,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Formato de fecha para el registro"
 
@@ -11039,7 +11040,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr ""
 
@@ -11199,7 +11200,7 @@ msgstr "Árbol de navegación del mapa"
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11277,19 +11278,19 @@ msgstr ""
 msgid "Mass update"
 msgstr "Actualizar masivamente"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11373,8 +11374,8 @@ msgid "May"
 msgstr "May"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Medio"
 
@@ -11498,8 +11499,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Tiempo de espera de mensajes"
 
@@ -11517,7 +11518,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Mensajería"
 
@@ -11616,11 +11617,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11788,8 +11789,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11955,7 +11956,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11975,15 +11976,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11992,16 +11993,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12281,7 +12282,7 @@ msgstr "Sin detalles"
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12337,8 +12338,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12642,7 +12643,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "No actualizar"
 
@@ -12688,8 +12689,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12697,17 +12698,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Ninguno"
@@ -12803,7 +12804,7 @@ msgstr "Informe de notificaciones"
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12977,8 +12978,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numérico (coma flotante)"
 
@@ -12988,8 +12989,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numérico (entero de 64 bits)"
 
@@ -12997,8 +12998,8 @@ msgstr "Numérico (entero de 64 bits)"
 msgid "OEM"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13010,13 +13011,13 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13077,7 +13078,7 @@ msgstr "INACTIVO"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13106,7 +13107,7 @@ msgstr "ACTIVO"
 msgid "On status change triggers blink for"
 msgstr "En cambios de estado los iniciadores parpadean durante"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Una vez"
 
@@ -13227,11 +13228,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operaciones"
@@ -13277,7 +13278,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13292,11 +13293,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13391,8 +13392,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13609,8 +13610,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLEMA"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "Modo de generador de eventos de PROBLEMA"
 
@@ -13692,8 +13693,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13741,8 +13742,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13773,12 +13774,12 @@ msgstr "Pasivo"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13811,12 +13812,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13829,7 +13830,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13872,8 +13873,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Período"
@@ -13894,9 +13895,9 @@ msgid "Periods"
 msgstr "Períodos"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13907,7 +13908,7 @@ msgstr "Períodos"
 msgid "Permissions"
 msgstr "Permisos"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Los permisos sólo pueden ser asignados por los grupos de usuarios."
 
@@ -13929,12 +13930,12 @@ msgstr ""
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Reproducir"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Reproducir sonido"
 
@@ -13964,8 +13965,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Por favor, selecciona dos elementos"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13975,14 +13975,15 @@ msgstr "Por favor, selecciona dos elementos"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13990,7 +13991,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Polaco (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -14052,16 +14053,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14158,8 +14159,8 @@ msgstr "Privada"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Archivo de clave privada"
 
@@ -14189,7 +14190,7 @@ msgstr "Nivel de privilegio"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problema"
 
@@ -14378,16 +14379,16 @@ msgstr "Público"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Clave pública"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Archivo de clave pública"
 
@@ -14401,8 +14402,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14452,8 +14453,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14479,14 +14480,14 @@ msgstr "Sólo lectura"
 msgid "Read-only"
 msgstr "Sólo lectura"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14500,14 +14501,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Lectura-escritura"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14553,7 +14554,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14562,10 +14563,10 @@ msgid "Recovery"
 msgstr "Recuperar"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14575,7 +14576,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14587,8 +14588,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr "Hora de recuperación"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14694,7 +14695,7 @@ msgstr "Comando remoto"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14725,13 +14726,13 @@ msgstr "Comando remoto"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14739,25 +14740,25 @@ msgstr "Comando remoto"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14785,14 +14786,14 @@ msgstr "Comando remoto"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14867,10 +14868,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Reemplazar"
 
@@ -14888,7 +14889,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14927,15 +14928,15 @@ msgstr "Informes"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14944,8 +14945,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14972,8 +14973,8 @@ msgstr "Rendimiento de servidor requerido, nuevos valores por segundo"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Códigos de estado requeridos"
 
@@ -14986,11 +14987,11 @@ msgstr "Cadena requerida"
 msgid "Reset"
 msgstr "Restablecer"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "¿Restablecer todos los campos a sus valores por defecto?"
 
@@ -15007,11 +15008,11 @@ msgstr "Confirmar restablecer"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Restablecer predeterminados"
 
@@ -15115,8 +15116,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15189,9 +15190,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15199,7 +15200,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Derecho"
@@ -15215,8 +15216,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15406,8 +15407,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15486,8 +15487,8 @@ msgstr "Resultado SQL: %1$s (selecciona: %2$s | ejecuta: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Consulta SQL"
 
@@ -15512,38 +15513,38 @@ msgstr "Agente SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Archivo de certificado SSL"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Archivo de clave SSL"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Contraseña de la clave SSL"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "Verificar el equipo SSL"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "Verificación del extremo SSL"
 
@@ -15662,9 +15663,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15689,8 +15690,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15822,10 +15823,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Seleccione"
@@ -15835,9 +15836,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15858,7 +15859,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr ""
 
@@ -16208,8 +16209,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16312,7 +16313,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16412,8 +16413,8 @@ msgstr "Gráfico sencillo"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16458,7 +16459,7 @@ msgstr "Estado/Provincia/Departamento"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16569,9 +16570,9 @@ msgstr "Velocidad"
 msgid "Stacked"
 msgstr "Apilado"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16592,7 +16593,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16787,14 +16788,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Pasos"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Parar"
 
@@ -16817,10 +16818,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17056,8 +17057,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17116,28 +17117,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Etiquetas"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Destino"
@@ -17298,14 +17299,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Probar"
@@ -17363,10 +17364,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Texto"
 
@@ -17519,8 +17520,8 @@ msgstr "Este mes"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17624,9 +17625,9 @@ msgstr "Período de tiempo"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17644,8 +17645,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Timeout"
 
@@ -17671,7 +17672,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "A"
 
@@ -17695,7 +17696,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Encima"
@@ -17747,8 +17748,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17759,7 +17759,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17767,9 +17768,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17781,8 +17782,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17800,9 +17801,9 @@ msgstr "Tendencias"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Iniciadores"
@@ -17904,7 +17905,7 @@ msgstr "Vistazo general de los iniciadores"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr ""
@@ -17970,7 +17971,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Gravedad del iniciador"
 
@@ -18077,23 +18078,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Tipo"
@@ -18102,12 +18103,12 @@ msgstr "Tipo"
 msgid "Type (Full details)"
 msgstr "Tipo (detalles completos)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Tipo (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18118,10 +18119,10 @@ msgstr "Tipo de cálculo"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Tipo de información"
 
@@ -18145,11 +18146,11 @@ msgstr "DESCONOCIDO"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18170,7 +18171,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18195,7 +18196,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18298,15 +18299,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18315,8 +18316,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Unidad"
 
@@ -18342,7 +18343,7 @@ msgstr "Unidad"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconocido"
@@ -18485,12 +18486,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18510,18 +18511,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18542,13 +18543,13 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Intervalo de actualización"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18687,7 +18688,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18799,10 +18800,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr ""
 
@@ -18870,7 +18871,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19247,12 +19248,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19314,8 +19315,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Asignación de valores"
@@ -19432,8 +19433,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Alineación vertical"
 
@@ -19636,8 +19637,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19648,12 +19648,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19729,8 +19730,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19742,11 +19743,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19760,8 +19761,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19781,12 +19782,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Valor MAX del eje Y"
 
@@ -19800,18 +19801,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Valor MIN del eje Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Lado del eje Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19831,11 +19832,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20866,10 +20867,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20898,8 +20899,8 @@ msgstr "equipo"
 msgid "host group"
 msgstr "grupo de equipos"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20932,7 +20933,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "incluir subgrupos"
 
@@ -21106,8 +21107,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21371,10 +21372,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21421,7 +21422,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21451,7 +21452,7 @@ msgstr ""
 msgid "of"
 msgstr "de"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21474,7 +21475,7 @@ msgstr "de"
 msgid "off"
 msgstr "desconectado"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21646,8 +21647,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21784,8 +21785,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22072,17 +22073,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/fa/LC_MESSAGES/frontend.po b/ui/locale/fa/LC_MESSAGES/frontend.po
index b6dd8c83498..980f812a6bb 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2013-10-10 08:30+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -171,10 +171,10 @@ msgid "%1$s message"
 msgid_plural "%1$s messages"
 msgstr[0] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -214,9 +214,9 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -317,7 +317,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 ثانیه"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "نمایش سه بعدی"
 
@@ -363,7 +363,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -450,27 +450,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "غير قابل دسترسي!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -542,35 +542,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -697,24 +697,24 @@ msgstr "فعال تا"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -750,13 +750,13 @@ msgstr "فعال تا"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -774,38 +774,38 @@ msgstr "فعال تا"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -832,7 +832,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -853,7 +853,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -862,16 +862,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -881,7 +881,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "افزودن نمونه اولیه\t"
 
@@ -918,7 +918,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1006,7 +1006,7 @@ msgstr "واسط های عامل"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1014,11 +1014,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1045,8 +1045,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1062,8 +1062,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1079,13 +1079,13 @@ msgstr "همه لینک ها باید \"نام\" و \"آدرس\" مشخص داش
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1106,19 +1106,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "هاست ها مجاز"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1135,21 +1135,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1163,7 +1163,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1208,11 +1208,11 @@ msgstr "خطای برنامه."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "اعمال"
@@ -1340,11 +1340,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1438,8 +1438,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "متد تصدیق هویت"
 
@@ -1501,8 +1501,8 @@ msgstr "خودکار"
 msgid "Automatic icon mapping"
 msgstr "نگاشت خودکار آیکن"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "انتخاب آیکن خودکار"
 
@@ -1569,12 +1569,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "پس زمینه"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1582,9 +1582,9 @@ msgstr ""
 msgid "Background image"
 msgstr "تصویر پس زمینه"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1592,8 +1592,8 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1636,15 +1636,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1655,8 +1655,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "خط‌ توپر"
 
@@ -1664,19 +1664,19 @@ msgstr "خط‌ توپر"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1689,7 +1689,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "پایین"
@@ -1772,7 +1772,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "محاسبه کردن"
 
@@ -1796,22 +1796,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3353,8 +3353,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "کاراکتر"
 
@@ -3382,7 +3382,7 @@ msgstr "اسکلت"
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "بررسی از قبل وجود دارد"
 
@@ -3503,8 +3503,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "پاک کردن تاریخچه و روند ها"
 
@@ -3532,22 +3532,22 @@ msgstr "ساعت"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "کپی برداری"
@@ -3555,28 +3555,28 @@ msgstr "کپی برداری"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "بستن"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "بستن عبارت سازنده"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3590,7 +3590,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3604,11 +3604,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3617,7 +3617,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3705,9 +3705,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "شروط"
@@ -3892,13 +3892,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "متصل به"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -3990,8 +3990,8 @@ msgstr "تماس"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4071,13 +4071,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "شماره تماس"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr ""
 
@@ -4094,7 +4094,7 @@ msgstr "رونوشت"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4230,10 +4230,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4437,7 +4437,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4451,8 +4451,8 @@ msgstr "نقشه های سفارشی"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4617,8 +4617,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "خط تیره"
 
@@ -4636,7 +4636,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "نمای کلی"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4820,11 +4820,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "پیش فرض"
 
@@ -4866,7 +4866,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr ""
 
@@ -4900,7 +4900,7 @@ msgstr "تأخیر توسط"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4909,7 +4909,7 @@ msgstr "تأخیر توسط"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4917,47 +4917,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "حذف"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "حذف و پاک کردن"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -4965,11 +4965,11 @@ msgstr ""
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -4982,10 +4982,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr ""
 
@@ -5009,11 +5009,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr ""
 
@@ -5055,11 +5055,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5118,7 +5118,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr ""
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr ""
 
@@ -5126,11 +5126,11 @@ msgstr ""
 msgid "Delete selected image?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr ""
 
@@ -5146,7 +5146,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr ""
 
@@ -5178,11 +5178,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5190,19 +5190,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5218,11 +5218,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr ""
 
@@ -5248,7 +5248,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "جداکننده"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5263,10 +5263,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "وابستگی‌ها"
 
@@ -5303,7 +5303,7 @@ msgstr "وضعیت گسترش"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5313,13 +5313,13 @@ msgstr "وضعیت گسترش"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "توصیف"
@@ -5329,10 +5329,10 @@ msgstr "توصیف"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "جزئیات"
@@ -5373,7 +5373,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5424,11 +5424,11 @@ msgstr ""
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5457,7 +5457,7 @@ msgstr ""
 msgid "Disable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr ""
 
@@ -5491,7 +5491,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5519,7 +5519,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "غیرفعال‌شده"
 
@@ -5545,9 +5545,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5739,7 +5739,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr "نمایش هشدار های رفع شده برای"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5747,13 +5747,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5777,15 +5777,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5799,8 +5799,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5810,8 +5810,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5821,8 +5821,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5830,8 +5830,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "نقطه"
 
@@ -5860,16 +5860,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "زمان از کار افتادگی"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "رسم سبک"
 
@@ -5920,7 +5920,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "مدت"
 
@@ -5943,29 +5943,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است."
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "ویرایش"
@@ -6019,12 +6019,12 @@ msgstr ""
 msgid "Element"
 msgstr "عنصر"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "نام عنصر"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6080,7 +6080,7 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6160,11 +6160,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6194,7 +6194,7 @@ msgstr ""
 msgid "Enable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr ""
 
@@ -6216,8 +6216,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6239,7 +6239,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6255,7 +6255,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6269,14 +6269,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "فعال‌شده"
 
@@ -6329,8 +6329,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6507,7 +6507,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6528,8 +6528,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "اجرای اسکریپت"
 
@@ -6543,13 +6543,13 @@ msgstr "تأیید اجرا"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6619,15 +6619,15 @@ msgstr "صدور به CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6640,10 +6640,10 @@ msgstr "عبارت"
 msgid "Expression cannot be empty"
 msgstr "عبارت نمیتواند خالی باشد"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "ساختار عبارت"
 
@@ -6711,7 +6711,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6845,8 +6845,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6857,7 +6856,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -6954,7 +6954,7 @@ msgid "Fit to map"
 msgstr "متناسب با نقشه"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "ثابت"
 
@@ -6966,9 +6966,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -6976,22 +6976,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -6999,8 +6999,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr ""
 
@@ -7036,7 +7036,7 @@ msgstr "جمعه"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "از"
 
@@ -7051,7 +7051,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "دسترسی به واسط کاربری"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7067,7 +7067,7 @@ msgid "Full clone"
 msgstr "کپی کامل"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "تابع"
 
@@ -7482,8 +7482,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "احراز هویت HTTP"
 
@@ -7494,8 +7494,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7532,10 +7532,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7551,7 +7551,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7657,7 +7657,7 @@ msgid "History cleared"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -7672,8 +7672,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7690,8 +7690,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "افقی"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "ردیف کردن افقی"
 
@@ -7808,7 +7808,7 @@ msgstr[0] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7894,9 +7894,9 @@ msgstr "گروه هاست ها"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "واسط هاست"
 
@@ -8183,8 +8183,8 @@ msgstr "واسط های IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "سنسور IPMI "
 
@@ -8198,19 +8198,19 @@ msgstr ""
 msgid "Icon"
 msgstr "نشان"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "نشان (پیش‌فرض)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "نشان(غیرفعال)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "نشان(نگهداری)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "نشان(مشکل)"
 
@@ -8257,7 +8257,7 @@ msgstr "نگاشت نشان"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "نشانها"
 
@@ -8399,7 +8399,7 @@ msgstr "تصاویر"
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "فوری"
 
@@ -8483,6 +8483,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9367,10 +9368,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "اطلاعات"
@@ -9437,8 +9438,8 @@ msgstr ""
 msgid "Insert"
 msgstr "درج"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9554,9 +9555,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "بازه"
@@ -9993,7 +9994,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "آیتم"
 
@@ -10252,8 +10253,8 @@ msgstr "عامل JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10271,8 +10272,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10311,8 +10312,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10351,9 +10352,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "کلید"
@@ -10419,13 +10420,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "برچسب"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "محل برچسب"
 
@@ -10566,9 +10567,9 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10579,7 +10580,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "چپ"
@@ -10612,25 +10613,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "محدودسازی مشخصه های جستجو/فیلتر"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "سطر"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10652,9 +10653,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "شاخص پیوند"
 
@@ -10685,8 +10686,8 @@ msgstr "پیوندزده به قالب ها"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10788,8 +10789,8 @@ msgstr "طول جغرافیایی"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "ثبت وقایع"
 
@@ -10802,8 +10803,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "قالب ثبت زمان"
 
@@ -10929,7 +10930,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "نگهداری"
 
@@ -11089,7 +11090,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11167,19 +11168,19 @@ msgstr ""
 msgid "Mass update"
 msgstr "بروز رسانی کلی"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11262,8 +11263,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "رسانه"
 
@@ -11384,8 +11385,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr ""
 
@@ -11403,7 +11404,7 @@ msgstr ""
 msgid "Messages"
 msgstr "پیام"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "پیام‌رسانی"
 
@@ -11501,11 +11502,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11669,8 +11670,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11836,7 +11837,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11856,15 +11857,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11873,16 +11874,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12162,7 +12163,7 @@ msgstr "بدون جزئیات"
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12218,8 +12219,8 @@ msgstr "بدون تصویر"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12523,7 +12524,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12569,8 +12570,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12578,17 +12579,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "هیچکدام"
@@ -12684,7 +12685,7 @@ msgstr "گزارش آگاه سازی"
 msgid "Notifications"
 msgstr "اخطارها"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12858,8 +12859,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "عددی(شناور)"
 
@@ -12869,8 +12870,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "عددی (بیعلامت)"
 
@@ -12878,8 +12879,8 @@ msgstr "عددی (بیعلامت)"
 msgid "OEM"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12891,13 +12892,13 @@ msgstr ""
 msgid "OK"
 msgstr "صحیح"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -12958,7 +12959,7 @@ msgstr "خاموش"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -12987,7 +12988,7 @@ msgstr "روشن"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "یکبار"
 
@@ -13107,11 +13108,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "عملکردها"
@@ -13157,7 +13158,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13172,11 +13173,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13271,8 +13272,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13489,8 +13490,8 @@ msgstr ""
 msgid "PROBLEM"
 msgstr "مشکل"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13572,8 +13573,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13621,8 +13622,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13653,12 +13654,12 @@ msgstr "منفعل"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13691,12 +13692,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13709,7 +13710,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13752,8 +13753,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "دوره"
@@ -13774,9 +13775,9 @@ msgid "Periods"
 msgstr "دوره ها"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13787,7 +13788,7 @@ msgstr "دوره ها"
 msgid "Permissions"
 msgstr "مجوزها"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13809,12 +13810,12 @@ msgstr "محل الگوریتم"
 msgid "Plain text"
 msgstr "متن ساده"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "پخش"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "پخش صدا"
 
@@ -13844,8 +13845,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "لطفاً دو عنصر انتخاب کنید"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13855,14 +13855,15 @@ msgstr "لطفاً دو عنصر انتخاب کنید"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13870,7 +13871,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "قرار گرفتن در فیلد هاست"
 
@@ -13932,16 +13933,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14038,8 +14039,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "فابل کلید اختصاصی"
 
@@ -14069,7 +14070,7 @@ msgstr "سطح ویژه"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "مشکل"
 
@@ -14257,16 +14258,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "كليد عمومى"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "فایل کلید عمومی"
 
@@ -14280,8 +14281,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14331,8 +14332,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14358,14 +14359,14 @@ msgstr "فقط خواندنی"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14379,14 +14380,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "خواندن-نوشتن"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14432,7 +14433,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14441,10 +14442,10 @@ msgid "Recovery"
 msgstr "بازیابی"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14454,7 +14455,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14466,8 +14467,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14572,7 +14573,7 @@ msgstr "فرمان راه دور"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14603,13 +14604,13 @@ msgstr "فرمان راه دور"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14617,25 +14618,25 @@ msgstr "فرمان راه دور"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14663,14 +14664,14 @@ msgstr "فرمان راه دور"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14745,10 +14746,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "جایگزینی"
 
@@ -14766,7 +14767,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14805,15 +14806,15 @@ msgstr "گزارشات"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14822,8 +14823,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14850,8 +14851,8 @@ msgstr "کارایی مورد نیاز سرور ، مقادیر جدید بر ث
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "کدهای وضعیت مورد نیاز"
 
@@ -14864,11 +14865,11 @@ msgstr "رشته مورد نیاز"
 msgid "Reset"
 msgstr "بازنشانی"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -14885,11 +14886,11 @@ msgstr "بازنشاندن تصدیق"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "بازنشانی پیش‌فرضها"
 
@@ -14993,8 +14994,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15067,9 +15068,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15077,7 +15078,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "راست"
@@ -15093,8 +15094,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15281,8 +15282,8 @@ msgstr ""
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr ""
 
@@ -15361,8 +15362,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15387,38 +15388,38 @@ msgstr "عامل SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15534,9 +15535,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15561,8 +15562,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "اسکریپت"
 
@@ -15693,10 +15694,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "انتخاب"
@@ -15706,9 +15707,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "انتخاب نمونه اولیه"
 
@@ -15729,7 +15730,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "عناصر انتخاب شده"
 
@@ -16077,8 +16078,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16181,7 +16182,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16281,8 +16282,8 @@ msgstr "نمودار ساده"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16327,7 +16328,7 @@ msgstr "استان سایت"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16438,9 +16439,9 @@ msgstr "سرعت"
 msgid "Stacked"
 msgstr "پشته‌ای"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16461,7 +16462,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16656,14 +16657,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "مراحل"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "توقف"
 
@@ -16686,10 +16687,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -16925,8 +16926,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -16985,28 +16986,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "هدف"
@@ -17167,14 +17168,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "آزمایش"
@@ -17232,10 +17233,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "متن"
 
@@ -17386,8 +17387,8 @@ msgstr "این ماه"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17491,9 +17492,9 @@ msgstr "دوره زمانی"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "انتقال زمان"
 
@@ -17511,8 +17512,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "زمان انقضا"
 
@@ -17538,7 +17539,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "به"
 
@@ -17562,7 +17563,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "بالا"
@@ -17614,8 +17615,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17626,7 +17626,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17634,9 +17635,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17648,8 +17649,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17667,9 +17668,9 @@ msgstr "روندها"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "هشدار"
@@ -17768,7 +17769,7 @@ msgstr "نمای کلی هشدارها"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "نمونه اولیه هشدار"
@@ -17833,7 +17834,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "جدیت هشدار"
 
@@ -17940,23 +17941,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "نوع"
@@ -17965,12 +17966,12 @@ msgstr "نوع"
 msgid "Type (Full details)"
 msgstr "نوع[جزییات کامل]"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "نوع (صحیح)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -17981,10 +17982,10 @@ msgstr "نوع محاسبات"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "نوع اطلاعات"
 
@@ -18008,11 +18009,11 @@ msgstr "ناشناخته"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "نشانی اینترنتی"
@@ -18033,7 +18034,7 @@ msgstr "نشانی اینترنتی ب"
 msgid "URL C"
 msgstr "نشانی اینترنتی ج"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18058,7 +18059,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "نشانی های اینترنتی"
@@ -18161,15 +18162,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18178,8 +18179,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "واحدها"
 
@@ -18205,7 +18206,7 @@ msgstr "واحدها"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "ناشناخته"
@@ -18347,12 +18348,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18372,18 +18373,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18404,13 +18405,13 @@ msgstr "بروزرسانی در حال حاضر"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr " فاصله به‌روزرسانی"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18549,7 +18550,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18658,10 +18659,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "نام کاربری"
 
@@ -18728,7 +18729,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19104,12 +19105,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19171,8 +19172,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "نگاشت مقدار"
@@ -19289,8 +19290,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "عمودی"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "ردیف کردن عمودی"
 
@@ -19491,8 +19492,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19503,12 +19503,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19584,8 +19585,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr ""
 
@@ -19597,11 +19598,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19615,8 +19616,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19636,12 +19637,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "حداکثر مقدار محور افقی"
 
@@ -19655,18 +19656,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "حداکثر مقدار محور عمودی"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "سمت محور عمودی"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19686,11 +19687,11 @@ msgstr ""
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20721,10 +20722,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20753,8 +20754,8 @@ msgstr "هاست"
 msgid "host group"
 msgstr "گروه هاست"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20787,7 +20788,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -20961,8 +20962,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21226,10 +21227,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21276,7 +21277,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21306,7 +21307,7 @@ msgstr ""
 msgid "of"
 msgstr "از"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21329,7 +21330,7 @@ msgstr "از"
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21501,8 +21502,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21639,8 +21640,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -21927,17 +21928,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/fi/LC_MESSAGES/frontend.po b/ui/locale/fi/LC_MESSAGES/frontend.po
index 5d740f4683a..930a81fc3db 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2013-10-10 08:23+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -179,10 +179,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -227,9 +227,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s yritys jäljellä"
 msgstr[1] "%1$s yritystä jäljellä"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -334,7 +334,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 sekuntia"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D-näkymä"
 
@@ -382,7 +382,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -472,27 +472,27 @@ msgstr "Ei käyttöoikeutta."
 msgid "Access denied!"
 msgstr "Ei käyttöoikeutta!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -564,35 +564,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -721,24 +721,24 @@ msgstr "Aktiivinen asti"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -774,13 +774,13 @@ msgstr "Aktiivinen asti"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -798,38 +798,38 @@ msgstr "Aktiivinen asti"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -856,7 +856,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -877,7 +877,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -886,16 +886,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -905,7 +905,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Lisää prototyyppi"
 
@@ -942,7 +942,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1031,7 +1031,7 @@ msgstr "Agentin verkkoliitännät"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1039,11 +1039,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1070,8 +1070,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1087,8 +1087,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1104,13 +1104,13 @@ msgstr "Kaikilla linkeillä pitäisi olla \"Nimi\" tai \"URL\" määriteltynä"
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1131,19 +1131,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Sallitut koneet"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1160,21 +1160,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "ja"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1188,7 +1188,7 @@ msgstr "ja"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "ja/tai"
 
@@ -1233,11 +1233,11 @@ msgstr "Sovelluksessa virhe."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Käytä"
@@ -1365,11 +1365,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1463,8 +1463,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Tunnistautumistapa"
 
@@ -1526,8 +1526,8 @@ msgstr "Automaattinen"
 msgid "Automatic icon mapping"
 msgstr "Automaattinen ikonien kartoitus"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Automaattinen ikonien valinta"
 
@@ -1594,12 +1594,12 @@ msgstr "Takaisin"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Tausta"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1607,9 +1607,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Taustakuva"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1617,8 +1617,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Perus-DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1661,15 +1661,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1680,8 +1680,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Lihavoitu viiva"
 
@@ -1689,19 +1689,19 @@ msgstr "Lihavoitu viiva"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1714,7 +1714,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Alareuna"
@@ -1797,7 +1797,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr ""
 
@@ -1821,22 +1821,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3427,8 +3427,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr ""
 
@@ -3456,7 +3456,7 @@ msgstr ""
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr ""
 
@@ -3577,8 +3577,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr ""
 
@@ -3606,22 +3606,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr ""
@@ -3629,28 +3629,28 @@ msgstr ""
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3664,7 +3664,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3678,11 +3678,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3691,7 +3691,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3779,9 +3779,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr ""
@@ -3966,13 +3966,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4064,8 +4064,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4145,13 +4145,13 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr ""
 
@@ -4168,7 +4168,7 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4307,10 +4307,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4514,7 +4514,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4528,8 +4528,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4695,8 +4695,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr ""
 
@@ -4714,7 +4714,7 @@ msgstr ""
 msgid "Data overview"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4898,11 +4898,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr ""
 
@@ -4944,7 +4944,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr ""
 
@@ -4978,7 +4978,7 @@ msgstr ""
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4987,7 +4987,7 @@ msgstr ""
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4995,47 +4995,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr ""
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -5043,11 +5043,11 @@ msgstr ""
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5060,10 +5060,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr ""
 
@@ -5087,11 +5087,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr ""
 
@@ -5133,11 +5133,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5196,7 +5196,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr ""
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr ""
 
@@ -5204,11 +5204,11 @@ msgstr ""
 msgid "Delete selected image?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr ""
 
@@ -5224,7 +5224,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr ""
 
@@ -5256,11 +5256,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5268,19 +5268,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5296,11 +5296,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr ""
 
@@ -5326,7 +5326,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5341,10 +5341,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr ""
 
@@ -5381,7 +5381,7 @@ msgstr ""
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5391,13 +5391,13 @@ msgstr ""
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr ""
@@ -5407,10 +5407,10 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr ""
@@ -5451,7 +5451,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5502,11 +5502,11 @@ msgstr ""
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5535,7 +5535,7 @@ msgstr ""
 msgid "Disable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr ""
 
@@ -5569,7 +5569,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5597,7 +5597,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr ""
 
@@ -5623,9 +5623,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5820,7 +5820,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5828,13 +5828,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5858,15 +5858,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5880,8 +5880,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5891,8 +5891,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5902,8 +5902,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5911,8 +5911,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr ""
 
@@ -5941,16 +5941,16 @@ msgstr ""
 msgid "Downtime"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr ""
 
@@ -6001,7 +6001,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr ""
 
@@ -6024,29 +6024,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr ""
@@ -6100,12 +6100,12 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6161,7 +6161,7 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6241,11 +6241,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6275,7 +6275,7 @@ msgstr ""
 msgid "Enable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr ""
 
@@ -6297,8 +6297,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6320,7 +6320,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6336,7 +6336,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6350,14 +6350,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr ""
 
@@ -6410,8 +6410,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6588,7 +6588,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6609,8 +6609,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr ""
 
@@ -6624,13 +6624,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6700,15 +6700,15 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6721,10 +6721,10 @@ msgstr ""
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr ""
 
@@ -6792,7 +6792,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6926,8 +6926,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6938,7 +6937,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7035,7 +7035,7 @@ msgid "Fit to map"
 msgstr ""
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr ""
 
@@ -7047,9 +7047,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7057,22 +7057,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7080,8 +7080,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr ""
 
@@ -7117,7 +7117,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr ""
 
@@ -7132,7 +7132,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7148,7 +7148,7 @@ msgid "Full clone"
 msgstr ""
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr ""
 
@@ -7565,8 +7565,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr ""
 
@@ -7577,8 +7577,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7615,10 +7615,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7634,7 +7634,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7740,7 +7740,7 @@ msgid "History cleared"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -7755,8 +7755,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7773,8 +7773,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr ""
 
@@ -7893,7 +7893,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7979,9 +7979,9 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr ""
 
@@ -8269,8 +8269,8 @@ msgstr ""
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr ""
 
@@ -8284,19 +8284,19 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr ""
 
@@ -8343,7 +8343,7 @@ msgstr ""
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr ""
 
@@ -8487,7 +8487,7 @@ msgstr ""
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr ""
 
@@ -8571,6 +8571,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9455,10 +9456,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr ""
@@ -9525,8 +9526,8 @@ msgstr ""
 msgid "Insert"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9642,9 +9643,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr ""
@@ -10081,7 +10082,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr ""
 
@@ -10344,8 +10345,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10363,8 +10364,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10403,8 +10404,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10443,9 +10444,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr ""
@@ -10511,13 +10512,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr ""
 
@@ -10664,9 +10665,9 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10677,7 +10678,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr ""
@@ -10710,25 +10711,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10750,9 +10751,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr ""
 
@@ -10783,8 +10784,8 @@ msgstr ""
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10886,8 +10887,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr ""
 
@@ -10900,8 +10901,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr ""
 
@@ -11027,7 +11028,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr ""
 
@@ -11187,7 +11188,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11265,19 +11266,19 @@ msgstr ""
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11361,8 +11362,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11486,8 +11487,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr ""
 
@@ -11505,7 +11506,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr ""
 
@@ -11604,11 +11605,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11776,8 +11777,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11943,7 +11944,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11963,15 +11964,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11980,16 +11981,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12269,7 +12270,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12325,8 +12326,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12630,7 +12631,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12676,8 +12677,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12685,17 +12686,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr ""
@@ -12791,7 +12792,7 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12965,8 +12966,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr ""
 
@@ -12976,8 +12977,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr ""
 
@@ -12985,8 +12986,8 @@ msgstr ""
 msgid "OEM"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12998,13 +12999,13 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13065,7 +13066,7 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13094,7 +13095,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr ""
 
@@ -13215,11 +13216,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr ""
@@ -13265,7 +13266,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13280,11 +13281,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13379,8 +13380,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13597,8 +13598,8 @@ msgstr ""
 msgid "PROBLEM"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13680,8 +13681,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13729,8 +13730,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13761,12 +13762,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13799,12 +13800,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13817,7 +13818,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13860,8 +13861,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr ""
@@ -13882,9 +13883,9 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13895,7 +13896,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13917,12 +13918,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr ""
 
@@ -13952,8 +13953,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13963,14 +13963,15 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13978,7 +13979,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -14040,16 +14041,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14146,8 +14147,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr ""
 
@@ -14177,7 +14178,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr ""
 
@@ -14366,16 +14367,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr ""
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr ""
 
@@ -14389,8 +14390,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14440,8 +14441,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14467,14 +14468,14 @@ msgstr ""
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14488,14 +14489,14 @@ msgstr ""
 msgid "Read-write"
 msgstr ""
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14541,7 +14542,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14550,10 +14551,10 @@ msgid "Recovery"
 msgstr ""
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14563,7 +14564,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14575,8 +14576,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14682,7 +14683,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14713,13 +14714,13 @@ msgstr ""
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14727,25 +14728,25 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14773,14 +14774,14 @@ msgstr ""
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14855,10 +14856,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr ""
 
@@ -14876,7 +14877,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14915,15 +14916,15 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14932,8 +14933,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14960,8 +14961,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr ""
 
@@ -14974,11 +14975,11 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -14995,11 +14996,11 @@ msgstr ""
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr ""
 
@@ -15103,8 +15104,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15177,9 +15178,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15187,7 +15188,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr ""
@@ -15203,8 +15204,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15394,8 +15395,8 @@ msgstr ""
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr ""
 
@@ -15474,8 +15475,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15500,38 +15501,38 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15650,9 +15651,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15677,8 +15678,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr ""
 
@@ -15810,10 +15811,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr ""
@@ -15823,9 +15824,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15846,7 +15847,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr ""
 
@@ -16195,8 +16196,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16299,7 +16300,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16399,8 +16400,8 @@ msgstr ""
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16445,7 +16446,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16556,9 +16557,9 @@ msgstr ""
 msgid "Stacked"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16579,7 +16580,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16774,14 +16775,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr ""
 
@@ -16804,10 +16805,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17043,8 +17044,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17103,28 +17104,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr ""
@@ -17285,14 +17286,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr ""
@@ -17350,10 +17351,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr ""
 
@@ -17506,8 +17507,8 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17611,9 +17612,9 @@ msgstr ""
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17631,8 +17632,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr ""
 
@@ -17658,7 +17659,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr ""
 
@@ -17682,7 +17683,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr ""
@@ -17734,8 +17735,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17746,7 +17746,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17754,9 +17755,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17768,8 +17769,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17787,9 +17788,9 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr ""
@@ -17891,7 +17892,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr ""
@@ -17957,7 +17958,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
@@ -18064,23 +18065,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr ""
@@ -18089,12 +18090,12 @@ msgstr ""
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr ""
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18105,10 +18106,10 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr ""
 
@@ -18132,11 +18133,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr ""
@@ -18157,7 +18158,7 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18182,7 +18183,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr ""
@@ -18285,15 +18286,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18302,8 +18303,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr ""
 
@@ -18329,7 +18330,7 @@ msgstr ""
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18472,12 +18473,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18497,18 +18498,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18529,13 +18530,13 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18674,7 +18675,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18786,10 +18787,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr ""
 
@@ -18857,7 +18858,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19234,12 +19235,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19301,8 +19302,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr ""
@@ -19419,8 +19420,8 @@ msgstr ""
 msgid "Vertical"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr ""
 
@@ -19623,8 +19624,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19635,12 +19635,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19716,8 +19717,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr ""
 
@@ -19729,11 +19730,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19747,8 +19748,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19768,12 +19769,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr ""
 
@@ -19787,18 +19788,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19818,11 +19819,11 @@ msgstr ""
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20853,10 +20854,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20885,8 +20886,8 @@ msgstr ""
 msgid "host group"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20919,7 +20920,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21093,8 +21094,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21358,10 +21359,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21408,7 +21409,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21438,7 +21439,7 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21461,7 +21462,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21633,8 +21634,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21771,8 +21772,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22059,17 +22060,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/fr/LC_MESSAGES/frontend.po b/ui/locale/fr/LC_MESSAGES/frontend.po
index d4a1b8c425f..38241e31812 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] "%1$s message"
 msgstr[1] "%1$s messages"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s essai restant"
 msgstr[1] "%1$s essais restants"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -335,7 +335,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 secondes"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "vue 3D"
 
@@ -381,7 +381,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "AJOUTER SURCHARGE"
 
@@ -471,27 +471,27 @@ msgstr "Accès refusé"
 msgid "Access denied!"
 msgstr "Accès refusé !"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -563,35 +563,35 @@ msgstr "Événements RÉSOLUS acquittés"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -720,24 +720,24 @@ msgstr "Actif jusqu'à"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -773,13 +773,13 @@ msgstr "Actif jusqu'à"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -797,38 +797,38 @@ msgstr "Actif jusqu'à"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -855,7 +855,7 @@ msgstr "Ajouter un élément enfant"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Ajouter plusieurs cartes"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "Ajouter un nouvel ensemble de données"
 
@@ -885,16 +885,16 @@ msgstr "Ajouter un nouvel ensemble de données"
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "Ajouter une nouvelle surcharge"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Ajouter prototype"
 
@@ -941,7 +941,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Ajouter un widget"
@@ -1029,7 +1029,7 @@ msgstr "Interfaces de l'agent"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1037,11 +1037,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1068,8 +1068,8 @@ msgstr "Aligner les éléments de carte"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1085,8 +1085,8 @@ msgid "All dashboards"
 msgstr "Tous les tableaux de bord"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Tous les groupes"
 
@@ -1102,13 +1102,13 @@ msgstr "Tous liens doivent avoir \"Nom\" et \"URL\" spécifiés"
 msgid "All maps"
 msgstr "Toutes les cartes"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Tous les problèmes"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Tous les problèmes si les valeurs de tag correspondent"
 
@@ -1129,19 +1129,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Autoriser la fermeture manuelle"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Hôtes autorisés"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1158,21 +1158,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "Et"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1186,7 +1186,7 @@ msgstr "Et"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "Et/Ou"
 
@@ -1231,11 +1231,11 @@ msgstr "Erreur d'application."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Appliquer"
@@ -1365,11 +1365,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Au moins une opération doit exister."
 
@@ -1463,8 +1463,8 @@ msgstr "L'authentification a échoué: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
@@ -1526,8 +1526,8 @@ msgstr "Automatique"
 msgid "Automatic icon mapping"
 msgstr "Correspondance d'icône automatique"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Sélection automatique d'icône"
 
@@ -1594,12 +1594,12 @@ msgstr "Retour"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Fond"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1607,9 +1607,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Image de fond"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1617,8 +1617,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "DN de base"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1661,15 +1661,15 @@ msgstr "Bleu"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Corps"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Corps et en-tête"
 
@@ -1680,8 +1680,8 @@ msgstr "Corps et en-tête"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Ligne épaisse"
 
@@ -1689,19 +1689,19 @@ msgstr "Ligne épaisse"
 msgid "Boolean to decimal"
 msgstr "Booléen vers décimal"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Bordure"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Type de bordure"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Largeur de bordure"
 
@@ -1714,7 +1714,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Bas"
@@ -1797,7 +1797,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Calculé"
 
@@ -1821,22 +1821,22 @@ msgstr "Rappel"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3430,8 +3430,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Caractère"
 
@@ -3459,7 +3459,7 @@ msgstr "Châssis"
 msgid "Chassis information. Returns string"
 msgstr "Informations du chaŝsis. Retourne une chaîne"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "La vérification existe déjà."
 
@@ -3580,8 +3580,8 @@ msgid "Clear history"
 msgstr "Effacer l'historique"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Effacer l'historique et les tendances"
 
@@ -3609,22 +3609,22 @@ msgstr "Horloge"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Clone"
@@ -3632,28 +3632,28 @@ msgstr "Clone"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Fermer"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Fermer le constructeur d'expression"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Fermer le nouvel événement"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Fermer les anciens événements"
@@ -3667,7 +3667,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Replier"
@@ -3681,11 +3681,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3694,7 +3694,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3782,9 +3782,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Conditions"
@@ -3969,13 +3969,13 @@ msgstr "Félicitations ! Vous avez installé l'interface Zabbix avec succès."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Connexion à"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "Connecté"
@@ -4067,8 +4067,8 @@ msgstr "Contact"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4148,13 +4148,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Numéro de contrat"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "Convertir en JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Coordonnées"
 
@@ -4171,7 +4171,7 @@ msgstr "Copier"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Corrélation"
 
@@ -4311,10 +4311,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4518,7 +4518,7 @@ msgid "Custom"
 msgstr "Personnalisé"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4532,8 +4532,8 @@ msgstr "Graphiques personnalisés"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Intervalle personnalisé"
 
@@ -4699,8 +4699,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "Tableaux de bord"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Ligne pointillée"
 
@@ -4718,7 +4718,7 @@ msgstr "Les données ne sont pas correctement encodées."
 msgid "Data overview"
 msgstr "Aperçu des données"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4902,11 +4902,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Défaut"
 
@@ -4948,7 +4948,7 @@ msgstr "Formulaire de connexion par défaut"
 msgid "Default media type"
 msgstr "Type de média par défaut"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Durée de l'étape d'opération par défaut"
 
@@ -4982,7 +4982,7 @@ msgstr "Retardé de"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4991,7 +4991,7 @@ msgstr "Retardé de"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4999,47 +4999,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Supprimer"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Supprimer et effacer"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Supprimer et nettoyer les modèles sélectionnés ? (Attention : tous les hôtes liés seront nettoyés !)"
 
@@ -5047,11 +5047,11 @@ msgstr "Supprimer et nettoyer les modèles sélectionnés ? (Attention : tous le
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Supprimer et nettoyer le modèle ? (Attention : tous les hôtes liés seront nettoyés !)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Effacer l'action actuelle ?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Effacer la corrélation actuelle ?"
 
@@ -5064,10 +5064,10 @@ msgstr "Effacer le tableau de bord ?"
 msgid "Delete discovery rule?"
 msgstr "Supprimer la règle de découverte ?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Supprimer l'expression ?"
 
@@ -5091,11 +5091,11 @@ msgstr "Supprimer l'historique des scénarios web sélectionnés ?"
 msgid "Delete icon map?"
 msgstr "Supprimer la correspondance d'icône ?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Supprimer le prototype d'élément ?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Effacer l'élément ?"
 
@@ -5137,11 +5137,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5200,7 +5200,7 @@ msgstr "Supprimer les prototypes d'hôtes sélectionnés ?"
 msgid "Delete selected host?"
 msgstr "Supprimer hôte sélectionné ?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Suppression des hôtes sélectionnés ?"
 
@@ -5208,11 +5208,11 @@ msgstr "Suppression des hôtes sélectionnés ?"
 msgid "Delete selected image?"
 msgstr "Supprimer l'image sélectionnée ?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Supprimer les prototypes d'éléments sélectionnés ?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Supprimer les éléments sélectionnés ?"
 
@@ -5228,7 +5228,7 @@ msgstr "Supprimer la carte sélectionnée ?"
 msgid "Delete selected maps?"
 msgstr "Supprimer les cartes sélectionnées ?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Supprimer les types de media sélectionnés ?"
 
@@ -5260,11 +5260,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Supprimer les scripts sélectionnés ?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5272,19 +5272,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Supprimer les formes sélectionnées ?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Supprimer les modèles sélectionnés ?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Supprimer les prototypes de déclencheurs sélectionnés ?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Supprimer les déclencheurs sélectionnés ?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Supprimer l'utilisateur sélectionné ?"
 
@@ -5300,11 +5300,11 @@ msgstr "Supprimer les scénarios web sélectionnés ?"
 msgid "Delete template?"
 msgstr "Supprimer le modèle ?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Supprimer le prototype de déclencheur ?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Supprimer le déclencheur ?"
 
@@ -5330,7 +5330,7 @@ msgstr "Supprimé : Prototype d'hôte \"%1$s\" sur \"%2$s\"."
 msgid "Delimiter"
 msgstr "Délimiteur"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5345,10 +5345,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Dépendances"
 
@@ -5385,7 +5385,7 @@ msgstr "État du déploiement"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5395,13 +5395,13 @@ msgstr "État du déploiement"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Description"
@@ -5411,10 +5411,10 @@ msgstr "Description"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Détails"
@@ -5455,7 +5455,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Taille du dossier (en octets). Retourne un entier"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5506,11 +5506,11 @@ msgstr "Désactiver les hôtes surveillés par les proxies sélectionnés ?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5539,7 +5539,7 @@ msgstr "Désactiver les hôtes sélectionnés ?"
 msgid "Disable selected items?"
 msgstr "Désactiver les éléments sélectionnés ?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Désactiver les types de média sélectionnés ?"
 
@@ -5573,7 +5573,7 @@ msgstr "Désactiver les scénarios web sélectionnés ?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5601,7 +5601,7 @@ msgstr "Désactiver les scénarios web sélectionnés ?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Désactivé"
 
@@ -5627,9 +5627,9 @@ msgstr "Ignorer la valeur"
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5825,7 +5825,7 @@ msgstr "Statistiques d'écriture du disque. Retourne un entier avec le type parm
 msgid "Display OK triggers for"
 msgstr "Afficher les déclencheurs OK pendant"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Afficher le graphique"
 
@@ -5833,13 +5833,13 @@ msgstr "Afficher le graphique"
 msgid "Display problems"
 msgstr "Afficher les problèmes"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Afficher le graphique empilé"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5863,15 +5863,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5885,8 +5885,8 @@ msgstr "Souhaitez-vous remplacer l'expression conditionnelle ?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5896,8 +5896,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5907,8 +5907,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5916,8 +5916,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr "Ne correspond pas à l'expression régulière"
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Point"
 
@@ -5946,16 +5946,16 @@ msgstr "Télécharger le fichier de configuration"
 msgid "Downtime"
 msgstr "Temps d'arrêt"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "Dessiner"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Style de dessin"
 
@@ -6006,7 +6006,7 @@ msgstr "Identifiant d'utilisateur \"%1$s\" en doublon dans les utilisateurs pour
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Durée"
 
@@ -6029,29 +6029,29 @@ msgstr "Éléments dynamiques"
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Édition"
@@ -6105,12 +6105,12 @@ msgstr "Erreur Elasticsearch : %1$s."
 msgid "Element"
 msgstr "Élément"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Nom de l'élément"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Ellipse"
 
@@ -6166,7 +6166,7 @@ msgstr "Paramètre d'entrée vide."
 msgid "Empty map ID."
 msgstr "Identifiant de carte vide."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6246,11 +6246,11 @@ msgstr "Activer le nettoyage interne"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6280,7 +6280,7 @@ msgstr "Activer les hôtes sélectionnés ?"
 msgid "Enable selected items?"
 msgstr "Activer les éléments sélectionnés ?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Activer les types de média sélectionnés ?"
 
@@ -6302,8 +6302,8 @@ msgstr "Activer les scénarios web sélectionnés ?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "Activer les trap"
 
@@ -6325,7 +6325,7 @@ msgstr "Activer les trap"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6341,7 +6341,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6355,14 +6355,14 @@ msgstr "Activer les trap"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Activé"
 
@@ -6415,8 +6415,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6593,7 +6593,7 @@ msgstr "Exécute une requête WMI et retourne le premier objet sélectionné. Re
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6614,8 +6614,8 @@ msgstr "Exécuté"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Script exécuté"
 
@@ -6629,13 +6629,13 @@ msgstr "Confirmation d'exécution"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Déplier"
@@ -6705,15 +6705,15 @@ msgstr "Exporter en CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6726,10 +6726,10 @@ msgstr "Expression"
 msgid "Expression cannot be empty"
 msgstr "L'expression ne peut pas être vide"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Constructeur d'expression"
 
@@ -6797,7 +6797,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Impossible de créer le tableau de bord"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Échec d'analyse de l'URL."
@@ -6931,8 +6931,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Information temporelle du fichier. Retourne un entier (timestamp Unix)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6943,7 +6942,8 @@ msgstr "Information temporelle du fichier. Retourne un entier (timestamp Unix)"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "Remplir"
 
@@ -7040,7 +7040,7 @@ msgid "Fit to map"
 msgstr "Ajuster à la carte"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fixe"
 
@@ -7052,9 +7052,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7062,22 +7062,22 @@ msgstr "Flexible"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Suivre les redirections"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Police"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Taille de police"
 
@@ -7085,8 +7085,8 @@ msgstr "Taille de police"
 msgid "Form data"
 msgstr "Données de formulaire"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formule"
 
@@ -7122,7 +7122,7 @@ msgstr "Vendredi"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "De"
 
@@ -7137,7 +7137,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Accès à l'interface"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Messages dans l'interface"
 
@@ -7153,7 +7153,7 @@ msgid "Full clone"
 msgstr "Clone complet"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Fonction"
 
@@ -7570,8 +7570,8 @@ msgstr "Agent HTTP"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Authentification HTTP"
 
@@ -7582,8 +7582,8 @@ msgstr "Formulaire de connexion HTTP"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
@@ -7620,10 +7620,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "En-têtes"
 
@@ -7639,7 +7639,7 @@ msgstr "Hébreu (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7745,7 +7745,7 @@ msgid "History cleared"
 msgstr "Historique nettoyé"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Le nettoyage de l'historique prend du temps. Continuer ?"
 
@@ -7760,8 +7760,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Période de stockage de l'historique"
 
@@ -7778,8 +7778,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Alignement horizontal"
 
@@ -7898,7 +7898,7 @@ msgstr[1] "Hôtes désactivés"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7984,9 +7984,9 @@ msgstr "Groupes d'hôtes"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Interface hôte"
 
@@ -8274,8 +8274,8 @@ msgstr "Interfaces IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "Capteur IPMI"
 
@@ -8289,19 +8289,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Icône"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Icône (par défaut)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Icône (désactivée)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Icône (maintenance)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Icône (problème)"
 
@@ -8348,7 +8348,7 @@ msgstr "Correspondance d'icônes"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "L'icône avec l'IS \"%1$s\" n'est pas disponible."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Icônes"
 
@@ -8492,7 +8492,7 @@ msgstr "Images"
 msgid "Images for all maps will be updated!"
 msgstr "Les images de toutes les cartes seront mises à jour !"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Immédiatement"
 
@@ -8576,6 +8576,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9460,10 +9461,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9530,8 +9531,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Insertion"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Insérer une expression"
 
@@ -9647,9 +9648,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Intervalle"
@@ -10086,7 +10087,7 @@ msgstr "Italien (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Élément"
 
@@ -10349,8 +10350,8 @@ msgstr "agent JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "Endpoint JMX"
 
@@ -10368,8 +10369,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "Données JSON"
 
@@ -10408,8 +10409,8 @@ msgstr "Japonais (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr "JavaScript"
@@ -10448,9 +10449,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Clé"
@@ -10516,13 +10517,13 @@ msgstr "macros LLD"
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Étiquette"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Positionnement de l'étiquette"
 
@@ -10669,9 +10670,9 @@ msgstr "Letton (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10682,7 +10683,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Gauche"
@@ -10715,25 +10716,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Limite d'éléments recherchés/filtrés"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Ligne"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Type de ligne"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Largeur de ligne"
 
@@ -10755,9 +10756,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Indicateurs de lien"
 
@@ -10788,8 +10789,8 @@ msgstr "Modèles liés"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Liens"
 
@@ -10891,8 +10892,8 @@ msgstr "Longitude de l'emplacement"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Journal"
 
@@ -10905,8 +10906,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Supervision d'un fichier de log. Retourne un log"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Format de l'horodatage du journal"
 
@@ -11032,7 +11033,7 @@ msgstr "Navigation principale"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Maintenance"
 
@@ -11192,7 +11193,7 @@ msgstr "Arborescence des cartes"
 msgid "Map owner cannot be empty."
 msgstr "Le propriétaire de la carte ne peut pas être vide."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Forme de carte"
 
@@ -11270,19 +11271,19 @@ msgstr "Masque"
 msgid "Mass update"
 msgstr "Modification collective"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Modifier les éléments collectivement"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Mise à jour en masse des formes"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Élément maître"
 
@@ -11366,8 +11367,8 @@ msgid "May"
 msgstr "Mai"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Média"
 
@@ -11491,8 +11492,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Expiration du message"
 
@@ -11510,7 +11511,7 @@ msgstr "Message/Commande"
 msgid "Messages"
 msgstr "Messages"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Messagerie"
 
@@ -11609,11 +11610,11 @@ msgstr "Champ \"name\" manquant pour le prototype de graphique."
 msgid "Missing \"name\" field for graph."
 msgstr "Champ \"nom\" manquant pour le graphique."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "Données manquantes"
 
@@ -11781,8 +11782,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Multiple"
 
@@ -11948,7 +11949,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11968,15 +11969,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11985,16 +11986,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12274,7 +12275,7 @@ msgstr "Pas de détails"
 msgid "No discovery rule IDs given."
 msgstr "Aucun identifiant de règle de découverte fourni."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12330,8 +12331,8 @@ msgstr "Aucune image"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Aucune interface trouvée"
 
@@ -12635,7 +12636,7 @@ msgstr "Aucun fichier de clé publique spécifié."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Pas de rafraîchissement"
 
@@ -12681,8 +12682,8 @@ msgstr "Les drapeaux non-booléens sont obsolètes."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12690,17 +12691,17 @@ msgstr "Les drapeaux non-booléens sont obsolètes."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Aucun"
@@ -12796,7 +12797,7 @@ msgstr "Rapport de notification"
 msgid "Notifications"
 msgstr "Notifications"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12970,8 +12971,8 @@ msgstr "Systèmes numériques"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numérique (flottant)"
 
@@ -12981,8 +12982,8 @@ msgstr "Numerique (Entier)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numérique (non signé)"
 
@@ -12990,8 +12991,8 @@ msgstr "Numérique (non signé)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13003,13 +13004,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "Un événement OK ferme"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "Génération d'événement OK"
 
@@ -13070,7 +13071,7 @@ msgstr "Inactif"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13099,7 +13100,7 @@ msgstr "Actif"
 msgid "On status change triggers blink for"
 msgstr "Au changement d'état, clignoter pendant"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Une fois"
 
@@ -13220,11 +13221,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Opérations"
@@ -13270,7 +13271,7 @@ msgstr "Options"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13285,11 +13286,11 @@ msgstr "Options"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Ou"
 
@@ -13384,8 +13385,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Surchargé par"
@@ -13602,8 +13603,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLÈME"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "Mode de génération des événements PROBLÈME"
 
@@ -13685,8 +13686,8 @@ msgstr "Le paramètre \"%1$s\" est obsolète."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Paramètres"
 
@@ -13734,8 +13735,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Analyser"
 
@@ -13766,12 +13767,12 @@ msgstr "Passif"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13804,12 +13805,12 @@ msgid "Paste"
 msgstr "Coller"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13822,7 +13823,7 @@ msgstr "Coller sans les liens externes"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "Suspendre les opérations des problèmes supprimés"
 
@@ -13865,8 +13866,8 @@ msgstr "Réalise une requête DNS. Retourne une chaîne de caractères avec le t
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Période"
@@ -13887,9 +13888,9 @@ msgid "Periods"
 msgstr "Périodes"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13900,7 +13901,7 @@ msgstr "Périodes"
 msgid "Permissions"
 msgstr "Permissions"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Les permissions ne peuvent être assignées qu'aux groupes d'utilisateurs."
 
@@ -13922,12 +13923,12 @@ msgstr "Algorithme de placement"
 msgid "Plain text"
 msgstr "Texte brut"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Jouer"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Jouer un son"
 
@@ -13957,8 +13958,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Veuillez sélectionner deux éléments"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13968,14 +13968,15 @@ msgstr "Veuillez sélectionner deux éléments"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "Taille du point"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Points"
 
@@ -13983,7 +13984,7 @@ msgstr "Points"
 msgid "Polish (pl_PL)"
 msgstr "Polonais (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Remplit le champ d'inventaire d'hôte"
 
@@ -14045,16 +14046,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Prétraitement"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Étape de prétraitement"
 
@@ -14151,8 +14152,8 @@ msgstr "Privé"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Fichier de clé privée"
 
@@ -14182,7 +14183,7 @@ msgstr "Niveau de privilège"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problème"
 
@@ -14371,16 +14372,16 @@ msgstr "Public"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Clé publique"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Fichier de clé publique"
 
@@ -14394,8 +14395,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Champs de requête"
 
@@ -14445,8 +14446,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Données brutes"
 
@@ -14472,14 +14473,14 @@ msgstr "Lecture seule"
 msgid "Read-only"
 msgstr "Lecture seule"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14493,14 +14494,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Lecture-écriture"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14546,7 +14547,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14555,10 +14556,10 @@ msgid "Recovery"
 msgstr "Récupération"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Expression de récupération"
@@ -14568,7 +14569,7 @@ msgstr "Expression de récupération"
 msgid "Recovery expression syntax error."
 msgstr "Erreur de syntaxe dans l'expression de récupération."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Opérations de récupération"
 
@@ -14580,8 +14581,8 @@ msgstr "Opérations de récupération"
 msgid "Recovery time"
 msgstr "Moment de la récupération"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Rectangle"
 
@@ -14687,7 +14688,7 @@ msgstr "Commande à distance"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14718,13 +14719,13 @@ msgstr "Commande à distance"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14732,25 +14733,25 @@ msgstr "Commande à distance"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14778,14 +14779,14 @@ msgstr "Commande à distance"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14860,10 +14861,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Remplacer"
 
@@ -14881,7 +14882,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14920,15 +14921,15 @@ msgstr "Rapports"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "Corps de la requête"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "Type du corps de la requête"
 
@@ -14937,8 +14938,8 @@ msgid "Request sent successfully"
 msgstr "Requête envoyée avec succès"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "Type de requête"
 
@@ -14965,8 +14966,8 @@ msgstr "Performance serveur requise, nouvelles valeurs par seconde"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Code d'état requis"
 
@@ -14979,11 +14980,11 @@ msgstr "Chaîne requise"
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Réinitialiser tous les champs à leur valeur par défaut ?"
 
@@ -15000,11 +15001,11 @@ msgstr "Confirmation de la réinitialisation"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Réinitialiser aux valeurs par défaut"
 
@@ -15108,8 +15109,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "Mode de récupération"
 
@@ -15182,9 +15183,9 @@ msgstr "Retourne le pourcentage de paquets ICMP ping perdus."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15192,7 +15193,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Droit"
@@ -15208,8 +15209,8 @@ msgstr "Y droit"
 msgid "Right trim"
 msgstr "Rogner à droite"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15399,8 +15400,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "OID SNMP"
 
@@ -15479,8 +15480,8 @@ msgstr "Compte SQL : %1$s (selects: %2$s | executes : %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Requête SQL"
 
@@ -15505,38 +15506,38 @@ msgstr "Agent SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Fichier de certificat SSL"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Fichier de clé SSL"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Mot de passe de la clé SSL"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "Vérifier l'hôte SSL"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "Vérifier le pair SSL"
 
@@ -15655,9 +15656,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15682,8 +15683,8 @@ msgstr "Étendue"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15815,10 +15816,10 @@ msgstr "Nom de la sécurité"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Sélectionner"
@@ -15828,9 +15829,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Sélectionner le prototype"
 
@@ -15851,7 +15852,7 @@ msgstr "Actions sélectionnées supprimées"
 msgid "Selected and all other problems of related triggers"
 msgstr "Sélectionnés et tous les autres problèmes des déclencheurs associés"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Éléments sélectonnés"
 
@@ -16201,8 +16202,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "La criticité a augmenté"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Forme"
@@ -16305,7 +16306,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16405,8 +16406,8 @@ msgstr "Graphique simple"
 msgid "Simple graph prototype"
 msgstr "Prototype de graphique simple"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Seul"
 
@@ -16451,7 +16452,7 @@ msgstr "Site - État / province"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Taille"
 
@@ -16562,9 +16563,9 @@ msgstr "Vitesse"
 msgid "Stacked"
 msgstr "Empilé"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "Escalier"
 
@@ -16585,7 +16586,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Démarrer dans"
 
@@ -16780,14 +16781,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "L'étape nommée \"%1$s\" existe déjà."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Étapes"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Stop"
 
@@ -16810,10 +16811,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17049,8 +17050,8 @@ msgstr "Priorité d'affichage des tags"
 msgid "Tag filter"
 msgstr "Filtre de tag"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Tag pour la concordance"
 
@@ -17109,28 +17110,28 @@ msgstr "Valeur du tag"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Tags"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Cible"
@@ -17291,14 +17292,14 @@ msgstr "Modèles mis à jour"
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17356,10 +17357,10 @@ msgstr "Tester le sujet"
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Texte"
 
@@ -17512,8 +17513,8 @@ msgstr "Ce mois-ci"
 msgid "This month so far"
 msgstr "Ce mois-ci jusqu'à présent"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17617,9 +17618,9 @@ msgstr "Période de temps"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Décalage temporel"
 
@@ -17637,8 +17638,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Expiration"
 
@@ -17664,7 +17665,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "À"
 
@@ -17688,7 +17689,7 @@ msgstr "Aujourd'hui jusqu'à présent"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Haut"
@@ -17740,8 +17741,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17752,7 +17752,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "Transparence"
 
@@ -17760,9 +17761,9 @@ msgstr "Transparence"
 msgid "Transport error."
 msgstr "Erreur de transport."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "Traiter comme 0"
@@ -17774,8 +17775,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Période de stockage des tendances"
 
@@ -17793,9 +17794,9 @@ msgstr "Tendances"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Déclencheur"
@@ -17897,7 +17898,7 @@ msgstr "Aperçu des déclencheurs"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Prototype du déclencheur"
@@ -17963,7 +17964,7 @@ msgstr "Prototypes de déclencheurs supprimés"
 msgid "Trigger prototypes updated"
 msgstr "Prototypes de déclencheurs mis à jour"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Sévérité du déclencheur"
 
@@ -18070,23 +18071,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Type"
@@ -18095,12 +18096,12 @@ msgstr "Type"
 msgid "Type (Full details)"
 msgstr "Type (détails complet)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Type (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18111,10 +18112,10 @@ msgstr "Type de calcul"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Type d'information"
 
@@ -18138,11 +18139,11 @@ msgstr "INCONNU"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18163,7 +18164,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "L'URL n'est pas correctement encodée."
@@ -18188,7 +18189,7 @@ msgstr "Le paramètre de l'URL ne peut pas être vide."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18291,15 +18292,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18308,8 +18309,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Unités"
 
@@ -18335,7 +18336,7 @@ msgstr "Unités"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Inconnu"
@@ -18478,12 +18479,12 @@ msgstr "Fonctionne"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18503,18 +18504,18 @@ msgstr "Fonctionne"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18535,13 +18536,13 @@ msgstr "Actualiser l'existant"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Intervalle d'actualisation"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "Opérations de mise à jour"
 
@@ -18680,7 +18681,7 @@ msgstr "Chaîne du \"user agent\""
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18792,10 +18793,10 @@ msgstr "Menu utilisateur"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
@@ -18863,7 +18864,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Le paramètre %1$s manque pour le partage d'utilisateur pour la carte \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19240,12 +19241,12 @@ msgstr "Validation"
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19307,8 +19308,8 @@ msgstr "La table de correspondance \"%1$s\" existe déjà."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Table de correspondance"
@@ -19425,8 +19426,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Alignement vertical"
 
@@ -19629,8 +19630,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19641,12 +19641,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19722,8 +19723,8 @@ msgstr "Champs incorrects pour un lien de carte."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19735,11 +19736,11 @@ msgstr "Axe X"
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19753,8 +19754,8 @@ msgstr "XPath XML"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "Données XML"
 
@@ -19774,12 +19775,12 @@ msgstr ""
 msgid "XPath"
 msgstr "XPath"
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Valeur MAX axe Y"
 
@@ -19793,18 +19794,18 @@ msgstr "La valeur MAX de l'axe Y doit être supérieure à la valeur MIN de l'ax
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "La valeur maximal de l'axe Y doit être supérieure à la valeur minimale de l'axe Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Valeur minimale axe Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Coté de l'axe Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Axe Y"
 
@@ -19824,11 +19825,11 @@ msgstr "d/m/Y H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20859,10 +20860,10 @@ msgstr "fuzzytime() - La différence entre la valeur de l'horodatage de l'élém
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "paramètres de nettoyage globaux"
@@ -20891,8 +20892,8 @@ msgstr "hôte"
 msgid "host group"
 msgstr "groupe d'hôte"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "modèle d'hôte"
@@ -20925,7 +20926,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "sous-groupes inclus"
 
@@ -21099,8 +21100,8 @@ msgstr "élément"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "modèle d'article"
 
@@ -21364,10 +21365,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "nom"
@@ -21414,7 +21415,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "aucun"
 
@@ -21444,7 +21445,7 @@ msgstr "nombre"
 msgid "of"
 msgstr "de"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21467,7 +21468,7 @@ msgstr "de"
 msgid "off"
 msgstr "inatif"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21639,8 +21640,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr "script"
@@ -21777,8 +21778,8 @@ msgstr "les informations d'identification fournies ne sont pas uniques"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22065,17 +22066,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/he/LC_MESSAGES/frontend.po b/ui/locale/he/LC_MESSAGES/frontend.po
index 57b67def2be..5f0480160e6 100644
--- a/ui/locale/he/LC_MESSAGES/frontend.po
+++ b/ui/locale/he/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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2021-11-21 09:37+0300\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: none\n"
@@ -179,10 +179,10 @@ msgid_plural "%1$s messages"
 msgstr[0] "הודעה אחת"
 msgstr[1] "%1$s הודעות"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -227,9 +227,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "נותר ניסיון אחד"
 msgstr[1] "נותרו %1$s ניסיונות"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -334,7 +334,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "חצי דקה"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "תצוגת תלת־ממד"
 
@@ -380,7 +380,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr "מ"
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "הוספת מעקף"
 
@@ -470,27 +470,27 @@ msgstr "הגישה נדחתה"
 msgid "Access denied!"
 msgstr "הגישה נדחתה!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr "גישה ל־API"
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "גישה לרכיבים במנשק המשתמש"
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr "גישה לפעולות"
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr "גישה למודולים"
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr "גישה לשירותים"
@@ -562,35 +562,35 @@ msgstr "אירועים מוכרים שנפתרו"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -719,24 +719,24 @@ msgstr "פעיל עד"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -772,13 +772,13 @@ msgstr "פעיל עד"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -796,38 +796,38 @@ msgstr "פעיל עד"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -854,7 +854,7 @@ msgstr "הוספת פריט צאצא"
 msgid "Add child service"
 msgstr "הוספת שירות צאצא"
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr "הוספת שירותים צאצאים"
 
@@ -875,7 +875,7 @@ msgstr "הוספת חוסר"
 msgid "Add multiple maps"
 msgstr "הוספת מספר מפות"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "הוספת ערכת נתונים חדשה"
 
@@ -884,16 +884,16 @@ msgstr "הוספת ערכת נתונים חדשה"
 msgid "Add new interface"
 msgstr "הוספת מנשק חדש"
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "הוספת מעקף חדש"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr "הוספת עמוד"
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr "הוספת שירותים הורים"
 
@@ -903,7 +903,7 @@ msgstr "הוספת הערות על תקלה"
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "הוספת אבטיפוס"
 
@@ -940,7 +940,7 @@ msgid "Add user group"
 msgstr "הוספת קבוצת משתמשים"
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "הוספת וידג׳ט"
@@ -1028,7 +1028,7 @@ msgstr "מנשקי הסוכן"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr "בדיקת הגוון סוכן. מחזירה 1 - לסוכן Zabbix,‏ 2 - לסוכן Zabbix 2"
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr "צבירה"
 
@@ -1036,11 +1036,11 @@ msgstr "צבירה"
 msgid "Aggregate functions"
 msgstr "פונקציות צבירה"
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr "פונקציית צבירה"
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr "משך צבירה"
 
@@ -1067,8 +1067,8 @@ msgstr "יישור רכיבים במפה"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1084,8 +1084,8 @@ msgid "All dashboards"
 msgstr "כל לוחות המחוונים"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "כל הקבוצות"
 
@@ -1101,13 +1101,13 @@ msgstr "יש לציין „שם” ו־„כתובת” לכל הקישורים"
 msgid "All maps"
 msgstr "כל המפות"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "כל התקלות"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "כל התקלות אם ערכי התגית תואמים"
 
@@ -1128,19 +1128,19 @@ msgid "Allow list"
 msgstr "רשימת היתר"
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "לאפשר סגירה ידנית"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "מארחים מורשים"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr "שיטות מורשות"
 
@@ -1157,21 +1157,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr "כמות הזיכרון הפיזי שנצרך לטובת גיבוי עמודי הזיכרון הפיזי של המערכת האורחת, <url> - כתובת שירות ה־VMware,‏ <uuid> - שם מארח של המכונה הווירטואלית ב־VMware"
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "וגם"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1185,7 +1185,7 @@ msgstr "וגם"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "וגם/או"
 
@@ -1230,11 +1230,11 @@ msgstr "שגיאת יישום."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "החלה"
@@ -1364,11 +1364,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr "יש לבחור בפעילות אחת לפחות."
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "חייבת להיות לפחות פעולה אחת."
 
@@ -1462,8 +1462,8 @@ msgstr "האימות נכשל: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "שיטת אימות"
 
@@ -1525,8 +1525,8 @@ msgstr "אוטומטי"
 msgid "Automatic icon mapping"
 msgstr "מיפוי סמלים אוטומטי"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "בחירת סמלים אוטומטית"
 
@@ -1593,12 +1593,12 @@ msgstr "חזרה"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "רקע"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr "צבע רקע"
 
@@ -1606,9 +1606,9 @@ msgstr "צבע רקע"
 msgid "Background image"
 msgstr "תמונת רקע"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr "עמודות"
 
@@ -1616,8 +1616,8 @@ msgstr "עמודות"
 msgid "Base DN"
 msgstr "DN בסיס"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr "צבע בסיס"
 
@@ -1660,15 +1660,15 @@ msgstr "כחול"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "גוף"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "גוף וכותרות"
 
@@ -1679,8 +1679,8 @@ msgstr "גוף וכותרות"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "קו עבה"
 
@@ -1688,19 +1688,19 @@ msgstr "קו עבה"
 msgid "Boolean to decimal"
 msgstr "בוליאני לעשרוני"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "מסגרת"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr "צבע מסגרת"
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "סוג המסגרת"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "עובי המסגרת"
 
@@ -1713,7 +1713,7 @@ msgstr "שתי הססמאות חייבות להיות זהות."
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "תחתית"
@@ -1796,7 +1796,7 @@ msgid "CUID is expected"
 msgstr "אמור להיות CUID"
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "מחושב"
 
@@ -1820,22 +1820,22 @@ msgstr "קריאה"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3426,8 +3426,8 @@ msgstr "החלפת סוג"
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "תו"
 
@@ -3455,7 +3455,7 @@ msgstr "מארז"
 msgid "Chassis information. Returns string"
 msgstr "פרטי מארז. מחזירה מחרוזת"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "הבדיקה כבר קיימת."
 
@@ -3576,8 +3576,8 @@ msgid "Clear history"
 msgstr "פינוי ההיסטוריה"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "פינוי היסטוריה ומגמות"
 
@@ -3605,22 +3605,22 @@ msgstr "שעון"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "שכפול"
@@ -3628,28 +3628,28 @@ msgstr "שכפול"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "סגירה"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "סגירת מרכיב הביטויים"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "סגירת אירוע חדש"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "סגירת אירועים ישנים"
@@ -3663,7 +3663,7 @@ msgid "Close problems"
 msgstr "סגירת תקלות"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "צמצום"
@@ -3677,11 +3677,11 @@ msgstr "צמצום סרגל הצד"
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr "צבע"
 
@@ -3690,7 +3690,7 @@ msgstr "צבע"
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr "הצבע „%1$s” שגוי: אמור להיות צבע קוד הקסדצימלי (6 תווים)."
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr "צבע (תקין)"
 
@@ -3778,9 +3778,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr "התנאי „%2$s” שנמצא בשימוש בנוסחה „%3$s” למעקף „%1$s” אינו מוגדר."
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "תנאים"
@@ -3965,13 +3965,13 @@ msgstr "ברכותינו! התקנת בהצלחה את מנשק המשתמש ש�
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "התחברות אל"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "מחובר"
@@ -4074,8 +4074,8 @@ msgstr "פרטי קשר"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4155,13 +4155,13 @@ msgstr "להמשיך מעקפים"
 msgid "Contract number"
 msgstr "מס׳ חוזה"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "המרה ל־JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "נקודות ציון"
 
@@ -4178,7 +4178,7 @@ msgstr "העתקה"
 msgid "Copy to clipboard"
 msgstr "העתקה ללוח הגזירים"
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "יחס"
 
@@ -4317,10 +4317,10 @@ msgstr "יצירת כלל גילוי (יש לבחור תבנית תחילה)"
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4524,7 +4524,7 @@ msgid "Custom"
 msgstr "בהתאמה אישית"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4538,8 +4538,8 @@ msgstr "תרשימים מותאמים אישית"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "מרווחי זמן מותאמים אישית"
 
@@ -4705,8 +4705,8 @@ msgstr "לוח מחוונים עם המזהה „%1$s” אינו זמין."
 msgid "Dashboards"
 msgstr "לוחות מחוונים"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "קו מרוסק"
 
@@ -4724,7 +4724,7 @@ msgstr "הנתונים אינם מוצפנים כראוי."
 msgid "Data overview"
 msgstr "סקירת נתונים"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4908,11 +4908,11 @@ msgstr "הקטנה בשיעור"
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "בררת מחדל"
 
@@ -4954,7 +4954,7 @@ msgstr "טופס כניסה כבררת מחדל"
 msgid "Default media type"
 msgstr "סוג מדיה כבררת מחדל"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "משך מהלך פעולה כבררת מחדל"
 
@@ -4988,7 +4988,7 @@ msgstr "בהשהיה של"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4997,7 +4997,7 @@ msgstr "בהשהיה של"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5005,47 +5005,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "מחיקה"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr "למחוק את כל הרכיבים שאינם מופיעים בקובץ הייבוא?"
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "מחיקה ופינוי"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "למחוק ולפנות את התבניות הנבחרות? (אזהרה: כל המארחים הקשורים יתפנו גם הם!)"
 
@@ -5053,11 +5053,11 @@ msgstr "למחוק ולפנות את התבניות הנבחרות? (אזהרה:
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "למחוק ולפנות את התבנית? (אזהרה: כל המארחים המקושרים יפונו גם הם!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "למחוק את המשימה הנוכחית?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "למחוק את היחס הנוכחי?"
 
@@ -5070,10 +5070,10 @@ msgstr "למחוק את לוח המחוונים?"
 msgid "Delete discovery rule?"
 msgstr "למחוק את כלל הגילוי?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "למחוק את הביטוי?"
 
@@ -5097,11 +5097,11 @@ msgstr "למחוק את ההיסטוריה של תרחישי הרשת הנבחר
 msgid "Delete icon map?"
 msgstr "למחוק מפת סמלים?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "למחוק אבטיפוס פריט?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "למחוק פריט?"
 
@@ -5143,11 +5143,11 @@ msgstr "למחוק את אסימון ה־API הנבחר?"
 msgid "Delete selected API tokens?"
 msgstr "למחוק את אסימוני ה־API הנבחרים?"
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5206,7 +5206,7 @@ msgstr "למחוק את אבות הטיפוס של המארחים הנבחרים
 msgid "Delete selected host?"
 msgstr "למחוק את המארח הנבחר?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "למחוק את המארחים הנבחרים?"
 
@@ -5214,11 +5214,11 @@ msgstr "למחוק את המארחים הנבחרים?"
 msgid "Delete selected image?"
 msgstr "למחוק את אתמונה הנבחרת?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "למחוק את אבות הטיפוס של הפריט הנבחר?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "למחוק את הפריטים הנבחרים?"
 
@@ -5234,7 +5234,7 @@ msgstr "למחוק את המפה הנבחרת?"
 msgid "Delete selected maps?"
 msgstr "למחוק את המפות הנבחרות?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "למחוק את סוגי המדיה הנבחרים?"
 
@@ -5266,11 +5266,11 @@ msgstr "למחוק את הדוחות המתוזמנים שנבחרו?"
 msgid "Delete selected scripts?"
 msgstr "למחוק את הסקריפטים הנבחרים?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr "למחוק את השירות הנבחר?"
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr "למחוק את השירותים הנבחרים?"
 
@@ -5278,19 +5278,19 @@ msgstr "למחוק את השירותים הנבחרים?"
 msgid "Delete selected shapes?"
 msgstr "למחוק את הצורות הנבחרות?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "למחוק את התבניות הנבחרות?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "למחוק את אבות הטיפוס של ההקפצה הנבחרת?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "למחוק את ההקפצות הנבחרות?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "למחוק את המשתמש הנבחר?"
 
@@ -5306,11 +5306,11 @@ msgstr "למחוק את תרחישי הרשת הנבחרים?"
 msgid "Delete template?"
 msgstr "למחוק תבנית?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "למחוק אבטיפוס הקפצה?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "למחוק הקפצה?"
 
@@ -5336,7 +5336,7 @@ msgstr "נמחק: אבטיפוס המארח „%1$s“ ב־„%2$s“."
 msgid "Delimiter"
 msgstr "מפריד"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr "שיטות שנדחו"
 
@@ -5351,10 +5351,10 @@ msgid "Deny list"
 msgstr "רשימת דחייה"
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "תלויות"
 
@@ -5391,7 +5391,7 @@ msgstr "מצב הטמעה"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5401,13 +5401,13 @@ msgstr "מצב הטמעה"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "תיאור"
@@ -5417,10 +5417,10 @@ msgstr "תיאור"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "פרטים"
@@ -5461,7 +5461,7 @@ msgstr "תיקייה"
 msgid "Directory size (in bytes). Returns integer"
 msgstr "גודל תיקייה (בבתים). מחזירה מספר שלם"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5512,11 +5512,11 @@ msgstr "להשבית את המארחים שמנוטרים על ידי המתוו
 msgid "Disable selected API tokens?"
 msgstr "למחוק את אסימוני ה־API הנבחרים?"
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5545,7 +5545,7 @@ msgstr "להשבית את המארחים הנבחרים?"
 msgid "Disable selected items?"
 msgstr "להשבית את הפריטים הנבחרים?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "להשבית את סוגי המדיה הנבחרים?"
 
@@ -5579,7 +5579,7 @@ msgstr "להשבית את תרחישי הרשת הנבחרים?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5607,7 +5607,7 @@ msgstr "להשבית את תרחישי הרשת הנבחרים?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "מושבת"
 
@@ -5633,9 +5633,9 @@ msgstr "התעלמות מערך"
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr "גילוי"
@@ -5830,7 +5830,7 @@ msgstr "סטטיסטיקת כתיבה לכונן. מחזירה מספר שלם �
 msgid "Display OK triggers for"
 msgstr "הצגת הקפצות תקינות עבור"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "הצגת תרשים"
 
@@ -5838,13 +5838,13 @@ msgstr "הצגת תרשים"
 msgid "Display problems"
 msgstr "הצגת תקלות"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "הצגת תרשים מוערם"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5868,15 +5868,15 @@ msgstr "מכנה החילוק"
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr "לא לשמור היסטוריה"
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr "לא לשמור מגמות"
 
@@ -5890,8 +5890,8 @@ msgstr "להחליף את הביטוי המותנה?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr "לא מכיל"
 
@@ -5901,8 +5901,8 @@ msgstr "לא מכיל"
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr "לא שווה"
 
@@ -5912,8 +5912,8 @@ msgstr "לא שווה"
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr "לא קיים"
 
@@ -5921,8 +5921,8 @@ msgstr "לא קיים"
 msgid "Does not match regular expression"
 msgstr "אינו תואם לביטוי רגולרי"
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "נקודה"
 
@@ -5951,16 +5951,16 @@ msgstr "הורדת קובץ ההגדרות"
 msgid "Downtime"
 msgstr "זמן אי פעילות"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "ציור"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "סגנון ציור"
 
@@ -6011,7 +6011,7 @@ msgstr "userid משוכפל „%1$s” במשתמשים עבור המפה „%2$
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "משך"
 
@@ -6034,29 +6034,29 @@ msgstr "פריטים דינמיים"
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "לכל כתובת צריך להיות שם ייחודי. נא לוודא שאין כפילות שם לכתובת"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr "כל פריט"
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "עריכה"
@@ -6110,12 +6110,12 @@ msgstr "שגיאת Elasticsearch:‏ %1$s."
 msgid "Element"
 msgstr "רכיב"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "שם הרכיב"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "אליפסה"
 
@@ -6171,7 +6171,7 @@ msgstr "פרמטר הקלט ריק."
 msgid "Empty map ID."
 msgstr "מזהה המפה ריק."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6251,11 +6251,11 @@ msgstr "הפעלת סדר וניקיון פנימיים"
 msgid "Enable selected API tokens?"
 msgstr "להפעיל את אסימוני ה־API הנבחרים?"
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6285,7 +6285,7 @@ msgstr "להפעיל את המארחים הנבחרים?"
 msgid "Enable selected items?"
 msgstr "להפעיל את הפריטים הנבחרים?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "להפעיל את סוגי המדיה הנבחרים?"
 
@@ -6307,8 +6307,8 @@ msgstr "להפעיל את תרחישי הרשת הנבחרים?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "הפעלת לכידה"
 
@@ -6330,7 +6330,7 @@ msgstr "הפעלת לכידה"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6346,7 +6346,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6360,14 +6360,14 @@ msgstr "הפעלת לכידה"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "פעיל"
 
@@ -6420,8 +6420,8 @@ msgstr "כבר קיימת רשומה עם המזהה הייחודי „%1$s”."
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6598,7 +6598,7 @@ msgstr "הפעלת שאילתת WMI והחזרת הפריט הראשון שנב�
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr "להריץ כעת"
@@ -6619,8 +6619,8 @@ msgstr "רץ"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "סקריפט שרץ"
 
@@ -6634,13 +6634,13 @@ msgstr "אימות הרצה"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr "קיים"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "הרחבה"
@@ -6710,15 +6710,15 @@ msgstr "יצוא ל־CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6731,10 +6731,10 @@ msgstr "ביטוי"
 msgid "Expression cannot be empty"
 msgstr "הביטוי לא יכול להיות ריק"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "בונה ביטויים"
 
@@ -6802,7 +6802,7 @@ msgstr "כניסה שנכשלה"
 msgid "Failed to create dashboard"
 msgstr "יצירת לוח מחוונים נכשלה"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "פענוח הכתובת נכשל."
@@ -6936,8 +6936,7 @@ msgstr "גודל קובץ בבתים (בררת מחדל) או בשורות חד�
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "פרטי זמן על הקובץ. מחזירה מספר שלם וחיובי (חותמת זמן יוניקס)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6948,7 +6947,8 @@ msgstr "פרטי זמן על הקובץ. מחזירה מספר שלם וחיוב
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "מילוי"
 
@@ -7045,7 +7045,7 @@ msgid "Fit to map"
 msgstr "התאמה למפה"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "קבוע"
 
@@ -7057,9 +7057,9 @@ msgstr "מצב קבוע"
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7067,22 +7067,22 @@ msgstr "גמיש"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "מעקב אחר הפניות"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "גופן"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr "צבע גופן"
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "גודל גופן"
 
@@ -7090,8 +7090,8 @@ msgstr "גודל גופן"
 msgid "Form data"
 msgstr "נתוני טופס"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "נוסחה"
 
@@ -7127,7 +7127,7 @@ msgstr "יום שישי"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "מאת"
 
@@ -7142,7 +7142,7 @@ msgstr "כתובת מנשק משתמש"
 msgid "Frontend access"
 msgstr "גישה לפני המערכת"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "הודעות בפני המערכת"
 
@@ -7158,7 +7158,7 @@ msgid "Full clone"
 msgstr "שכפול מלא"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "פונקציה"
 
@@ -7575,8 +7575,8 @@ msgstr "סוכן HTTP"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "אימות HTTP"
 
@@ -7587,8 +7587,8 @@ msgstr "טופס כניסה HTTP"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "מתווך HTTP"
 
@@ -7625,10 +7625,10 @@ msgstr "Vault מבית HashiCorp"
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "כותרות"
 
@@ -7644,7 +7644,7 @@ msgstr "עברית (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7750,7 +7750,7 @@ msgid "History cleared"
 msgstr "ההיסטוריה נמחקה"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "מחיקת ההיסטוריה עשויה לארוך זמן רב. להמשיך?"
 
@@ -7765,8 +7765,8 @@ msgstr "פונקציות היסטוריה"
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "תקופת אחסון היסטוריה"
 
@@ -7783,8 +7783,8 @@ msgstr "דף הבית"
 msgid "Horizontal"
 msgstr "אופקי"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "יישור אופקי"
 
@@ -7903,7 +7903,7 @@ msgstr[1] "מארחים מופעלים"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7989,9 +7989,9 @@ msgstr "קבוצות מארחים"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "מנשק מארח"
 
@@ -8279,8 +8279,8 @@ msgstr "מנשקי IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "חיישן IPMI"
 
@@ -8294,19 +8294,19 @@ msgstr "מזהי חיישני IPMI ומשתנים נוספים שקשורים ב
 msgid "Icon"
 msgstr "סמל"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "סמל (בררת מחדל)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "סמל (מושבת)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "סמל (מצב תחזוקה)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "סמל (תקלה)"
 
@@ -8353,7 +8353,7 @@ msgstr "מיפוי סמלים"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "הסמל עם המזהה „%1$s” לא זמין."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "סמלים"
 
@@ -8497,7 +8497,7 @@ msgstr "תמונות"
 msgid "Images for all maps will be updated!"
 msgstr "התמונות עבור כל המפות יעודכנו!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "מיידית"
 
@@ -8581,6 +8581,7 @@ msgid "Inaccessible item prototype"
 msgstr "אבטיפוס פריט בלתי נגיש"
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9465,10 +9466,10 @@ msgstr "אינסוף"
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "מידע"
@@ -9535,8 +9536,8 @@ msgstr "תצוגה ראשונית לא תוצג אם מוגדרת תצוגת ב�
 msgid "Insert"
 msgstr "הוספה"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "הוספת ביטוי"
 
@@ -9652,9 +9653,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "משך"
@@ -10091,7 +10092,7 @@ msgstr "איטלקית (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "פריט"
 
@@ -10354,8 +10355,8 @@ msgstr "סוכן JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "נקודת גישה JMX"
 
@@ -10373,8 +10374,8 @@ msgstr "הקלט אמור להיות מערך JSON."
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "נתוני JSON"
 
@@ -10413,8 +10414,8 @@ msgstr "יפנית (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr "JavaScript"
@@ -10453,9 +10454,9 @@ msgstr "Kerberos"
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "מפתח"
@@ -10521,13 +10522,13 @@ msgstr "מאקרואים LLD (גילוי ברמה נמוכה)"
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "תווית"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "מיקום התווית"
 
@@ -10674,9 +10675,9 @@ msgstr "לטבית (lv_LV)"
 msgid "Layout"
 msgstr "פריסה"
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10687,7 +10688,7 @@ msgstr "פריסה"
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "ימין"
@@ -10720,25 +10721,25 @@ msgstr "כפוף לרישיון"
 msgid "Limit for search and filter results"
 msgstr "הגבלה לתוצאות החיפוש והסינון"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "קו"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr "צבע קו"
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "סוג קו"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "עובי קו"
 
@@ -10760,9 +10761,9 @@ msgstr "הקישור בשדה „selementid1” מצביע למזהה selement �
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "הקישור בשדה „selementid2” מצביע למזהה selement במפה שאינו קיים „%1$s” במפה „%2$s”."
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "מחווני קישור"
 
@@ -10793,8 +10794,8 @@ msgstr "תבניות מקושרות"
 msgid "Linked to templates"
 msgstr "מקושר לתבניות"
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "קישורים"
 
@@ -10896,8 +10897,8 @@ msgstr "קו גובה של המיקום"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "יומן"
 
@@ -10910,8 +10911,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "מעקב אחר קובץ יומן. מחזירה יומן"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "תבנית הזמן ליומן"
 
@@ -11037,7 +11038,7 @@ msgstr "ניווט ראשי"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "תחזוקה"
 
@@ -11197,7 +11198,7 @@ msgstr "עץ ניווט במפה"
 msgid "Map owner cannot be empty."
 msgstr "הבעלות על המפה לא יכולה להיות ריקה."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "צורת המפה"
 
@@ -11275,19 +11276,19 @@ msgstr "מסכה"
 msgid "Mass update"
 msgstr "עדכון כמותי"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "עדכון כמותי של רכיבים"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "עדכון כמותי של צורות"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "פריט אב"
 
@@ -11371,8 +11372,8 @@ msgid "May"
 msgstr "מאי"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "מדיה"
 
@@ -11496,8 +11497,8 @@ msgstr "תבנית הודעה"
 msgid "Message templates"
 msgstr "תבניות הודעות"
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "תום זמן המתנה להודעה"
 
@@ -11515,7 +11516,7 @@ msgstr "הודעה/פקודה"
 msgid "Messages"
 msgstr "הודעות"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "התכתבות"
 
@@ -11614,11 +11615,11 @@ msgstr "השדה „name” (שם) חסר לאבטיפוס תרשים."
 msgid "Missing \"name\" field for graph."
 msgstr "שדה „name” חסר לתרשים."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "נתונים חסרים"
 
@@ -11786,8 +11787,8 @@ msgstr "הכי קריטי מבין שירותי הצאצאים"
 msgid "Mozilla Firefox"
 msgstr "Firefox מבית Mozilla"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "מרובים"
 
@@ -11953,7 +11954,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11973,15 +11974,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11990,16 +11991,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12279,7 +12280,7 @@ msgstr "אין פרטים"
 msgid "No discovery rule IDs given."
 msgstr "לא סופק מזהה של כלל גילוי."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr "לא נמצאו מודולים שהופעלו."
@@ -12335,8 +12336,8 @@ msgstr "אין תמונה"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "לא נמצא מנשק"
 
@@ -12640,7 +12641,7 @@ msgstr "לא צוין מפתח ציבורי."
 msgid "No recipients specified for action operation message."
 msgstr "לא צוינו נמענים להודעת פעילות משימה."
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "ללא רענון"
 
@@ -12686,8 +12687,8 @@ msgstr "הופסק השימוש בדגלונים שאינם בוליאנים."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12695,17 +12696,17 @@ msgstr "הופסק השימוש בדגלונים שאינם בוליאנים."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "ללא"
@@ -12801,7 +12802,7 @@ msgstr "דוח התרעות"
 msgid "Notifications"
 msgstr "התרעות"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12975,8 +12976,8 @@ msgstr "מערכות ספרתיות"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "מספרי (שבר עשרוני)"
 
@@ -12986,8 +12987,8 @@ msgstr "ספרתי (שלם וחיובי)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "מספרי (ללא סימן)"
 
@@ -12995,8 +12996,8 @@ msgstr "מספרי (ללא סימן)"
 msgid "OEM"
 msgstr "יצרן"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13008,13 +13009,13 @@ msgstr "יצרן"
 msgid "OK"
 msgstr "תקין"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "האירוע התקין נסגר"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "יצירת אירועי תקינות"
 
@@ -13075,7 +13076,7 @@ msgstr "כבוי"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13104,7 +13105,7 @@ msgstr "פעיל"
 msgid "On status change triggers blink for"
 msgstr "עם החלפת מצב ההקפצות מהבהבות למשך"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "פעם אחת"
 
@@ -13225,11 +13226,11 @@ msgstr "לפעולה אין תבנית לפעילות."
 msgid "Operational data"
 msgstr "נתונים תפעוליים"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "פעולות"
@@ -13275,7 +13276,7 @@ msgstr "אפשרויות"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13290,11 +13291,11 @@ msgstr "אפשרויות"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "או"
 
@@ -13389,8 +13390,8 @@ msgstr "פלט"
 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”."
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "נדרס ע״י"
@@ -13607,8 +13608,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "תקלה"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "מצב יצירת אירוע תקלה"
 
@@ -13690,8 +13691,8 @@ msgstr "הפרמטר „%1$s” נזנח."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "פרמטרים"
 
@@ -13739,8 +13740,8 @@ msgstr "סתירה ביחס הורה-צאצא בשירותים „%1$s” ו־�
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "ניתוח"
 
@@ -13771,12 +13772,12 @@ msgstr "פאסיבי"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13809,12 +13810,12 @@ msgid "Paste"
 msgstr "הדבקה"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr "הדבקת עמוד"
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr "הדבקת וידג׳ט"
 
@@ -13827,7 +13828,7 @@ msgstr "הדבקה ללא קישורים חיצוניים"
 msgid "Pattern"
 msgstr "תבנית"
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "השהיית פעולות לתקלות מוסתרות"
 
@@ -13870,8 +13871,8 @@ msgstr "ביצוע שאילתת DNS. מחזירה מחרוזת תווים עם �
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "תקופה"
@@ -13892,9 +13893,9 @@ msgid "Periods"
 msgstr "תקופות"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13905,7 +13906,7 @@ msgstr "תקופות"
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "ניתן להקצות הרשאות לקבוצות משתמשים בלבד."
 
@@ -13927,12 +13928,12 @@ msgstr "אלגוריתם הצבה"
 msgid "Plain text"
 msgstr "טקסט פשוט"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "ניגון"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "ניגון צליל"
 
@@ -13962,8 +13963,7 @@ msgstr "נא להפעיל את ההנחיה „allow_url_fopen” (לאפשר פ
 msgid "Please select two elements"
 msgstr "נא לבחור בשני רכיבים"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13973,14 +13973,15 @@ msgstr "נא לבחור בשני רכיבים"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "גודל נקודה"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "נקודות"
 
@@ -13988,7 +13989,7 @@ msgstr "נקודות"
 msgid "Polish (pl_PL)"
 msgstr "פולנית (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "ממלא שדה במאגר המארח"
 
@@ -14050,16 +14051,16 @@ msgstr "פונקציות חיזוי"
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "עיבוד טרומי"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "שלבי עיבוד טרומי"
 
@@ -14156,8 +14157,8 @@ msgstr "פרטי"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "קובץ מפתח פרטי"
 
@@ -14187,7 +14188,7 @@ msgstr "רמת ההרשאות"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "תקלה"
 
@@ -14376,16 +14377,16 @@ msgstr "ציבורי"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "מפתח ציבורי"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "קובץ מפתח ציבורי"
 
@@ -14399,8 +14400,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "שדות תשאול"
 
@@ -14450,8 +14451,8 @@ msgstr "RMCP+‎"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "נתונים גולמיים"
 
@@ -14477,14 +14478,14 @@ msgstr "קריאה בלבד"
 msgid "Read-only"
 msgstr "קריאה-בלבד"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr "גישה לקריאה בלבד מהשירותים"
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr "גישה לקריאה בלבד מהשירותים עם תגית"
@@ -14498,14 +14499,14 @@ msgstr "גישה לקריאה בלבד מהשירותים עם תגית"
 msgid "Read-write"
 msgstr "קריאה-כתיבה"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr "גישה לקריאה-כתיבה לשירותים"
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr "גישה לקריאה-כתיבה לשירותים עם תגית"
@@ -14551,7 +14552,7 @@ msgstr "נמענים"
 msgid "Recordset ID"
 msgstr "מזהה סדרת רשומות"
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14560,10 +14561,10 @@ msgid "Recovery"
 msgstr "שחזור"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "ביטוי שחזור"
@@ -14573,7 +14574,7 @@ msgstr "ביטוי שחזור"
 msgid "Recovery expression syntax error."
 msgstr "שגיאה בתחביר ביטוי השחזור."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "פעולות שחזור"
 
@@ -14585,8 +14586,8 @@ msgstr "פעולות שחזור"
 msgid "Recovery time"
 msgstr "מועד השחזור"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "מרובע"
 
@@ -14692,7 +14693,7 @@ msgstr "פקודה מרוחקת"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14723,13 +14724,13 @@ msgstr "פקודה מרוחקת"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14737,25 +14738,25 @@ msgstr "פקודה מרוחקת"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14783,14 +14784,14 @@ msgstr "פקודה מרוחקת"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14865,10 +14866,10 @@ msgstr "חוזרת"
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "החלפה"
 
@@ -14886,7 +14887,7 @@ msgstr "החלפה"
 msgid "Report \"%1$s\" already exists."
 msgstr "הדוח „%1$s” כבר קיים."
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr "דוח שנוצר על ידי משתמשים אחרים ישתנה למשתמש הנוכחי."
 
@@ -14925,15 +14926,15 @@ msgstr "דוחות"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "גוף בקשה"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "סוג גוף הבקשה"
 
@@ -14942,8 +14943,8 @@ msgid "Request sent successfully"
 msgstr "הבקשה נשלחה בהצלחה"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "סוג בקשה"
 
@@ -14970,8 +14971,8 @@ msgstr "דרישות שרת נדרשות, ערכים חדשים לשנייה"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "קודים נדרשים למצב"
 
@@ -14984,11 +14985,11 @@ msgstr "מחרוזת נדרשת"
 msgid "Reset"
 msgstr "איפוס"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "לאפס את כל השדות לערכי בררת המחדל?"
 
@@ -15005,11 +15006,11 @@ msgstr "אישור איפוס"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "איפוס לבררות המחדל"
 
@@ -15113,8 +15114,8 @@ msgstr "חלה תוצאה עם מפת ערכים"
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "מצב קבלה"
 
@@ -15187,9 +15188,9 @@ msgstr "מחזירה אחוזים של מנות נתונים מסוג ping ב־I
 msgid "Revert changes"
 msgstr "החזרת השינויים"
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15197,7 +15198,7 @@ msgstr "החזרת השינויים"
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "ימין"
@@ -15213,8 +15214,8 @@ msgstr "Y ימין"
 msgid "Right trim"
 msgstr "צמצום מימין"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr "תפקיד"
 
@@ -15404,8 +15405,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "OID של SNMP"
 
@@ -15484,8 +15485,8 @@ msgstr "ספירת SQL:‏ %1$s (בחירות: %2$s | הפעלות: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "שאילתת SQL"
 
@@ -15510,38 +15511,38 @@ msgstr "סוכן SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "קובץ אישור SSL"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "קובץ מפתח SSL"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "ססמת מפתח SSL"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "אימות מארח SSL"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "אימות עמית עם SSL"
 
@@ -15660,9 +15661,9 @@ msgstr "דוחות מתוזמנים"
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15687,8 +15688,8 @@ msgstr "היקף"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "סקריפט"
 
@@ -15820,10 +15821,10 @@ msgstr "שם אבטחה"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "בחירה"
@@ -15833,9 +15834,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "בחירת אבטיפוס"
 
@@ -15856,7 +15857,7 @@ msgstr "הפעולה הנבחרת נמחקה"
 msgid "Selected and all other problems of related triggers"
 msgstr "התקלות הנבחרות וכל השאר של ההקפצות הקשורות"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "רכיבים שנבחרו"
 
@@ -16205,8 +16206,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "דרגת החומרה הוגברה"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "צורה"
@@ -16309,7 +16310,7 @@ msgstr "הצגת סרגל צד"
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16409,8 +16410,8 @@ msgstr "תרשים פשוט"
 msgid "Simple graph prototype"
 msgstr "אבטיפוס תרשים פשוט"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "בודדת"
 
@@ -16455,7 +16456,7 @@ msgstr "מדינה / מחוז של האתר"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "גודל"
 
@@ -16566,9 +16567,9 @@ msgstr "מהירות"
 msgid "Stacked"
 msgstr "בערימה"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "גרם מדרגות"
 
@@ -16589,7 +16590,7 @@ msgstr "התחלה"
 msgid "Start date"
 msgstr "תאריך התחלה"
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "התחלה בעוד"
 
@@ -16784,14 +16785,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "מהלך עם השם „%1$s” כבר קיים."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "שלבים"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "עצירה"
 
@@ -16814,10 +16815,10 @@ msgstr "נעצר"
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr "תקופת אחסון"
 
@@ -17053,8 +17054,8 @@ msgstr "עדיפות הצגת תגיות"
 msgid "Tag filter"
 msgstr "מסנן תגיות"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "תגית להתאמה"
 
@@ -17113,28 +17114,28 @@ msgstr "ערך תגית"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "תגיות"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "יעד"
@@ -17295,14 +17296,14 @@ msgstr "תבניות עודכנו"
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "בדיקה"
@@ -17360,10 +17361,10 @@ msgstr "הנבדק"
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "טקסט"
 
@@ -17516,8 +17517,8 @@ msgstr "החודש"
 msgid "This month so far"
 msgstr "החודש הזה עד כה"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr "סוג המידע הזה כנראה שלא תואם למפתח."
 
@@ -17621,9 +17622,9 @@ msgstr "תקופת זמן"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "היסט זמן"
 
@@ -17641,8 +17642,8 @@ msgstr "אזור זמן"
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "תום הזמן"
 
@@ -17668,7 +17669,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "עד"
 
@@ -17692,7 +17693,7 @@ msgstr "היום עד כה"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "למעלה"
@@ -17744,8 +17745,7 @@ msgstr "התמרת תוצאת שאילתת SQL לכדי מערך JSON לטובת
 msgid "Transform SQL query result into a JSON array."
 msgstr "התמרת תוצאת שאילתת SQL לכדי מערך JSON."
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17756,7 +17756,8 @@ msgstr "התמרת תוצאת שאילתת SQL לכדי מערך JSON."
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "שקיפות"
 
@@ -17764,9 +17765,9 @@ msgstr "שקיפות"
 msgid "Transport error."
 msgstr "שגיאת העברה."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "להתייחס כ־0"
@@ -17778,8 +17779,8 @@ msgstr "סטטיסטיקת זיכרון מטמון פונקציית מגמה. ה
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "תקופת אחסון מגמות"
 
@@ -17797,9 +17798,9 @@ msgstr "מגמות"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "הקפצה"
@@ -17901,7 +17902,7 @@ msgstr "סקירת הקפצה"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "אבטיפוס הקפצה"
@@ -17967,7 +17968,7 @@ msgstr "אבות טיפוס של הקפצות נמחקו"
 msgid "Trigger prototypes updated"
 msgstr "אבות טיפוס של הקפצות עודכנו"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "חומרת הקפצה"
 
@@ -18074,23 +18075,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "סוג"
@@ -18099,12 +18100,12 @@ msgstr "סוג"
 msgid "Type (Full details)"
 msgstr "סוג (פרטים מלאים)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "סוג (תקין)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18115,10 +18116,10 @@ msgstr "סוג חישוב"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "סוג מידע"
 
@@ -18142,11 +18143,11 @@ msgstr "לא ידוע"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "כתובת"
@@ -18167,7 +18168,7 @@ msgstr "כתובת ב׳"
 msgid "URL C"
 msgstr "כתובת ג׳"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "הכתובת אינה מוצפנת כראוי."
@@ -18192,7 +18193,7 @@ msgstr "שם פרמטר הכתובת ריק."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "כתובות"
@@ -18295,15 +18296,15 @@ msgstr "תגובה לא צפויה לפעולה %1$s."
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr "שגיאת שרת לא צפויה."
 
@@ -18312,8 +18313,8 @@ msgstr "שגיאת שרת לא צפויה."
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "יחידות"
 
@@ -18339,7 +18340,7 @@ msgstr "יחידות"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "לא ידוע"
@@ -18482,12 +18483,12 @@ msgstr "פעיל"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18507,18 +18508,18 @@ msgstr "פעיל"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18539,13 +18540,13 @@ msgstr "עדכון קיימים"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "תדירות עדכון"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "עדכון פעולות"
 
@@ -18684,7 +18685,7 @@ msgstr "מחרוזת סוכן משתמש"
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "המשתמש לא יכול להוסיף את עצמו לקבוצת משתמשים מושבתת או לקבוצה שהגישה שלה למנשק המשתמש הושבתה."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr "המשתמש לא יכול לשנות את התפקיד של עצמו."
@@ -18796,10 +18797,10 @@ msgstr "תפריט משתמש"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "שם משתמש"
 
@@ -18867,7 +18868,7 @@ msgstr "הגדרות משתמש"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "לשיתוף משתמשים חסרים משתנים: %1$s עבור המפה „%2$s”."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19244,12 +19245,12 @@ msgstr "אימות"
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19311,8 +19312,8 @@ msgstr "מפת הערכים „%1$s“ כבר קיימת."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "מיפוי ערכים"
@@ -19429,8 +19430,8 @@ msgstr "גרסת שרת ה־Zabbix או המתווך"
 msgid "Vertical"
 msgstr "אנכי"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "יישור אנכי"
 
@@ -19633,8 +19634,7 @@ msgstr "הווידג׳ט בנקודה X:%3$d,‏ Y:%4$d בעמוד מס׳ %2$d �
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "הווידג׳ט קטן לעומת גודל העמודות והשורות שצוין."
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19645,12 +19645,13 @@ msgstr "הווידג׳ט קטן לעומת גודל העמודות והשורו�
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19726,8 +19727,8 @@ msgstr "שדות שגויים עבור קישור המפה."
 msgid "Wrong value for \"url\" field."
 msgstr "ערך שגוי לשדה „url” (כתובת)."
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19739,11 +19740,11 @@ msgstr "ציר X"
 msgid "X-Frame-Options HTTP header"
 msgstr "כותרת ה־HTTP ‏X-Frame-Options"
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19757,8 +19758,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "נתוני XML"
 
@@ -19778,12 +19779,12 @@ msgstr "XML ל־JSON"
 msgid "XPath"
 msgstr "XPath"
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "ערך מרבי של ציר ה־Y"
 
@@ -19797,18 +19798,18 @@ msgstr "הערך המרבי של ציר ה־Y חייב להיות גדול מה�
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "הערך המרבי של ציר ה־Y חייב להיות גדול מהערך המזערי של ציר ה־Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "ערך מזערי של ציר ה־Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "צד ציר ה־Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "ציר Y"
 
@@ -19828,11 +19829,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr "Y-n-d"
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20866,10 +20867,10 @@ msgstr "fuzzytime()‎ - ההפרש בין ערך פריט (בתור חותמת
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr "אמורות נקודות ציון גאוגרפיות (ערכים של קווי רוחב ואורך מופרדים בפסיקים)"
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "הגדרות תחזוקה כלליות"
@@ -20898,8 +20899,8 @@ msgstr "מארח"
 msgid "host group"
 msgstr "קבוצת מארחים"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "תבנית מארח"
@@ -20932,7 +20933,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr "in()‎ - בודקת אם ערך שווה לאחד מהערכים המוגדרים (1 - שווה, 0 - אחרת)"
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "כולל תת־קבוצות"
 
@@ -21106,8 +21107,8 @@ msgstr "פריט"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr "הפריט „%1$s” במארח „%2$s” אינו במעקב"
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "תבנית פריט"
 
@@ -21371,10 +21372,10 @@ msgstr "n-d H:i"
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "שם"
@@ -21421,7 +21422,7 @@ msgstr "אין הרשאות לבטל הכרה בתקלות"
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr "nodata()‎ - לא התקבלו נתונים בפרק זמן T (1 - אמת, 0 - שקר), מצב (קפדני - התעלמות מעיכוב בזמן מהמתווך בשליחת נתונים)"
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "ללא"
 
@@ -21451,7 +21452,7 @@ msgstr "מספר"
 msgid "of"
 msgstr "מתוך"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21474,7 +21475,7 @@ msgstr "מתוך"
 msgid "off"
 msgstr "כבוי"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21646,8 +21647,8 @@ msgstr "שנ׳"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr "סקריפט"
@@ -21784,8 +21785,8 @@ msgstr "פרטי הגישה שסופקו אינם יחודיים"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22072,17 +22073,17 @@ msgstr "אמור להיות מזהה באותיות גדולות"
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/hu/LC_MESSAGES/frontend.po b/ui/locale/hu/LC_MESSAGES/frontend.po
index f4a97d20273..5f9373efef6 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -335,7 +335,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 másodperc"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D nézet"
 
@@ -381,7 +381,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -471,27 +471,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Hozzáférés megtagadva!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -563,35 +563,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -720,24 +720,24 @@ msgstr "Aktív eddig"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -773,13 +773,13 @@ msgstr "Aktív eddig"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -797,38 +797,38 @@ msgstr "Aktív eddig"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -855,7 +855,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -885,16 +885,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Prototípus hozzáadása"
 
@@ -941,7 +941,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1029,7 +1029,7 @@ msgstr "Ügynök interface"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1037,11 +1037,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1068,8 +1068,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1085,8 +1085,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1102,13 +1102,13 @@ msgstr ""
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1129,19 +1129,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Engedélyezett hosztok"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1158,21 +1158,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1186,7 +1186,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1231,11 +1231,11 @@ msgstr "Alkalmazás hiba."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Alkalmaz"
@@ -1363,11 +1363,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1461,8 +1461,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Autentikációs mód"
 
@@ -1524,8 +1524,8 @@ msgstr "Automatikus"
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr ""
 
@@ -1592,12 +1592,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Háttér"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1605,9 +1605,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Háttérkép"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1615,8 +1615,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1659,15 +1659,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1678,8 +1678,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Vastag vonal"
 
@@ -1687,19 +1687,19 @@ msgstr "Vastag vonal"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1712,7 +1712,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Alúl"
@@ -1795,7 +1795,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Kalkulált"
 
@@ -1819,22 +1819,22 @@ msgstr "Visszahívás"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3429,8 +3429,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Betű"
 
@@ -3458,7 +3458,7 @@ msgstr ""
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr ""
 
@@ -3579,8 +3579,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr ""
 
@@ -3608,22 +3608,22 @@ msgstr "Óra"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Klón"
@@ -3631,28 +3631,28 @@ msgstr "Klón"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Bezár"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3666,7 +3666,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3680,11 +3680,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3693,7 +3693,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3781,9 +3781,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Feltételek"
@@ -3968,13 +3968,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Kapcsolódva"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4066,8 +4066,8 @@ msgstr "Kapcsolat"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4147,13 +4147,13 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr ""
 
@@ -4170,7 +4170,7 @@ msgstr "Másolás"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4309,10 +4309,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4516,7 +4516,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4530,8 +4530,8 @@ msgstr "Egyéni grafikonok"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4697,8 +4697,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Szaggatott vonal"
 
@@ -4716,7 +4716,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Adat áttekintés"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4900,11 +4900,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -4946,7 +4946,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr ""
 
@@ -4980,7 +4980,7 @@ msgstr "Késleltetve"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4989,7 +4989,7 @@ msgstr "Késleltetve"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4997,47 +4997,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Törlés"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Törlés ÉS kiürítés"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Figyelmeztetés: Ez a művelet törli a kijelölt mintákat és eltávolítja az érintett elemeket az összes csatolt hosztról"
 
@@ -5045,11 +5045,11 @@ msgstr "Figyelmeztetés: Ez a művelet törli a kijelölt mintákat és eltávol
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5062,10 +5062,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Törli a kifejezést?"
 
@@ -5089,11 +5089,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr ""
 
@@ -5135,11 +5135,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5198,7 +5198,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr "Törli a kiválasztott hosztokat?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Törli a kijelölt hosztokat?"
 
@@ -5206,11 +5206,11 @@ msgstr "Törli a kijelölt hosztokat?"
 msgid "Delete selected image?"
 msgstr "Kijelölt kép törlése?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Kijelölt elemek törlése?"
 
@@ -5226,7 +5226,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr "Törli a kjelölt térképeket?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr ""
 
@@ -5258,11 +5258,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Törli a kiválasztott szkripteket?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5270,19 +5270,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Törli a kijelölt mintákat?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Törli a kijelölt triggereket?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Törli a kiválasztott felhasználót?"
 
@@ -5298,11 +5298,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Törli a kiválasztott triggert?"
 
@@ -5328,7 +5328,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Elválasztó"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5343,10 +5343,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr ""
 
@@ -5383,7 +5383,7 @@ msgstr ""
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5393,13 +5393,13 @@ msgstr ""
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Leírás"
@@ -5409,10 +5409,10 @@ msgstr "Leírás"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Részletek"
@@ -5453,7 +5453,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5504,11 +5504,11 @@ msgstr "Letiltja a hosztokat a kiválasztott proxykon?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5537,7 +5537,7 @@ msgstr "Letiltja a kijelölt hosztokat?"
 msgid "Disable selected items?"
 msgstr "Kijelölt elemek tiltása?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr ""
 
@@ -5571,7 +5571,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5599,7 +5599,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Letiltva"
 
@@ -5625,9 +5625,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5823,7 +5823,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5831,13 +5831,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5861,15 +5861,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5883,8 +5883,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5894,8 +5894,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5905,8 +5905,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5914,8 +5914,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Pontozott vonal"
 
@@ -5944,16 +5944,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "Kiesés"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Rajz stílusa"
 
@@ -6004,7 +6004,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Időtartam"
 
@@ -6027,29 +6027,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Szerkesztés"
@@ -6103,12 +6103,12 @@ msgstr ""
 msgid "Element"
 msgstr "Elem"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Elem név"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6164,7 +6164,7 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6244,11 +6244,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6278,7 +6278,7 @@ msgstr ""
 msgid "Enable selected items?"
 msgstr "Kijelölt elemek engedélyezése?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr ""
 
@@ -6300,8 +6300,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6323,7 +6323,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6339,7 +6339,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6353,14 +6353,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Engedélyezve"
 
@@ -6413,8 +6413,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6592,7 +6592,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6613,8 +6613,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Végrehajtott szkript"
 
@@ -6628,13 +6628,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6704,15 +6704,15 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6725,10 +6725,10 @@ msgstr "Kifejezés"
 msgid "Expression cannot be empty"
 msgstr "A kifejezés nem lehet üres"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr ""
 
@@ -6796,7 +6796,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6930,8 +6930,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6942,7 +6941,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7039,7 +7039,7 @@ msgid "Fit to map"
 msgstr ""
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fix"
 
@@ -7051,9 +7051,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7061,22 +7061,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7084,8 +7084,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr ""
 
@@ -7121,7 +7121,7 @@ msgstr "Péntek"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "-tól"
 
@@ -7136,7 +7136,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7152,7 +7152,7 @@ msgid "Full clone"
 msgstr "Teljes klón"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funkció"
 
@@ -7570,8 +7570,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr ""
 
@@ -7582,8 +7582,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7620,10 +7620,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7639,7 +7639,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7745,7 +7745,7 @@ msgid "History cleared"
 msgstr "Előzmények törölve"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Az előzmények törlése hosszabb időt vehet igénybe. Folytatja?"
 
@@ -7760,8 +7760,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7778,8 +7778,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Vízszintes igazítás"
 
@@ -7898,7 +7898,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7984,9 +7984,9 @@ msgstr "Hoszt csoportok"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr ""
 
@@ -8274,8 +8274,8 @@ msgstr ""
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI szenzor"
 
@@ -8289,19 +8289,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ikon"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ikon (alapértelmezett)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ikon (letiltva)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ikon (karbantartás)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ikon (hiba)"
 
@@ -8348,7 +8348,7 @@ msgstr ""
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr ""
 
@@ -8492,7 +8492,7 @@ msgstr "Képek"
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Azonnal"
 
@@ -8576,6 +8576,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9460,10 +9461,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr ""
@@ -9530,8 +9531,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9647,9 +9648,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Intervallum"
@@ -10086,7 +10087,7 @@ msgstr "Olasz (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Elem"
 
@@ -10349,8 +10350,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10368,8 +10369,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10408,8 +10409,8 @@ msgstr "Japán (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10448,9 +10449,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Kulcs"
@@ -10516,13 +10517,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Cimke"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Cimke elhelyezkedése"
 
@@ -10669,9 +10670,9 @@ msgstr "Litván (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10682,7 +10683,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Balra"
@@ -10715,25 +10716,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Keresési/Szűrési limit"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Vonal"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10755,9 +10756,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Kapcsolatjelzők"
 
@@ -10788,8 +10789,8 @@ msgstr "Csatolt minták"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10891,8 +10892,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Napló"
 
@@ -10905,8 +10906,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Napló időformátuma"
 
@@ -11032,7 +11033,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Karbantartás"
 
@@ -11192,7 +11193,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11270,19 +11271,19 @@ msgstr ""
 msgid "Mass update"
 msgstr "Tömeges frissítés"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11366,8 +11367,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Eszköztípus"
 
@@ -11491,8 +11492,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr ""
 
@@ -11510,7 +11511,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr ""
 
@@ -11609,11 +11610,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11781,8 +11782,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11948,7 +11949,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11968,15 +11969,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11985,16 +11986,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12274,7 +12275,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12330,8 +12331,8 @@ msgstr "Nincs kép"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12635,7 +12636,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12681,8 +12682,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12690,17 +12691,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Nincs"
@@ -12796,7 +12797,7 @@ msgstr "Értesítési riportok"
 msgid "Notifications"
 msgstr "Értesítések"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12970,8 +12971,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numerikus (lebegőpontos)"
 
@@ -12981,8 +12982,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numerikus (pozitív egész)"
 
@@ -12990,8 +12991,8 @@ msgstr "Numerikus (pozitív egész)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13003,13 +13004,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13070,7 +13071,7 @@ msgstr "KIKAPCSOL"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13099,7 +13100,7 @@ msgstr "BEKAPCSOL"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr ""
 
@@ -13220,11 +13221,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Műveletek"
@@ -13270,7 +13271,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13285,11 +13286,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13384,8 +13385,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13602,8 +13603,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "HIBA"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13685,8 +13686,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13734,8 +13735,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13766,12 +13767,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13804,12 +13805,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13822,7 +13823,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13865,8 +13866,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Időszak"
@@ -13887,9 +13888,9 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13900,7 +13901,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13922,12 +13923,12 @@ msgstr ""
 msgid "Plain text"
 msgstr "Szöveg"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr ""
 
@@ -13957,8 +13958,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13968,14 +13968,15 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13983,7 +13984,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Lengyel (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -14045,16 +14046,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14151,8 +14152,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Privát kulcsfájl"
 
@@ -14182,7 +14183,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Hiba"
 
@@ -14371,16 +14372,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Publikus kulcs"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Publikus kulcsfájl"
 
@@ -14394,8 +14395,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14445,8 +14446,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14472,14 +14473,14 @@ msgstr "Csak olvasható"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14493,14 +14494,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Írható-olvasható"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14546,7 +14547,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14555,10 +14556,10 @@ msgid "Recovery"
 msgstr ""
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14568,7 +14569,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14580,8 +14581,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14688,7 +14689,7 @@ msgstr "Távoli parancs"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14719,13 +14720,13 @@ msgstr "Távoli parancs"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14733,25 +14734,25 @@ msgstr "Távoli parancs"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14779,14 +14780,14 @@ msgstr "Távoli parancs"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14861,10 +14862,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Csere"
 
@@ -14882,7 +14883,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14921,15 +14922,15 @@ msgstr "Jelentések"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14938,8 +14939,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14966,8 +14967,8 @@ msgstr "Szükséges szerver teljesítmény (másodpercenkénti mérések száma)
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr ""
 
@@ -14980,11 +14981,11 @@ msgstr ""
 msgid "Reset"
 msgstr "Visszaállítás"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -15001,11 +15002,11 @@ msgstr ""
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr ""
 
@@ -15109,8 +15110,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15183,9 +15184,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15193,7 +15194,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Jobbra"
@@ -15209,8 +15210,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15400,8 +15401,8 @@ msgstr ""
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15480,8 +15481,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15506,38 +15507,38 @@ msgstr "SSH agent"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15656,9 +15657,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15683,8 +15684,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15816,10 +15817,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Kiválaszt"
@@ -15829,9 +15830,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15852,7 +15853,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr ""
 
@@ -16202,8 +16203,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16306,7 +16307,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16406,8 +16407,8 @@ msgstr "Egyszerű grafikon"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16452,7 +16453,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16563,9 +16564,9 @@ msgstr "Sebesség"
 msgid "Stacked"
 msgstr "Rögzített"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16586,7 +16587,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16781,14 +16782,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Lépések száma"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr ""
 
@@ -16811,10 +16812,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17050,8 +17051,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17110,28 +17111,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Cél"
@@ -17292,14 +17293,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Teszt"
@@ -17357,10 +17358,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Szöveg"
 
@@ -17513,8 +17514,8 @@ msgstr "Ebben a hónapban"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17618,9 +17619,9 @@ msgstr "Idő periódus"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17638,8 +17639,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Időtúllépés"
 
@@ -17665,7 +17666,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr ""
 
@@ -17689,7 +17690,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Felül"
@@ -17741,8 +17742,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17753,7 +17753,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17761,9 +17762,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17775,8 +17776,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17794,9 +17795,9 @@ msgstr "Trendek"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigger"
@@ -17898,7 +17899,7 @@ msgstr "Trigger áttekintés"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr ""
@@ -17964,7 +17965,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Trigger súlyosság"
 
@@ -18071,23 +18072,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Típus"
@@ -18096,12 +18097,12 @@ msgstr "Típus"
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Típus (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18112,10 +18113,10 @@ msgstr "Számítás tipusa"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Információ típusa"
 
@@ -18139,11 +18140,11 @@ msgstr "ISMERETLEN"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18164,7 +18165,7 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18189,7 +18190,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr ""
@@ -18292,15 +18293,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18309,8 +18310,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Egységek"
 
@@ -18336,7 +18337,7 @@ msgstr "Egységek"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -18479,12 +18480,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18504,18 +18505,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18536,13 +18537,13 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Frissítési gyakoriság"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18681,7 +18682,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18793,10 +18794,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Felhasználónév"
 
@@ -18864,7 +18865,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19241,12 +19242,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19308,8 +19309,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Érték-hozzárendelés"
@@ -19426,8 +19427,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Függőleges igazítás"
 
@@ -19630,8 +19631,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19642,12 +19642,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19723,8 +19724,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19736,11 +19737,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19754,8 +19755,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19775,12 +19776,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Y tengely MAX érték"
 
@@ -19794,18 +19795,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Y tengely MIN érték"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Y tengely elhelyezkedése"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19825,11 +19826,11 @@ msgstr ""
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20860,10 +20861,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20892,8 +20893,8 @@ msgstr ""
 msgid "host group"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20926,7 +20927,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21100,8 +21101,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21365,10 +21366,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21415,7 +21416,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21445,7 +21446,7 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21468,7 +21469,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21640,8 +21641,8 @@ msgstr "mp"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21778,8 +21779,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22066,17 +22067,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/id/LC_MESSAGES/frontend.po b/ui/locale/id/LC_MESSAGES/frontend.po
index 2045f37429e..a41e943230b 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2013-10-10 08:26+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -171,10 +171,10 @@ msgid "%1$s message"
 msgid_plural "%1$s messages"
 msgstr[0] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -214,9 +214,9 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] ""
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -317,7 +317,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 detik"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "Tampilan 3D"
 
@@ -363,7 +363,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -450,27 +450,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Akses ditolak!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -542,35 +542,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -697,24 +697,24 @@ msgstr "Aktif sampai"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -750,13 +750,13 @@ msgstr "Aktif sampai"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -774,38 +774,38 @@ msgstr "Aktif sampai"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -832,7 +832,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -853,7 +853,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -862,16 +862,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -881,7 +881,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Tambah bentuk dasar"
 
@@ -918,7 +918,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1006,7 +1006,7 @@ msgstr "Agen interfaces"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1014,11 +1014,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1045,8 +1045,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1062,8 +1062,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1079,13 +1079,13 @@ msgstr "Semua tautan harus memiliki \"Nama\" dan \"URL\""
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1106,19 +1106,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Host yang diizinkan"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1135,21 +1135,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1163,7 +1163,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1208,11 +1208,11 @@ msgstr "Aplikasi bermasalah."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Terapkan"
@@ -1340,11 +1340,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1438,8 +1438,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Metode otentikasi"
 
@@ -1501,8 +1501,8 @@ msgstr "Otomatis"
 msgid "Automatic icon mapping"
 msgstr "Pemetaan ikon otomatis"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Pemilihan ikon otomatis"
 
@@ -1569,12 +1569,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Latar belakang"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1582,9 +1582,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Gambar latar belakang"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1592,8 +1592,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1636,15 +1636,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1655,8 +1655,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Garis tebal"
 
@@ -1664,19 +1664,19 @@ msgstr "Garis tebal"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1689,7 +1689,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Bawah"
@@ -1772,7 +1772,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Dihitung"
 
@@ -1796,22 +1796,22 @@ msgstr "Callback"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3353,8 +3353,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Karakter"
 
@@ -3382,7 +3382,7 @@ msgstr "Kerangka"
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Pemeriksaan sudah ada."
 
@@ -3503,8 +3503,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Bersihkan riwayat dan tren"
 
@@ -3532,22 +3532,22 @@ msgstr "Jam"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Klon"
@@ -3555,28 +3555,28 @@ msgstr "Klon"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Tutup"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Tutup pembangun ekspresi"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3590,7 +3590,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3604,11 +3604,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3617,7 +3617,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3705,9 +3705,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Kondisi"
@@ -3892,13 +3892,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Hubungkan ke"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -3990,8 +3990,8 @@ msgstr "Kontak"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4071,13 +4071,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Nomor kontrak"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Koordinat"
 
@@ -4094,7 +4094,7 @@ msgstr "Salin"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4230,10 +4230,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4437,7 +4437,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4451,8 +4451,8 @@ msgstr "Custom grafik"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4617,8 +4617,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Garis putus-putus"
 
@@ -4636,7 +4636,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Rangkuman data"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4820,11 +4820,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Standar"
 
@@ -4866,7 +4866,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Standar durasi langkah operasi"
 
@@ -4900,7 +4900,7 @@ msgstr "Delay oleh"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4909,7 +4909,7 @@ msgstr "Delay oleh"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4917,47 +4917,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Hapus"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Hapus dan bersihkan"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang terhubung akan dibersihkan!)"
 
@@ -4965,11 +4965,11 @@ msgstr "Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Hapus dan bersihkan template? (Peringatan: semua host yang terhubung akan dibersihkan!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Hapus aksi yang berlaku?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -4982,10 +4982,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "Hapus aturan discovery?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Hapus ekspresi?"
 
@@ -5009,11 +5009,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr "Hapus peta ikon?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Hapus item?"
 
@@ -5055,11 +5055,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5118,7 +5118,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr "Hapus host yang dipilih?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Hapus host yang dipilih?"
 
@@ -5126,11 +5126,11 @@ msgstr "Hapus host yang dipilih?"
 msgid "Delete selected image?"
 msgstr "Hapus gambar yang dipilih?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Hapus item yang dipilih?"
 
@@ -5146,7 +5146,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr "Hapus peta yang dipilih?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Hapus tipe media yang dipilih?"
 
@@ -5178,11 +5178,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Hapus skrip yang dipilih?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5190,19 +5190,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Hapus template yang dipilih?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Hapus trigger yang dipilih?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Hapus user yang dipilih?"
 
@@ -5218,11 +5218,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr "Hapus template?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Hapus trigger?"
 
@@ -5248,7 +5248,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Pembatas"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5263,10 +5263,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Dependensi"
 
@@ -5303,7 +5303,7 @@ msgstr "Status deployment"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5313,13 +5313,13 @@ msgstr "Status deployment"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Deskripsi"
@@ -5329,10 +5329,10 @@ msgstr "Deskripsi"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detail"
@@ -5373,7 +5373,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5424,11 +5424,11 @@ msgstr "Non-aktifkan host yang dimonitor dengan proxy yang terpilih?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5457,7 +5457,7 @@ msgstr "Non-aktifkan host yang dipilih?"
 msgid "Disable selected items?"
 msgstr "Non-aktifkan item yang dipilih?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Non-aktifkan tipe media yang dipilih?"
 
@@ -5491,7 +5491,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5519,7 +5519,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Non-aktifkan"
 
@@ -5545,9 +5545,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5740,7 +5740,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr "Tampilkan trigger OK untuk"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5748,13 +5748,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5778,15 +5778,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5800,8 +5800,8 @@ msgstr "Apakah Anda ingin mengganti ekspresi kondisional?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5811,8 +5811,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5822,8 +5822,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5831,8 +5831,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Titik"
 
@@ -5861,16 +5861,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "Downtime"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Menggambar gaya"
 
@@ -5921,7 +5921,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Durasi"
 
@@ -5944,29 +5944,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Ubah"
@@ -6020,12 +6020,12 @@ msgstr ""
 msgid "Element"
 msgstr "Elemen"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Nama elemen"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6081,7 +6081,7 @@ msgstr "Masukan parameter kosong."
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6161,11 +6161,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6195,7 +6195,7 @@ msgstr "Aktifkan host yang dipilih?"
 msgid "Enable selected items?"
 msgstr "Aktifkan item yang dipilih?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Aktifkan tipe media yang dipilih?"
 
@@ -6217,8 +6217,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6240,7 +6240,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6256,7 +6256,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6270,14 +6270,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Aktif"
 
@@ -6330,8 +6330,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6508,7 +6508,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6529,8 +6529,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Skrip yang dijalankan"
 
@@ -6544,13 +6544,13 @@ msgstr "Konfirmasi eksekusi"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6620,15 +6620,15 @@ msgstr "Ekspor ke CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6641,10 +6641,10 @@ msgstr "Ekspresi"
 msgid "Expression cannot be empty"
 msgstr "Ekspresi tidak boleh kosong"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Pembangun ekspresi"
 
@@ -6712,7 +6712,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6846,8 +6846,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6858,7 +6857,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -6955,7 +6955,7 @@ msgid "Fit to map"
 msgstr "Paskan pada peta"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Tetap"
 
@@ -6967,9 +6967,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -6977,22 +6977,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7000,8 +7000,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Rumus"
 
@@ -7037,7 +7037,7 @@ msgstr "Jumat"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Dari"
 
@@ -7052,7 +7052,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Akses frontend"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Sistem pesan frontend"
 
@@ -7068,7 +7068,7 @@ msgid "Full clone"
 msgstr "Full clone"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Fungsi"
 
@@ -7484,8 +7484,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Otentikasi HTTP"
 
@@ -7496,8 +7496,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7534,10 +7534,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7553,7 +7553,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7659,7 +7659,7 @@ msgid "History cleared"
 msgstr "Riwayat dibersihkan"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Pembersihan riwayat akan memakan waktu lama. Lanjutkan?"
 
@@ -7674,8 +7674,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7692,8 +7692,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Luruskan horisontal"
 
@@ -7809,7 +7809,7 @@ msgstr[0] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7895,9 +7895,9 @@ msgstr "Grup host"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Antarmuka host"
 
@@ -8184,8 +8184,8 @@ msgstr "Interface IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "Sensor IPMI"
 
@@ -8199,19 +8199,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ikon"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ikon (default)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ikon (non-aktif)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ikon (pemeliharaan)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ikon (masalah)"
 
@@ -8258,7 +8258,7 @@ msgstr "Pemetaan ikon"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Ikon"
 
@@ -8400,7 +8400,7 @@ msgstr "Gambar"
 msgid "Images for all maps will be updated!"
 msgstr "Gambar untuk semua peta akan diperbarui!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Segera"
 
@@ -8484,6 +8484,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9368,10 +9369,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9438,8 +9439,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Sisipkan"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9555,9 +9556,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Interval"
@@ -9994,7 +9995,7 @@ msgstr "Italian (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Item"
 
@@ -10253,8 +10254,8 @@ msgstr "Agen JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10272,8 +10273,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10312,8 +10313,8 @@ msgstr "Japanese (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10352,9 +10353,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Kunci"
@@ -10420,13 +10421,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Label"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Label lokasi"
 
@@ -10567,9 +10568,9 @@ msgstr "Latvian (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10580,7 +10581,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Kiri"
@@ -10613,25 +10614,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Cari/Filter batas elemen"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Garis"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10653,9 +10654,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Indikator tautan"
 
@@ -10686,8 +10687,8 @@ msgstr "Template terhubung"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10789,8 +10790,8 @@ msgstr "Longitude lokasi"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -10803,8 +10804,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Log format waktu"
 
@@ -10930,7 +10931,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Pemeliharaan"
 
@@ -11090,7 +11091,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11168,19 +11169,19 @@ msgstr ""
 msgid "Mass update"
 msgstr "Perbarui secara masal"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Perbarui elemen secara masal"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11263,8 +11264,8 @@ msgid "May"
 msgstr "Mei"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11387,8 +11388,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Habis waktu pesan"
 
@@ -11406,7 +11407,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Pesan"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Pesan"
 
@@ -11504,11 +11505,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr "Hilangnya field \"nama\" untuk grafik."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11672,8 +11673,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11839,7 +11840,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11859,15 +11860,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11876,16 +11877,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12165,7 +12166,7 @@ msgstr "Tidak ada detail"
 msgid "No discovery rule IDs given."
 msgstr "Tidak ada aturan ID yang diberikan pada discovery."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12221,8 +12222,8 @@ msgstr "Tidak ada gambar"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Tidak ada interface yang ditemukan"
 
@@ -12526,7 +12527,7 @@ msgstr "Tidak file kunci publik yang dispesifikasikan."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12572,8 +12573,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12581,17 +12582,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Tidak ada"
@@ -12687,7 +12688,7 @@ msgstr "Laporan notifikasi"
 msgid "Notifications"
 msgstr "Notifikasi"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12861,8 +12862,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numerik (float)"
 
@@ -12872,8 +12873,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numerik (unsigned)"
 
@@ -12881,8 +12882,8 @@ msgstr "Numerik (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12894,13 +12895,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -12961,7 +12962,7 @@ msgstr "Mati"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -12990,7 +12991,7 @@ msgstr "Nyala"
 msgid "On status change triggers blink for"
 msgstr "Pada perubahan status trigger berkedip untuk"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Sekali"
 
@@ -13110,11 +13111,11 @@ msgstr "Operasi tidak memiliki template untuk beroperasi."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operasi"
@@ -13160,7 +13161,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13175,11 +13176,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13274,8 +13275,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13492,8 +13493,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "MASALAH"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13575,8 +13576,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13624,8 +13625,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13656,12 +13657,12 @@ msgstr "Pasif"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13694,12 +13695,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13712,7 +13713,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13755,8 +13756,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Periode"
@@ -13777,9 +13778,9 @@ msgid "Periods"
 msgstr "Periode"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13790,7 +13791,7 @@ msgstr "Periode"
 msgid "Permissions"
 msgstr "Izin"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Perizinan dapat diberikan hanya untuk grup user."
 
@@ -13812,12 +13813,12 @@ msgstr "Menempatkan algoritma"
 msgid "Plain text"
 msgstr "Plain text"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Mainkan"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Mainkan suara"
 
@@ -13847,8 +13848,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Silahkan pilih dua elemen"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13858,14 +13858,15 @@ msgstr "Silahkan pilih dua elemen"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13873,7 +13874,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Polish (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Mengisi field inventaris host"
 
@@ -13935,16 +13936,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14041,8 +14042,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "File kunci pribadi"
 
@@ -14072,7 +14073,7 @@ msgstr "Tingkatan hak"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Masalah"
 
@@ -14260,16 +14261,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Kunci publik"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "File kunci publik"
 
@@ -14283,8 +14284,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14334,8 +14335,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14361,14 +14362,14 @@ msgstr "Hanya baca"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14382,14 +14383,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Baca-tulis"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14435,7 +14436,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14444,10 +14445,10 @@ msgid "Recovery"
 msgstr "Pemulihan"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14457,7 +14458,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14469,8 +14470,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14575,7 +14576,7 @@ msgstr "Perintah jarak jauh"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14606,13 +14607,13 @@ msgstr "Perintah jarak jauh"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14620,25 +14621,25 @@ msgstr "Perintah jarak jauh"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14666,14 +14667,14 @@ msgstr "Perintah jarak jauh"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14748,10 +14749,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Gantikan"
 
@@ -14769,7 +14770,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14808,15 +14809,15 @@ msgstr "Laporan"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14825,8 +14826,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14853,8 +14854,8 @@ msgstr "Dibutuhkan performa server, nilai baru per detik"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Dibutuhkan kode status"
 
@@ -14867,11 +14868,11 @@ msgstr "Dibutuhkan string"
 msgid "Reset"
 msgstr "Reset"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Reset semua field ke nilai standar?"
 
@@ -14888,11 +14889,11 @@ msgstr "Konfirmasi reset"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Reset standar"
 
@@ -14996,8 +14997,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15070,9 +15071,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15080,7 +15081,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Kanan"
@@ -15096,8 +15097,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15284,8 +15285,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "OID SNMP"
 
@@ -15364,8 +15365,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15390,38 +15391,38 @@ msgstr "Agen SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15537,9 +15538,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15564,8 +15565,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Skrip"
 
@@ -15696,10 +15697,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Pilih"
@@ -15709,9 +15710,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Pilih prototipe"
 
@@ -15732,7 +15733,7 @@ msgstr "Aksi yang dipilih dihapus"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Elemen yang dipilih"
 
@@ -16081,8 +16082,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16185,7 +16186,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16285,8 +16286,8 @@ msgstr "Grafik sederhana"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16331,7 +16332,7 @@ msgstr "Provinsi situs"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16442,9 +16443,9 @@ msgstr "Kecepatan"
 msgid "Stacked"
 msgstr "Ditumpuk"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16465,7 +16466,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Memulai"
 
@@ -16660,14 +16661,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Langkah"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Berhenti"
 
@@ -16690,10 +16691,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -16929,8 +16930,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -16989,28 +16990,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Sasaran"
@@ -17171,14 +17172,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Tes"
@@ -17236,10 +17237,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Teks"
 
@@ -17390,8 +17391,8 @@ msgstr "Bulan ini"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17495,9 +17496,9 @@ msgstr "Periode waktu"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Waktu pergeseran"
 
@@ -17515,8 +17516,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Batas waktu"
 
@@ -17542,7 +17543,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Ke"
 
@@ -17566,7 +17567,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Atas"
@@ -17618,8 +17619,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17630,7 +17630,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17638,9 +17639,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Trasnport error."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17652,8 +17653,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17671,9 +17672,9 @@ msgstr "Tren"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigger"
@@ -17772,7 +17773,7 @@ msgstr "Rangkuman trigger"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Prototipe trigger"
@@ -17837,7 +17838,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Trigger keparahan"
 
@@ -17944,23 +17945,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Tipe"
@@ -17969,12 +17970,12 @@ msgstr "Tipe"
 msgid "Type (Full details)"
 msgstr "Tipe (Detail lengkap)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Tipe (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -17985,10 +17986,10 @@ msgstr "Tipe kalkulasi"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Tipe informasi"
 
@@ -18012,11 +18013,11 @@ msgstr "TIDAK DIKENAL"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18037,7 +18038,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18062,7 +18063,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URL"
@@ -18165,15 +18166,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18182,8 +18183,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Unit"
 
@@ -18209,7 +18210,7 @@ msgstr "Unit"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Tidak dikenal"
@@ -18351,12 +18352,12 @@ msgstr "Nyala"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18376,18 +18377,18 @@ msgstr "Nyala"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18408,13 +18409,13 @@ msgstr "Perbaru yang ada"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Perbaru interval"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18553,7 +18554,7 @@ msgstr ""
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18662,10 +18663,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Nama user"
 
@@ -18732,7 +18733,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19108,12 +19109,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19175,8 +19176,8 @@ msgstr "Peta nilai \"%1$s\" sudah ada."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Pemetaan nilai"
@@ -19293,8 +19294,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Meluruskan vertikal"
 
@@ -19495,8 +19496,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19507,12 +19507,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19588,8 +19589,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19601,11 +19602,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19619,8 +19620,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19640,12 +19641,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Nilai Y axis MAX"
 
@@ -19659,18 +19660,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Nilai Y axis MAX harus lebih besar dari nilai Y axis MIN."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Nilai Y axis MIN"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Sisi Y axis"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19690,11 +19691,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20725,10 +20726,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20757,8 +20758,8 @@ msgstr "host"
 msgid "host group"
 msgstr "grup host"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20791,7 +20792,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -20965,8 +20966,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21230,10 +21231,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21280,7 +21281,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21310,7 +21311,7 @@ msgstr ""
 msgid "of"
 msgstr "dari"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21333,7 +21334,7 @@ msgstr "dari"
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21505,8 +21506,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21643,8 +21644,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -21931,17 +21932,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/it/LC_MESSAGES/frontend.po b/ui/locale/it/LC_MESSAGES/frontend.po
index 8cadb2d635a..dbcf35b5fea 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] "%1$s messaggio"
 msgstr[1] "%1$s messaggi"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s tentativo disponibile"
 msgstr[1] "%1$s tentativi disponibili"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -335,7 +335,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 secondi"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "vista 3D"
 
@@ -381,7 +381,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "AGGIUNGI OVERRIDE"
 
@@ -471,27 +471,27 @@ msgstr "Accesso negato"
 msgid "Access denied!"
 msgstr "Accesso negato!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -563,35 +563,35 @@ msgstr "Acknowledged RESOLVED events"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -720,24 +720,24 @@ msgstr "Attivo fino a"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -773,13 +773,13 @@ msgstr "Attivo fino a"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -797,38 +797,38 @@ msgstr "Attivo fino a"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -855,7 +855,7 @@ msgstr "Aggiungi elemento child"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Aggiungi mappe multiple"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -885,16 +885,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Aggiungi prototipo"
 
@@ -941,7 +941,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1029,7 +1029,7 @@ msgstr "Interfacce agente"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1037,11 +1037,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1068,8 +1068,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1085,8 +1085,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Tutti i gruppi"
 
@@ -1102,13 +1102,13 @@ msgstr "Tutti i collegamenti devono avere \"Nome\" e \"URL\" definiti"
 msgid "All maps"
 msgstr "Tutte le mappe"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Tutti i problemi"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Tutti i problemi se il valore del tag trova riscontro"
 
@@ -1129,19 +1129,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Consenti chiusura manuale"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Host consentiti"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1158,21 +1158,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "And"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1186,7 +1186,7 @@ msgstr "And"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "And/Or"
 
@@ -1231,11 +1231,11 @@ msgstr "Errore dell'applicazione."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Applica"
@@ -1363,11 +1363,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1461,8 +1461,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
@@ -1524,8 +1524,8 @@ msgstr "Automatico"
 msgid "Automatic icon mapping"
 msgstr "Mappatura icone automatica"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Selezione automatica icona"
 
@@ -1592,12 +1592,12 @@ msgstr "Indietro"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Sfondo"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1605,9 +1605,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Immagine di sfondo"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1615,8 +1615,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "DN base"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1659,15 +1659,15 @@ msgstr "Blu"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1678,8 +1678,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Linea in grassetto"
 
@@ -1687,19 +1687,19 @@ msgstr "Linea in grassetto"
 msgid "Boolean to decimal"
 msgstr "Boolean a decimale"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Bordo"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Tipo bordo"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Spessore bordo"
 
@@ -1712,7 +1712,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "In basso"
@@ -1795,7 +1795,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Calculated"
 
@@ -1819,22 +1819,22 @@ msgstr "Callback"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3428,8 +3428,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Carattere"
 
@@ -3457,7 +3457,7 @@ msgstr "Chassis"
 msgid "Chassis information. Returns string"
 msgstr "Informazioni chassis. Restituisce stringa"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Il controllo esiste già."
 
@@ -3578,8 +3578,8 @@ msgid "Clear history"
 msgstr "Cancella storico"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Pulisci storico e trend"
 
@@ -3607,22 +3607,22 @@ msgstr "Orologio"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Clona"
@@ -3630,28 +3630,28 @@ msgstr "Clona"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Chiudi"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Chiudi costruttore di espressioni"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Chiudi nuovo evento"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Chiudi vecchi eventi"
@@ -3665,7 +3665,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Espandi"
@@ -3679,11 +3679,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3692,7 +3692,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3780,9 +3780,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Condizioni"
@@ -3967,13 +3967,13 @@ msgstr "Complimenti! Hai installato con successo il frontend di Zabbix."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Connetti tramite"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4065,8 +4065,8 @@ msgstr "Contatto"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4146,13 +4146,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Numero contratto"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Coordinate"
 
@@ -4169,7 +4169,7 @@ msgstr "Copia"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Correlazione"
 
@@ -4309,10 +4309,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4516,7 +4516,7 @@ msgid "Custom"
 msgstr "Personalizzato"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4530,8 +4530,8 @@ msgstr "Grafici personalizzati"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Intervalli personalizzati"
 
@@ -4697,8 +4697,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Linea tratteggiata"
 
@@ -4716,7 +4716,7 @@ msgstr "Dati non codificati correttamente."
 msgid "Data overview"
 msgstr "Panoramica dei dati"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4900,11 +4900,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Default"
 
@@ -4946,7 +4946,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Durata predefinita step dell'operazione"
 
@@ -4980,7 +4980,7 @@ msgstr "Ritardato di"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4989,7 +4989,7 @@ msgstr "Ritardato di"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4997,47 +4997,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Rimuovi"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Rimuovi e pulisci"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Rimuovere e pulire template selezionati? (Attenzione: tutti gli host collegati saranno puliti!)Rimuovere e pulire template selezionati? (Attenzione: tutti gli host collegati saranno puliti!)"
 
@@ -5045,11 +5045,11 @@ msgstr "Rimuovere e pulire template selezionati? (Attenzione: tutti gli host col
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Rimuovere e pulire il template? (Attenzione: tutti gli host collegati saranno puliti!)Rimuovere e pulire il template? (Attenzione: tutti gli host collegati saranno puliti!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Rimuovere azione corrente?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Cancella attuale correlazione?"
 
@@ -5062,10 +5062,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "Rimuovere regola di discovery?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Rimuovere espressione?"
 
@@ -5089,11 +5089,11 @@ msgstr "Cancella la history dello scenario web selezionato?"
 msgid "Delete icon map?"
 msgstr "Rimuovere mappa di icone?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Cancella item prototipo?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Rimuovere item?"
 
@@ -5135,11 +5135,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5198,7 +5198,7 @@ msgstr "Rimuovere prototipi host selezionati?"
 msgid "Delete selected host?"
 msgstr "Rimuovi host selezionato?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Rimuovere gli host selezionati?"
 
@@ -5206,11 +5206,11 @@ msgstr "Rimuovere gli host selezionati?"
 msgid "Delete selected image?"
 msgstr "Rimuovere l'immagine selezionata?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Cancella item prototipo selezionati?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Rimuovere item selezionati?"
 
@@ -5226,7 +5226,7 @@ msgstr "Cancellare la mappa selezionata?"
 msgid "Delete selected maps?"
 msgstr "Rimuovere mappe selezionate?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Rimuovere tipi di supporto?"
 
@@ -5258,11 +5258,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Rimuovere script selezionati?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5270,19 +5270,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Elimina forme selezionate?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Rimuovere template selezionati?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Cancella trigger prototipo selezionati?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Rimuovere trigger selezionati?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Rimuovere utente selezionato?"
 
@@ -5298,11 +5298,11 @@ msgstr "Cancella scenario web selezionato?"
 msgid "Delete template?"
 msgstr "Rimuovere template?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Cancella trigger prototipo?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Rimuovere trigger?"
 
@@ -5328,7 +5328,7 @@ msgstr "Rimosso: Prototipo host \"%1$s\" su \"%2$s\"."
 msgid "Delimiter"
 msgstr "Separatore"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5343,10 +5343,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Dipendenze"
 
@@ -5383,7 +5383,7 @@ msgstr "Stato di deploy"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5393,13 +5393,13 @@ msgstr "Stato di deploy"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Descrizione"
@@ -5409,10 +5409,10 @@ msgstr "Descrizione"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Dettagli"
@@ -5453,7 +5453,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5504,11 +5504,11 @@ msgstr "Disabilitare host monitorati dai proxy selezionati?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5537,7 +5537,7 @@ msgstr "Disabilitare host selezionati?"
 msgid "Disable selected items?"
 msgstr "Disabilitare item selezionati?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Disabilitare tipi di supporto selezionati?"
 
@@ -5571,7 +5571,7 @@ msgstr "Disabilitare scenario web selezionato?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5599,7 +5599,7 @@ msgstr "Disabilitare scenario web selezionato?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Disabilitato"
 
@@ -5625,9 +5625,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5823,7 +5823,7 @@ msgstr "Statistiche di scrittura su disco. Restituisce intero per informazioni d
 msgid "Display OK triggers for"
 msgstr "Mostra trigger OK per"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Mostra grafico"
 
@@ -5831,13 +5831,13 @@ msgstr "Mostra grafico"
 msgid "Display problems"
 msgstr "Mostra problemi"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Mostra grafico stacked"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5861,15 +5861,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5883,8 +5883,8 @@ msgstr "Desideri sostituire l'espressione condizionale?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5894,8 +5894,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5905,8 +5905,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5914,8 +5914,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Punto"
 
@@ -5944,16 +5944,16 @@ msgstr "Scarica il file di configurazione"
 msgid "Downtime"
 msgstr "Tempo di inattività"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Stile disegno"
 
@@ -6004,7 +6004,7 @@ msgstr "Userid duplicato \"%1$s\" sugli utenti per la mappa \"%2$s\"."
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Durata"
 
@@ -6027,29 +6027,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Modifica"
@@ -6103,12 +6103,12 @@ msgstr ""
 msgid "Element"
 msgstr "Elemento"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Nome elemento"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Ellisse"
 
@@ -6164,7 +6164,7 @@ msgstr "Parametro di input vuoto."
 msgid "Empty map ID."
 msgstr "ID mappa assente."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6244,11 +6244,11 @@ msgstr "Abilita housekeeping interno"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6278,7 +6278,7 @@ msgstr "Abilitare host selezionati?"
 msgid "Enable selected items?"
 msgstr "Abilitare item selezionati?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Abilitare tipi di supporto selezionati?"
 
@@ -6300,8 +6300,8 @@ msgstr "Abilitare scenari web selezionati?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6323,7 +6323,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6339,7 +6339,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6353,14 +6353,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Abilitato"
 
@@ -6413,8 +6413,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6592,7 +6592,7 @@ msgstr "Esegue query WMI e restituisce il primo oggetto selezionato. Restituisce
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6613,8 +6613,8 @@ msgstr "Eseguito"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Script eseguito"
 
@@ -6628,13 +6628,13 @@ msgstr "Conferma esecuzione"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Espandi"
@@ -6704,15 +6704,15 @@ msgstr "Esporta in CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6725,10 +6725,10 @@ msgstr "Espressione"
 msgid "Expression cannot be empty"
 msgstr "L'espressione non può esser vuota"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Costruttore di espressioni"
 
@@ -6796,7 +6796,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Impossibile analizzare l'URL."
@@ -6930,8 +6930,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "File time information. Restituisce intero (Unix timestamp)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6942,7 +6941,8 @@ msgstr "File time information. Restituisce intero (Unix timestamp)"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7039,7 +7039,7 @@ msgid "Fit to map"
 msgstr "Adatta alla mappa"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fisso"
 
@@ -7051,9 +7051,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7061,22 +7061,22 @@ msgstr "Flessibile"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Segui redirezioni"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Carattere"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Dimensione carattere"
 
@@ -7084,8 +7084,8 @@ msgstr "Dimensione carattere"
 msgid "Form data"
 msgstr "Modulo dati"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formula"
 
@@ -7121,7 +7121,7 @@ msgstr "Venerdì"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Da"
 
@@ -7136,7 +7136,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Accesso frontend"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Messaggi frontend"
 
@@ -7152,7 +7152,7 @@ msgid "Full clone"
 msgstr "Clona tutto"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funzione"
 
@@ -7569,8 +7569,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Autenticazione HTTP"
 
@@ -7581,8 +7581,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
@@ -7619,10 +7619,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Headers"
 
@@ -7638,7 +7638,7 @@ msgstr "Hebrew (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7744,7 +7744,7 @@ msgid "History cleared"
 msgstr "Storico pulito"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "La pulizia dello storico può durare a lungo. Continuare?"
 
@@ -7759,8 +7759,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Periodo storicizzazione History"
 
@@ -7777,8 +7777,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Allinea in orizzontale"
 
@@ -7897,7 +7897,7 @@ msgstr[1] "Host abilitati"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7983,9 +7983,9 @@ msgstr "Gruppo host"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Interfaccia host"
 
@@ -8273,8 +8273,8 @@ msgstr "Interfacce IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "Sensore IPMI"
 
@@ -8288,19 +8288,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Icona"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Icona (predefinita)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Icona (disabilitata)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Icona (manutenzione)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Icona (problema)"
 
@@ -8347,7 +8347,7 @@ msgstr "Mappatura icone"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "L'icona con ID \"%1$s\" non è disponibile."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Icone"
 
@@ -8491,7 +8491,7 @@ msgstr "Immagini"
 msgid "Images for all maps will be updated!"
 msgstr "Le immagini di tutte le mappe verranno aggiornate!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Immediatamente"
 
@@ -8575,6 +8575,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9459,10 +9460,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9529,8 +9530,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Inserisci"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Inserire espressione"
 
@@ -9646,9 +9647,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Intervallo"
@@ -10085,7 +10086,7 @@ msgstr "Italiano (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Item"
 
@@ -10348,8 +10349,8 @@ msgstr "Agente JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX endpoint"
 
@@ -10367,8 +10368,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10407,8 +10408,8 @@ msgstr "Giapponese (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10447,9 +10448,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Chiave"
@@ -10515,13 +10516,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Etichetta"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Posizione etichetta"
 
@@ -10668,9 +10669,9 @@ msgstr "Lettone (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10681,7 +10682,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Sinistra"
@@ -10714,25 +10715,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Limite Cerca/Filtra elementi"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Linea"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Tipo linea"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Spessore linea"
 
@@ -10754,9 +10755,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Indicatori collegamento"
 
@@ -10787,8 +10788,8 @@ msgstr "Template collegati"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Collegamenti"
 
@@ -10890,8 +10891,8 @@ msgstr "Longitudine della posizione"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -10904,8 +10905,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Log file monitoring. Restituisce log"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Formato orario log"
 
@@ -11031,7 +11032,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Manutenzione"
 
@@ -11191,7 +11192,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr "Proprietario mappa non puo' essere assente."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Condividi mappa"
 
@@ -11269,19 +11270,19 @@ msgstr "Maschera"
 msgid "Mass update"
 msgstr "Aggiornamento massivo"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Elementi per l'aggiornamento massivo"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Aggiornamento massivo forme"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11365,8 +11366,8 @@ msgid "May"
 msgstr "Maggio"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Supporti"
 
@@ -11490,8 +11491,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Timeout messaggio"
 
@@ -11509,7 +11510,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Messaggi"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Messaggi"
 
@@ -11608,11 +11609,11 @@ msgstr "Campo \"name\" mancante per il prototipo grafico."
 msgid "Missing \"name\" field for graph."
 msgstr "Campo \"nome\" mancante per il grafico."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11780,8 +11781,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Multiplo"
 
@@ -11947,7 +11948,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11967,15 +11968,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11984,16 +11985,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12273,7 +12274,7 @@ msgstr "Nessun dettaglio"
 msgid "No discovery rule IDs given."
 msgstr "Nessun ID regola di discovery fornito."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12329,8 +12330,8 @@ msgstr "Nessuna immagine"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Nessuna interfaccia trovata"
 
@@ -12634,7 +12635,7 @@ msgstr "Nessun file di chiave pubblica specificato."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12680,8 +12681,8 @@ msgstr "Flag non booleani sono deprecati."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12689,17 +12690,17 @@ msgstr "Flag non booleani sono deprecati."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Nessuno"
@@ -12795,7 +12796,7 @@ msgstr "Report notifiche"
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12969,8 +12970,8 @@ msgstr "Sistema numerico"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numerico (float)"
 
@@ -12980,8 +12981,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numerico (senza segno)"
 
@@ -12989,8 +12990,8 @@ msgstr "Numerico (senza segno)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13002,14 +13003,14 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "Chiudere eventi in OK"
 
 # Not so much clear
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "Generazione eventi OK"
 
@@ -13070,7 +13071,7 @@ msgstr "Off"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13099,7 +13100,7 @@ msgstr "On"
 msgid "On status change triggers blink for"
 msgstr "Al cambio di stato i trigger lampeggiano per"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Una volta"
 
@@ -13220,11 +13221,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operazioni"
@@ -13270,7 +13271,7 @@ msgstr "Opzioni"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13285,11 +13286,11 @@ msgstr "Opzioni"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Or"
 
@@ -13384,8 +13385,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Sovrascritto da"
@@ -13602,8 +13603,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLEMA"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "modalità di generazione eventi PROBLEM"
 
@@ -13685,8 +13686,8 @@ msgstr "Parametro \"%1$s\" e' deprecato."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parametri"
 
@@ -13734,8 +13735,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Analizzare"
 
@@ -13766,12 +13767,12 @@ msgstr "Passivo"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13804,12 +13805,12 @@ msgid "Paste"
 msgstr "Incolla"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13822,7 +13823,7 @@ msgstr "Incolla senza link esterni"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13865,8 +13866,8 @@ msgstr "Esegue una query DNS. Restituisce una stringa di caratteri con le inform
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Periodo"
@@ -13887,9 +13888,9 @@ msgid "Periods"
 msgstr "Periodi"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13900,7 +13901,7 @@ msgstr "Periodi"
 msgid "Permissions"
 msgstr "Permessi"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "I permessi possono esser assegnati solo per i gruppi utente."
 
@@ -13922,12 +13923,12 @@ msgstr "Algoritmo di posizionamento"
 msgid "Plain text"
 msgstr "Testo semplice"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Riproduci"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Riproduci suono"
 
@@ -13957,8 +13958,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Per favore seleziona due elementi"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13968,14 +13968,15 @@ msgstr "Per favore seleziona due elementi"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Punti"
 
@@ -13983,7 +13984,7 @@ msgstr "Punti"
 msgid "Polish (pl_PL)"
 msgstr "Polacco (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Popola campo inventario host"
 
@@ -14045,16 +14046,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Preprocesso"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Passo preprocesso"
 
@@ -14151,8 +14152,8 @@ msgstr "Privato"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "File chiave privata"
 
@@ -14182,7 +14183,7 @@ msgstr "Livello privilegi"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problema"
 
@@ -14371,16 +14372,16 @@ msgstr "Pubblico"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Chiave pubblica"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "File di chiave pubblica"
 
@@ -14394,8 +14395,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Campo query"
 
@@ -14445,8 +14446,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Raw data"
 
@@ -14472,14 +14473,14 @@ msgstr "Sola lettura"
 msgid "Read-only"
 msgstr "Sola-lettura"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14493,14 +14494,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Lettura-scrittura"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14546,7 +14547,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14555,10 +14556,10 @@ msgid "Recovery"
 msgstr "Ripristino"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Espressione di recovery"
@@ -14568,7 +14569,7 @@ msgstr "Espressione di recovery"
 msgid "Recovery expression syntax error."
 msgstr "Errore di sintassi sull'espressione di recovery."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Operazioni di recovery"
 
@@ -14580,8 +14581,8 @@ msgstr "Operazioni di recovery"
 msgid "Recovery time"
 msgstr "Periodo di recovery"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Rettangolo"
 
@@ -14687,7 +14688,7 @@ msgstr "Comando remoto"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14718,13 +14719,13 @@ msgstr "Comando remoto"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14732,25 +14733,25 @@ msgstr "Comando remoto"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14778,14 +14779,14 @@ msgstr "Comando remoto"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14860,10 +14861,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Sostituisci"
 
@@ -14881,7 +14882,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14920,15 +14921,15 @@ msgstr "Report"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14937,8 +14938,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14965,8 +14966,8 @@ msgstr "Stima performance server, nuovi valori per secondo"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Status Code atteso"
 
@@ -14979,11 +14980,11 @@ msgstr "Stringa attesa"
 msgid "Reset"
 msgstr "Azzera"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Ripristinare tutti i campi ai valori predefiniti?"
 
@@ -15000,11 +15001,11 @@ msgstr "Conferma ripristino"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Ripristina predefiniti"
 
@@ -15108,8 +15109,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15182,9 +15183,9 @@ msgstr "Restituisce la percentuale di pacchetti ICMP ping persi."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15192,7 +15193,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Destra"
@@ -15208,8 +15209,8 @@ msgstr ""
 msgid "Right trim"
 msgstr "Trim destro"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15399,8 +15400,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15479,8 +15480,8 @@ msgstr "SQL totale: %1$s (selezionati: %2$s | eseguiti: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Query SQL"
 
@@ -15505,38 +15506,38 @@ msgstr "Agente SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "File certificato SSL"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "File chiave SSL"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Password chiave SSL"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL verifica host"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL verifica peer"
 
@@ -15655,9 +15656,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15682,8 +15683,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15815,10 +15816,10 @@ msgstr "Nome di sicurezza"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Seleziona"
@@ -15828,9 +15829,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Seleziona prototipi"
 
@@ -15851,7 +15852,7 @@ msgstr "Azioni selezionate eliminate"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Elementi selezionati"
 
@@ -16201,8 +16202,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Forma"
@@ -16305,7 +16306,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16405,8 +16406,8 @@ msgstr "Grafico semplice"
 msgid "Simple graph prototype"
 msgstr "Prototipo grafico semplice"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Singolo"
 
@@ -16451,7 +16452,7 @@ msgstr "Stato / provincia sito"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Grandezza"
 
@@ -16562,9 +16563,9 @@ msgstr "Velocità"
 msgid "Stacked"
 msgstr "Sovrapposto"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16585,7 +16586,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Inizia in"
 
@@ -16780,14 +16781,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Il passo con nome \"%1$s\" esiste già."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Passi"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Ferma"
 
@@ -16810,10 +16811,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17049,8 +17050,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Tag per corrispondenza"
 
@@ -17109,28 +17110,28 @@ msgstr "Valore tag"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Tag"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Target"
@@ -17291,14 +17292,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17356,10 +17357,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Testo"
 
@@ -17512,8 +17513,8 @@ msgstr "Questo mese"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17617,9 +17618,9 @@ msgstr "Periodo di tempo"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Spostamento temporale"
 
@@ -17637,8 +17638,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Timeout"
 
@@ -17664,7 +17665,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "A"
 
@@ -17688,7 +17689,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "In alto"
@@ -17740,8 +17741,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17752,7 +17752,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17760,9 +17761,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Errore di trasporto."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17774,8 +17775,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Periodo storicizzazione Trend"
 
@@ -17793,9 +17794,9 @@ msgstr "Trend"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigger"
@@ -17897,7 +17898,7 @@ msgstr "Panoramica Trigger"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Prototipo trigger"
@@ -17963,7 +17964,7 @@ msgstr "Prototipo Trigger cancellato"
 msgid "Trigger prototypes updated"
 msgstr "Prototipi Trigger aggiornati"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Severity trigger"
 
@@ -18070,23 +18071,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Tipo"
@@ -18095,12 +18096,12 @@ msgstr "Tipo"
 msgid "Type (Full details)"
 msgstr "Tipo (dettagli completi)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Tipo (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18111,10 +18112,10 @@ msgstr "Tipo di calcolo"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Tipo di informazione"
 
@@ -18138,11 +18139,11 @@ msgstr "SCONOSCIUT0"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18163,7 +18164,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL non codificata correttamente."
@@ -18188,7 +18189,7 @@ msgstr "Il nome del parametro URL è vuoto."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18291,15 +18292,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18308,8 +18309,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Unità"
 
@@ -18335,7 +18336,7 @@ msgstr "Unità"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -18478,12 +18479,12 @@ msgstr "Su"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18503,18 +18504,18 @@ msgstr "Su"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18535,13 +18536,13 @@ msgstr "Aggiorna esistenti"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Intervallo di aggiornamento"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18680,7 +18681,7 @@ msgstr "Stringa user agent"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18792,10 +18793,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Nome utente"
 
@@ -18863,7 +18864,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Condivisioni utente assenza parametri: %1$s per la mappa \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19240,12 +19241,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19307,8 +19308,8 @@ msgstr "Mappa valori \"%1$s\" esiste già."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Mappatura valori"
@@ -19425,8 +19426,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Verticale"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Allineamento verticale"
 
@@ -19629,8 +19630,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19641,12 +19641,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19722,8 +19723,8 @@ msgstr "Campi errati per il collegamento mappa."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19735,11 +19736,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19753,8 +19754,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19774,12 +19775,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Valore MAX asse Y"
 
@@ -19793,18 +19794,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Il valore MAX dell'asse Y dev'esser più grande del valore MIN dell'asse Y.Il valore MAX dell'asse Y dev'esser più grande del valore MIN dell'asse Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Valore MIN asse Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Lato asse Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19824,11 +19825,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20859,10 +20860,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "Impostazioni di housekeeping globali"
@@ -20891,8 +20892,8 @@ msgstr "host"
 msgid "host group"
 msgstr "gruppo host"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20925,7 +20926,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "inclusione sottogruppi"
 
@@ -21099,8 +21100,8 @@ msgstr "item"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21364,10 +21365,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "nome"
@@ -21414,7 +21415,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21444,7 +21445,7 @@ msgstr "numero"
 msgid "of"
 msgstr "di"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21467,7 +21468,7 @@ msgstr "di"
 msgid "off"
 msgstr "off"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21639,8 +21640,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21777,8 +21778,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22065,17 +22066,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/ja/LC_MESSAGES/frontend.po b/ui/locale/ja/LC_MESSAGES/frontend.po
index 032c541a670..84d3e343ea6 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: 2022-01-07 19:57+0200\n"
-"PO-Revision-Date: 2021-12-14 11:32+0300\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
+"PO-Revision-Date: 2022-01-09 02:58+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: 1639474328.000000\n"
+"X-POOTLE-MTIME: 1641689929.000000\n"
 
 #: app/controllers/CControllerSlaReportList.php:181
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
@@ -172,10 +172,10 @@ msgid "%1$s message"
 msgid_plural "%1$s messages"
 msgstr[0] "メッセージ%1$s件"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -215,9 +215,9 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "リトライ残り%1$s回"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -311,14 +311,14 @@ msgstr "障害発生数上位100項目"
 
 #: app/views/popup.sla.edit.php:100 include/classes/helpers/CSlaHelper.php:243
 msgid "24x7"
-msgstr ""
+msgstr "24x7"
 
 #: app/views/administration.queue.overview.php:48
 #: app/views/administration.queue.overview.proxy.php:48
 msgid "30 seconds"
 msgstr "30秒"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D表示"
 
@@ -364,7 +364,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr "軽"
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "オーバーライドの追加"
 
@@ -451,27 +451,27 @@ msgstr "アクセスは拒否されました"
 msgid "Access denied!"
 msgstr "アクセスは拒否されました！"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr "APIへのアクセス"
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "UI要素へのアクセス"
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr "アクションへのアクセス"
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr "モジュールへのアクセス"
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr "サービスへのアクセス"
@@ -543,35 +543,35 @@ msgstr "確認済の解決済イベント"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -698,24 +698,24 @@ msgstr "設定有効期間の終了日時"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -751,13 +751,13 @@ msgstr "設定有効期間の終了日時"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -775,38 +775,38 @@ msgstr "設定有効期間の終了日時"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -833,7 +833,7 @@ msgstr "子の要素を追加"
 msgid "Add child service"
 msgstr "子サービスの追加"
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr "子サービスの追加"
 
@@ -854,7 +854,7 @@ msgstr "未設定時に追加"
 msgid "Add multiple maps"
 msgstr "複数のマップを追加"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "新しいデータセットの追加"
 
@@ -863,16 +863,16 @@ msgstr "新しいデータセットの追加"
 msgid "Add new interface"
 msgstr "新しいインターフェースの追加"
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "新しいオーバーライドの追加"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr "ページの追加"
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr "親サービスの追加"
 
@@ -882,7 +882,7 @@ msgstr "障害対応メッセージの追加"
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "プロトタイプを追加"
 
@@ -919,7 +919,7 @@ msgid "Add user group"
 msgstr "ユーザーグループを追加"
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "ウィジェットの追加"
@@ -1007,7 +1007,7 @@ msgstr "エージェントのインターフェース"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr "エージェント種別チェック。返却値は1 - Zabbixエージェント；2 - Zabbixエージェント2"
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr "アグリゲート"
 
@@ -1015,11 +1015,11 @@ msgstr "アグリゲート"
 msgid "Aggregate functions"
 msgstr "集計関数"
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr "アグリゲーション関数"
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr "アグリゲーション間隔"
 
@@ -1046,8 +1046,8 @@ msgstr "グリッドに揃える"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1063,8 +1063,8 @@ msgid "All dashboards"
 msgstr "すべてのダッシュボード"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "すべてのグループ"
 
@@ -1080,13 +1080,13 @@ msgstr "すべてのリンクに\"名前\"と\"URL\"を設定する必要があ�
 msgid "All maps"
 msgstr "すべてのマップ"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "すべての障害"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "タグの値が一致したすべての障害"
 
@@ -1107,19 +1107,19 @@ msgid "Allow list"
 msgstr "許可リスト"
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "手動クローズを許可"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "許可されたホスト"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr "許可されたメソッド"
 
@@ -1136,21 +1136,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr "ゲストの物理メモリページをバックアップするために消費されたホストの物理メモリ量、<url> - VMwareサービスURL、<uuid> - VMware仮想マシンのホスト名"
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "And"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1164,13 +1164,13 @@ msgstr "And"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "And/Or"
 
 #: app/views/popup.sla.edit.php:78 include/classes/helpers/CSlaHelper.php:43
 msgid "Annually"
-msgstr ""
+msgstr "毎年"
 
 #: app/partials/monitoring.host.filter.php:127
 #: app/views/administration.mediatype.list.php:55
@@ -1209,11 +1209,11 @@ msgstr "アプリケーションエラー。"
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "適用"
@@ -1324,7 +1324,7 @@ msgstr "少なくとも1人の有効なユーザーを役割\"%1$s\"と共に指
 
 #: include/classes/api/services/CMaintenance.php:683
 msgid "At least one day of the week or day of the month must be specified."
-msgstr ""
+msgstr "少なくとも1つの曜日または日付を指定してください。"
 
 #: include/classes/api/services/CMaintenance.php:382
 #: include/classes/api/services/CMaintenance.php:574
@@ -1341,11 +1341,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr "少なくとも1つ以上の実行内容が選択されている必要があります。"
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "少なくとも1つ以上の実行内容が設定されている必要があります。"
 
@@ -1439,8 +1439,8 @@ msgstr "認証に失敗しました：%1$s。"
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "認証方式"
 
@@ -1502,8 +1502,8 @@ msgstr "自動"
 msgid "Automatic icon mapping"
 msgstr "アイコンの自動マッピング"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "アイコンの自動選択"
 
@@ -1570,12 +1570,12 @@ msgstr "戻る"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "背景"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr "背景色"
 
@@ -1583,9 +1583,9 @@ msgstr "背景色"
 msgid "Background image"
 msgstr "背景のイメージ"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr "棒"
 
@@ -1593,8 +1593,8 @@ msgstr "棒"
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr "基本色"
 
@@ -1637,15 +1637,15 @@ msgstr "Blue"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "ボディ"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "ボディとヘッダー"
 
@@ -1656,8 +1656,8 @@ msgstr "ボディとヘッダー"
 msgid "Bold"
 msgstr "太字"
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "太線"
 
@@ -1665,19 +1665,19 @@ msgstr "太線"
 msgid "Boolean to decimal"
 msgstr "論理値から10進数"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "境界"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr "境界色"
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "境界タイプ"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "境界幅"
 
@@ -1690,7 +1690,7 @@ msgstr "両方のパスワードが一致している必要があります。"
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "下"
@@ -1773,7 +1773,7 @@ msgid "CUID is expected"
 msgstr "CUIDで指定してください"
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "計算"
 
@@ -1797,22 +1797,22 @@ msgstr "コールバック"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -2130,7 +2130,7 @@ msgstr[0] "APIトークンを削除できません"
 #: app/controllers/CControllerSlaDelete.php:79
 msgid "Cannot delete SLA"
 msgid_plural "Cannot delete SLAs"
-msgstr[0] ""
+msgstr[0] "SLAを削除できません"
 
 #: include/classes/api/services/CUser.php:1257
 #, c-format
@@ -2395,7 +2395,7 @@ msgstr[0] "APIトークンを無効にできません"
 #: app/controllers/CControllerSlaDisable.php:88
 msgid "Cannot disable SLA"
 msgid_plural "Cannot disable SLAs"
-msgstr[0] ""
+msgstr[0] "SLAを無効にできません"
 
 #: actionconf.php:499
 msgid "Cannot disable action"
@@ -2467,7 +2467,7 @@ msgstr[0] "APIトークンを有効にできません"
 #: app/controllers/CControllerSlaEnable.php:88
 msgid "Cannot enable SLA"
 msgid_plural "Cannot enable SLAs"
-msgstr[0] ""
+msgstr[0] "SLAを有効にできません"
 
 #: actionconf.php:498
 msgid "Cannot enable action"
@@ -2705,44 +2705,44 @@ msgstr "トリガー\"%3$s\"の条件式によってテンプレート\"%1$s\"�
 #: include/classes/api/services/CHostBase.php:520
 #, c-format
 msgid "Cannot link template \"%1$s\" to host \"%2$s\" due to its parent template \"%3$s\" will be linked twice."
-msgstr ""
+msgstr "親テンプレート\"%3$s\"が2回リンクされるためテンプレート\"%1$s\"をホスト\"%2$s\"にリンクできません。"
 
 #: include/classes/api/services/CHostBase.php:675
 #: include/classes/api/services/CHostBase.php:752
 #, c-format
 msgid "Cannot link template \"%1$s\" to host prototype \"%2$s\" due to dependency of trigger \"%3$s\"."
-msgstr ""
+msgstr "トリガー\"%3$s\"の依存関係によってテンプレート\"%1$s\"をホストプロトタイプ\"%2$s\"にリンクできません。"
 
 #: include/classes/api/services/CHostBase.php:802
 #, c-format
 msgid "Cannot link template \"%1$s\" to host prototype \"%2$s\" due to expression of trigger \"%3$s\"."
-msgstr ""
+msgstr "トリガー\"%3$s\"の条件式によってテンプレート\"%1$s\"をホストプロトタイプ\"%2$s\"にリンクできません。"
 
 #: include/classes/api/services/CHostBase.php:517
 #, c-format
 msgid "Cannot link template \"%1$s\" to host prototype \"%2$s\" due to its parent template \"%3$s\" will be linked twice."
-msgstr ""
+msgstr "親テンプレート\"%3$s\"が2回リンクされるためテンプレート\"%1$s\"をホストプロトタイプ\"%2$s\"にリンクできません。"
 
 #: include/classes/api/services/CHostBase.php:381
 #, c-format
 msgid "Cannot link template \"%1$s\" to template \"%2$s\" due to circular linkage (%3$s) will occurs."
-msgstr ""
+msgstr "循環リンク(%3$s)が発生するためテンプレート\"%1$s\"をテンプレート\"%2$s\"にリンクできません。"
 
 #: include/classes/api/services/CHostBase.php:672
 #: include/classes/api/services/CHostBase.php:749
 #, c-format
 msgid "Cannot link template \"%1$s\" to template \"%2$s\" due to dependency of trigger \"%3$s\"."
-msgstr ""
+msgstr "トリガー\"%3$s\"の依存関係によってテンプレート\"%1$s\"をテンプレート\"%2$s\"にリンクできません。"
 
 #: include/classes/api/services/CHostBase.php:799
 #, c-format
 msgid "Cannot link template \"%1$s\" to template \"%2$s\" due to expression of trigger \"%3$s\"."
-msgstr ""
+msgstr "トリガー\"%3$s\"の条件式によってテンプレート\"%1$s\"をテンプレート\"%2$s\"にリンクできません。"
 
 #: include/classes/api/services/CHostBase.php:514
 #, c-format
 msgid "Cannot link template \"%1$s\" to template \"%2$s\" due to its parent template \"%3$s\" will be linked twice."
-msgstr ""
+msgstr "親テンプレート\"%3$s\"が2回リンクされるためテンプレート\"%1$s\"をテンプレート\"%2$s\"にリンクできません。"
 
 #: include/classes/api/services/CHostBase.php:705
 #, c-format
@@ -3349,8 +3349,8 @@ msgstr "形式の変更"
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "文字列"
 
@@ -3378,7 +3378,7 @@ msgstr "シャーシ"
 msgid "Chassis information. Returns string"
 msgstr "シャーシ情報。文字列値を返す。"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "すでに存在します。"
 
@@ -3499,8 +3499,8 @@ msgid "Clear history"
 msgstr "ヒストリを削除"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "ヒストリとトレンドを削除"
 
@@ -3528,22 +3528,22 @@ msgstr "時刻"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "複製"
@@ -3551,28 +3551,28 @@ msgstr "複製"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "閉じる"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "条件式ビルダーを閉じる"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "新しいイベントのクローズ"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "古いイベントのクローズ"
@@ -3586,7 +3586,7 @@ msgid "Close problems"
 msgstr "障害のクローズ"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "縮小"
@@ -3600,11 +3600,11 @@ msgstr "サイドバーの縮小"
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr "色"
 
@@ -3613,7 +3613,7 @@ msgstr "色"
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr "色\"%1$s\"の設定が正しくありません: 16進数のカラーコードを指定してください(6桁)。"
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr "色(正常)"
 
@@ -3701,9 +3701,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr "\"%1$s\"を上書きするための式\"%3$s\"内の条件\"%2$s\"は定義されていません。"
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "実行条件"
@@ -3888,13 +3888,13 @@ msgstr "おめでとうございます！Webインターフェースのインス
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "接続方法"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "接続する"
@@ -3997,8 +3997,8 @@ msgstr "連絡先"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4078,13 +4078,13 @@ msgstr "上書きを続行"
 msgid "Contract number"
 msgstr "契約番号"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "JSONへの変換"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "座標"
 
@@ -4101,7 +4101,7 @@ msgstr "コピー"
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "相関関係"
 
@@ -4175,7 +4175,7 @@ msgstr "APIトークンの作成"
 
 #: app/views/sla.list.php:188
 msgid "Create SLA"
-msgstr ""
+msgstr "SLAの作成"
 
 #: include/views/configuration.action.list.php:61
 msgid "Create action"
@@ -4237,10 +4237,10 @@ msgstr "ディスカバリルールの作成(先にテンプレートを選択)"
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4444,7 +4444,7 @@ msgid "Custom"
 msgstr "カスタム"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4458,8 +4458,8 @@ msgstr "カスタムグラフ"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "監視間隔のカスタマイズ"
 
@@ -4489,7 +4489,7 @@ msgstr "失敗時のカスタマイズ"
 
 #: include/classes/helpers/CSlaHelper.php:247
 msgid "Custom schedule"
-msgstr ""
+msgstr "スケジュールのカスタマイズ"
 
 #: include/items.inc.php:1860
 msgid "Custom scripts"
@@ -4624,8 +4624,8 @@ msgstr "ID\"%1$s\"のダッシュボードは使用できません。"
 msgid "Dashboards"
 msgstr "ダッシュボード"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "破線"
 
@@ -4643,7 +4643,7 @@ msgstr "データが正しくエンコードされていません。"
 msgid "Data overview"
 msgstr "データの概要"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4784,7 +4784,7 @@ msgstr "日"
 
 #: include/classes/api/services/CMaintenance.php:689
 msgid "Day of the week and day of the month cannot be specified simultaneously."
-msgstr ""
+msgstr "曜日と日付を同時に指定できません。"
 
 #: app/views/popup.maintenance.period.php:96
 #: app/views/popup.maintenance.period.php:115
@@ -4827,11 +4827,11 @@ msgstr "深刻度を減らす"
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "標準"
 
@@ -4873,7 +4873,7 @@ msgstr "デフォルトのログイン画面"
 msgid "Default media type"
 msgstr "デフォルトのメディア"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "デフォルトのアクション実行ステップの間隔"
 
@@ -4907,7 +4907,7 @@ msgstr "遅延時間"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4916,7 +4916,7 @@ msgstr "遅延時間"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4924,47 +4924,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "削除"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr "インポートするファイル内に存在しないすべての要素を削除しますか？"
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "削除とクリア"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "選択したテンプレートとデータを削除しますか？(警告: リンクしているすべてのホストからデータが削除されます！)"
 
@@ -4972,11 +4972,11 @@ msgstr "選択したテンプレートとデータを削除しますか？(警�
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "テンプレートとデータを削除しますか？(警告: リンクしているすべてのホストからデータが削除されます！)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "現在のアクションを削除しますか？"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "現在の相関関係を削除しますか？"
 
@@ -4989,10 +4989,10 @@ msgstr "ダッシュボードを削除しますか？"
 msgid "Delete discovery rule?"
 msgstr "ディスカバリルールを削除しますか？"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "条件式を削除しますか？"
 
@@ -5016,11 +5016,11 @@ msgstr "選択したWebシナリオのヒストリを削除しますか？"
 msgid "Delete icon map?"
 msgstr "アイコンのマッピングを削除しますか？"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "アイテムのプロトタイプを削除しますか？"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "アイテムを削除しますか？"
 
@@ -5062,13 +5062,13 @@ msgstr "選択したAPIトークンを削除しますか？"
 msgid "Delete selected API tokens?"
 msgstr "選択したAPIトークンを削除しますか？"
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
-msgstr ""
+msgstr "選択したSLAを削除しますか？"
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
-msgstr ""
+msgstr "選択したSLAを削除しますか？"
 
 #: include/views/configuration.action.list.php:169
 msgid "Delete selected actions?"
@@ -5125,7 +5125,7 @@ msgstr "選択したホストのプロトタイプを削除しますか？"
 msgid "Delete selected host?"
 msgstr "選択したホストを削除しますか？"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "選択したホストを削除しますか？"
 
@@ -5133,11 +5133,11 @@ msgstr "選択したホストを削除しますか？"
 msgid "Delete selected image?"
 msgstr "選択したイメージを削除しますか？"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "選択したアイテムのプロトタイプを削除しますか？"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "選択したアイテムを削除しますか？"
 
@@ -5153,7 +5153,7 @@ msgstr "選択したマップを削除しますか？"
 msgid "Delete selected maps?"
 msgstr "選択したマップを削除しますか？"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "選択したメディアタイプを削除しますか？"
 
@@ -5185,11 +5185,11 @@ msgstr "選択した定期レポートを削除しますか？"
 msgid "Delete selected scripts?"
 msgstr "選択したスクリプトを削除しますか？"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr "選択したサービスを削除しますか？"
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr "選択したサービスを削除しますか？"
 
@@ -5197,19 +5197,19 @@ msgstr "選択したサービスを削除しますか？"
 msgid "Delete selected shapes?"
 msgstr "選択した図形を削除しますか？"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "選択したテンプレートを削除しますか？"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "選択したトリガーのプロトタイプを削除しますか？"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "選択したトリガーを削除しますか？"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "選択したユーザーを削除しますか？"
 
@@ -5225,11 +5225,11 @@ msgstr "選択したWebシナリオを削除しますか？"
 msgid "Delete template?"
 msgstr "テンプレートを削除しますか？"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "トリガーのプロトタイプを削除しますか？"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "トリガーを削除しますか？"
 
@@ -5255,7 +5255,7 @@ msgstr "削除: \"%2$s\"のホストのプロトタイプ\"%1$s\"。"
 msgid "Delimiter"
 msgstr "区切り文字"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr "拒否されたメソッド"
 
@@ -5270,10 +5270,10 @@ msgid "Deny list"
 msgstr "拒否リスト"
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "依存関係"
 
@@ -5310,7 +5310,7 @@ msgstr "配布ステータス"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5320,13 +5320,13 @@ msgstr "配布ステータス"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "説明"
@@ -5336,10 +5336,10 @@ msgstr "説明"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "詳細"
@@ -5380,7 +5380,7 @@ msgstr "ディレクトリ"
 msgid "Directory size (in bytes). Returns integer"
 msgstr "ディレクトリのサイズ(バイト単位)。整数値を返す"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5431,13 +5431,13 @@ msgstr "選択したプロキシによるホストの監視を無効にします
 msgid "Disable selected API tokens?"
 msgstr "選択したAPIトークンを無効にしますか？"
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
-msgstr ""
+msgstr "選択したSLAを無効にしますか？"
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
-msgstr ""
+msgstr "選択したSLAを無効にしますか？"
 
 #: include/views/configuration.action.list.php:168
 msgid "Disable selected actions?"
@@ -5464,7 +5464,7 @@ msgstr "選択したホストを無効にしますか？"
 msgid "Disable selected items?"
 msgstr "選択したアイテムを無効にしますか？"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "選択したメディアタイプを無効にしますか？"
 
@@ -5498,7 +5498,7 @@ msgstr "選択したWebシナリオを無効にしますか？"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5526,7 +5526,7 @@ msgstr "選択したWebシナリオを無効にしますか？"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "無効"
 
@@ -5552,9 +5552,9 @@ msgstr "値を破棄"
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr "ディスカバリ"
@@ -5746,7 +5746,7 @@ msgstr "ディスク書き込み統計。typeがsectors、operations、bytesの�
 msgid "Display OK triggers for"
 msgstr "正常イベントの表示期間"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "グラフ表示"
 
@@ -5754,13 +5754,13 @@ msgstr "グラフ表示"
 msgid "Display problems"
 msgstr "障害数の表示"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "積算グラフ表示"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5784,15 +5784,15 @@ msgstr "除算分母"
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr "ヒストリを保存しない"
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr "トレンドを保存しない"
 
@@ -5806,8 +5806,8 @@ msgstr "条件式を置き換えますか？"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr "含まない"
 
@@ -5817,8 +5817,8 @@ msgstr "含まない"
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr "等しくない"
 
@@ -5828,8 +5828,8 @@ msgstr "等しくない"
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr "存在しない"
 
@@ -5837,8 +5837,8 @@ msgstr "存在しない"
 msgid "Does not match regular expression"
 msgstr "正規表現と一致しない"
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "点線"
 
@@ -5867,16 +5867,16 @@ msgstr "設定ファイルのダウンロード"
 msgid "Downtime"
 msgstr "ダウンタイム"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "グラフの形式"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "グラフの形式"
 
@@ -5927,7 +5927,7 @@ msgstr "マップ\"%2$s\"のためのユーザー内のuserid \"%1$s\"が重複�
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "継続期間"
 
@@ -5950,29 +5950,29 @@ msgstr "ダイナミックアイテム"
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "各URLの名前は重複できません。同じURL名が使用されていないか確認してください"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr "アイテムごと"
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "変更"
@@ -6003,7 +6003,7 @@ msgstr "ウィジェットの変更"
 
 #: app/views/popup.sla.edit.php:113 app/views/sla.list.php:89
 msgid "Effective date"
-msgstr ""
+msgstr "発効日"
 
 #: app/partials/hostmacros.inherited.list.html.php:49
 msgid "Effective value"
@@ -6026,12 +6026,12 @@ msgstr "Elasticsearchエラー: %1$s。"
 msgid "Element"
 msgstr "項目"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "アイコン名"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "楕円"
 
@@ -6087,7 +6087,7 @@ msgstr "入力パラメータが空白です"
 msgid "Empty map ID."
 msgstr "マップIDが空白です。"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6167,13 +6167,13 @@ msgstr "削除処理を有効"
 msgid "Enable selected API tokens?"
 msgstr "選択したAPIトークンを有効にしますか？"
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
-msgstr ""
+msgstr "選択したSLAを有効にしますか？"
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
-msgstr ""
+msgstr "選択したSLAを有効にしますか？"
 
 #: include/views/configuration.action.list.php:167
 msgid "Enable selected actions?"
@@ -6201,7 +6201,7 @@ msgstr "選択したホストを有効にしますか？"
 msgid "Enable selected items?"
 msgstr "選択したアイテムを有効にしますか？"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "選択したメディアタイプを有効にしますか？"
 
@@ -6223,8 +6223,8 @@ msgstr "選択したWebシナリオを有効にしますか？"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "トラッピングの有効化"
 
@@ -6246,7 +6246,7 @@ msgstr "トラッピングの有効化"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6262,7 +6262,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6276,14 +6276,14 @@ msgstr "トラッピングの有効化"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "有効"
 
@@ -6336,8 +6336,8 @@ msgstr "UUID \\\"%1$s\\\"のエントリはすでに存在します。"
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6513,7 +6513,7 @@ msgstr "WMIクエリを実行して最初の検索結果を返す。リクエス
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr "監視データ取得"
@@ -6534,8 +6534,8 @@ msgstr "実行"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "実行するスクリプト"
 
@@ -6549,13 +6549,13 @@ msgstr "実行の確認"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr "存在する"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "展開"
@@ -6625,15 +6625,15 @@ msgstr "CSVエクスポート"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6646,10 +6646,10 @@ msgstr "条件式"
 msgid "Expression cannot be empty"
 msgstr "条件式は必須のパラメータです"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "条件式ビルダー"
 
@@ -6717,7 +6717,7 @@ msgstr "ログイン失敗"
 msgid "Failed to create dashboard"
 msgstr "ダッシュボードの作成に失敗しました"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "URLを解析できませんでした。"
@@ -6851,8 +6851,7 @@ msgstr "バイト(デフォルト)または行数でのファイルサイズ。�
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "ファイルの時刻情報。UNIXのタイムスタンプで整数値を返す。"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6863,7 +6862,8 @@ msgstr "ファイルの時刻情報。UNIXのタイムスタンプで整数値�
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "塗りつぶし"
 
@@ -6960,7 +6960,7 @@ msgid "Fit to map"
 msgstr "マップに合わせる"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "固定"
 
@@ -6972,9 +6972,9 @@ msgstr "固定ステータス"
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -6982,22 +6982,22 @@ msgstr "例外設定"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "リダイレクトをたどる"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "フォント"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr "フォント色"
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "フォントサイズ"
 
@@ -7005,8 +7005,8 @@ msgstr "フォントサイズ"
 msgid "Form data"
 msgstr "フォームデータ"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "式"
 
@@ -7042,7 +7042,7 @@ msgstr "金曜"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "開始"
 
@@ -7057,7 +7057,7 @@ msgstr "WebインターフェースURL"
 msgid "Frontend access"
 msgstr "Webインターフェースへのアクセス"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Webインターフェースのアラート表示"
 
@@ -7073,7 +7073,7 @@ msgid "Full clone"
 msgstr "すべて複製"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "関数"
 
@@ -7488,8 +7488,8 @@ msgstr "HTTPエージェント"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP認証"
 
@@ -7500,8 +7500,8 @@ msgstr "HTTPのログイン画面"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTPプロキシ"
 
@@ -7538,10 +7538,10 @@ msgstr "HashiCorp Vault"
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "ヘッダー"
 
@@ -7557,7 +7557,7 @@ msgstr "ヘブライ語 (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7663,7 +7663,7 @@ msgid "History cleared"
 msgstr "ヒストリを削除しました"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "ヒストリの削除には時間を要します。実行しますか？"
 
@@ -7678,8 +7678,8 @@ msgstr "履歴関数"
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "ヒストリの保存期間"
 
@@ -7696,8 +7696,8 @@ msgstr "ホームページ"
 msgid "Horizontal"
 msgstr "横"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "横位置"
 
@@ -7813,7 +7813,7 @@ msgstr[0] "ホストを有効にしました"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7899,9 +7899,9 @@ msgstr "ホストグループ"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "ホストインターフェース"
 
@@ -8188,8 +8188,8 @@ msgstr "IPMIインターフェース"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMIセンサー"
 
@@ -8203,19 +8203,19 @@ msgstr "IPMIセンサーのIDとその他のセンサーに関連したパラメ
 msgid "Icon"
 msgstr "アイコン"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "アイコン (デフォルト)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "アイコン (無効)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "アイコン (メンテナンス)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "アイコン (障害)"
 
@@ -8262,7 +8262,7 @@ msgstr "アイコンのマッピング"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のアイコンは使用できません。"
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "アイコン"
 
@@ -8404,7 +8404,7 @@ msgstr "イメージ"
 msgid "Images for all maps will be updated!"
 msgstr "すべてのマップのイメージがアップデートされます！"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "すぐに"
 
@@ -8488,6 +8488,7 @@ msgid "Inaccessible item prototype"
 msgstr "アクセスできないアイテムのプロトタイプ"
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -8502,7 +8503,7 @@ msgstr "アクセスできないマップ"
 
 #: app/controllers/CControllerDashboardWidgetEdit.php:362
 msgid "Inaccessible service"
-msgstr ""
+msgstr "アクセスできないサービス"
 
 #: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
 #: include/httptest.inc.php:222 include/items.inc.php:916
@@ -8963,7 +8964,7 @@ msgstr "Zabbixサーバー\"%1$s\"から正しくない値を受信しました�
 #: app/controllers/CControllerSlaCreateUpdate.php:111
 #, c-format
 msgid "Incorrect schedule: %1$s."
-msgstr ""
+msgstr "スケジュールが正しくありません：%1$s。"
 
 #: include/classes/api/services/CEvent.php:491
 #: include/classes/api/services/CProblem.php:356
@@ -9372,10 +9373,10 @@ msgstr "無限大"
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "情報"
@@ -9442,8 +9443,8 @@ msgstr "デフォルト表示が設定されている場合は、初期表示設
 msgid "Insert"
 msgstr "挿入"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "条件式の挿入"
 
@@ -9559,9 +9560,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "監視間隔"
@@ -9998,7 +9999,7 @@ msgstr "イタリア語 (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "アイテム"
 
@@ -10257,8 +10258,8 @@ msgstr "JMXエージェント"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMXエンドポイント"
 
@@ -10276,8 +10277,8 @@ msgstr "JSONの配列で指定してください。"
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "JSONデータ"
 
@@ -10316,8 +10317,8 @@ msgstr "日本語 (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr "JavaScript"
@@ -10356,9 +10357,9 @@ msgstr "Kerberos"
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "キー"
@@ -10424,13 +10425,13 @@ msgstr "LLDマクロ"
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "ラベル"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "ラベルの位置"
 
@@ -10571,9 +10572,9 @@ msgstr "ラトビア語 (lv_LV)"
 msgid "Layout"
 msgstr "レイアウト"
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10584,7 +10585,7 @@ msgstr "レイアウト"
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "左"
@@ -10617,25 +10618,25 @@ msgstr "ライセンスは"
 msgid "Limit for search and filter results"
 msgstr "検索/フィルターの項目の上限値"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "線"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr "線色"
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "線タイプ"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "線幅"
 
@@ -10657,9 +10658,9 @@ msgstr "マップ\"%2$s\"のリンク\"selementid1\"フィールドが存在し�
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "マップ\"%2$s\"のリンク\"selementid2\"フィールドが存在しないマップのselement ID \"%1$s\"を指しています。"
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "障害発生時の条件設定"
 
@@ -10690,8 +10691,8 @@ msgstr "テンプレートとのリンク"
 msgid "Linked to templates"
 msgstr "テンプレートへのリンク"
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "リンク"
 
@@ -10793,8 +10794,8 @@ msgstr "経度"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "ログ"
 
@@ -10807,8 +10808,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "ログファイル監視。ログ値を返す。"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "ログの時間の形式"
 
@@ -10934,7 +10935,7 @@ msgstr "メインナビゲーション"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "メンテナンス"
 
@@ -10996,7 +10997,7 @@ msgstr "APIトークンの管理"
 
 #: include/classes/helpers/CRoleHelper.php:472
 msgid "Manage SLA"
-msgstr ""
+msgstr "SLAの管理"
 
 #: include/classes/helpers/CRoleHelper.php:471
 msgid "Manage scheduled reports"
@@ -11094,7 +11095,7 @@ msgstr "マップナビゲーション"
 msgid "Map owner cannot be empty."
 msgstr "マップの所有者は必須項目です。"
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "マップ図形"
 
@@ -11172,19 +11173,19 @@ msgstr "マスク"
 msgid "Mass update"
 msgstr "一括更新"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "要素の一括更新"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "図形の一括更新"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "マスターアイテム"
 
@@ -11267,8 +11268,8 @@ msgid "May"
 msgstr "5月"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "メディア"
 
@@ -11389,8 +11390,8 @@ msgstr "メッセージテンプレート"
 msgid "Message templates"
 msgstr "メッセージテンプレート"
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "表示期間"
 
@@ -11408,7 +11409,7 @@ msgstr "メッセージ/コマンド"
 msgid "Messages"
 msgstr "メッセージ"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "アラート表示"
 
@@ -11506,11 +11507,11 @@ msgstr "グラフのプロトタイプの\"name\"フィールドが存在しま�
 msgid "Missing \"name\" field for graph."
 msgstr "グラフの\"name\"フィールドが存在しません。"
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "欠損データ"
 
@@ -11674,8 +11675,8 @@ msgstr "子サービスでもっとも重要"
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "複数"
 
@@ -11710,7 +11711,7 @@ msgstr "N%"
 
 #: include/classes/helpers/CSlaHelper.php:183
 msgid "N/A"
-msgstr ""
+msgstr "該当なし"
 
 #: include/discovery.inc.php:53
 msgid "NNTP"
@@ -11841,7 +11842,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11861,15 +11862,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11878,16 +11879,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -11979,7 +11980,7 @@ msgstr "未監視"
 
 #: app/views/popup.sla.edit.php:254 app/views/popup.sla.edit.php:274
 msgid "New SLA"
-msgstr ""
+msgstr "新規SLA"
 
 #: app/views/popup.service.statusrule.edit.php:94
 msgid "New additional rule"
@@ -12167,7 +12168,7 @@ msgstr "詳細がありません"
 msgid "No discovery rule IDs given."
 msgstr "ディスカバリルールIDが設定されていません。"
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr "有効なモジュールがありません。"
@@ -12223,8 +12224,8 @@ msgstr "イメージは存在しません"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "インターフェースが見つかりません。"
 
@@ -12528,7 +12529,7 @@ msgstr "公開鍵ファイルが設定されていません。"
 msgid "No recipients specified for action operation message."
 msgstr "アクションメッセージの受信者が指定されていません。"
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "リフレッシュなし"
 
@@ -12574,8 +12575,8 @@ msgstr "論理値ではないフラグは廃止予定です。"
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12583,17 +12584,17 @@ msgstr "論理値ではないフラグは廃止予定です。"
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "なし"
@@ -12689,7 +12690,7 @@ msgstr "通知レポート"
 msgid "Notifications"
 msgstr "通知レポート"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr "キャンセルされたエスカレーションの通知"
 
@@ -12863,8 +12864,8 @@ msgstr "数値変換"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "数値 (浮動小数)"
 
@@ -12874,8 +12875,8 @@ msgstr "数値 (整数)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "数値 (整数)"
 
@@ -12883,8 +12884,8 @@ msgstr "数値 (整数)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12896,13 +12897,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "正常"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "正常時のイベントクローズ"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "正常イベントの生成"
 
@@ -12963,7 +12964,7 @@ msgstr "OFF"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -12992,7 +12993,7 @@ msgstr "ON"
 msgid "On status change triggers blink for"
 msgstr "ステータスが変化したイベントの点滅期間"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "一度だけ"
 
@@ -13112,11 +13113,11 @@ msgstr "操作対象のテンプレートがありません。"
 msgid "Operational data"
 msgstr "運用データ"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "実行内容"
@@ -13162,7 +13163,7 @@ msgstr "オプション"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13177,11 +13178,11 @@ msgstr "オプション"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Or"
 
@@ -13276,8 +13277,8 @@ msgstr "出力"
 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 にあるウィジェットと重複しています。"
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "次で上書き"
@@ -13494,8 +13495,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "障害"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "障害イベント生成モード"
 
@@ -13577,8 +13578,8 @@ msgstr "パラメータ\"%1$s\"は廃止予定です。"
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "パラメータ"
 
@@ -13626,8 +13627,8 @@ msgstr "サービス\"%1$s\"と\"%2$s\"の親子関係が衝突しています�
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "URL解析"
 
@@ -13658,12 +13659,12 @@ msgstr "パッシブ"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13696,12 +13697,12 @@ msgid "Paste"
 msgstr "貼り付け"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr "ページの貼り付け"
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr "ウィジェットの貼り付け"
 
@@ -13714,7 +13715,7 @@ msgstr "リンクなしで貼り付け"
 msgid "Pattern"
 msgstr "パターン"
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "メンテナンス中の場合に実行を保留"
 
@@ -13757,8 +13758,8 @@ msgstr "DNSクエリの実行。要求した情報のタイプの文字列を返
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "期間"
@@ -13779,9 +13780,9 @@ msgid "Periods"
 msgstr "監視対象のメンテナンス期間"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13792,7 +13793,7 @@ msgstr "監視対象のメンテナンス期間"
 msgid "Permissions"
 msgstr "権限"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "権限はユーザーグループにのみ割り当てることができます。"
 
@@ -13814,12 +13815,12 @@ msgstr "配置アルゴリズム"
 msgid "Plain text"
 msgstr "プレーンテキスト"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "再生"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "サウンド再生"
 
@@ -13849,8 +13850,7 @@ msgstr "\"allow_url_fopen\"ディレクティブを有効にしてください�
 msgid "Please select two elements"
 msgstr "2つの要素を選択してください"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13860,14 +13860,15 @@ msgstr "2つの要素を選択してください"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "ポイントサイズ"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "ポイント"
 
@@ -13875,7 +13876,7 @@ msgstr "ポイント"
 msgid "Polish (pl_PL)"
 msgstr "ポーランド語 (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "ホストインベントリフィールドの自動設定"
 
@@ -13937,16 +13938,16 @@ msgstr "予測関数"
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "保存前処理"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "保存前処理の設定"
 
@@ -14043,8 +14044,8 @@ msgstr "非公開"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "秘密鍵ファイル"
 
@@ -14074,7 +14075,7 @@ msgstr "特権レベル"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "障害"
 
@@ -14262,31 +14263,31 @@ msgstr "公開"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "公開鍵"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "公開鍵ファイル"
 
 #: include/classes/helpers/CSlaHelper.php:61
 msgid "Quarter"
-msgstr ""
+msgstr "四半期"
 
 #: app/views/popup.sla.edit.php:77 include/classes/helpers/CSlaHelper.php:42
 msgid "Quarterly"
-msgstr ""
+msgstr "四半期ごと"
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "クエリフィールド"
 
@@ -14336,8 +14337,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "RAWデータ"
 
@@ -14363,14 +14364,14 @@ msgstr "表示のみ"
 msgid "Read-only"
 msgstr "表示のみ"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr "サービスの表示のみ"
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr "タグとサービスの表示のみ"
@@ -14384,14 +14385,14 @@ msgstr "タグとサービスの表示のみ"
 msgid "Read-write"
 msgstr "表示/設定"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr "サービスの表示/設定"
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr "タグとサービスの表示/設定"
@@ -14437,7 +14438,7 @@ msgstr "受信者"
 msgid "Recordset ID"
 msgstr "記録ID"
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14446,10 +14447,10 @@ msgid "Recovery"
 msgstr "復旧"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "復旧条件式"
@@ -14459,7 +14460,7 @@ msgstr "復旧条件式"
 msgid "Recovery expression syntax error."
 msgstr "復旧条件式の構文エラー。"
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "復旧時の実行内容"
 
@@ -14471,8 +14472,8 @@ msgstr "復旧時の実行内容"
 msgid "Recovery time"
 msgstr "復旧時刻"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "長方形"
 
@@ -14577,7 +14578,7 @@ msgstr "リモートコマンド"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14608,13 +14609,13 @@ msgstr "リモートコマンド"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14622,25 +14623,25 @@ msgstr "リモートコマンド"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14668,14 +14669,14 @@ msgstr "リモートコマンド"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14750,10 +14751,10 @@ msgstr "繰り返し"
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "置換"
 
@@ -14771,7 +14772,7 @@ msgstr "指定文字列"
 msgid "Report \"%1$s\" already exists."
 msgstr "レポート\"%1$s\"はすでに存在します。"
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr "他のユーザーが生成したレポートは現在のユーザーに変更されます。"
 
@@ -14810,15 +14811,15 @@ msgstr "レポート"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "リクエストボディ"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "リクエストボディのタイプ"
 
@@ -14827,8 +14828,8 @@ msgid "Request sent successfully"
 msgstr "リクエストを送信しました"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "リクエストメソッド"
 
@@ -14855,8 +14856,8 @@ msgstr "1秒あたりの監視項目数(Zabbixサーバーの要求パフォー�
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "要求ステータスコード"
 
@@ -14869,11 +14870,11 @@ msgstr "要求文字列"
 msgid "Reset"
 msgstr "リセット"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "すべてのフィールドをデフォルト値に戻しますか？"
 
@@ -14890,11 +14891,11 @@ msgstr "リセットの確認"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "デフォルトにリセット"
 
@@ -14998,8 +14999,8 @@ msgstr "値のマッピングを適用した結果"
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "取得モード"
 
@@ -15072,9 +15073,9 @@ msgstr "ICMP pingパケットのロスト率を返す。"
 msgid "Revert changes"
 msgstr "変更を戻す"
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15082,7 +15083,7 @@ msgstr "変更を戻す"
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "右"
@@ -15098,8 +15099,8 @@ msgstr "右側Y軸"
 msgid "Right trim"
 msgstr "末尾文字列削除"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr "ユーザーの役割"
 
@@ -15188,26 +15189,26 @@ msgstr ""
 
 #: app/controllers/CControllerSlaReportList.php:229
 msgid "SLA Report"
-msgstr ""
+msgstr "SLAレポート"
 
 #: app/controllers/CControllerSlaCreate.php:123
 msgid "SLA created"
-msgstr ""
+msgstr "SLAを作成しました"
 
 #: app/controllers/CControllerSlaDelete.php:64
 msgid "SLA deleted"
 msgid_plural "SLAs deleted"
-msgstr[0] ""
+msgstr[0] "SLAを削除しました"
 
 #: app/controllers/CControllerSlaDisable.php:73
 msgid "SLA disabled"
 msgid_plural "SLAs disabled"
-msgstr[0] ""
+msgstr[0] "SLAを無効にしました"
 
 #: app/controllers/CControllerSlaEnable.php:73
 msgid "SLA enabled"
 msgid_plural "SLAs enabled"
-msgstr[0] ""
+msgstr[0] "SLAを有効にしました"
 
 #: app/views/monitoring.widget.slareport.view.php:33
 msgid "SLA is disabled."
@@ -15218,11 +15219,11 @@ msgstr ""
 #: include/classes/helpers/CRoleHelper.php:359
 #: include/classes/widgets/CWidgetConfig.php:62
 msgid "SLA report"
-msgstr ""
+msgstr "SLAレポート"
 
 #: app/controllers/CControllerSlaUpdate.php:134
 msgid "SLA updated"
-msgstr ""
+msgstr "SLAを更新しました"
 
 #: include/classes/api/services/CDashboardGeneral.php:630
 #, c-format
@@ -15286,8 +15287,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15366,8 +15367,8 @@ msgstr "SQL数: %1$s (selects: %2$s | executes: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQLクエリ"
 
@@ -15392,38 +15393,38 @@ msgstr "SSHエージェント"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "SSL証明書ファイル"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "SSL秘密鍵ファイル"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "SSL秘密鍵パスワード"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSLホスト検証"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSLピア検証"
 
@@ -15539,9 +15540,9 @@ msgstr "定期レポート"
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15566,8 +15567,8 @@ msgstr "範囲"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "スクリプト"
 
@@ -15698,10 +15699,10 @@ msgstr "セキュリティ名"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "選択"
@@ -15711,9 +15712,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "プロトタイプの選択"
 
@@ -15734,7 +15735,7 @@ msgstr "選択したアクションを削除しました"
 msgid "Selected and all other problems of related triggers"
 msgstr "選択された障害とトリガーに関係する他のすべての障害"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "選択した要素"
 
@@ -15910,7 +15911,7 @@ msgstr "サービスのタグの値"
 
 #: app/views/popup.sla.edit.php:122 app/views/sla.list.php:60
 msgid "Service tags"
-msgstr ""
+msgstr "サービスタグ"
 
 #: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
@@ -16082,8 +16083,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "深刻度を上げました"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "図形"
@@ -16186,7 +16187,7 @@ msgstr "サイドバーを表示"
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16286,8 +16287,8 @@ msgstr "シンプルグラフ"
 msgid "Simple graph prototype"
 msgstr "シンプルグラフのプロトタイプ"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "単一"
 
@@ -16332,7 +16333,7 @@ msgstr "県"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "サイズ"
 
@@ -16443,9 +16444,9 @@ msgstr "スピード"
 msgid "Stacked"
 msgstr "積算グラフ"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "階段"
 
@@ -16466,7 +16467,7 @@ msgstr "開始位置"
 msgid "Start date"
 msgstr "開始日付"
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "開始時刻"
 
@@ -16661,14 +16662,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "\"%1$s\"の名前を持つステップがすでに存在します。"
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "ステップ"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "停止"
 
@@ -16691,10 +16692,10 @@ msgstr "停止中"
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr "保存期間"
 
@@ -16930,8 +16931,8 @@ msgstr "タグ表示優先度"
 msgid "Tag filter"
 msgstr "タグフィルター"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "クローズに利用するタグ名"
 
@@ -16990,28 +16991,28 @@ msgstr "タグの値"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "タグ"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "ターゲット"
@@ -17172,14 +17173,14 @@ msgstr "テンプレートを更新しました"
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "テスト"
@@ -17237,10 +17238,10 @@ msgstr "テスト用の件名"
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "テキスト"
 
@@ -17391,8 +17392,8 @@ msgstr "今月"
 msgid "This month so far"
 msgstr "今月(現在まで)"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr "このデータ型はアイテムキーと合ってません。"
 
@@ -17496,9 +17497,9 @@ msgstr "期間"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "タイムシフト"
 
@@ -17516,8 +17517,8 @@ msgstr "タイムゾーン"
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "タイムアウト"
 
@@ -17543,7 +17544,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "終了"
 
@@ -17567,7 +17568,7 @@ msgstr "今日(現在まで)"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "上"
@@ -17619,8 +17620,7 @@ msgstr "LLDのためにSQLクエリ結果をJSON配列に変換。"
 msgid "Transform SQL query result into a JSON array."
 msgstr "SQLクエリ結果をJSON配列に変換。"
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17631,7 +17631,8 @@ msgstr "SQLクエリ結果をJSON配列に変換。"
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "透明度"
 
@@ -17639,9 +17640,9 @@ msgstr "透明度"
 msgid "Transport error."
 msgstr "転送エラー。"
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "0とみなす"
@@ -17653,8 +17654,8 @@ msgstr "トレンド関数キャッシュの統計。有効なパラメータ：
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "トレンドの保存期間"
 
@@ -17672,9 +17673,9 @@ msgstr "トレンド"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "トリガー"
@@ -17773,7 +17774,7 @@ msgstr "トリガーの概要"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "トリガーのプロトタイプ"
@@ -17838,7 +17839,7 @@ msgstr "トリガーのプロトタイプを削除しました"
 msgid "Trigger prototypes updated"
 msgstr "トリガーのプロトタイプを更新しました"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "トリガーの深刻度"
 
@@ -17945,23 +17946,23 @@ msgstr "2つ以上のフィールドを同じスペースに配置できませ�
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "タイプ"
@@ -17970,12 +17971,12 @@ msgstr "タイプ"
 msgid "Type (Full details)"
 msgstr "タイプ(詳細)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "タイプ (正常)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -17986,10 +17987,10 @@ msgstr "計算のタイプ"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "データ型"
 
@@ -18013,11 +18014,11 @@ msgstr "不明"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18038,7 +18039,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URLが正しくエンコードされていません。"
@@ -18063,7 +18064,7 @@ msgstr "URLパラメータが設定されていません。"
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URL"
@@ -18166,15 +18167,15 @@ msgstr "アクション%1$sから想定外の応答を受信しました。"
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr "想定しないエラーが発生しました。"
 
@@ -18183,8 +18184,8 @@ msgstr "想定しないエラーが発生しました。"
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "単位"
 
@@ -18210,7 +18211,7 @@ msgstr "単位"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "不明"
@@ -18352,12 +18353,12 @@ msgstr "Up"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18377,18 +18378,18 @@ msgstr "Up"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18409,13 +18410,13 @@ msgstr "既存の設定を上書"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "監視間隔"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "更新時の実行内容"
 
@@ -18554,7 +18555,7 @@ msgstr "ユーザーエージェント文字列"
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "ユーザーは無効のグループやGUIアクセスが無効のグループに自分自身を追加できません。"
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr "ユーザーは自分の役割を変更できません。"
@@ -18663,10 +18664,10 @@ msgstr "ユーザーメニュー"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "ユーザー名"
 
@@ -18733,7 +18734,7 @@ msgstr "ユーザー設定"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "マップ\"%2$s\"のユーザーでの共有にはパラメータ:%1$s が必要です。"
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19109,12 +19110,12 @@ msgstr "バリデーション"
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19176,8 +19177,8 @@ msgstr "値のマッピング\"%1$s\"はすでに存在します。"
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "値のマッピング"
@@ -19294,8 +19295,8 @@ msgstr "Zabbixサーバーまたはプロキシのバージョン"
 msgid "Vertical"
 msgstr "縦"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "縦位置"
 
@@ -19496,8 +19497,7 @@ msgstr "ダッシュボード\"%1$s\"のページ#%2$d上の X:%3$d, Y:%4$d の�
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "指定された列と行の数に対してウィジェットが小さすぎます。"
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19508,12 +19508,13 @@ msgstr "指定された列と行の数に対してウィジェットが小さす
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19589,8 +19590,8 @@ msgstr "マップリンクの設定が正しくありません。"
 msgid "Wrong value for \"url\" field."
 msgstr "\"url\"フィールドが正しくありません。"
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19602,11 +19603,11 @@ msgstr "X軸"
 msgid "X-Frame-Options HTTP header"
 msgstr "X-Frame-Options HTTPヘッダ"
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19620,8 +19621,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "XMLデータ"
 
@@ -19641,12 +19642,12 @@ msgstr "XMLからJSON"
 msgid "XPath"
 msgstr "XPath"
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Y軸の最大値"
 
@@ -19660,18 +19661,18 @@ msgstr "Y軸の最大値はY軸の最小値よりも大きな値を設定して�
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y軸の最大値はY軸の最小値よりも大きな値を設定してください。"
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Y軸の最小値"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Y軸"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Y軸"
 
@@ -19691,11 +19692,11 @@ msgstr "Y/m/d H:i:s"
 msgid "Y-n-d"
 msgstr "Y-n-d"
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20729,10 +20730,10 @@ msgstr "fuzzytime() - アイテムの値(タイムスタンプとして)とZabbi
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr "地理座標(コンマで区切られた緯度と経度の値)を指定してください"
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "データの保存期間設定(全体設定)"
@@ -20761,8 +20762,8 @@ msgstr "ホスト"
 msgid "host group"
 msgstr "ホストグループ"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "ホストパターン"
@@ -20795,7 +20796,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr "in() - 値がリストアップされた値と同じかチェック (1 - 同じ、0 - その他)"
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "サブグループを含む"
 
@@ -20969,8 +20970,8 @@ msgstr "アイテム"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr "ホスト\"%2$s\"上のアイテム\"%1$s\"は監視されていません"
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "アイテムパターン"
 
@@ -21234,10 +21235,10 @@ msgstr "n-d H:i"
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "名前"
@@ -21284,7 +21285,7 @@ msgstr "障害を未確認にする権限がありません"
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr "nodata() - 期間Tの間取得データなし (1 - 取得データなし、0 - それ以外)、Mode (strict - 送られてきたデータ内のプロキシでの遅延を無視)"
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "なし"
 
@@ -21314,7 +21315,7 @@ msgstr "数値"
 msgid "of"
 msgstr "of"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21337,7 +21338,7 @@ msgstr "of"
 msgid "off"
 msgstr "off"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21509,8 +21510,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr "スクリプト"
@@ -21647,8 +21648,8 @@ msgstr "指定された資格情報はユニークではありません"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -21935,17 +21936,17 @@ msgstr "大文字の識別子が必要です"
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/ka/LC_MESSAGES/frontend.po b/ui/locale/ka/LC_MESSAGES/frontend.po
index e6162d37a60..ef73c73da9e 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2021-03-19 18:13+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -171,10 +171,10 @@ msgid "%1$s message"
 msgid_plural "%1$s messages"
 msgstr[0] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -214,9 +214,9 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "დარჩა %1$s მცდელობა"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -317,7 +317,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 წამი"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D ხედი"
 
@@ -363,7 +363,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -451,27 +451,27 @@ msgstr "წვდომა აკრძალულია"
 msgid "Access denied!"
 msgstr "წვდომა აკრძალულია!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -544,35 +544,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -700,24 +700,24 @@ msgstr ""
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -753,13 +753,13 @@ msgstr ""
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -777,38 +777,38 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -835,7 +835,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -856,7 +856,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -865,16 +865,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -884,7 +884,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "პროტოტიპის დამატება"
 
@@ -921,7 +921,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1009,7 +1009,7 @@ msgstr "აგენტის ინტერფეისები"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1017,11 +1017,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1048,8 +1048,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1065,8 +1065,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1082,13 +1082,13 @@ msgstr ""
 msgid "All maps"
 msgstr "ყველა რუკა"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1109,19 +1109,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "დაშვებული ჰოსტები"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1138,21 +1138,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "და"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1166,7 +1166,7 @@ msgstr "და"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "და/ან"
 
@@ -1211,11 +1211,11 @@ msgstr "პროგრამის შეცდომა."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "გამოყენება"
@@ -1343,11 +1343,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1441,8 +1441,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "ავთენტიფიკაციის მეთოდი"
 
@@ -1504,8 +1504,8 @@ msgstr "ავტომატური"
 msgid "Automatic icon mapping"
 msgstr "ხატულების ავტომატური მისადაგება"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "ხატულების ავტომატური არჩევა"
 
@@ -1572,12 +1572,12 @@ msgstr "უკან"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "ფონი"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1585,9 +1585,9 @@ msgstr ""
 msgid "Background image"
 msgstr "ფონური გამოსახულება"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1595,8 +1595,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "საბაზო DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1639,15 +1639,15 @@ msgstr "ლურჯი"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1658,8 +1658,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "მუქი ხაზი"
 
@@ -1667,19 +1667,19 @@ msgstr "მუქი ხაზი"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1692,7 +1692,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 #, fuzzy
 msgid "Bottom"
@@ -1779,7 +1779,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "გამოთვლადი"
 
@@ -1803,22 +1803,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3356,8 +3356,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr ""
 
@@ -3385,7 +3385,7 @@ msgstr ""
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr ""
 
@@ -3506,8 +3506,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr ""
 
@@ -3535,22 +3535,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr ""
@@ -3558,28 +3558,28 @@ msgstr ""
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3593,7 +3593,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3607,11 +3607,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3620,7 +3620,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3708,9 +3708,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr ""
@@ -3895,13 +3895,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -3993,8 +3993,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4074,13 +4074,13 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr ""
 
@@ -4097,7 +4097,7 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4233,10 +4233,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4440,7 +4440,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4454,8 +4454,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4620,8 +4620,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr ""
 
@@ -4639,7 +4639,7 @@ msgstr ""
 msgid "Data overview"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4823,11 +4823,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr ""
 
@@ -4869,7 +4869,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr ""
 
@@ -4903,7 +4903,7 @@ msgstr ""
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4912,7 +4912,7 @@ msgstr ""
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4920,47 +4920,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr ""
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -4968,11 +4968,11 @@ msgstr ""
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -4985,10 +4985,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr ""
 
@@ -5012,11 +5012,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr ""
 
@@ -5058,11 +5058,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5121,7 +5121,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr ""
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr ""
 
@@ -5129,11 +5129,11 @@ msgstr ""
 msgid "Delete selected image?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr ""
 
@@ -5149,7 +5149,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr ""
 
@@ -5181,11 +5181,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5193,19 +5193,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5221,11 +5221,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr ""
 
@@ -5251,7 +5251,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5266,10 +5266,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr ""
 
@@ -5306,7 +5306,7 @@ msgstr ""
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5316,13 +5316,13 @@ msgstr ""
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr ""
@@ -5332,10 +5332,10 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr ""
@@ -5376,7 +5376,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5427,11 +5427,11 @@ msgstr ""
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5460,7 +5460,7 @@ msgstr ""
 msgid "Disable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr ""
 
@@ -5494,7 +5494,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5522,7 +5522,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr ""
 
@@ -5548,9 +5548,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5742,7 +5742,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5750,13 +5750,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5780,15 +5780,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5802,8 +5802,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5813,8 +5813,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5824,8 +5824,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5833,8 +5833,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr ""
 
@@ -5863,16 +5863,16 @@ msgstr ""
 msgid "Downtime"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr ""
 
@@ -5923,7 +5923,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr ""
 
@@ -5946,29 +5946,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr ""
@@ -6022,12 +6022,12 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6083,7 +6083,7 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6163,11 +6163,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6197,7 +6197,7 @@ msgstr ""
 msgid "Enable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr ""
 
@@ -6219,8 +6219,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6242,7 +6242,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6258,7 +6258,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6272,14 +6272,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr ""
 
@@ -6332,8 +6332,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6509,7 +6509,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6530,8 +6530,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr ""
 
@@ -6545,13 +6545,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6621,15 +6621,15 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6642,10 +6642,10 @@ msgstr ""
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr ""
 
@@ -6713,7 +6713,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6847,8 +6847,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6859,7 +6858,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -6956,7 +6956,7 @@ msgid "Fit to map"
 msgstr ""
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr ""
 
@@ -6968,9 +6968,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -6978,22 +6978,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7001,8 +7001,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr ""
 
@@ -7038,7 +7038,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr ""
 
@@ -7053,7 +7053,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7069,7 +7069,7 @@ msgid "Full clone"
 msgstr ""
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr ""
 
@@ -7484,8 +7484,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr ""
 
@@ -7496,8 +7496,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7534,10 +7534,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7553,7 +7553,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7659,7 +7659,7 @@ msgid "History cleared"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -7674,8 +7674,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7692,8 +7692,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr ""
 
@@ -7809,7 +7809,7 @@ msgstr[0] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7895,9 +7895,9 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr ""
 
@@ -8184,8 +8184,8 @@ msgstr ""
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr ""
 
@@ -8199,19 +8199,19 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr ""
 
@@ -8258,7 +8258,7 @@ msgstr ""
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr ""
 
@@ -8400,7 +8400,7 @@ msgstr ""
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr ""
 
@@ -8484,6 +8484,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9368,10 +9369,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr ""
@@ -9438,8 +9439,8 @@ msgstr ""
 msgid "Insert"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9555,9 +9556,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr ""
@@ -9994,7 +9995,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr ""
 
@@ -10253,8 +10254,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10272,8 +10273,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10312,8 +10313,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10352,9 +10353,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr ""
@@ -10420,13 +10421,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr ""
 
@@ -10567,9 +10568,9 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10580,7 +10581,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr ""
@@ -10613,25 +10614,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10653,9 +10654,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr ""
 
@@ -10686,8 +10687,8 @@ msgstr ""
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10789,8 +10790,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr ""
 
@@ -10803,8 +10804,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr ""
 
@@ -10930,7 +10931,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr ""
 
@@ -11090,7 +11091,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11168,19 +11169,19 @@ msgstr ""
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11263,8 +11264,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11385,8 +11386,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr ""
 
@@ -11404,7 +11405,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr ""
 
@@ -11502,11 +11503,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11670,8 +11671,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11837,7 +11838,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11857,15 +11858,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11874,16 +11875,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12163,7 +12164,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12219,8 +12220,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12524,7 +12525,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12570,8 +12571,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12579,17 +12580,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr ""
@@ -12685,7 +12686,7 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12859,8 +12860,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr ""
 
@@ -12870,8 +12871,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr ""
 
@@ -12879,8 +12880,8 @@ msgstr ""
 msgid "OEM"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12892,13 +12893,13 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -12959,7 +12960,7 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -12988,7 +12989,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr ""
 
@@ -13108,11 +13109,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr ""
@@ -13158,7 +13159,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13173,11 +13174,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13272,8 +13273,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13490,8 +13491,8 @@ msgstr ""
 msgid "PROBLEM"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13573,8 +13574,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13622,8 +13623,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13654,12 +13655,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13692,12 +13693,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13710,7 +13711,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13753,8 +13754,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr ""
@@ -13775,9 +13776,9 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13788,7 +13789,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13810,12 +13811,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr ""
 
@@ -13845,8 +13846,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13856,14 +13856,15 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13871,7 +13872,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -13933,16 +13934,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14039,8 +14040,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr ""
 
@@ -14070,7 +14071,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr ""
 
@@ -14258,16 +14259,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr ""
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr ""
 
@@ -14281,8 +14282,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14332,8 +14333,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14359,14 +14360,14 @@ msgstr ""
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14380,14 +14381,14 @@ msgstr ""
 msgid "Read-write"
 msgstr ""
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14433,7 +14434,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14442,10 +14443,10 @@ msgid "Recovery"
 msgstr ""
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14455,7 +14456,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14467,8 +14468,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14573,7 +14574,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14604,13 +14605,13 @@ msgstr ""
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14618,25 +14619,25 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14664,14 +14665,14 @@ msgstr ""
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14746,10 +14747,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr ""
 
@@ -14767,7 +14768,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14806,15 +14807,15 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14823,8 +14824,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14851,8 +14852,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr ""
 
@@ -14865,11 +14866,11 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -14886,11 +14887,11 @@ msgstr ""
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr ""
 
@@ -14994,8 +14995,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15068,9 +15069,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15078,7 +15079,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr ""
@@ -15094,8 +15095,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15282,8 +15283,8 @@ msgstr ""
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr ""
 
@@ -15362,8 +15363,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15388,38 +15389,38 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15535,9 +15536,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15562,8 +15563,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr ""
 
@@ -15694,10 +15695,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr ""
@@ -15707,9 +15708,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15730,7 +15731,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr ""
 
@@ -16078,8 +16079,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16182,7 +16183,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16282,8 +16283,8 @@ msgstr ""
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16328,7 +16329,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16439,9 +16440,9 @@ msgstr ""
 msgid "Stacked"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16462,7 +16463,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16657,14 +16658,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr ""
 
@@ -16687,10 +16688,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -16926,8 +16927,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -16986,28 +16987,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr ""
@@ -17168,14 +17169,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr ""
@@ -17233,10 +17234,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr ""
 
@@ -17387,8 +17388,8 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17492,9 +17493,9 @@ msgstr ""
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17512,8 +17513,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr ""
 
@@ -17539,7 +17540,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr ""
 
@@ -17563,7 +17564,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr ""
@@ -17615,8 +17616,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17627,7 +17627,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17635,9 +17636,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17649,8 +17650,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17668,9 +17669,9 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr ""
@@ -17769,7 +17770,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr ""
@@ -17834,7 +17835,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
@@ -17941,23 +17942,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr ""
@@ -17966,12 +17967,12 @@ msgstr ""
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr ""
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -17982,10 +17983,10 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr ""
 
@@ -18009,11 +18010,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr ""
@@ -18034,7 +18035,7 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18059,7 +18060,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr ""
@@ -18162,15 +18163,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18179,8 +18180,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr ""
 
@@ -18206,7 +18207,7 @@ msgstr ""
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18348,12 +18349,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18373,18 +18374,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18405,13 +18406,13 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18550,7 +18551,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18659,10 +18660,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr ""
 
@@ -18729,7 +18730,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19105,12 +19106,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19172,8 +19173,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr ""
@@ -19290,8 +19291,8 @@ msgstr ""
 msgid "Vertical"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr ""
 
@@ -19492,8 +19493,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19504,12 +19504,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19585,8 +19586,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr ""
 
@@ -19598,11 +19599,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19616,8 +19617,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19637,12 +19638,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr ""
 
@@ -19656,18 +19657,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19687,11 +19688,11 @@ msgstr ""
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20722,10 +20723,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20754,8 +20755,8 @@ msgstr ""
 msgid "host group"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20788,7 +20789,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -20962,8 +20963,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21227,10 +21228,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21277,7 +21278,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21307,7 +21308,7 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21330,7 +21331,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21502,8 +21503,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21640,8 +21641,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -21928,17 +21929,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/ko/LC_MESSAGES/frontend.po b/ui/locale/ko/LC_MESSAGES/frontend.po
index b019a57685e..6aa510392a5 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -172,10 +172,10 @@ msgid "%1$s message"
 msgid_plural "%1$s messages"
 msgstr[0] "메세지 %1$s건"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -215,9 +215,9 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "%1$s 의 재시도 가능"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -318,7 +318,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30초"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D표시"
 
@@ -364,7 +364,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "오버라이드 추가"
 
@@ -451,27 +451,27 @@ msgstr "엑세스가 거부되었습니다"
 msgid "Access denied!"
 msgstr "엑세스가 거부되었습니다!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -543,35 +543,35 @@ msgstr "대응 완료된 해결 이벤트"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -698,24 +698,24 @@ msgstr "종료시간"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -751,13 +751,13 @@ msgstr "종료시간"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -775,38 +775,38 @@ msgstr "종료시간"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -833,7 +833,7 @@ msgstr "하위 요소 추가"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -854,7 +854,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "복수의 맵을 추가"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "새로운 데이터 셋을 추가"
 
@@ -863,16 +863,16 @@ msgstr "새로운 데이터 셋을 추가"
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "새로운 오버라이드를 추가"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -882,7 +882,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "프로토타입을 추가"
 
@@ -919,7 +919,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "위젯을 추가"
@@ -1007,7 +1007,7 @@ msgstr "에이전트 인터페이스"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1015,11 +1015,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1046,8 +1046,8 @@ msgstr "그리드에 정렬하기"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1063,8 +1063,8 @@ msgid "All dashboards"
 msgstr "전체 대시보드"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "모든 그룹"
 
@@ -1080,13 +1080,13 @@ msgstr "모든 링크는 반드시 \"이름\"과 \"URL\"을 설정할 필요가
 msgid "All maps"
 msgstr "모든 맵"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "모든 장애"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "태그 값이 일치하는 모든 장애"
 
@@ -1107,19 +1107,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "수동으로 클로즈 허가"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "허가된 호스트"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1136,21 +1136,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "And"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1164,7 +1164,7 @@ msgstr "And"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "And/Or"
 
@@ -1209,11 +1209,11 @@ msgstr "어플리케이션 에러."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "적용"
@@ -1341,11 +1341,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "최소 하나 이상의 액션처리가 설정되어 있어야 합니다."
 
@@ -1439,8 +1439,8 @@ msgstr "인증에 실패하였습니다 : %1$s"
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "인증 방식"
 
@@ -1502,8 +1502,8 @@ msgstr "자동"
 msgid "Automatic icon mapping"
 msgstr "아이콘의 자동매핑"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "아이콘의 자동선택"
 
@@ -1570,12 +1570,12 @@ msgstr "돌아가기"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "배경"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1583,9 +1583,9 @@ msgstr ""
 msgid "Background image"
 msgstr "배경 이미지"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1593,8 +1593,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1637,15 +1637,15 @@ msgstr "Blue"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Body"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Body와 Header"
 
@@ -1656,8 +1656,8 @@ msgstr "Body와 Header"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "굵은 선"
 
@@ -1665,19 +1665,19 @@ msgstr "굵은 선"
 msgid "Boolean to decimal"
 msgstr "Boolean 에서 10진수(decimal)로"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "테두리"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "테두리 타입"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "테두리 너비"
 
@@ -1690,7 +1690,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "아래쪽"
@@ -1773,7 +1773,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "자동 계산"
 
@@ -1797,22 +1797,22 @@ msgstr "콜백"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3352,8 +3352,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "문자"
 
@@ -3381,7 +3381,7 @@ msgstr "섀시"
 msgid "Chassis information. Returns string"
 msgstr "섀시 정보. string 값을 리턴."
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "이미 존재합니다"
 
@@ -3502,8 +3502,8 @@ msgid "Clear history"
 msgstr "히스토리를 삭제"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "히스토리와 트렌드를 삭제"
 
@@ -3531,22 +3531,22 @@ msgstr "시각"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "복제"
@@ -3554,28 +3554,28 @@ msgstr "복제"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "닫기"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "조건식 빌더를 닫는다"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "새 이벤트를 닫기"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "오래된 이벤트를 닫기"
@@ -3589,7 +3589,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "축소"
@@ -3603,11 +3603,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3616,7 +3616,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3704,9 +3704,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "조건"
@@ -3891,13 +3891,13 @@ msgstr "축하합니다! Zabbix frontend 설치가 종료되었습니다."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "접속 방법"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "접속됨"
@@ -3989,8 +3989,8 @@ msgstr "연락처"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4070,13 +4070,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "계약번호"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "JSON변환"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "좌표"
 
@@ -4093,7 +4093,7 @@ msgstr "복사"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "상관관계"
 
@@ -4230,10 +4230,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4437,7 +4437,7 @@ msgid "Custom"
 msgstr "커스텀"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4451,8 +4451,8 @@ msgstr "커스텀 그래프"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "갱신 간격(intervals) 커스터마이즈"
 
@@ -4617,8 +4617,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "대시보드"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "파선"
 
@@ -4636,7 +4636,7 @@ msgstr "데이터가 올바르게 인코딩되어 있지 않습니다."
 msgid "Data overview"
 msgstr "데이터 개요"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4820,11 +4820,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "디폴트"
 
@@ -4866,7 +4866,7 @@ msgstr "기본 로그인 화면"
 msgid "Default media type"
 msgstr "기본 미디어 타입"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "디폴트 액션 실행 스텝의 간격"
 
@@ -4900,7 +4900,7 @@ msgstr "연장 시간"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4909,7 +4909,7 @@ msgstr "연장 시간"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4917,47 +4917,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "삭제"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "삭제와 클리어"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "선택한 템플릿과 데이터를 삭제하시겠습니까? (경고: 링크되어 있는 모든 호스트에서 데이터가 삭제됩니다!)"
 
@@ -4965,11 +4965,11 @@ msgstr "선택한 템플릿과 데이터를 삭제하시겠습니까? (경고: �
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "템플릿과 데이터를 삭제하시겠습니까? (경고: 링크되어 있는 모든 호스트에서 데이터가 삭제됩니다!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "현재 액션을 삭제하시겠습니까?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "현재의 상관관계를 삭제하시겠습니다?"
 
@@ -4982,10 +4982,10 @@ msgstr "대시보드를 삭제하시겠습니까?"
 msgid "Delete discovery rule?"
 msgstr "디스커버리 규칙를 삭제하시겠습니까?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "조건식를 삭제하시겠습니까?"
 
@@ -5009,11 +5009,11 @@ msgstr "선택한 Web시나리오의 히스토리를 삭제하시겠습니까?"
 msgid "Delete icon map?"
 msgstr "아이콘 매핑를 삭제하시겠습니까?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "아이템 프로토타입을 삭제하시겠습니까?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "아이템를 삭제하시겠습니까?"
 
@@ -5055,11 +5055,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5118,7 +5118,7 @@ msgstr "선택한 호스트 프로토타입을 삭제하시겠습니까?"
 msgid "Delete selected host?"
 msgstr "선택한 호스트를 삭제하시겠습니까?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "선택한 호스트를 삭제하시겠습니까?"
 
@@ -5126,11 +5126,11 @@ msgstr "선택한 호스트를 삭제하시겠습니까?"
 msgid "Delete selected image?"
 msgstr "선택한 이미지를 삭제하시겠습니까?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "선택한 아이템 프로토타입을 삭제하시겠습니까?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "선택한 아이템를 삭제하시겠습니까?"
 
@@ -5146,7 +5146,7 @@ msgstr "선택한 맵을 삭제하시겠습니까?"
 msgid "Delete selected maps?"
 msgstr "선택한 맵을 삭제하시겠습니까?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "선택한 미디어 타입을 삭제하시겠습니까?"
 
@@ -5178,11 +5178,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "선택한 스크립트를 삭제하시겠습니까?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5190,19 +5190,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "선택한 도형을 삭제하시겠습니까?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "선택한 템플릿을 삭제하시겠습니까?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "선택한 트리거 프로토타입을 삭제하시겠습니까?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "선택한 트리거를 삭제하시겠습니까?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "선택한 사용자를 삭제하시겠습니까?"
 
@@ -5218,11 +5218,11 @@ msgstr "선택한 Web시나리오를 삭제하시겠습니까?"
 msgid "Delete template?"
 msgstr "템플릿을 삭제하시겠습니까?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "트리거 프로토타입을 삭제하시겠습니까?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "트리거를 삭제하시겠습니까?"
 
@@ -5248,7 +5248,7 @@ msgstr "삭제: \"%2$s\" 호스트 프로토타입\"%1$s\"."
 msgid "Delimiter"
 msgstr "구분 문자"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5263,10 +5263,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "의존관계"
 
@@ -5303,7 +5303,7 @@ msgstr "배포상태"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5313,13 +5313,13 @@ msgstr "배포상태"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "이름"
@@ -5329,10 +5329,10 @@ msgstr "이름"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "자세히"
@@ -5373,7 +5373,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "디렉토리 사이즈 (바이트). integer를 리턴"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5424,11 +5424,11 @@ msgstr "선택한 프록시에 의한 호스트 감시를 비활성으로 하시
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5457,7 +5457,7 @@ msgstr "선택한 호스트을 비활성으로 하시겠습니까?"
 msgid "Disable selected items?"
 msgstr "선택한 아이템을 비활성으로 하시겠습니까?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "선택한 연락 방법을 비활성으로 하시겠습니까?"
 
@@ -5491,7 +5491,7 @@ msgstr "선택한 Web시나리오를 비활성으로 하시겠습니까?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5519,7 +5519,7 @@ msgstr "선택한 Web시나리오를 비활성으로 하시겠습니까?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "비활성"
 
@@ -5545,9 +5545,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5741,7 +5741,7 @@ msgstr "디스크 쓰기 통계. 타입이 sectors, operations, bytes의 경우�
 msgid "Display OK triggers for"
 msgstr "복구트리거 표시기간"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "그래프 표시"
 
@@ -5749,13 +5749,13 @@ msgstr "그래프 표시"
 msgid "Display problems"
 msgstr "장애의 표시"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "누계 그래프 표시"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5779,15 +5779,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5801,8 +5801,8 @@ msgstr "조건식을 치환하시겠습니까?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5812,8 +5812,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5823,8 +5823,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5832,8 +5832,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "점선"
 
@@ -5862,16 +5862,16 @@ msgstr "설정 파일 다운로드"
 msgid "Downtime"
 msgstr "정지 시간"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "그래프 형식"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "종류"
 
@@ -5922,7 +5922,7 @@ msgstr "맵 \"%2$s\"를 위한 유저 내의 userid \"%1$s\"가 중복되었습�
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "기간"
 
@@ -5945,29 +5945,29 @@ msgstr "다이나믹 아이템"
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "각URL의 이름은 중복될 수 없습니다. 같은 URL 이름이 이용되지 않는지 확인해 주세요"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "편집"
@@ -6021,12 +6021,12 @@ msgstr "Elasticsearch에러 : %1$s"
 msgid "Element"
 msgstr "항목"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "구성요소 이름"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "타원형"
 
@@ -6082,7 +6082,7 @@ msgstr "입력 파라미터가 공백입니다"
 msgid "Empty map ID."
 msgstr "맵ID가 공백입니다."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6162,11 +6162,11 @@ msgstr "데이터 삭제처리를 활성화"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6196,7 +6196,7 @@ msgstr "선택한 호스트를 활성화 하시겠습니까?"
 msgid "Enable selected items?"
 msgstr "선택한 아이템를 활성화 하시겠습니까?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "선택한 미디어 타입을 활성화 하시겠습니까?"
 
@@ -6218,8 +6218,8 @@ msgstr "선택한 Web시나리오를 활성화 하시겠습니까?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "트래핑의 활성화"
 
@@ -6241,7 +6241,7 @@ msgstr "트래핑의 활성화"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6257,7 +6257,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6271,14 +6271,14 @@ msgstr "트래핑의 활성화"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "활성"
 
@@ -6331,8 +6331,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6508,7 +6508,7 @@ msgstr "WMI쿼리를 실행하여 처음의 검색결과를 리턴. 리퀘스트
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6529,8 +6529,8 @@ msgstr "실행"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "실행 스크립트"
 
@@ -6544,13 +6544,13 @@ msgstr "실행 확인"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "전개"
@@ -6620,15 +6620,15 @@ msgstr "CSV 내보내기"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6641,10 +6641,10 @@ msgstr "조건식"
 msgid "Expression cannot be empty"
 msgstr "조건식은 필수 파라미터입니다"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "조건식 빌더"
 
@@ -6712,7 +6712,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "대시보드의 작성에 실패하였습니다."
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "URL을 해석할 수 없었습니다."
@@ -6846,8 +6846,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "파일의 시간 정보. UNIX의 타임스탬프로 integer를 리턴"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6858,7 +6857,8 @@ msgstr "파일의 시간 정보. UNIX의 타임스탬프로 integer를 리턴"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "채우기"
 
@@ -6955,7 +6955,7 @@ msgid "Fit to map"
 msgstr "맵에 맞춘다"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "고정"
 
@@ -6967,9 +6967,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -6977,22 +6977,22 @@ msgstr "예외 설정"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "리다이렉트를 따라간다"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "폰트"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "폰트 사이즈"
 
@@ -7000,8 +7000,8 @@ msgstr "폰트 사이즈"
 msgid "Form data"
 msgstr "폼 데이터"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "식"
 
@@ -7037,7 +7037,7 @@ msgstr "금"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "시작"
 
@@ -7052,7 +7052,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Web 인터페이스에 액세스"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Web 인터페이스 알림 표시"
 
@@ -7068,7 +7068,7 @@ msgid "Full clone"
 msgstr "모두 복제"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "기능"
 
@@ -7483,8 +7483,8 @@ msgstr "HTTP 에이전트"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP 인증"
 
@@ -7495,8 +7495,8 @@ msgstr "HTTP의 로그인 화면"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP 프록시"
 
@@ -7533,10 +7533,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "헤더"
 
@@ -7552,7 +7552,7 @@ msgstr "히브리어 (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7658,7 +7658,7 @@ msgid "History cleared"
 msgstr "이력이 삭제되었습니다"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "이력 삭제에 시간이 걸릴 수도 있습니다. 계속하시겠습니까?"
 
@@ -7673,8 +7673,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "히스토리 보존 기간"
 
@@ -7691,8 +7691,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "가로"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "가로 위치"
 
@@ -7808,7 +7808,7 @@ msgstr[0] "호스트를 활성화 하였습니다"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7894,9 +7894,9 @@ msgstr "호스트 그룹"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "호스트 인터페이스"
 
@@ -8183,8 +8183,8 @@ msgstr "IPMI 인터페이스"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI센서"
 
@@ -8198,19 +8198,19 @@ msgstr ""
 msgid "Icon"
 msgstr "아이콘"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "아이콘 (디폴트)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "아이콘 (비활성)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "아이콘 (메인터넌스)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "아이콘 (장애)"
 
@@ -8257,7 +8257,7 @@ msgstr "아이콘 매핑"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 아이콘은 사용할 수 없습니다."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "아이콘"
 
@@ -8399,7 +8399,7 @@ msgstr "이미지"
 msgid "Images for all maps will be updated!"
 msgstr "모든 맵의 이미지가 업로드 됩니다!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "즉시"
 
@@ -8483,6 +8483,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9367,10 +9368,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "정보"
@@ -9437,8 +9438,8 @@ msgstr ""
 msgid "Insert"
 msgstr "삽입"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "조건식의 삽입"
 
@@ -9554,9 +9555,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "갱신 간격"
@@ -9993,7 +9994,7 @@ msgstr "이탈리아어 (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "아이템"
 
@@ -10252,8 +10253,8 @@ msgstr "JMX 에이전트"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX 엔드 포인트"
 
@@ -10271,8 +10272,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "JSON 데이터"
 
@@ -10311,8 +10312,8 @@ msgstr "일본어 (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10351,9 +10352,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "키"
@@ -10419,13 +10420,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "라벨"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "라벨 위치"
 
@@ -10566,9 +10567,9 @@ msgstr "라트비아어 (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10579,7 +10580,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "왼쪽"
@@ -10612,25 +10613,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "검색/필터 항목의 상한치"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "선"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "선 타입"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "선 폭"
 
@@ -10652,9 +10653,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "장애발생시의 조건설정"
 
@@ -10685,8 +10686,8 @@ msgstr "템플릿과의 링크"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "링크"
 
@@ -10788,8 +10789,8 @@ msgstr "경도"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "로그"
 
@@ -10802,8 +10803,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "로그파일 감시. 로그 값을 리턴."
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "로그 시간 형식"
 
@@ -10929,7 +10930,7 @@ msgstr "메인 네비게이션"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "메인터넌스"
 
@@ -11089,7 +11090,7 @@ msgstr "맵 네비게이션"
 msgid "Map owner cannot be empty."
 msgstr "맵의 소유자는 필수항목입니다."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "맵 형태"
 
@@ -11167,19 +11168,19 @@ msgstr "마스크"
 msgid "Mass update"
 msgstr "일괄갱신"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "요소의 일괄갱신"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "형태의 일괄갱신"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "마스터 아이템"
 
@@ -11262,8 +11263,8 @@ msgid "May"
 msgstr "5월"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "연락 방법"
 
@@ -11384,8 +11385,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "표시기간"
 
@@ -11403,7 +11404,7 @@ msgstr "메세지/커맨드"
 msgid "Messages"
 msgstr "메시지"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "알림 표시"
 
@@ -11501,11 +11502,11 @@ msgstr "그래프 프로토타입의 \"name\" 항목이 존재하지 않습니�
 msgid "Missing \"name\" field for graph."
 msgstr "그래프의 \"name\" 항목이 존재하지 않습니다."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "결손 데이터"
 
@@ -11669,8 +11670,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "복수"
 
@@ -11836,7 +11837,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11856,15 +11857,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11873,16 +11874,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12162,7 +12163,7 @@ msgstr "자세한 내용이 없습니다"
 msgid "No discovery rule IDs given."
 msgstr "디스커버리 규칙ID이 설정되어 있지 않습니다"
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12218,8 +12219,8 @@ msgstr "이미지는 존재하지 않습니다"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "인터페이스를 찾을 수 없습니다."
 
@@ -12523,7 +12524,7 @@ msgstr "공개키 파일이 설정되어 있지 않습니다"
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "새로고침 없음"
 
@@ -12569,8 +12570,8 @@ msgstr "boolean이 아닌 플래그는 폐지될 예정입니다."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12578,17 +12579,17 @@ msgstr "boolean이 아닌 플래그는 폐지될 예정입니다."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "없음"
@@ -12684,7 +12685,7 @@ msgstr "통지 보고서"
 msgid "Notifications"
 msgstr "통지"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12858,8 +12859,8 @@ msgstr "수치변환"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "수치 (float)"
 
@@ -12869,8 +12870,8 @@ msgstr "수치 (integer)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "수치 (unsigned)"
 
@@ -12878,8 +12879,8 @@ msgstr "수치 (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12891,13 +12892,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "정상"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "정상 이벤트를 닫기"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "정상 이벤트를 생성"
 
@@ -12958,7 +12959,7 @@ msgstr "OFF"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -12987,7 +12988,7 @@ msgstr "ON"
 msgid "On status change triggers blink for"
 msgstr "상태가 바뀐 트리거의 점멸기간"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "한번"
 
@@ -13107,11 +13108,11 @@ msgstr "조작대상의 템플릿이 없습니다."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "오퍼레이션"
@@ -13157,7 +13158,7 @@ msgstr "옵션"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13172,11 +13173,11 @@ msgstr "옵션"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Or"
 
@@ -13271,8 +13272,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "다음에 덮어쓰기"
@@ -13489,8 +13490,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "장애"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "장애 이벤트의 생성모드"
 
@@ -13572,8 +13573,8 @@ msgstr "파라미터 \"%1$s\"는 폐지될 예정입니다."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "파라미터"
 
@@ -13621,8 +13622,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Parse"
 
@@ -13653,12 +13654,12 @@ msgstr "패시브"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13691,12 +13692,12 @@ msgid "Paste"
 msgstr "붙여넣기"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13709,7 +13710,7 @@ msgstr "링크 없이 붙여넣기"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "잠시 억제된 문제의 실행을 일시중지"
 
@@ -13752,8 +13753,8 @@ msgstr "DNS쿼리를 실행. 요구한 정보 타입의 string을 리턴."
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "기간"
@@ -13774,9 +13775,9 @@ msgid "Periods"
 msgstr "기간"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13787,7 +13788,7 @@ msgstr "기간"
 msgid "Permissions"
 msgstr "권한"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "권한은 사용자그룹만 할당할 수 있습니다."
 
@@ -13809,12 +13810,12 @@ msgstr "배치 알고리즘"
 msgid "Plain text"
 msgstr "일반 텍스트"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "재생"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "사운드 재생"
 
@@ -13844,8 +13845,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "2개의 요소를 선택하여 주십시오"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13855,14 +13855,15 @@ msgstr "2개의 요소를 선택하여 주십시오"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "포인트 사이즈"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "포인트"
 
@@ -13870,7 +13871,7 @@ msgstr "포인트"
 msgid "Polish (pl_PL)"
 msgstr "폴란드어 (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "호스트 인벤토리 필드의 자동설정"
 
@@ -13932,16 +13933,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "보존하기 전의 처리"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "보존하기 전의 처리 스탭"
 
@@ -14038,8 +14039,8 @@ msgstr "비공개"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "비밀키 파일"
 
@@ -14069,7 +14070,7 @@ msgstr "특권 레벨"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "장애"
 
@@ -14257,16 +14258,16 @@ msgstr "공개"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "공개키"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "공개키 파일"
 
@@ -14280,8 +14281,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Query필드"
 
@@ -14331,8 +14332,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "로우 데이터"
 
@@ -14358,14 +14359,14 @@ msgstr "읽기 전용"
 msgid "Read-only"
 msgstr "읽기 전용"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14379,14 +14380,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "쓰기 가능"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14432,7 +14433,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14441,10 +14442,10 @@ msgid "Recovery"
 msgstr "복구"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "복구조건식"
@@ -14454,7 +14455,7 @@ msgstr "복구조건식"
 msgid "Recovery expression syntax error."
 msgstr "복구조건식의 syntax 에러"
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "복구시 실행내용"
 
@@ -14466,8 +14467,8 @@ msgstr "복구시 실행내용"
 msgid "Recovery time"
 msgstr "복구시각"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "직사각형"
 
@@ -14572,7 +14573,7 @@ msgstr "원격 명령"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14603,13 +14604,13 @@ msgstr "원격 명령"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14617,25 +14618,25 @@ msgstr "원격 명령"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14663,14 +14664,14 @@ msgstr "원격 명령"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14745,10 +14746,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "치환"
 
@@ -14766,7 +14767,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14805,15 +14806,15 @@ msgstr "보고서"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "리퀘스트 body"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "리퀘스트 body 타입"
 
@@ -14822,8 +14823,8 @@ msgid "Request sent successfully"
 msgstr "리퀘스트를 송신을 성공하였습니다"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "리퀘스트 타입"
 
@@ -14850,8 +14851,8 @@ msgstr "1초간의 감시항목수(Zabbix서버의 요구 퍼포먼스)"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "요구 스테이터스 코드"
 
@@ -14864,11 +14865,11 @@ msgstr "요구문자열"
 msgid "Reset"
 msgstr "리셋"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "모든 필드를 기본값으로 되돌리시겠습니까?"
 
@@ -14885,11 +14886,11 @@ msgstr "리셋 확인"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "기본값으로 설정"
 
@@ -14993,8 +14994,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "재습득 모드"
 
@@ -15067,9 +15068,9 @@ msgstr "ICMP ping 패킷의 실패율을 리턴."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15077,7 +15078,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "오른쪽"
@@ -15093,8 +15094,8 @@ msgstr "우측 Y"
 msgid "Right trim"
 msgstr "오른쪽 trim"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15281,8 +15282,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15361,8 +15362,8 @@ msgstr "SQL수: %1$s (selects: %2$s | executes: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL 쿼리"
 
@@ -15387,38 +15388,38 @@ msgstr "SSH 에이전트"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "SSL 인증서 파일"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "SSL 키 파일"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "SSL 키 패스워드"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL호스트 검증"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL피어 검증"
 
@@ -15534,9 +15535,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15561,8 +15562,8 @@ msgstr "범위"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "스크립트"
 
@@ -15693,10 +15694,10 @@ msgstr "보안 이름"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "선택"
@@ -15706,9 +15707,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "프로토타입의 선택"
 
@@ -15729,7 +15730,7 @@ msgstr "선택한 액션을 삭제하였습니다"
 msgid "Selected and all other problems of related triggers"
 msgstr "선택된 장애와 트리거에 관련된 다른 모든 장애"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "선택한 요소"
 
@@ -16078,8 +16079,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "심각도를 올렸습니다"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "도형"
@@ -16182,7 +16183,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16282,8 +16283,8 @@ msgstr "단순 그래프"
 msgid "Simple graph prototype"
 msgstr "심플그래프 프로토타입"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "싱글"
 
@@ -16328,7 +16329,7 @@ msgstr "장소"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "사이즈"
 
@@ -16439,9 +16440,9 @@ msgstr "속도"
 msgid "Stacked"
 msgstr "누적 그래프"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "막대 그래프"
 
@@ -16462,7 +16463,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "시작시간"
 
@@ -16657,14 +16658,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "\"%1$s\"의 이름를 지닌 스텝이 이미 존재합니다."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "스텝"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "정지"
 
@@ -16687,10 +16688,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -16926,8 +16927,8 @@ msgstr "태그 표시 우선도"
 msgid "Tag filter"
 msgstr "태그 필터"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "매칭을 위한 태그"
 
@@ -16986,28 +16987,28 @@ msgstr "태그 값"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "태그"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "대상"
@@ -17168,14 +17169,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "테스트"
@@ -17233,10 +17234,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "텍스트"
 
@@ -17387,8 +17388,8 @@ msgstr "이번 달"
 msgid "This month so far"
 msgstr "이번 달의 지금까지"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17492,9 +17493,9 @@ msgstr "기간"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "타임 시프트"
 
@@ -17512,8 +17513,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "타임아웃"
 
@@ -17539,7 +17540,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "종료"
 
@@ -17563,7 +17564,7 @@ msgstr "오늘의 지금까지"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "위쪽"
@@ -17615,8 +17616,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17627,7 +17627,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "투명도"
 
@@ -17635,9 +17636,9 @@ msgstr "투명도"
 msgid "Transport error."
 msgstr "전송에러."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "0 으로 처리"
@@ -17649,8 +17650,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "트랜드 보존기간"
 
@@ -17668,9 +17669,9 @@ msgstr "트렌드"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "트리거"
@@ -17769,7 +17770,7 @@ msgstr "트리거 개요"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "트리거 프로토타입"
@@ -17834,7 +17835,7 @@ msgstr "트리거 프로토타입을 삭제하였습니다"
 msgid "Trigger prototypes updated"
 msgstr "트리거 프로토타입을 갱신하였습니다"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "트리거 심각도"
 
@@ -17941,23 +17942,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "종류"
@@ -17966,12 +17967,12 @@ msgstr "종류"
 msgid "Type (Full details)"
 msgstr "종류 (전체설명)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "타입 (정상)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -17982,10 +17983,10 @@ msgstr "계산 종류"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "데이터형"
 
@@ -18009,11 +18010,11 @@ msgstr "알 수 없음"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18034,7 +18035,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL이 올바르게 인코딩되지 않았습니다."
@@ -18059,7 +18060,7 @@ msgstr "URL파라미터가 설정되어 있지 않습니다"
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URL"
@@ -18162,15 +18163,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18179,8 +18180,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "단위"
 
@@ -18206,7 +18207,7 @@ msgstr "단위"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "알 수 없음"
@@ -18348,12 +18349,12 @@ msgstr "Up"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18373,18 +18374,18 @@ msgstr "Up"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18405,13 +18406,13 @@ msgstr "기존설정을 덮어씌움"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "갱신 간격"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "갱신시 실행내용"
 
@@ -18550,7 +18551,7 @@ msgstr "유저 에이전트 문자열"
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "사용자는 비활성의 그룹이나 GUI액세스가 비활성인 그룹에 자기자신을 추가할 수 없습니다."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18659,10 +18660,10 @@ msgstr "유저 메뉴"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "유저 명"
 
@@ -18729,7 +18730,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "맵 \"%2$s\"의 유저로 공유하기 위해서는 파라미터 :%1$s 가 필요합니다."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19105,12 +19106,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19172,8 +19173,8 @@ msgstr "값 매핑 \"%1$s\"는 이미 존재합니다."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "값 매핑"
@@ -19290,8 +19291,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "세로"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "세로 위치"
 
@@ -19492,8 +19493,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19504,12 +19504,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19585,8 +19586,8 @@ msgstr "맵 링크 설정이 올바르지 않습니다."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19598,11 +19599,11 @@ msgstr "X축"
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19616,8 +19617,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "XML 데이터"
 
@@ -19637,12 +19638,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Y축 최댓값"
 
@@ -19656,18 +19657,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y축의 최댓값은 Y축의 최솟값보다도 큰 숫자로 설정해주십시오."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Y축 최솟값"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Y축"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Y축"
 
@@ -19687,11 +19688,11 @@ msgstr "Y/m/d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20723,10 +20724,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "글로벌 데이터의 보존기간 설정"
@@ -20755,8 +20756,8 @@ msgstr "호스트"
 msgid "host group"
 msgstr "호스트 그룹"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "호스트 패턴"
@@ -20789,7 +20790,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "서브 그룹을 포함"
 
@@ -20963,8 +20964,8 @@ msgstr "아이템"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "아이템 패턴"
 
@@ -21228,10 +21229,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "이름"
@@ -21278,7 +21279,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "없음"
 
@@ -21308,7 +21309,7 @@ msgstr "수치"
 msgid "of"
 msgstr "of"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21331,7 +21332,7 @@ msgstr "of"
 msgid "off"
 msgstr "off"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21503,8 +21504,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21641,8 +21642,8 @@ msgstr "지정된 자격 정보는 유니크 값이 아닙니다."
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -21929,17 +21930,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/lt/LC_MESSAGES/frontend.po b/ui/locale/lt/LC_MESSAGES/frontend.po
index 81e609be1b3..18e77d38319 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2013-10-10 08:29+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -187,10 +187,10 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -240,9 +240,9 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -351,7 +351,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 sekundžių"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D vaizdas"
 
@@ -397,7 +397,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -490,27 +490,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Prieiga uždrausta!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -583,35 +583,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -742,24 +742,24 @@ msgstr "Aktyvus iki"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -795,13 +795,13 @@ msgstr "Aktyvus iki"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -819,38 +819,38 @@ msgstr "Aktyvus iki"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -877,7 +877,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -898,7 +898,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -907,16 +907,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Pridėti prototipą"
 
@@ -963,7 +963,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1051,7 +1051,7 @@ msgstr "Agento sąsaja"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1059,11 +1059,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1090,8 +1090,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1107,8 +1107,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1124,13 +1124,13 @@ msgstr "Visos nuorodos turi turėti apibrėžtą \"Pavadinimą\" ir \"URL\""
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1151,19 +1151,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Leidžiami mazgai"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1180,21 +1180,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1208,7 +1208,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1253,11 +1253,11 @@ msgstr "Programos klaida."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Taikyti"
@@ -1385,11 +1385,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1483,8 +1483,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Autentifikacijos metodas"
 
@@ -1546,8 +1546,8 @@ msgstr "Automatinis"
 msgid "Automatic icon mapping"
 msgstr "Automatinis piktogramų išdėstymas"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Automatinis piktogramų pažymėjimas"
 
@@ -1614,12 +1614,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Fonas"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1627,9 +1627,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Fono paveikslėlis"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1637,8 +1637,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Bazė DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1681,15 +1681,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1700,8 +1700,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Pusjuodė eilutė"
 
@@ -1709,19 +1709,19 @@ msgstr "Pusjuodė eilutė"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1734,7 +1734,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Apačia"
@@ -1817,7 +1817,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Apskaičiuotas"
 
@@ -1841,22 +1841,22 @@ msgstr "Atgalinis skambutis"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3501,8 +3501,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr ""
 
@@ -3530,7 +3530,7 @@ msgstr ""
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr ""
 
@@ -3651,8 +3651,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr ""
 
@@ -3680,22 +3680,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr ""
@@ -3703,28 +3703,28 @@ msgstr ""
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3738,7 +3738,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3752,11 +3752,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3765,7 +3765,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3853,9 +3853,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr ""
@@ -4040,13 +4040,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4138,8 +4138,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4219,13 +4219,13 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr ""
 
@@ -4242,7 +4242,7 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4384,10 +4384,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4591,7 +4591,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4605,8 +4605,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4773,8 +4773,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr ""
 
@@ -4792,7 +4792,7 @@ msgstr ""
 msgid "Data overview"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4976,11 +4976,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr ""
 
@@ -5022,7 +5022,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr ""
 
@@ -5056,7 +5056,7 @@ msgstr ""
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5065,7 +5065,7 @@ msgstr ""
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5073,47 +5073,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr ""
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -5121,11 +5121,11 @@ msgstr ""
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5138,10 +5138,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr ""
 
@@ -5165,11 +5165,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr ""
 
@@ -5211,11 +5211,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5274,7 +5274,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr ""
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr ""
 
@@ -5282,11 +5282,11 @@ msgstr ""
 msgid "Delete selected image?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr ""
 
@@ -5302,7 +5302,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr ""
 
@@ -5334,11 +5334,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5346,19 +5346,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5374,11 +5374,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr ""
 
@@ -5404,7 +5404,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5419,10 +5419,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr ""
 
@@ -5459,7 +5459,7 @@ msgstr ""
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5469,13 +5469,13 @@ msgstr ""
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr ""
@@ -5485,10 +5485,10 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr ""
@@ -5529,7 +5529,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5580,11 +5580,11 @@ msgstr ""
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5613,7 +5613,7 @@ msgstr ""
 msgid "Disable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr ""
 
@@ -5647,7 +5647,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5675,7 +5675,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr ""
 
@@ -5701,9 +5701,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5901,7 +5901,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5909,13 +5909,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5939,15 +5939,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5961,8 +5961,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5972,8 +5972,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5983,8 +5983,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5992,8 +5992,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr ""
 
@@ -6022,16 +6022,16 @@ msgstr ""
 msgid "Downtime"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr ""
 
@@ -6082,7 +6082,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr ""
 
@@ -6105,29 +6105,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr ""
@@ -6181,12 +6181,12 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6242,7 +6242,7 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6322,11 +6322,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6356,7 +6356,7 @@ msgstr ""
 msgid "Enable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr ""
 
@@ -6378,8 +6378,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6401,7 +6401,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6417,7 +6417,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6431,14 +6431,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr ""
 
@@ -6491,8 +6491,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6670,7 +6670,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6691,8 +6691,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr ""
 
@@ -6706,13 +6706,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6782,15 +6782,15 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6803,10 +6803,10 @@ msgstr ""
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr ""
 
@@ -6874,7 +6874,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -7008,8 +7008,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -7020,7 +7019,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7117,7 +7117,7 @@ msgid "Fit to map"
 msgstr ""
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr ""
 
@@ -7129,9 +7129,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7139,22 +7139,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7162,8 +7162,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr ""
 
@@ -7199,7 +7199,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr ""
 
@@ -7214,7 +7214,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7230,7 +7230,7 @@ msgid "Full clone"
 msgstr ""
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr ""
 
@@ -7649,8 +7649,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr ""
 
@@ -7661,8 +7661,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7699,10 +7699,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7718,7 +7718,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7824,7 +7824,7 @@ msgid "History cleared"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -7839,8 +7839,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7857,8 +7857,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr ""
 
@@ -7980,7 +7980,7 @@ msgstr[2] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8066,9 +8066,9 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr ""
 
@@ -8357,8 +8357,8 @@ msgstr ""
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr ""
 
@@ -8372,19 +8372,19 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr ""
 
@@ -8431,7 +8431,7 @@ msgstr ""
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr ""
 
@@ -8577,7 +8577,7 @@ msgstr ""
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr ""
 
@@ -8661,6 +8661,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9545,10 +9546,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr ""
@@ -9615,8 +9616,8 @@ msgstr ""
 msgid "Insert"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9732,9 +9733,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr ""
@@ -10171,7 +10172,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr ""
 
@@ -10438,8 +10439,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10457,8 +10458,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10497,8 +10498,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10537,9 +10538,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr ""
@@ -10605,13 +10606,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr ""
 
@@ -10764,9 +10765,9 @@ msgstr ""
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10777,7 +10778,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr ""
@@ -10810,25 +10811,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10850,9 +10851,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr ""
 
@@ -10883,8 +10884,8 @@ msgstr ""
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10986,8 +10987,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr ""
 
@@ -11000,8 +11001,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr ""
 
@@ -11127,7 +11128,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr ""
 
@@ -11287,7 +11288,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11365,19 +11366,19 @@ msgstr ""
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11462,8 +11463,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11590,8 +11591,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr ""
 
@@ -11609,7 +11610,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr ""
 
@@ -11709,11 +11710,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11885,8 +11886,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -12052,7 +12053,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -12072,15 +12073,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12089,16 +12090,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12378,7 +12379,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12434,8 +12435,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12739,7 +12740,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12785,8 +12786,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12794,17 +12795,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr ""
@@ -12900,7 +12901,7 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -13074,8 +13075,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr ""
 
@@ -13085,8 +13086,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr ""
 
@@ -13094,8 +13095,8 @@ msgstr ""
 msgid "OEM"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13107,13 +13108,13 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13174,7 +13175,7 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13203,7 +13204,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr ""
 
@@ -13325,11 +13326,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr ""
@@ -13375,7 +13376,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13390,11 +13391,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13489,8 +13490,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13707,8 +13708,8 @@ msgstr ""
 msgid "PROBLEM"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13790,8 +13791,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13839,8 +13840,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13871,12 +13872,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13909,12 +13910,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13927,7 +13928,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13970,8 +13971,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr ""
@@ -13992,9 +13993,9 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -14005,7 +14006,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -14027,12 +14028,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr ""
 
@@ -14062,8 +14063,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14073,14 +14073,15 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -14088,7 +14089,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -14150,16 +14151,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14256,8 +14257,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr ""
 
@@ -14287,7 +14288,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr ""
 
@@ -14477,16 +14478,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr ""
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr ""
 
@@ -14500,8 +14501,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14551,8 +14552,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14578,14 +14579,14 @@ msgstr ""
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14599,14 +14600,14 @@ msgstr ""
 msgid "Read-write"
 msgstr ""
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14652,7 +14653,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14661,10 +14662,10 @@ msgid "Recovery"
 msgstr ""
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14674,7 +14675,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14686,8 +14687,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14794,7 +14795,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14825,13 +14826,13 @@ msgstr ""
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14839,25 +14840,25 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14885,14 +14886,14 @@ msgstr ""
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14967,10 +14968,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr ""
 
@@ -14988,7 +14989,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -15027,15 +15028,15 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -15044,8 +15045,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -15072,8 +15073,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr ""
 
@@ -15086,11 +15087,11 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -15107,11 +15108,11 @@ msgstr ""
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr ""
 
@@ -15215,8 +15216,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15289,9 +15290,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15299,7 +15300,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr ""
@@ -15315,8 +15316,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15509,8 +15510,8 @@ msgstr ""
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr ""
 
@@ -15589,8 +15590,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15615,38 +15616,38 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15768,9 +15769,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15795,8 +15796,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr ""
 
@@ -15929,10 +15930,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr ""
@@ -15942,9 +15943,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15965,7 +15966,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr ""
 
@@ -16315,8 +16316,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16419,7 +16420,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16519,8 +16520,8 @@ msgstr ""
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16565,7 +16566,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16676,9 +16677,9 @@ msgstr ""
 msgid "Stacked"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16699,7 +16700,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16894,14 +16895,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr ""
 
@@ -16924,10 +16925,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17163,8 +17164,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17223,28 +17224,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr ""
@@ -17405,14 +17406,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr ""
@@ -17470,10 +17471,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr ""
 
@@ -17628,8 +17629,8 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17733,9 +17734,9 @@ msgstr ""
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17753,8 +17754,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr ""
 
@@ -17780,7 +17781,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr ""
 
@@ -17804,7 +17805,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr ""
@@ -17856,8 +17857,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17868,7 +17868,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17876,9 +17877,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17890,8 +17891,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17909,9 +17910,9 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr ""
@@ -18016,7 +18017,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr ""
@@ -18083,7 +18084,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
@@ -18190,23 +18191,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr ""
@@ -18215,12 +18216,12 @@ msgstr ""
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr ""
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18231,10 +18232,10 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr ""
 
@@ -18258,11 +18259,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr ""
@@ -18283,7 +18284,7 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18308,7 +18309,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr ""
@@ -18411,15 +18412,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18428,8 +18429,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr ""
 
@@ -18455,7 +18456,7 @@ msgstr ""
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18599,12 +18600,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18624,18 +18625,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18656,13 +18657,13 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18801,7 +18802,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18916,10 +18917,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr ""
 
@@ -18988,7 +18989,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19366,12 +19367,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19433,8 +19434,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr ""
@@ -19551,8 +19552,8 @@ msgstr ""
 msgid "Vertical"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr ""
 
@@ -19757,8 +19758,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19769,12 +19769,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19850,8 +19851,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr ""
 
@@ -19863,11 +19864,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19881,8 +19882,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19902,12 +19903,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr ""
 
@@ -19921,18 +19922,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19952,11 +19953,11 @@ msgstr ""
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20987,10 +20988,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -21019,8 +21020,8 @@ msgstr ""
 msgid "host group"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -21053,7 +21054,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21227,8 +21228,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21492,10 +21493,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21542,7 +21543,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21572,7 +21573,7 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21595,7 +21596,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21767,8 +21768,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21905,8 +21906,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22193,17 +22194,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/lv/LC_MESSAGES/frontend.po b/ui/locale/lv/LC_MESSAGES/frontend.po
index 1ce0423c422..0431de92b7b 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -188,10 +188,10 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -241,9 +241,9 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -352,7 +352,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 sekundes"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D skats"
 
@@ -398,7 +398,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -491,27 +491,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Piekļuve liegta!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -583,35 +583,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -742,24 +742,24 @@ msgstr "Aktīvs līdz"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -795,13 +795,13 @@ msgstr "Aktīvs līdz"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -819,38 +819,38 @@ msgstr "Aktīvs līdz"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -877,7 +877,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -898,7 +898,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -907,16 +907,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Pievienot prototipu"
 
@@ -965,7 +965,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1053,7 +1053,7 @@ msgstr "Aģenta interfeiss"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1061,11 +1061,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1092,8 +1092,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1109,8 +1109,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1126,13 +1126,13 @@ msgstr ""
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1153,19 +1153,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Atļautie resursdatori"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1182,21 +1182,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1210,7 +1210,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1255,11 +1255,11 @@ msgstr "Aplikācijas kļūda."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Pielietot"
@@ -1387,11 +1387,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1485,8 +1485,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Autentifikācijas metode"
 
@@ -1548,8 +1548,8 @@ msgstr "Automātiski"
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr ""
 
@@ -1616,12 +1616,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Fons"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1629,9 +1629,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Fona attēls"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1639,8 +1639,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Bāzes DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1683,15 +1683,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1702,8 +1702,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Treknraksta līnija"
 
@@ -1711,19 +1711,19 @@ msgstr "Treknraksta līnija"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1736,7 +1736,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Apakša"
@@ -1819,7 +1819,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Izskaitļots"
 
@@ -1843,22 +1843,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3505,8 +3505,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Simbols"
 
@@ -3534,7 +3534,7 @@ msgstr ""
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr ""
 
@@ -3655,8 +3655,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr ""
 
@@ -3684,22 +3684,22 @@ msgstr "Pulkstenis"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Klonēt"
@@ -3707,28 +3707,28 @@ msgstr "Klonēt"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Aizvērt"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3742,7 +3742,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3756,11 +3756,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3769,7 +3769,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3857,9 +3857,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Nosacījumi"
@@ -4044,13 +4044,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4142,8 +4142,8 @@ msgstr "Kontaktinformācija"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4223,13 +4223,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Līguma numurs"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Koordinātes"
 
@@ -4246,7 +4246,7 @@ msgstr "Kopēt"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4388,10 +4388,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4595,7 +4595,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4609,8 +4609,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4777,8 +4777,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Pārtraukta līnija"
 
@@ -4796,7 +4796,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Datu pārskats"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4980,11 +4980,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Noklusētais"
 
@@ -5026,7 +5026,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr ""
 
@@ -5060,7 +5060,7 @@ msgstr "Aizkave pēc"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5069,7 +5069,7 @@ msgstr "Aizkave pēc"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5077,47 +5077,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Dzēst"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr ""
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -5125,11 +5125,11 @@ msgstr ""
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5142,10 +5142,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Dzēst izteiksmi?"
 
@@ -5169,11 +5169,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr ""
 
@@ -5215,11 +5215,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5278,7 +5278,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr ""
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr ""
 
@@ -5286,11 +5286,11 @@ msgstr ""
 msgid "Delete selected image?"
 msgstr "Vai dzēst iezīmēto attēlu?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr ""
 
@@ -5306,7 +5306,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr "Vai dzēst iezīmētās kartes?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr ""
 
@@ -5338,11 +5338,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Vai dzēst iezīmētos skriptus?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5350,19 +5350,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Izdzēst atlasīto lietotāju?"
 
@@ -5378,11 +5378,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr "Dzēst"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Dzēst trigeri?"
 
@@ -5408,7 +5408,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "Atdalītājs"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5423,10 +5423,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr ""
 
@@ -5463,7 +5463,7 @@ msgstr ""
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5473,13 +5473,13 @@ msgstr ""
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Apraksts"
@@ -5489,10 +5489,10 @@ msgstr "Apraksts"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detaļas"
@@ -5533,7 +5533,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5584,11 +5584,11 @@ msgstr ""
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5617,7 +5617,7 @@ msgstr ""
 msgid "Disable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr ""
 
@@ -5651,7 +5651,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5679,7 +5679,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Atspējots"
 
@@ -5705,9 +5705,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5905,7 +5905,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5913,13 +5913,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5943,15 +5943,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5965,8 +5965,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5976,8 +5976,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5987,8 +5987,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5996,8 +5996,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Punkti"
 
@@ -6026,16 +6026,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "Dīkstāve"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr ""
 
@@ -6086,7 +6086,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Ilgums"
 
@@ -6109,29 +6109,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Rediģēt"
@@ -6185,12 +6185,12 @@ msgstr ""
 msgid "Element"
 msgstr "Elements"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Elementa vārds"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6246,7 +6246,7 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6326,11 +6326,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6360,7 +6360,7 @@ msgstr ""
 msgid "Enable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr ""
 
@@ -6382,8 +6382,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6405,7 +6405,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6421,7 +6421,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6435,14 +6435,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Ieslēgts"
 
@@ -6495,8 +6495,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6675,7 +6675,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6696,8 +6696,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Palaist skriptu"
 
@@ -6711,13 +6711,13 @@ msgstr "Izpildes apstiprināšana"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6787,15 +6787,15 @@ msgstr "Eksportēt uz CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6808,10 +6808,10 @@ msgstr "Izteiksme"
 msgid "Expression cannot be empty"
 msgstr "Izteiksme nedrīkst būt tukša"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Izteiksmes konstruktors"
 
@@ -6879,7 +6879,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -7013,8 +7013,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -7025,7 +7024,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7122,7 +7122,7 @@ msgid "Fit to map"
 msgstr ""
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fiksēts"
 
@@ -7134,9 +7134,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7144,22 +7144,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7167,8 +7167,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formula"
 
@@ -7204,7 +7204,7 @@ msgstr "Piektdiena"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "No"
 
@@ -7219,7 +7219,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Saskarnes piekļuve"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7235,7 +7235,7 @@ msgid "Full clone"
 msgstr ""
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funkcija"
 
@@ -7655,8 +7655,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP autentifikācija"
 
@@ -7667,8 +7667,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP starpniekserveris"
 
@@ -7705,10 +7705,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7724,7 +7724,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7830,7 +7830,7 @@ msgid "History cleared"
 msgstr "Vēsture nodzēsta"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Vēstures dzēšana var aizņemt daudz laika. Vai turpināt?"
 
@@ -7845,8 +7845,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7863,8 +7863,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horizontāli"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr ""
 
@@ -7987,7 +7987,7 @@ msgstr[2] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8073,9 +8073,9 @@ msgstr "Iekārtas grupas"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Iekārtas interfeiss"
 
@@ -8364,8 +8364,8 @@ msgstr ""
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI sensors"
 
@@ -8379,19 +8379,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ikona"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ikona (noklusējuma)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ikona (atspējots)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ikona (uzturēšana)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ikona (problēma)"
 
@@ -8438,7 +8438,7 @@ msgstr ""
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Ikonas"
 
@@ -8584,7 +8584,7 @@ msgstr "Attēli"
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Nekavējoties"
 
@@ -8668,6 +8668,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9552,10 +9553,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr ""
@@ -9622,8 +9623,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Ievietot"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9739,9 +9740,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Intervāls"
@@ -10178,7 +10179,7 @@ msgstr "Itāļu (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Rādītājs"
 
@@ -10445,8 +10446,8 @@ msgstr "JMX aģents"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10464,8 +10465,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10504,8 +10505,8 @@ msgstr "Japāņu (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10544,9 +10545,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Atslēga"
@@ -10612,13 +10613,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Iezīme"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Iezīmes izvietojums"
 
@@ -10771,9 +10772,9 @@ msgstr "Latviešu (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10784,7 +10785,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr ""
@@ -10817,25 +10818,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Meklēšanas/filtra rezultātu limits"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Līnija"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10857,9 +10858,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr ""
 
@@ -10890,8 +10891,8 @@ msgstr ""
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10993,8 +10994,8 @@ msgstr "Atrašanās vietas ģeogrāfiskais garums"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Žurnalēšanas fails"
 
@@ -11007,8 +11008,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr ""
 
@@ -11134,7 +11135,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr ""
 
@@ -11294,7 +11295,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11372,19 +11373,19 @@ msgstr ""
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11469,8 +11470,8 @@ msgid "May"
 msgstr "Mai"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr ""
 
@@ -11597,8 +11598,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr ""
 
@@ -11616,7 +11617,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Ziņojumi"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr ""
 
@@ -11716,11 +11717,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11892,8 +11893,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -12059,7 +12060,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -12079,15 +12080,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12096,16 +12097,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12385,7 +12386,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12441,8 +12442,8 @@ msgstr "Nav attēla"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12746,7 +12747,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12792,8 +12793,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12801,17 +12802,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr ""
@@ -12907,7 +12908,7 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -13081,8 +13082,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numurs (peldošais)"
 
@@ -13092,8 +13093,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr ""
 
@@ -13101,8 +13102,8 @@ msgstr ""
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13114,13 +13115,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13181,7 +13182,7 @@ msgstr ""
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13210,7 +13211,7 @@ msgstr ""
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Vienreiz"
 
@@ -13332,11 +13333,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operācija"
@@ -13382,7 +13383,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13397,11 +13398,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13496,8 +13497,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13714,8 +13715,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLĒMA"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13797,8 +13798,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13846,8 +13847,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13878,12 +13879,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13916,12 +13917,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13934,7 +13935,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13977,8 +13978,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Periods"
@@ -13999,9 +14000,9 @@ msgid "Periods"
 msgstr "Periodi"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -14012,7 +14013,7 @@ msgstr "Periodi"
 msgid "Permissions"
 msgstr "Pieejas tiesības"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -14034,12 +14035,12 @@ msgstr ""
 msgid "Plain text"
 msgstr ""
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Atskaņot"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Atskaņot skaņu"
 
@@ -14069,8 +14070,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14080,14 +14080,15 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -14095,7 +14096,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Poļu (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -14157,16 +14158,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14263,8 +14264,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Privātās atslēgas fails"
 
@@ -14294,7 +14295,7 @@ msgstr "Privilēģiju līmenis"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problēma"
 
@@ -14484,16 +14485,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Publiskā atslēga"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Publiskās atslēgas fails"
 
@@ -14507,8 +14508,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14558,8 +14559,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14585,14 +14586,14 @@ msgstr "Tikai lasīšana"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14606,14 +14607,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Lasīšana un rakstīšana"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14659,7 +14660,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14668,10 +14669,10 @@ msgid "Recovery"
 msgstr "Atjaunošana"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14681,7 +14682,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14693,8 +14694,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14801,7 +14802,7 @@ msgstr "Attālināta komanda"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14832,13 +14833,13 @@ msgstr "Attālināta komanda"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14846,25 +14847,25 @@ msgstr "Attālināta komanda"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14892,14 +14893,14 @@ msgstr "Attālināta komanda"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14974,10 +14975,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Aizstāt"
 
@@ -14995,7 +14996,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -15034,15 +15035,15 @@ msgstr "Atskaites"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -15051,8 +15052,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -15079,8 +15080,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr ""
 
@@ -15093,11 +15094,11 @@ msgstr ""
 msgid "Reset"
 msgstr "Atiestatīt"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -15114,11 +15115,11 @@ msgstr ""
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr ""
 
@@ -15222,8 +15223,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15296,9 +15297,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15306,7 +15307,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Pa labi"
@@ -15322,8 +15323,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15516,8 +15517,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15596,8 +15597,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL pieprasījums"
 
@@ -15622,38 +15623,38 @@ msgstr "SSH aģents"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15775,9 +15776,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15802,8 +15803,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Skripts"
 
@@ -15936,10 +15937,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Atlasīt"
@@ -15949,9 +15950,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15972,7 +15973,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Atlasītie elementi"
 
@@ -16322,8 +16323,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16426,7 +16427,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16526,8 +16527,8 @@ msgstr "Vienkāršs grafiks"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16572,7 +16573,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16683,9 +16684,9 @@ msgstr "Ātrums"
 msgid "Stacked"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16706,7 +16707,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16901,14 +16902,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Soļi"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Apturēt"
 
@@ -16931,10 +16932,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17170,8 +17171,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17230,28 +17231,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr ""
@@ -17412,14 +17413,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Tests"
@@ -17477,10 +17478,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Teksts"
 
@@ -17635,8 +17636,8 @@ msgstr "Šis mēnesis"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17740,9 +17741,9 @@ msgstr "Laika periods"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17760,8 +17761,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Taimauts"
 
@@ -17787,7 +17788,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Līdz"
 
@@ -17811,7 +17812,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr ""
@@ -17863,8 +17864,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17875,7 +17875,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17883,9 +17884,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17897,8 +17898,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17916,9 +17917,9 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigeris"
@@ -18023,7 +18024,7 @@ msgstr ""
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Trigera prototips"
@@ -18090,7 +18091,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr ""
 
@@ -18197,23 +18198,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Tips"
@@ -18222,12 +18223,12 @@ msgstr "Tips"
 msgid "Type (Full details)"
 msgstr "Tips (Visas detaļas)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Tips (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18238,10 +18239,10 @@ msgstr "Aprēķina tips"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Informācijas tips"
 
@@ -18265,11 +18266,11 @@ msgstr "NEZINĀMS"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "Saite"
@@ -18290,7 +18291,7 @@ msgstr "Tīmekļa adrese B"
 msgid "URL C"
 msgstr "Tīmekļa adrese C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18315,7 +18316,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr ""
@@ -18418,15 +18419,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18435,8 +18436,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Vienības"
 
@@ -18462,7 +18463,7 @@ msgstr "Vienības"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Nav zināms"
@@ -18606,12 +18607,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18631,18 +18632,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18663,13 +18664,13 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Atjaunošanas intervāls"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18808,7 +18809,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18923,10 +18924,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Lietotāja vārds"
 
@@ -18995,7 +18996,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19373,12 +19374,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19440,8 +19441,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Vērtību plānojums"
@@ -19558,8 +19559,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertikāli"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Vertikāls novietojums"
 
@@ -19764,8 +19765,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19776,12 +19776,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19857,8 +19858,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19870,11 +19871,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19888,8 +19889,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19909,12 +19910,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Y ass MAX vērtība"
 
@@ -19928,18 +19929,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Y ass MIN vērtība"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19959,11 +19960,11 @@ msgstr ""
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20994,10 +20995,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -21026,8 +21027,8 @@ msgstr ""
 msgid "host group"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -21060,7 +21061,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21234,8 +21235,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21499,10 +21500,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21549,7 +21550,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21579,7 +21580,7 @@ msgstr ""
 msgid "of"
 msgstr "no"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21602,7 +21603,7 @@ msgstr "no"
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21774,8 +21775,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21912,8 +21913,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22200,17 +22201,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/nb/LC_MESSAGES/frontend.po b/ui/locale/nb/LC_MESSAGES/frontend.po
index 215f25be89b..05ce66ddff0 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2021-03-19 18:13+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -184,10 +184,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -232,9 +232,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s forsøk gjenstår"
 msgstr[1] "%1$s forsøk gjenstår"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -339,7 +339,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 sekunder"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D-visning"
 
@@ -385,7 +385,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -475,27 +475,27 @@ msgstr "Tilgang nektet"
 msgid "Access denied!"
 msgstr "Tilgang nektet!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -567,35 +567,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -724,24 +724,24 @@ msgstr "Aktiv til"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -777,13 +777,13 @@ msgstr "Aktiv til"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -801,38 +801,38 @@ msgstr "Aktiv til"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -859,7 +859,7 @@ msgstr "Legg til barnelement"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -880,7 +880,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Legg til flere kart"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -889,16 +889,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -908,7 +908,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Legg til prototype"
 
@@ -945,7 +945,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Legg til widget"
@@ -1033,7 +1033,7 @@ msgstr "Agent grensesnitt"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1041,11 +1041,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1072,8 +1072,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1089,8 +1089,8 @@ msgid "All dashboards"
 msgstr "Alle dashboard"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Alle grupper"
 
@@ -1106,13 +1106,13 @@ msgstr "Alle koblinger skal ha \"Name\" og \"URL\" angitt"
 msgid "All maps"
 msgstr "Alle kart"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Alle problemer"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Alle problemer hvis tagverdier samsvarer"
 
@@ -1133,19 +1133,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Tillat manuell lukking"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Tillatte verter"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1162,21 +1162,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "Og"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1190,7 +1190,7 @@ msgstr "Og"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "Og/Eller"
 
@@ -1235,11 +1235,11 @@ msgstr "Programfeil."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Bruk"
@@ -1367,11 +1367,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1465,8 +1465,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Autentiserings metode"
 
@@ -1528,8 +1528,8 @@ msgstr "Automatisk"
 msgid "Automatic icon mapping"
 msgstr "Automatisk ikon kartlegging"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Automatisk ikonvalg"
 
@@ -1596,12 +1596,12 @@ msgstr "Tilbake"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Bakgrunn"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1609,9 +1609,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Bakgrunnsbilde"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1619,8 +1619,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1663,15 +1663,15 @@ msgstr "Blå"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1682,8 +1682,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Fet linje"
 
@@ -1691,19 +1691,19 @@ msgstr "Fet linje"
 msgid "Boolean to decimal"
 msgstr "Boolsk til desimal"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Kant"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Kanttype"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Kantbredde"
 
@@ -1716,7 +1716,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Bunn"
@@ -1799,7 +1799,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Kalkulert"
 
@@ -1823,22 +1823,22 @@ msgstr "Ring tilbake"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3432,8 +3432,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Karakter"
 
@@ -3461,7 +3461,7 @@ msgstr "chassis"
 msgid "Chassis information. Returns string"
 msgstr "Chassisinformasjon. Returnerer streng"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Sjekk allerede eksisterer."
 
@@ -3582,8 +3582,8 @@ msgid "Clear history"
 msgstr "Slett logg"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Ryd historie og trender"
 
@@ -3611,22 +3611,22 @@ msgstr "Klokke"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Klon"
@@ -3634,28 +3634,28 @@ msgstr "Klon"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Lukk"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Lukk uttrykkskonstruksjon"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Lukk ny hendelse"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Lukk gamle arrangementer"
@@ -3669,7 +3669,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Kollaps"
@@ -3683,11 +3683,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3696,7 +3696,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3784,9 +3784,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Tilstander"
@@ -3971,13 +3971,13 @@ msgstr "Gratulerer! Du har installert Zabbix frontend."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Koble til"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4069,8 +4069,8 @@ msgstr "Kontakt"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4150,13 +4150,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Kontrakt nummer"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Koordinater"
 
@@ -4173,7 +4173,7 @@ msgstr "Kopier"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Korrelasjon"
 
@@ -4313,10 +4313,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4520,7 +4520,7 @@ msgid "Custom"
 msgstr "Tilpasset"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4534,8 +4534,8 @@ msgstr "Egendefinerte grafer"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Tilpassede intervaller"
 
@@ -4701,8 +4701,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "oversikter"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Stiplede linje"
 
@@ -4720,7 +4720,7 @@ msgstr "Dataene er ikke riktig kodet."
 msgid "Data overview"
 msgstr "Dataoversikt"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4904,11 +4904,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Forvalg"
 
@@ -4950,7 +4950,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Standard driftstidsvarighet"
 
@@ -4984,7 +4984,7 @@ msgstr "Forsinket av"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4993,7 +4993,7 @@ msgstr "Forsinket av"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5001,47 +5001,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Slett"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Slett og fjern"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Slett og fjern valgte maler? (Advarsel: alle tilknyttede verter blir ryddet!)"
 
@@ -5049,11 +5049,11 @@ msgstr "Slett og fjern valgte maler? (Advarsel: alle tilknyttede verter blir ryd
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Slett og fjern mal? (Advarsel: alle tilknyttede verter blir ryddet!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Slett nåværende handling?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Slett nåværende korrelasjon?"
 
@@ -5066,10 +5066,10 @@ msgstr "Slett dashbord?"
 msgid "Delete discovery rule?"
 msgstr "Slett oppdagelsesregel?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Slett uttrykk?"
 
@@ -5093,11 +5093,11 @@ msgstr "Slett historie av utvalgte webscenarier?"
 msgid "Delete icon map?"
 msgstr "Slett ikon kart?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Slett element prototype?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Slett element?"
 
@@ -5139,11 +5139,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5202,7 +5202,7 @@ msgstr "Slett utvalgte vertsprototyper?"
 msgid "Delete selected host?"
 msgstr "Slett valgt vert?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Slett valgte verter?"
 
@@ -5210,11 +5210,11 @@ msgstr "Slett valgte verter?"
 msgid "Delete selected image?"
 msgstr "Slett valgt bilde?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Slett utvalgte prototyper?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Slett valgte elementer?"
 
@@ -5230,7 +5230,7 @@ msgstr "Slett valgt kart?"
 msgid "Delete selected maps?"
 msgstr "Slett valgte kart?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Slett valgte medietyper?"
 
@@ -5262,11 +5262,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Slett utvalgte skript?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5274,19 +5274,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Slett valgte former?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Slett valgte maler?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Slett valgte utløserprototyper?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Slett valgte utløsere?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Slett valgt bruker?"
 
@@ -5302,11 +5302,11 @@ msgstr "Slett valgte webscenarier?"
 msgid "Delete template?"
 msgstr "Slett mal?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Slett utløseren prototype?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Slett utløseren?"
 
@@ -5332,7 +5332,7 @@ msgstr "Slettet: Vertsprototype \"%1$s\" på \"%2$s\"."
 msgid "Delimiter"
 msgstr "delimiter"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5347,10 +5347,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "avhengig"
 
@@ -5387,7 +5387,7 @@ msgstr "Distribusjonsstatus"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5397,13 +5397,13 @@ msgstr "Distribusjonsstatus"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Beskrivelse"
@@ -5413,10 +5413,10 @@ msgstr "Beskrivelse"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detaljer"
@@ -5457,7 +5457,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5508,11 +5508,11 @@ msgstr "Deaktiver verter overvåket av utvalgte proxyer?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5541,7 +5541,7 @@ msgstr "Deaktivere valgte verter?"
 msgid "Disable selected items?"
 msgstr "Deaktivere valgte elementer?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Deaktivere valgte medietyper?"
 
@@ -5575,7 +5575,7 @@ msgstr "Deaktiver valgte webscenarier?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5603,7 +5603,7 @@ msgstr "Deaktiver valgte webscenarier?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Funksjonshemmet"
 
@@ -5629,9 +5629,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5827,7 +5827,7 @@ msgstr "Disk skrive statistikk. Returnerer heltall med type i sektorer, operasjo
 msgid "Display OK triggers for"
 msgstr "Vis OK utløsere for"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Vis grafen"
 
@@ -5835,13 +5835,13 @@ msgstr "Vis grafen"
 msgid "Display problems"
 msgstr "Vis problemer"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Vis stablet graf"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5865,15 +5865,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5887,8 +5887,8 @@ msgstr "Ønsker du å erstatte det betingede uttrykket?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5898,8 +5898,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5909,8 +5909,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5918,8 +5918,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Punkt"
 
@@ -5948,16 +5948,16 @@ msgstr "Last ned konfigurasjonsfilen"
 msgid "Downtime"
 msgstr "nedetid"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Tegn stil"
 
@@ -6008,7 +6008,7 @@ msgstr "Dupliser userid \"%1$s\" i brukere for kart \"%2$s\"."
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Varighet"
 
@@ -6031,29 +6031,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Redigerer"
@@ -6107,12 +6107,12 @@ msgstr ""
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Elementnavn"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "ellipse"
 
@@ -6168,7 +6168,7 @@ msgstr "Tom inngangsparameter."
 msgid "Empty map ID."
 msgstr "Tom kart ID."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6248,11 +6248,11 @@ msgstr "Aktiver intern rengjøring"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6282,7 +6282,7 @@ msgstr "Aktiver valgte verter?"
 msgid "Enable selected items?"
 msgstr "Aktiver valgte elementer?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Aktiver valgte medietyper?"
 
@@ -6304,8 +6304,8 @@ msgstr "Aktiver valgte webscenarier?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6327,7 +6327,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6343,7 +6343,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6357,14 +6357,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "aktivert"
 
@@ -6417,8 +6417,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6596,7 +6596,7 @@ msgstr "Utfør WMI-spørring og returner det første valgte objektet. Returnerer
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6617,8 +6617,8 @@ msgstr "utført"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Utført script"
 
@@ -6632,13 +6632,13 @@ msgstr "Utførelsesbekreftelse"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Utvide"
@@ -6708,15 +6708,15 @@ msgstr "Eksporter til CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6729,10 +6729,10 @@ msgstr "Uttrykk"
 msgid "Expression cannot be empty"
 msgstr "Uttrykk kan ikke være tomt"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Ekspresjonskonstruktør"
 
@@ -6800,7 +6800,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Kunne ikke opprette dashbordet"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Kunne ikke analysere nettadressen."
@@ -6934,8 +6934,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Fil tid informasjon. Returnerer heltall (Unix tidsstempel)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6946,7 +6945,8 @@ msgstr "Fil tid informasjon. Returnerer heltall (Unix tidsstempel)"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7043,7 +7043,7 @@ msgid "Fit to map"
 msgstr "Tilpass til kart"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fikset"
 
@@ -7055,9 +7055,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7065,22 +7065,22 @@ msgstr "fleksibel"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Følg omdirigeringer"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Skrifttype"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
@@ -7088,8 +7088,8 @@ msgstr "Skriftstørrelse"
 msgid "Form data"
 msgstr "Skjema data"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formel"
 
@@ -7125,7 +7125,7 @@ msgstr "Fredag"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Fra"
 
@@ -7140,7 +7140,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Frontend tilgang"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Frontend-meldinger"
 
@@ -7156,7 +7156,7 @@ msgid "Full clone"
 msgstr "Full klone"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funksjon"
 
@@ -7573,8 +7573,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP-godkjenning"
 
@@ -7585,8 +7585,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP-proxy"
 
@@ -7623,10 +7623,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Overskrifter"
 
@@ -7642,7 +7642,7 @@ msgstr "Hebraisk (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7748,7 +7748,7 @@ msgid "History cleared"
 msgstr "Historikk ryddet"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Historisk rydding kan ta lang tid. Fortsette?"
 
@@ -7763,8 +7763,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Historikk lagringsperiode"
 
@@ -7781,8 +7781,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Horisontal justering"
 
@@ -7901,7 +7901,7 @@ msgstr[1] "Verter aktivert"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7987,9 +7987,9 @@ msgstr "Vert grupper"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Vertsgrensesnitt"
 
@@ -8277,8 +8277,8 @@ msgstr "IPMI-grensesnitt"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI-sensor"
 
@@ -8292,19 +8292,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ikon"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ikon (standard)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ikon (deaktivert)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ikon (vedlikehold)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ikon (problem)"
 
@@ -8351,7 +8351,7 @@ msgstr "Ikon kartlegging"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Ikon med ID \"%1$s\" er ikke tilgjengelig."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "ikoner"
 
@@ -8495,7 +8495,7 @@ msgstr "Bilder"
 msgid "Images for all maps will be updated!"
 msgstr "Bilder for alle kart vil bli oppdatert!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Med en gang"
 
@@ -8579,6 +8579,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9463,10 +9464,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "info"
@@ -9533,8 +9534,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Sett inn"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Sett inn uttrykk"
 
@@ -9650,9 +9651,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Intervall"
@@ -10089,7 +10090,7 @@ msgstr "Italiensk (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "artikkel"
 
@@ -10352,8 +10353,8 @@ msgstr "JMX agent"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX endepunkt"
 
@@ -10371,8 +10372,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10411,8 +10412,8 @@ msgstr "Japansk (ja_jp)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10451,9 +10452,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Tast"
@@ -10520,13 +10521,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Etikett"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Etikettsted"
 
@@ -10673,9 +10674,9 @@ msgstr "Latvisk (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10686,7 +10687,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Venstre"
@@ -10719,25 +10720,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Grense for søk og filter resultater"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Linje"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Linjetype"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Linje bredde"
 
@@ -10759,9 +10760,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Link indikatorer"
 
@@ -10792,8 +10793,8 @@ msgstr "Lenkede maler"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "lenker"
 
@@ -10895,8 +10896,8 @@ msgstr "Plassering lengdegrad"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Logg"
 
@@ -10909,8 +10910,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Logfilovervåking. Returnerer logg"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Logg tid format"
 
@@ -11037,7 +11038,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Vedlikehold"
 
@@ -11197,7 +11198,7 @@ msgstr "Kartnavigasjonstreet"
 msgid "Map owner cannot be empty."
 msgstr "Karteieren kan ikke være tom."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Kartform"
 
@@ -11275,19 +11276,19 @@ msgstr "Maske"
 msgid "Mass update"
 msgstr "Masseoppdatering"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Masseoppdateringselementer"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Masse oppdateringsformer"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Master element"
 
@@ -11371,8 +11372,8 @@ msgid "May"
 msgstr "Kan"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11496,8 +11497,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Melding timeout"
 
@@ -11515,7 +11516,7 @@ msgstr ""
 msgid "Messages"
 msgstr "meldinger"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Meldinger"
 
@@ -11614,11 +11615,11 @@ msgstr "Mangler \"navn\" -felt for grafprototype."
 msgid "Missing \"name\" field for graph."
 msgstr "Mangler \"navn\" -felt for graf."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11786,8 +11787,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Flere"
 
@@ -11953,7 +11954,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11973,15 +11974,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11990,16 +11991,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12279,7 +12280,7 @@ msgstr "Ingen detaljer"
 msgid "No discovery rule IDs given."
 msgstr "Ingen oppdagelsesregel-IDer er gitt."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12335,8 +12336,8 @@ msgstr "Ikke noe bilde"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Ingen grensesnitt funnet"
 
@@ -12640,7 +12641,7 @@ msgstr "Ingen offentlig nøkkelfil spesifisert."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Ingen oppdatering"
 
@@ -12686,8 +12687,8 @@ msgstr "Ikke-boolske flagg er foreldet."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12695,17 +12696,17 @@ msgstr "Ikke-boolske flagg er foreldet."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Ingen"
@@ -12801,7 +12802,7 @@ msgstr "Varslingsrapport"
 msgid "Notifications"
 msgstr "Varsler"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12975,8 +12976,8 @@ msgstr "Numerale systemer"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numerisk (flyt)"
 
@@ -12986,8 +12987,8 @@ msgstr "Numerisk (heltall)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numerisk (usignert)"
 
@@ -12995,8 +12996,8 @@ msgstr "Numerisk (usignert)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13008,13 +13009,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "OK-hendelsen lukkes"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "OK eventgenerering"
 
@@ -13075,7 +13076,7 @@ msgstr "Av"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13104,7 +13105,7 @@ msgstr "På"
 msgid "On status change triggers blink for"
 msgstr "På statusendring utløser blink for"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "En gang"
 
@@ -13225,11 +13226,11 @@ msgstr "Operasjonen har ingen mal å betjene."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operasjoner"
@@ -13275,7 +13276,7 @@ msgstr "Alternativer"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13290,11 +13291,11 @@ msgstr "Alternativer"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Eller"
 
@@ -13389,8 +13390,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Overstyrt av"
@@ -13607,8 +13608,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLEM"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "PROBLEM hendelsesgenereringsmodus"
 
@@ -13690,8 +13691,8 @@ msgstr "Parameteret \"%1$s\" er utdatert."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parametere"
 
@@ -13739,8 +13740,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Tolk"
 
@@ -13771,12 +13772,12 @@ msgstr "Passiv"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13809,12 +13810,12 @@ msgid "Paste"
 msgstr "Lim inn"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13827,7 +13828,7 @@ msgstr "Lim inn uten eksterne lenker"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13870,8 +13871,8 @@ msgstr "Utfører en DNS-spørring. Returnerer tegnstreng med nødvendig informas
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Periode"
@@ -13892,9 +13893,9 @@ msgid "Periods"
 msgstr "perioder"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13905,7 +13906,7 @@ msgstr "perioder"
 msgid "Permissions"
 msgstr "tillatelser"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Tillatelser kan bare tilordnes for brukergrupper."
 
@@ -13927,12 +13928,12 @@ msgstr "Plassering av algoritme"
 msgid "Plain text"
 msgstr "Vanlig tekst"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Spill"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Spill lyd"
 
@@ -13962,8 +13963,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Vennligst velg to elementer"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13973,14 +13973,15 @@ msgstr "Vennligst velg to elementer"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Poeng"
 
@@ -13988,7 +13989,7 @@ msgstr "Poeng"
 msgid "Polish (pl_PL)"
 msgstr "Polsk (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Fyller vertsinvesteringsfelt"
 
@@ -14050,16 +14051,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "forbehandling"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Forbehandlingstrinn"
 
@@ -14156,8 +14157,8 @@ msgstr "Privat"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Privat nøkkelfil"
 
@@ -14187,7 +14188,7 @@ msgstr "Privilege nivå"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problem"
 
@@ -14376,16 +14377,16 @@ msgstr "Offentlig"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Offentlig nøkkel"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Offentlig nøkkelfil"
 
@@ -14399,8 +14400,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Søkefelt"
 
@@ -14450,8 +14451,8 @@ msgstr "RMCP +"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Ubehandlede data"
 
@@ -14477,14 +14478,14 @@ msgstr "Les bare"
 msgid "Read-only"
 msgstr "Skrivebeskyttet"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14498,14 +14499,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Les Skriv"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14551,7 +14552,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14560,10 +14561,10 @@ msgid "Recovery"
 msgstr "Gjenoppretting"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Recovery uttrykk"
@@ -14573,7 +14574,7 @@ msgstr "Recovery uttrykk"
 msgid "Recovery expression syntax error."
 msgstr "Syntaksfeil for gjenopprettingsuttrykk."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Gjenopprettingsoperasjoner"
 
@@ -14585,8 +14586,8 @@ msgstr "Gjenopprettingsoperasjoner"
 msgid "Recovery time"
 msgstr "Restitusjonstid"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Rektangel"
 
@@ -14692,7 +14693,7 @@ msgstr "Fjernkommando"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14723,13 +14724,13 @@ msgstr "Fjernkommando"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14737,25 +14738,25 @@ msgstr "Fjernkommando"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14783,14 +14784,14 @@ msgstr "Fjernkommando"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14865,10 +14866,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Erstatt"
 
@@ -14886,7 +14887,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14925,15 +14926,15 @@ msgstr "Rapporter"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14942,8 +14943,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14970,8 +14971,8 @@ msgstr "Nødvendig serverytelse, nye verdier per sekund"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Nødvendige statuskoder"
 
@@ -14984,11 +14985,11 @@ msgstr "Nødvendig streng"
 msgid "Reset"
 msgstr "Nullstill"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Tilbakestill alle felt til standardverdier?"
 
@@ -15005,11 +15006,11 @@ msgstr "Tilbakestill bekreftelse"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Tilbakestill standardinnstillinger"
 
@@ -15113,8 +15114,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15187,9 +15188,9 @@ msgstr "Returnerer prosentandelen av tapte ICMP pingpakker."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15197,7 +15198,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Ikke sant"
@@ -15213,8 +15214,8 @@ msgstr ""
 msgid "Right trim"
 msgstr "Høyre trim"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15404,8 +15405,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15484,8 +15485,8 @@ msgstr "SQL-teller: %1$s (velges: %2$s | kjører ut: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL spørring"
 
@@ -15510,38 +15511,38 @@ msgstr "SSH agent"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "SSL sertifikatfilen"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "SSL nøkkelfil"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "SSL nøkkelpassord"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL verifiser verten"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL verifiser peer"
 
@@ -15660,9 +15661,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15687,8 +15688,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Skript"
 
@@ -15820,10 +15821,10 @@ msgstr "Sikkerhetsnavn"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Valgt"
@@ -15833,9 +15834,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Velg prototype"
 
@@ -15856,7 +15857,7 @@ msgstr "Utvalgte handlinger slettet"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Valgte elementer"
 
@@ -16206,8 +16207,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Form"
@@ -16310,7 +16311,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16410,8 +16411,8 @@ msgstr "Enkel graf"
 msgid "Simple graph prototype"
 msgstr "Enkel graf prototype"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Enkelt"
 
@@ -16456,7 +16457,7 @@ msgstr "Område stat / provins"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Størrelse"
 
@@ -16567,9 +16568,9 @@ msgstr "Hastighet"
 msgid "Stacked"
 msgstr "Stablet"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16590,7 +16591,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Start i"
 
@@ -16785,14 +16786,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Trinn med navn \"%1$s\" eksisterer allerede."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Steg"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Stopp"
 
@@ -16815,10 +16816,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17054,8 +17055,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Merk for å matche"
 
@@ -17114,28 +17115,28 @@ msgstr "Merkverdien"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Tagger"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Mål"
@@ -17296,14 +17297,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17361,10 +17362,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Tekst"
 
@@ -17517,8 +17518,8 @@ msgstr "Denne måneden"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17622,9 +17623,9 @@ msgstr "Tidsperiode"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Time shift"
 
@@ -17642,8 +17643,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Tidsavbrudd"
 
@@ -17669,7 +17670,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Til"
 
@@ -17693,7 +17694,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Topp"
@@ -17745,8 +17746,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17757,7 +17757,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17765,9 +17766,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Transportfeil."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17779,8 +17780,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Trend lagringsperiode"
 
@@ -17798,9 +17799,9 @@ msgstr "Trender"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Utløser"
@@ -17902,7 +17903,7 @@ msgstr "Utløser oversikt"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Utløser prototype"
@@ -17968,7 +17969,7 @@ msgstr "Trigger prototyper slettet"
 msgid "Trigger prototypes updated"
 msgstr "Trigger prototyper oppdatert"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Trigger alvorlighet"
 
@@ -18075,23 +18076,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Type"
@@ -18100,12 +18101,12 @@ msgstr "Type"
 msgid "Type (Full details)"
 msgstr "Type (full detaljer)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Skriv inn (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18116,10 +18117,10 @@ msgstr "Type beregning"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Type informasjon"
 
@@ -18143,11 +18144,11 @@ msgstr "UKJENT"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18168,7 +18169,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL-adressen er ikke riktig kodet."
@@ -18193,7 +18194,7 @@ msgstr "URL-parameternavn er tomt."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "webadresser"
@@ -18296,15 +18297,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18313,8 +18314,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Enheter"
 
@@ -18340,7 +18341,7 @@ msgstr "Enheter"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Ukjent"
@@ -18483,12 +18484,12 @@ msgstr "Opp"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18508,18 +18509,18 @@ msgstr "Opp"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18540,13 +18541,13 @@ msgstr "Oppdater eksisterende"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Oppdateringsintervall"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18685,7 +18686,7 @@ msgstr "Brukeragent streng"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18797,10 +18798,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Bruker navn"
 
@@ -18868,7 +18869,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Brukerdeling mangler parametere: %1$s for kart \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19245,12 +19246,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19312,8 +19313,8 @@ msgstr "Verdikart \"%1$s\" eksisterer allerede."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Verdi kartlegging"
@@ -19430,8 +19431,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Vertikaljustering"
 
@@ -19634,8 +19635,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19646,12 +19646,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19727,8 +19728,8 @@ msgstr "Feil felt for kartlink."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19740,11 +19741,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19758,8 +19759,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19779,12 +19780,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Y-aksens MAX-verdi"
 
@@ -19798,18 +19799,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y-aksens MAX-verdi må være større enn Y-aksen MIN-verdien."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Y-aksen MIN-verdi"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Y-akseside"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19829,11 +19830,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20864,10 +20865,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "globale housekeeping innstillinger"
@@ -20896,8 +20897,8 @@ msgstr "vert"
 msgid "host group"
 msgstr "vertsgruppe"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20931,7 +20932,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "inkludert undergrupper"
 
@@ -21105,8 +21106,8 @@ msgstr "element"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21370,10 +21371,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "navn"
@@ -21420,7 +21421,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21450,7 +21451,7 @@ msgstr "nummer"
 msgid "of"
 msgstr "av"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21473,7 +21474,7 @@ msgstr "av"
 msgid "off"
 msgstr "av"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21645,8 +21646,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21783,8 +21784,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22071,17 +22072,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/nl/LC_MESSAGES/frontend.po b/ui/locale/nl/LC_MESSAGES/frontend.po
index 82fb693b0bc..b87370fd7a2 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2013-08-07 16:41+0300\n"
 "Last-Translator: open-future <patrik@open-future.be>\n"
 "Language-Team: NL\n"
@@ -182,10 +182,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -230,9 +230,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s poging resterend"
 msgstr[1] "%1$s pogingen resterend"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -337,7 +337,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 seconden"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D aanzicht"
 
@@ -383,7 +383,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -473,27 +473,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Toegang geweigerd!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -565,35 +565,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -722,24 +722,24 @@ msgstr "Actief tot"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -775,13 +775,13 @@ msgstr "Actief tot"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -799,38 +799,38 @@ msgstr "Actief tot"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -857,7 +857,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -878,7 +878,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -887,16 +887,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -906,7 +906,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Prototype toevoegen"
 
@@ -943,7 +943,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1031,7 +1031,7 @@ msgstr "Agent interfaces"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1039,11 +1039,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1070,8 +1070,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1087,8 +1087,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1104,13 +1104,13 @@ msgstr "Bij alle koppelingen moeten \"Naam\" en \"URL\" gespecificeerd zijn."
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1131,19 +1131,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Toegestane hosts"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1160,21 +1160,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "En"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1188,7 +1188,7 @@ msgstr "En"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "En/Of"
 
@@ -1233,11 +1233,11 @@ msgstr "Applicatie fout."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Toepassen"
@@ -1365,11 +1365,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1463,8 +1463,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Authenticatie methode"
 
@@ -1526,8 +1526,8 @@ msgstr "Automatisch"
 msgid "Automatic icon mapping"
 msgstr "Automatisch iconen koppelen"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Automatisch iconen selecteren"
 
@@ -1594,12 +1594,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Achtergrond"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1607,9 +1607,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Achtergrond afbeelding"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1617,8 +1617,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1661,15 +1661,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1680,8 +1680,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Vette lijn"
 
@@ -1689,19 +1689,19 @@ msgstr "Vette lijn"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1714,7 +1714,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Onderzijde"
@@ -1797,7 +1797,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Berekend"
 
@@ -1821,22 +1821,22 @@ msgstr "Terugbellen"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3432,8 +3432,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Karakter"
 
@@ -3461,7 +3461,7 @@ msgstr "Chassis"
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Controle bestaat al."
 
@@ -3582,8 +3582,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Wis geschiedenis en trends"
 
@@ -3611,22 +3611,22 @@ msgstr "Klok"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Kloon"
@@ -3634,28 +3634,28 @@ msgstr "Kloon"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Sluiten"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Sluit expressie bouwer"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3669,7 +3669,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3683,11 +3683,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3696,7 +3696,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3784,9 +3784,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Condities"
@@ -3971,13 +3971,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Verbinding met"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4069,8 +4069,8 @@ msgstr "Contact"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4150,13 +4150,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Contract nummer"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Coordinaten"
 
@@ -4173,7 +4173,7 @@ msgstr "Kopie"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4312,10 +4312,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4519,7 +4519,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4533,8 +4533,8 @@ msgstr "Speciale grafieken"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4700,8 +4700,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Gestippelde lijn"
 
@@ -4719,7 +4719,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Data overzicht"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4903,11 +4903,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Standaard"
 
@@ -4949,7 +4949,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Standaard duur van bewerking"
 
@@ -4983,7 +4983,7 @@ msgstr "Vertraagd door"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4992,7 +4992,7 @@ msgstr "Vertraagd door"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5000,47 +5000,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Verwijder"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Verwijder en opschonen"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Geselecteerde sjablonen verwijderen en opschonen? (Aandacht: alle gelinkte host worden opgeschoont!)"
 
@@ -5048,11 +5048,11 @@ msgstr "Geselecteerde sjablonen verwijderen en opschonen? (Aandacht: alle gelink
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Sjabloon verwijderen en opschonen? (Aandacht: alle gelinkte host worden opgeschoont!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Huidige actie verwijderen?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5065,10 +5065,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "Discovery regel verwijderen?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Expressie verwijderen?"
 
@@ -5092,11 +5092,11 @@ msgstr "Historie van geselecteerde webdraaiboeken verwijderen?"
 msgid "Delete icon map?"
 msgstr "Icoon map verwijderen?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Item-prototype verwijderen?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Item verwijderen?"
 
@@ -5138,11 +5138,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5201,7 +5201,7 @@ msgstr "Geselecteerde host-prototypen verwijderen?"
 msgid "Delete selected host?"
 msgstr "Geselecteerde host verwijderen?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Geselecteerde hosts verwijderen?"
 
@@ -5209,11 +5209,11 @@ msgstr "Geselecteerde hosts verwijderen?"
 msgid "Delete selected image?"
 msgstr "Geselecteerderde afbeelding verwijderen?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Geselecteerde item-prototypen verwijderen?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Geselecteerde items verwijderen?"
 
@@ -5229,7 +5229,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr "Geselecteerde mappen verwijderen?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Geselecteerde media types verwijderen?"
 
@@ -5261,11 +5261,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Geselecteerde scripts verwijderen?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5273,19 +5273,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Geselecteerde sjablonen verwijderen?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Geselecteerde trigger-prototypen verwijderen?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Geselecteerde trigger verwijderen?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Geselecteerde gebruiker verwijderen?"
 
@@ -5301,11 +5301,11 @@ msgstr "Geselecteerde webdraaiboeken verwijderen?"
 msgid "Delete template?"
 msgstr "Sjabloon verwijderen?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Trigger-prototype verwijderen?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Trigger verwijderen?"
 
@@ -5331,7 +5331,7 @@ msgstr "Verwijderd: Host prototype \"%1$s\" op \"%2$s\"."
 msgid "Delimiter"
 msgstr "Onderscheidingsteken"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5346,10 +5346,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Afhankelijkheden"
 
@@ -5386,7 +5386,7 @@ msgstr "Uitrol status"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5396,13 +5396,13 @@ msgstr "Uitrol status"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Omschrijving"
@@ -5412,10 +5412,10 @@ msgstr "Omschrijving"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Details"
@@ -5456,7 +5456,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5507,11 +5507,11 @@ msgstr "Host gecontroleerd door geslecteerde proxies uitschakelen?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5540,7 +5540,7 @@ msgstr "Geselecteerde hosts uitschakelen?"
 msgid "Disable selected items?"
 msgstr "Geselecteerde items uitschakelen?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Geselecteerde media types uitschakelen?"
 
@@ -5574,7 +5574,7 @@ msgstr "Geselecteerde webdraaiboeken uitschakelen?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5602,7 +5602,7 @@ msgstr "Geselecteerde webdraaiboeken uitschakelen?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Gedeactiveerd"
 
@@ -5628,9 +5628,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5826,7 +5826,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr "Toon triggers met status OK voor"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Toon grafiek"
 
@@ -5834,13 +5834,13 @@ msgstr "Toon grafiek"
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Toon gestapelde grafiek"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5864,15 +5864,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5886,8 +5886,8 @@ msgstr "Wens je de voorwaardelijke expressie te vervangen?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5897,8 +5897,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5908,8 +5908,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5917,8 +5917,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Punt"
 
@@ -5947,16 +5947,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "Uitvaltijd"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Afbeelding stijl"
 
@@ -6007,7 +6007,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Looptijd"
 
@@ -6030,29 +6030,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Bijwerken"
@@ -6106,12 +6106,12 @@ msgstr ""
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Element naam"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6167,7 +6167,7 @@ msgstr "Lege invoerparameter"
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6247,11 +6247,11 @@ msgstr "Intern opschoonproces inschakelen"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6281,7 +6281,7 @@ msgstr "Geselecteerde hosts activeren?"
 msgid "Enable selected items?"
 msgstr "Geselecteerde items activeren?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Geselecteerde media types activeren?"
 
@@ -6303,8 +6303,8 @@ msgstr "Geselecteerde webdraaiboeken inschakelen?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6326,7 +6326,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6342,7 +6342,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6356,14 +6356,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Geactiveerd"
 
@@ -6416,8 +6416,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6594,7 +6594,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6615,8 +6615,8 @@ msgstr "Uitgevoerd"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Uitgevoerd script"
 
@@ -6630,13 +6630,13 @@ msgstr "Uitvoer bevestiging"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6706,15 +6706,15 @@ msgstr "Exporteren naar CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6727,10 +6727,10 @@ msgstr "Expressie"
 msgid "Expression cannot be empty"
 msgstr "Expressie kan niet leeg zijn"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Expressie bouwer"
 
@@ -6798,7 +6798,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6932,8 +6932,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6944,7 +6943,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7041,7 +7041,7 @@ msgid "Fit to map"
 msgstr "Passend in kaart"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Statisch"
 
@@ -7053,9 +7053,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7063,22 +7063,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7086,8 +7086,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formule"
 
@@ -7123,7 +7123,7 @@ msgstr "Vrijdag"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Van"
 
@@ -7138,7 +7138,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Voorkant toegang"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Voorkant Berichten"
 
@@ -7154,7 +7154,7 @@ msgid "Full clone"
 msgstr "Volledige klone"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Functie"
 
@@ -7571,8 +7571,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP authenticatie"
 
@@ -7583,8 +7583,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
@@ -7621,10 +7621,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Kopregels"
 
@@ -7640,7 +7640,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7746,7 +7746,7 @@ msgid "History cleared"
 msgstr "Geschiedenis opgeschoond"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Geschiedenis opkuisen kan een lange tijd duren. Doorgaan?"
 
@@ -7761,8 +7761,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Opslagtermijn historie"
 
@@ -7779,8 +7779,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Horizontale uitlijning"
 
@@ -7899,7 +7899,7 @@ msgstr[1] "Hosts ingeschakeld"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7985,9 +7985,9 @@ msgstr "Hostgroepen"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Host interface"
 
@@ -8276,8 +8276,8 @@ msgstr "IPMI interfaces"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI sensor"
 
@@ -8291,19 +8291,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Icoon"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Icoon (standaard)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Icoon (gedesactiveerd)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Icoon (onderhoud)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Icoon (probleem)"
 
@@ -8350,7 +8350,7 @@ msgstr "Icoon toewijzing"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Iconen"
 
@@ -8494,7 +8494,7 @@ msgstr "Afbeeldingen"
 msgid "Images for all maps will be updated!"
 msgstr "Afbeeldingen voor alle kaarten worden bijgewerkt!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Onmiddellijk"
 
@@ -8578,6 +8578,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9462,10 +9463,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9532,8 +9533,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Invoegen"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Voeg expressie in"
 
@@ -9649,9 +9650,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Interval"
@@ -10088,7 +10089,7 @@ msgstr "Italian (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Item"
 
@@ -10352,8 +10353,8 @@ msgstr "JMX agent"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10371,8 +10372,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10411,8 +10412,8 @@ msgstr "Japanese (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10451,9 +10452,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Key"
@@ -10519,13 +10520,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Label"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Label locatie"
 
@@ -10672,9 +10673,9 @@ msgstr "Lets (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10685,7 +10686,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Links"
@@ -10718,25 +10719,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Lijn"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10758,9 +10759,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Koppelings indicatoren"
 
@@ -10791,8 +10792,8 @@ msgstr "Gekoppelde templates"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10894,8 +10895,8 @@ msgstr "Locatie longitude"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -10908,8 +10909,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Log tijd formaat"
 
@@ -11035,7 +11036,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Onderhoud"
 
@@ -11195,7 +11196,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11273,19 +11274,19 @@ msgstr "Masker"
 msgid "Mass update"
 msgstr "Bulk bijwerken"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Elementen in bulk bijwerken"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11369,8 +11370,8 @@ msgid "May"
 msgstr "Mei"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11494,8 +11495,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Bericht timeout"
 
@@ -11513,7 +11514,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Berichten"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr ""
 
@@ -11612,11 +11613,11 @@ msgstr "Veld \"naam\" ontbreekt voor grafiek-prototype."
 msgid "Missing \"name\" field for graph."
 msgstr "Veld \"naam\" ontbreekt voor grafiek."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11784,8 +11785,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11951,7 +11952,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11971,15 +11972,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11988,16 +11989,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12277,7 +12278,7 @@ msgstr "Geen details"
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12333,8 +12334,8 @@ msgstr "Geen afbeelding"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Geen interface gevonden"
 
@@ -12638,7 +12639,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12684,8 +12685,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12693,17 +12694,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Geen"
@@ -12799,7 +12800,7 @@ msgstr "Notificaties report"
 msgid "Notifications"
 msgstr "Notificaties"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12973,8 +12974,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numeriek (zwevend)"
 
@@ -12984,8 +12985,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numeriek (integer 64bit)"
 
@@ -12993,8 +12994,8 @@ msgstr "Numeriek (integer 64bit)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13006,13 +13007,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13073,7 +13074,7 @@ msgstr "UIT"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13102,7 +13103,7 @@ msgstr "AAN"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr ""
 
@@ -13223,11 +13224,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr ""
@@ -13273,7 +13274,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13288,11 +13289,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13387,8 +13388,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13605,8 +13606,8 @@ msgstr ""
 msgid "PROBLEM"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13688,8 +13689,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13737,8 +13738,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13769,12 +13770,12 @@ msgstr "Passief"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13807,12 +13808,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13825,7 +13826,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13868,8 +13869,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Periode"
@@ -13890,9 +13891,9 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13903,7 +13904,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13925,12 +13926,12 @@ msgstr ""
 msgid "Plain text"
 msgstr "Platte tekst"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Afspelen"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Geluid afspelen"
 
@@ -13960,8 +13961,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Selecteer twee elementen"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13971,14 +13971,15 @@ msgstr "Selecteer twee elementen"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13986,7 +13987,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Pools (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -14048,16 +14049,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14154,8 +14155,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr ""
 
@@ -14185,7 +14186,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr ""
 
@@ -14374,16 +14375,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr ""
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr ""
 
@@ -14397,8 +14398,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14448,8 +14449,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14475,14 +14476,14 @@ msgstr "Alleen lezen"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14496,14 +14497,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Lees-schrijf"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14549,7 +14550,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14558,10 +14559,10 @@ msgid "Recovery"
 msgstr ""
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14571,7 +14572,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14583,8 +14584,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14690,7 +14691,7 @@ msgstr "Remote commando"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14721,13 +14722,13 @@ msgstr "Remote commando"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14735,25 +14736,25 @@ msgstr "Remote commando"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14781,14 +14782,14 @@ msgstr "Remote commando"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14863,10 +14864,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr ""
 
@@ -14884,7 +14885,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14923,15 +14924,15 @@ msgstr "Reporten"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14940,8 +14941,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14968,8 +14969,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr ""
 
@@ -14982,11 +14983,11 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -15003,11 +15004,11 @@ msgstr ""
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr ""
 
@@ -15111,8 +15112,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15185,9 +15186,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15195,7 +15196,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Recht"
@@ -15211,8 +15212,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15402,8 +15403,8 @@ msgstr ""
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15482,8 +15483,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15508,38 +15509,38 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15658,9 +15659,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15685,8 +15686,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15818,10 +15819,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Selecteer"
@@ -15831,9 +15832,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15854,7 +15855,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr ""
 
@@ -16204,8 +16205,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16308,7 +16309,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16408,8 +16409,8 @@ msgstr "Simpel grafiek"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16454,7 +16455,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16565,9 +16566,9 @@ msgstr ""
 msgid "Stacked"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16588,7 +16589,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16783,14 +16784,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr ""
 
@@ -16813,10 +16814,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17052,8 +17053,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17112,28 +17113,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr ""
@@ -17294,14 +17295,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr ""
@@ -17359,10 +17360,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Tekst"
 
@@ -17515,8 +17516,8 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17620,9 +17621,9 @@ msgstr "Tijd periode"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17640,8 +17641,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr ""
 
@@ -17667,7 +17668,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr ""
 
@@ -17691,7 +17692,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "boven"
@@ -17743,8 +17744,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17755,7 +17755,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17763,9 +17764,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17777,8 +17778,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17796,9 +17797,9 @@ msgstr "Trends"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigger"
@@ -17900,7 +17901,7 @@ msgstr "Triggers overzicht"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr ""
@@ -17966,7 +17967,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Trigger severity"
 
@@ -18073,23 +18074,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Type"
@@ -18098,12 +18099,12 @@ msgstr "Type"
 msgid "Type (Full details)"
 msgstr "Type (Volledige details)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Type (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18114,10 +18115,10 @@ msgstr "Type van de berekening"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Type informatie"
 
@@ -18141,11 +18142,11 @@ msgstr "ONBEKEND"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18166,7 +18167,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18191,7 +18192,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18294,15 +18295,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18311,8 +18312,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Eenheden"
 
@@ -18338,7 +18339,7 @@ msgstr "Eenheden"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Onbekend"
@@ -18481,12 +18482,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18506,18 +18507,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18538,13 +18539,13 @@ msgstr "Bestaande bijwerken"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Bijwerk interval"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18683,7 +18684,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18795,10 +18796,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Gebruikersnaam"
 
@@ -18866,7 +18867,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19243,12 +19244,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19310,8 +19311,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Waarde afbeeldingen"
@@ -19428,8 +19429,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Verticale uitlijning"
 
@@ -19632,8 +19633,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19644,12 +19644,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19725,8 +19726,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19738,11 +19739,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19756,8 +19757,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19777,12 +19778,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Y-as MAX waarde"
 
@@ -19796,18 +19797,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Y lijn MIN waarde"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Y lijn zijde"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19827,11 +19828,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20862,10 +20863,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20894,8 +20895,8 @@ msgstr "host"
 msgid "host group"
 msgstr "host groep"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20928,7 +20929,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21102,8 +21103,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21367,10 +21368,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21417,7 +21418,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21447,7 +21448,7 @@ msgstr ""
 msgid "of"
 msgstr "of"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21470,7 +21471,7 @@ msgstr "of"
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21642,8 +21643,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21780,8 +21781,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22068,17 +22069,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/pl/LC_MESSAGES/frontend.po b/ui/locale/pl/LC_MESSAGES/frontend.po
index af251eabd66..06d0d64daca 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -188,10 +188,10 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -241,9 +241,9 @@ msgstr[0] "została %1$s próba"
 msgstr[1] "zostały %1$s próby"
 msgstr[2] "zostało %1$s prób"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -352,7 +352,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 sekund"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "Widok 3D"
 
@@ -399,7 +399,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "DODAJ I NADPISZ"
 
@@ -492,27 +492,27 @@ msgstr "Dostęp zabroniony"
 msgid "Access denied!"
 msgstr "Dostęp zabroniony!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr "Dostęp do API"
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "Dostęp do elementów UI"
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr "Dostęp do akcji"
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr "Dostęp do modułów"
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -584,35 +584,35 @@ msgstr "Oznacz zdarzenia ROZWIĄZANE"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -743,24 +743,24 @@ msgstr "Aktywne do"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -796,13 +796,13 @@ msgstr "Aktywne do"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -820,38 +820,38 @@ msgstr "Aktywne do"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -878,7 +878,7 @@ msgstr "Dodaj element potomny"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -899,7 +899,7 @@ msgstr "Dodaj brakujący"
 msgid "Add multiple maps"
 msgstr "Dodaj wiele map"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "Dodaj nowy zbiór danych"
 
@@ -908,16 +908,16 @@ msgstr "Dodaj nowy zbiór danych"
 msgid "Add new interface"
 msgstr "Dodaj nowy interfejs"
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "Dodaj nowe sterowanie"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -927,7 +927,7 @@ msgstr "Dodaj komentarz do problemu"
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Dodaj prototyp"
 
@@ -964,7 +964,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Dodaj widżet"
@@ -1052,7 +1052,7 @@ msgstr "Interfejsy agenta"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr "Agregacja"
 
@@ -1060,11 +1060,11 @@ msgstr "Agregacja"
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr "Agregacja funkcji"
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr "Agregacja odstępów"
 
@@ -1091,8 +1091,8 @@ msgstr "Dopasuj elementy map"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1108,8 +1108,8 @@ msgid "All dashboards"
 msgstr "Wszystkie widoki"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Wszystkie grupy"
 
@@ -1125,13 +1125,13 @@ msgstr "Wszystkie połączenia powinny mieć określone pola \"Name\" i \"URL\""
 msgid "All maps"
 msgstr "Wszystkie mapy"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Wszystkie problemy"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Wszystkie problemy, jeśli wartość tag'a się pasuje"
 
@@ -1152,19 +1152,19 @@ msgid "Allow list"
 msgstr "Zezwól na listę"
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Zezwól na manualne zamknięcie"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Dopuszczalne hosty"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr "Dopuszczalne metody"
 
@@ -1181,21 +1181,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr "Ilość fizycznej pamięci zyżytej na kopie stron fizycznej pamięci, <url> - URL usługi VMware, <uuid> - nazwa hosta wirtualnej maszyny VMware "
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "I"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1209,7 +1209,7 @@ msgstr "I"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "I/Lub"
 
@@ -1254,11 +1254,11 @@ msgstr "Błąd aplikacji."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Zastosuj"
@@ -1386,11 +1386,11 @@ msgstr ""
 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:159
 msgid "At least one operation must be selected."
 msgstr "Przynajmniej jedna operacja musi być wybrana."
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Przynajmnniej jedna operacja musi istnieć."
 
@@ -1484,8 +1484,8 @@ msgstr "Uwierzytelnienie nieudane: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Metoda uwierzytelniania"
 
@@ -1547,8 +1547,8 @@ msgstr "Automatycznie"
 msgid "Automatic icon mapping"
 msgstr "Automatyczne mapowanie ikon"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Automatyczny wybór ikon"
 
@@ -1615,12 +1615,12 @@ msgstr "Wstecz"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Tło"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1628,9 +1628,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Obraz tła"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr "Belka"
 
@@ -1638,8 +1638,8 @@ msgstr "Belka"
 msgid "Base DN"
 msgstr "Bazowa DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1682,15 +1682,15 @@ msgstr "Niebieski"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Obiekt"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Obiekty i nagłówki"
 
@@ -1701,8 +1701,8 @@ msgstr "Obiekty i nagłówki"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Gruba linia"
 
@@ -1710,19 +1710,19 @@ msgstr "Gruba linia"
 msgid "Boolean to decimal"
 msgstr "Boolowski do dziesiętnego"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Obwódka"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Rodzaj obwódki"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Szerokość pogrubienia"
 
@@ -1735,7 +1735,7 @@ msgstr "Podane hasła muszą być takie same."
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Na dole"
@@ -1818,7 +1818,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Obliczone"
 
@@ -1842,22 +1842,22 @@ msgstr "Oddzwanianie"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3503,8 +3503,8 @@ msgstr "Zmień typ"
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Znak"
 
@@ -3532,7 +3532,7 @@ msgstr "Obudowa"
 msgid "Chassis information. Returns string"
 msgstr "Informacje o obudowie. Zwraca ciąg znaków"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Test już istnieje."
 
@@ -3653,8 +3653,8 @@ msgid "Clear history"
 msgstr "Wyczyść historię"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Wyczyść historię i trendy"
 
@@ -3682,22 +3682,22 @@ msgstr "Zegar"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Powiel"
@@ -3705,28 +3705,28 @@ msgstr "Powiel"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Zamknij"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Zamknij generator wyrażeń"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Zamknij nowe zdarzenie"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Zamknij stare zdarzenia"
@@ -3740,7 +3740,7 @@ msgid "Close problems"
 msgstr "Zakończ problemy"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Zwiń"
@@ -3754,11 +3754,11 @@ msgstr "Zwiń pasek boczny"
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3767,7 +3767,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3855,9 +3855,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr "Warunek \"%2$s\" użyty w formule \"%3$s\" dla nadpisania \"%1$s\" nie jest zdefiniowany."
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Warunki"
@@ -4042,13 +4042,13 @@ msgstr "Gratulacje! Poprawnie zainstalowano interfejs użytkownika Zabbix."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Połącz z"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "Połączony"
@@ -4151,8 +4151,8 @@ msgstr "Kontakt"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4232,13 +4232,13 @@ msgstr "Kontynuuj nadpisywanie"
 msgid "Contract number"
 msgstr "Numer kontraktu"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "Konwertuj do JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Współrzędne"
 
@@ -4255,7 +4255,7 @@ msgstr "Skopiuj"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Współzależność"
 
@@ -4397,10 +4397,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4604,7 +4604,7 @@ msgid "Custom"
 msgstr "Indywidualne"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4618,8 +4618,8 @@ msgstr "Wykresy własne"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Okresy użytkownika"
 
@@ -4786,8 +4786,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "Pulpity"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Linia przerywana"
 
@@ -4805,7 +4805,7 @@ msgstr "Dane nie są prawidłowo zakodowane."
 msgid "Data overview"
 msgstr "Przegląd danych"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4989,11 +4989,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Domyślnie"
 
@@ -5035,7 +5035,7 @@ msgstr "Domyślny format logowania"
 msgid "Default media type"
 msgstr "Domyślny typ mediów"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Czas trwania kroku domyślnej operacji"
 
@@ -5069,7 +5069,7 @@ msgstr "Opóźniony o"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5078,7 +5078,7 @@ msgstr "Opóźniony o"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5086,47 +5086,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Usuń"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr "Usunąć wszystkie elementy, które nie są obecne w pliku importu?"
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Usuń i wyczyść"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Usunąć i wyczyścić wybrane szablony? (Uwaga: wszystkie połączone hosty zostaną wyczyszczone!)"
 
@@ -5134,11 +5134,11 @@ msgstr "Usunąć i wyczyścić wybrane szablony? (Uwaga: wszystkie połączone h
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Usunąć i wyczyścić szablon? (Uwaga: wszystkie powiązane hosty zostaną wyczyszczone!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Usunąć aktualną akcję?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Usunąć bieżącą współzależność?"
 
@@ -5151,10 +5151,10 @@ msgstr "Usunąć pulpit?"
 msgid "Delete discovery rule?"
 msgstr "Usunąć regułę wykrywania?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Usunąć wyrażenie?"
 
@@ -5178,11 +5178,11 @@ msgstr "Usunąć historię wybranych scenariuszy sieci www?"
 msgid "Delete icon map?"
 msgstr "Usunąć mapę ikon?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Usunąć prototyp pozycji?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Usunąć pozycję?"
 
@@ -5224,11 +5224,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5287,7 +5287,7 @@ msgstr "Usunąć wybrane prototypy hostów?"
 msgid "Delete selected host?"
 msgstr "Usunąć wybranego hosta?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Usunąć wybrane hosty?"
 
@@ -5295,11 +5295,11 @@ msgstr "Usunąć wybrane hosty?"
 msgid "Delete selected image?"
 msgstr "Usunąć wybrany obraz?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Usunąć wybrane prototypy pozycji?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Usunąć wybrane pozycje?"
 
@@ -5315,7 +5315,7 @@ msgstr "Usunąć wybraną mapę?"
 msgid "Delete selected maps?"
 msgstr "Usunąć wybrane mapy?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Usunąć wybrane typy mediów?"
 
@@ -5347,11 +5347,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Usunąć wybrane skrypty?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5359,19 +5359,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Usunąć zaznaczone kształty?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Usunąć wybrane szablony?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Usunąć wybrane prototypy wyzwalaczy?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Usunąć wybrane wyzwalacze?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Usunąć wybranego użytkownika?"
 
@@ -5387,11 +5387,11 @@ msgstr "Usunąć wybrane scenariusze sieci www?"
 msgid "Delete template?"
 msgstr "Usunąć szablon?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Usunąć prototyp wyzwalacza?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Usunąć wyzwalacz?"
 
@@ -5417,7 +5417,7 @@ msgstr "Usunięto: Prototyp hosta \"%1$s\" w \"%2$s\"."
 msgid "Delimiter"
 msgstr "Ogranicznik"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr "Metody zabronione"
 
@@ -5432,10 +5432,10 @@ msgid "Deny list"
 msgstr "Lista zabroniona"
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Zależności"
 
@@ -5472,7 +5472,7 @@ msgstr "Stan instalacji"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5482,13 +5482,13 @@ msgstr "Stan instalacji"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Opis"
@@ -5498,10 +5498,10 @@ msgstr "Opis"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Szczegóły"
@@ -5542,7 +5542,7 @@ msgstr "Katalog"
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Rozmiar katalogu (w bajtach). Zwraca liczbę całkowitą"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5593,11 +5593,11 @@ msgstr "Wyłączyć hosty monitorowane przez wybrane proxy?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5626,7 +5626,7 @@ msgstr "Wyłączyć wybrane hosty?"
 msgid "Disable selected items?"
 msgstr "Wyłączyć wybrane pozycje?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Wyłączyć wybrane typy mediów?"
 
@@ -5660,7 +5660,7 @@ msgstr "Wyłączyć wybrane scenariusze sieci www?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5688,7 +5688,7 @@ msgstr "Wyłączyć wybrane scenariusze sieci www?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Wyłączony"
 
@@ -5714,9 +5714,9 @@ msgstr "Odrzuć wartość"
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr "Wykryj"
@@ -5914,7 +5914,7 @@ msgstr "Statystyki zapisu na dysk. Zwraca liczbę całkowitą dla typów sectors
 msgid "Display OK triggers for"
 msgstr "Wyświetlanie wyzwalaczy w stanie OK przez"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Wyświetl wykres"
 
@@ -5922,13 +5922,13 @@ msgstr "Wyświetl wykres"
 msgid "Display problems"
 msgstr "Wyświetl problemy"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Wyświetl wykres skumulowany"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5952,15 +5952,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr "Nie przechowuj historii"
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr "Nie przechowuj trendów"
 
@@ -5974,8 +5974,8 @@ msgstr "Zastąpić wyrażenie warunkowe?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5985,8 +5985,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5996,8 +5996,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -6005,8 +6005,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr "Nie dopasowano regularnego wyrażenia"
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Kropka"
 
@@ -6035,16 +6035,16 @@ msgstr "Pobranie pliku konfiguracyjnego"
 msgid "Downtime"
 msgstr "Czas przerwy w pracy"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "Rysuj"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Styl rysowania"
 
@@ -6095,7 +6095,7 @@ msgstr "Powtórzone userid (id użytkownika) \"%1$s\" w użytkownikach dla mapy
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Czas trwania"
 
@@ -6118,29 +6118,29 @@ msgstr "Dynamiczne elementy"
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr "Każdy element"
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Edycja"
@@ -6194,12 +6194,12 @@ msgstr "Błąd elasticsearch: %1$s."
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Nazwa elementu"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Elipsa"
 
@@ -6255,7 +6255,7 @@ msgstr "Pusty parametr wejściowy."
 msgid "Empty map ID."
 msgstr "Puste ID mapy."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6335,11 +6335,11 @@ msgstr "Włącz wewnętrzne porządkowanie"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6369,7 +6369,7 @@ msgstr "Włączyć wybrane hosty?"
 msgid "Enable selected items?"
 msgstr "Włączyć wybrane pozycje?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Włączyć wybrane typy mediów?"
 
@@ -6391,8 +6391,8 @@ msgstr "Włączyć wybrane scenariusze sieci www?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "Włącz wyłapywanie"
 
@@ -6414,7 +6414,7 @@ msgstr "Włącz wyłapywanie"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6430,7 +6430,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6444,14 +6444,14 @@ msgstr "Włącz wyłapywanie"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Włączony"
 
@@ -6504,8 +6504,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6683,7 +6683,7 @@ msgstr "Wykonuje zapytanie WMI i zwraca pierwszy wybrany obiekt. Zwraca liczbę
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr "Wykonaj teraz"
@@ -6704,8 +6704,8 @@ msgstr "Wykonano"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Wykonywany skrypt"
 
@@ -6719,13 +6719,13 @@ msgstr "Potwierdzenie wykonania"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Rozwiń"
@@ -6795,15 +6795,15 @@ msgstr "Eksportuj do pliku CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6816,10 +6816,10 @@ msgstr "Wyrażenie"
 msgid "Expression cannot be empty"
 msgstr "Wyrażenie nie może być puste"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Konstruktor wyrażeń"
 
@@ -6887,7 +6887,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Stworzenie widoku nieudane"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Nie udało się przetworzyć URL."
@@ -7021,8 +7021,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Informacja o czasie pliku. Zwraca liczbę całkowitą (znacznik czasu Unix)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -7033,7 +7032,8 @@ msgstr "Informacja o czasie pliku. Zwraca liczbę całkowitą (znacznik czasu Un
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "Wypełnij"
 
@@ -7130,7 +7130,7 @@ msgid "Fit to map"
 msgstr "Dopasuj do mapy"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Stały"
 
@@ -7142,9 +7142,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7152,22 +7152,22 @@ msgstr "Elastyczny"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Podążaj za przekierowaniami"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Czcionka"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
@@ -7175,8 +7175,8 @@ msgstr "Rozmiar czcionki"
 msgid "Form data"
 msgstr "Dane czcionki"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formuła"
 
@@ -7212,7 +7212,7 @@ msgstr "Piątek"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Od"
 
@@ -7227,7 +7227,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Dostęp do interfejsu użytkownika"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Komunikaty interfejsu użytkownika"
 
@@ -7243,7 +7243,7 @@ msgid "Full clone"
 msgstr "Pełne powielenie"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funkcja"
 
@@ -7662,8 +7662,8 @@ msgstr "Agent HTTP"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Uwierzytelnianie HTTP"
 
@@ -7674,8 +7674,8 @@ msgstr "Formularz logowania HTTP"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
@@ -7712,10 +7712,10 @@ msgstr "Sejf HashiCorp"
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Nagłówki"
 
@@ -7731,7 +7731,7 @@ msgstr "Hebrajski (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7837,7 +7837,7 @@ msgid "History cleared"
 msgstr "Wyczyszczono historię"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Czyszczenie historii może zająć dużo czasu. Kontynuować?"
 
@@ -7852,8 +7852,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Okres przechowywania historii"
 
@@ -7870,8 +7870,8 @@ msgstr "Strona początkowa"
 msgid "Horizontal"
 msgstr "Poziome"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Ułożenie poziome"
 
@@ -7993,7 +7993,7 @@ msgstr[2] "Włączono hosty"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8079,9 +8079,9 @@ msgstr "Grupy hostów"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Interfejs hosta"
 
@@ -8370,8 +8370,8 @@ msgstr "Interfejsy IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "Czujnik IPMI"
 
@@ -8385,19 +8385,19 @@ msgstr "ID czujnika IPMI i innego powiązanego parametrami. Zwraca JSON."
 msgid "Icon"
 msgstr "Ikona"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ikona (domyślna)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ikona (wyłączone)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ikona (utrzymanie)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ikona (problem)"
 
@@ -8444,7 +8444,7 @@ msgstr "Mapowanie ikon"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Ikona o ID \"%1$s\" jest niedostępna."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Ikony"
 
@@ -8590,7 +8590,7 @@ msgstr "Obrazy"
 msgid "Images for all maps will be updated!"
 msgstr "Obrazy dla wszystkich map zostaną zaktualizowane!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Teraz"
 
@@ -8674,6 +8674,7 @@ msgid "Inaccessible item prototype"
 msgstr "Nieosiągalny prototyp elementu"
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9558,10 +9559,10 @@ msgstr "Nieskończoność"
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9628,8 +9629,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Wprowadź"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Wprowadź wyrażenie"
 
@@ -9745,9 +9746,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Interwał"
@@ -10184,7 +10185,7 @@ msgstr "Włoski (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Pozycja"
 
@@ -10451,8 +10452,8 @@ msgstr "Agent JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "Punkt końcowy JMX"
 
@@ -10470,8 +10471,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "Dane JSON"
 
@@ -10510,8 +10511,8 @@ msgstr "Japoński (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr "JavaScript"
@@ -10550,9 +10551,9 @@ msgstr "Kerberos"
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Klucz"
@@ -10618,13 +10619,13 @@ msgstr "Makra LLD"
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Etykieta"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Położenie etykiety"
 
@@ -10777,9 +10778,9 @@ msgstr "Łotewski (lv_LV)"
 msgid "Layout"
 msgstr "Układ"
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10790,7 +10791,7 @@ msgstr "Układ"
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Z lewej"
@@ -10823,25 +10824,25 @@ msgstr "Uprawniony do"
 msgid "Limit for search and filter results"
 msgstr "Ograniczenie wyszukiwania/filtrowania elementów"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Linia"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Typ linii"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Szerokość linii"
 
@@ -10863,9 +10864,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Wskaźnik połączenia"
 
@@ -10896,8 +10897,8 @@ msgstr "Połączone szablony"
 msgid "Linked to templates"
 msgstr "Podłączone do szablonów"
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Łącza"
 
@@ -10999,8 +11000,8 @@ msgstr "Wysokość geograficzna"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -11013,8 +11014,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Monitorowanie pliku logu. Zwraca log"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Format czasu dla logowania"
 
@@ -11140,7 +11141,7 @@ msgstr "Główna nawigacja"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Utrzymanie"
 
@@ -11300,7 +11301,7 @@ msgstr "Drzewo nawigacyjne mapy"
 msgid "Map owner cannot be empty."
 msgstr "Właściciel mapy nie może być pusty."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Kształt mapy"
 
@@ -11378,19 +11379,19 @@ msgstr "Maska"
 msgid "Mass update"
 msgstr "Aktualizacja masowa"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Masowo aktualizuj elementy"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Masowa aktualizacja kształtów"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Element główny"
 
@@ -11475,8 +11476,8 @@ msgid "May"
 msgstr "Maj"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11603,8 +11604,8 @@ msgstr "Szkic wiadomości"
 msgid "Message templates"
 msgstr "Szkice wiadomości"
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Czas wygaśnięcia komunikatu"
 
@@ -11622,7 +11623,7 @@ msgstr "Wiadomość/Polecenie"
 msgid "Messages"
 msgstr "Komunikaty"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Komunikaty"
 
@@ -11722,11 +11723,11 @@ msgstr "Brakujące pole \"name\" dla prototypu wykresu."
 msgid "Missing \"name\" field for graph."
 msgstr "Brakujące pole \"name\" dla wykresu."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "Brakujące dane"
 
@@ -11898,8 +11899,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Wiele"
 
@@ -12065,7 +12066,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -12085,15 +12086,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12102,16 +12103,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12391,7 +12392,7 @@ msgstr "Bez szczegółów"
 msgid "No discovery rule IDs given."
 msgstr "Nie podano żadnego identifykatora reguł wykrywania."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr "Nie znaleziono włączonych modułów."
@@ -12447,8 +12448,8 @@ msgstr "Brak obrazka"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Nie znaleziono interfejsu"
 
@@ -12752,7 +12753,7 @@ msgstr "Nie określono pliku klucza publicznego."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Nie odświeżono"
 
@@ -12798,8 +12799,8 @@ msgstr "Flagi nieboolowskie są przestarzałe."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12807,17 +12808,17 @@ msgstr "Flagi nieboolowskie są przestarzałe."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Brak"
@@ -12913,7 +12914,7 @@ msgstr "Raport powiadomień"
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -13087,8 +13088,8 @@ msgstr "Systemy liczbowe"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numerycznie (zmiennoprzecinkowo)"
 
@@ -13098,8 +13099,8 @@ msgstr "Numeryczny (liczba całkowita)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numerycznie (liczba całkowita bez znaku)"
 
@@ -13107,8 +13108,8 @@ msgstr "Numerycznie (liczba całkowita bez znaku)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13120,13 +13121,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "OK - zamknięto zdarzenie"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "OK - wygenerowano zdarzenie"
 
@@ -13187,7 +13188,7 @@ msgstr "Wyłączone"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13216,7 +13217,7 @@ msgstr "Włączone"
 msgid "On status change triggers blink for"
 msgstr "Przy zmianie stanu wyzwalacze migają przez"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Raz"
 
@@ -13338,11 +13339,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operacje"
@@ -13388,7 +13389,7 @@ msgstr "Opcje"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13403,11 +13404,11 @@ msgstr "Opcje"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Lub"
 
@@ -13502,8 +13503,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Nadpisane przez"
@@ -13720,8 +13721,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLEM"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "PROBLEM - tryb generowania zdarzenia"
 
@@ -13803,8 +13804,8 @@ msgstr "Parametr \"%1$s\" jest przestarzały."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parametry"
 
@@ -13852,8 +13853,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Składnia"
 
@@ -13884,12 +13885,12 @@ msgstr "Pasywny"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13922,12 +13923,12 @@ msgid "Paste"
 msgstr "Wklej"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr "Wklej widżet"
 
@@ -13940,7 +13941,7 @@ msgstr "Wklej bez zewnętrznych łączy"
 msgid "Pattern"
 msgstr "Wzór"
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "Zatrzymaj operacje dla wstrzymanych problemów"
 
@@ -13983,8 +13984,8 @@ msgstr "Wykonuje zapytanie DNS. Zwraca ciąg znaków z wymaganym typem informacj
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Okres"
@@ -14005,9 +14006,9 @@ msgid "Periods"
 msgstr "Okresy"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -14018,7 +14019,7 @@ msgstr "Okresy"
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Uprawnienia mogą być nadawane wyłącznie dla grup użytkowników."
 
@@ -14040,12 +14041,12 @@ msgstr "Algorytm rozmieszczania"
 msgid "Plain text"
 msgstr "Zwykły tekst"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Odtwórz"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Odtwórz dźwięk"
 
@@ -14075,8 +14076,7 @@ msgstr "Proszę włącznyć \"allow_url_fopen\" wytyczną."
 msgid "Please select two elements"
 msgstr "Proszę wybrać dwa elementy"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14086,14 +14086,15 @@ msgstr "Proszę wybrać dwa elementy"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "Rozmiar punktu"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Punkty"
 
@@ -14101,7 +14102,7 @@ msgstr "Punkty"
 msgid "Polish (pl_PL)"
 msgstr "Polski (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Powielaj pola inwentarza hosta"
 
@@ -14163,16 +14164,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Wstępne przetwarzanie"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Kroki wstępnego przetwarzania"
 
@@ -14269,8 +14270,8 @@ msgstr "Prywatne"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Plik zawierający klucz prywatny"
 
@@ -14300,7 +14301,7 @@ msgstr "Poziom uprawnień"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problem"
 
@@ -14490,16 +14491,16 @@ msgstr "Publiczny"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Klucz publiczny"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Plik klucza publicznego"
 
@@ -14513,8 +14514,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Pola zapytania"
 
@@ -14564,8 +14565,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Dane nieprzetworzone"
 
@@ -14591,14 +14592,14 @@ msgstr "Tylko do odczytu"
 msgid "Read-only"
 msgstr "Tylko do odczytu"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14612,14 +14613,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Do odczytu i zapisu"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14665,7 +14666,7 @@ msgstr "Odbiorcy"
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14674,10 +14675,10 @@ msgid "Recovery"
 msgstr "Odzyskiwanie"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Wyrażenie dla przywracania"
@@ -14687,7 +14688,7 @@ msgstr "Wyrażenie dla przywracania"
 msgid "Recovery expression syntax error."
 msgstr "Błąd składni wyrażenia przywracania."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Operacje przywracania"
 
@@ -14699,8 +14700,8 @@ msgstr "Operacje przywracania"
 msgid "Recovery time"
 msgstr "Czas przywrócenia"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Prostokąt"
 
@@ -14807,7 +14808,7 @@ msgstr "Zdalne polecenie"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14838,13 +14839,13 @@ msgstr "Zdalne polecenie"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14852,25 +14853,25 @@ msgstr "Zdalne polecenie"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14898,14 +14899,14 @@ msgstr "Zdalne polecenie"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14980,10 +14981,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Zastąp"
 
@@ -15001,7 +15002,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -15040,15 +15041,15 @@ msgstr "Raporty"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "Żądanie treści"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "Żądanie typu treści"
 
@@ -15057,8 +15058,8 @@ msgid "Request sent successfully"
 msgstr "Żądanie wysłane z powodzenie"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "Typ żądania"
 
@@ -15085,8 +15086,8 @@ msgstr "Wymagana wydajność serwera, nowe wartości na sekundę"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Wymagane kody stanu"
 
@@ -15099,11 +15100,11 @@ msgstr "Wymagany ciąg znaków"
 msgid "Reset"
 msgstr "Przywróć"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Przywrócić wszystkie pola do wartości domyślnych?"
 
@@ -15120,11 +15121,11 @@ msgstr "Potwierdzenie przywracania"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Przywróć domyślne"
 
@@ -15228,8 +15229,8 @@ msgstr "Wynik z wartością mapy zastosowany"
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "Tryb pobierania"
 
@@ -15302,9 +15303,9 @@ msgstr "Zwraca procent utraconych pakietów ping ICMP."
 msgid "Revert changes"
 msgstr "Cofnij zmiany"
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15312,7 +15313,7 @@ msgstr "Cofnij zmiany"
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Z prawej"
@@ -15328,8 +15329,8 @@ msgstr "Prawy Y"
 msgid "Right trim"
 msgstr "Przytnij z prawej"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr "Rola"
 
@@ -15522,8 +15523,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "OID SNMP"
 
@@ -15602,8 +15603,8 @@ msgstr "Licznik SQL: %1$s (select: %2$s | execute: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Zapytanie SQL"
 
@@ -15628,38 +15629,38 @@ msgstr "Agent SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Plik certyfikatu SSL"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Plik klucza SSL"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Hasło klucza SSL"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "Host weryfikacji SSL"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "Podmiot weryfikujący SSL"
 
@@ -15781,9 +15782,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15808,8 +15809,8 @@ msgstr "Zakres"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Skrypt"
 
@@ -15942,10 +15943,10 @@ msgstr "Nazwa ochrony"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Wybierz"
@@ -15955,9 +15956,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Wybierz prototyp"
 
@@ -15978,7 +15979,7 @@ msgstr "Usunięto wybrane akcje"
 msgid "Selected and all other problems of related triggers"
 msgstr "Wybrane i inne problemy powiązanych wyzwalaczy"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Wybrane elementy"
 
@@ -16329,8 +16330,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "Poziom zwiększony"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Kształt"
@@ -16433,7 +16434,7 @@ msgstr "Pokaż panel boczny"
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16533,8 +16534,8 @@ msgstr "Prosty wykres"
 msgid "Simple graph prototype"
 msgstr "Prosty prototyp wykresu"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Pojedynczy"
 
@@ -16579,7 +16580,7 @@ msgstr "Województwo / prowincja witryny"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -16690,9 +16691,9 @@ msgstr "Prędkość"
 msgid "Stacked"
 msgstr "Warstwowy"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "Schody"
 
@@ -16713,7 +16714,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Uruchom w"
 
@@ -16908,14 +16909,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Krok o nazwie \"%1$s\" już istnieje."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Kroki"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Stop"
 
@@ -16938,10 +16939,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr "OKres przechowywania"
 
@@ -17177,8 +17178,8 @@ msgstr "Priorytet pokazania znacznika"
 msgid "Tag filter"
 msgstr "Filtr znacznika"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Znacznik dla dopasowania"
 
@@ -17237,28 +17238,28 @@ msgstr "Wartość znacznika"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Znaczniki"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Cel"
@@ -17419,14 +17420,14 @@ msgstr "Zaktualizowane szablony"
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17484,10 +17485,10 @@ msgstr "Testowanie tematu"
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Tekst"
 
@@ -17642,8 +17643,8 @@ msgstr "Bieżący miesiąc"
 msgid "This month so far"
 msgstr "Ten miesiąc jak dotąd"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17747,9 +17748,9 @@ msgstr "Okres"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Przesunięcie czasu"
 
@@ -17767,8 +17768,8 @@ msgstr "Strafa czasowa"
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Przekroczenie czasu"
 
@@ -17794,7 +17795,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Do"
 
@@ -17818,7 +17819,7 @@ msgstr "Dzisiaj jak dotąd"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Na górze"
@@ -17870,8 +17871,7 @@ msgstr "Przekształcenie zapytania SQL do tablicy JSON dla niskopoziomego wykryw
 msgid "Transform SQL query result into a JSON array."
 msgstr "Przekształcenie zapytania SQL do tablicy JSON."
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17882,7 +17882,8 @@ msgstr "Przekształcenie zapytania SQL do tablicy JSON."
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "Przezroczystość"
 
@@ -17890,9 +17891,9 @@ msgstr "Przezroczystość"
 msgid "Transport error."
 msgstr "Błąd przesyłu."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "Traktuj jako 0"
@@ -17904,8 +17905,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Okres przechowywania trendu"
 
@@ -17923,9 +17924,9 @@ msgstr "Trendy"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Wyzwalacz"
@@ -18030,7 +18031,7 @@ msgstr "Przegląd wyzwalaczy"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Prototyp wyzwalacza"
@@ -18097,7 +18098,7 @@ msgstr "Usunięto prototypy wyzwalaczy"
 msgid "Trigger prototypes updated"
 msgstr "Zaktualizowano prototypy wyzwalaczy"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Poziom wyzwalacza"
 
@@ -18204,23 +18205,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Typ"
@@ -18229,12 +18230,12 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr "Typ (szczegóły)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Typ (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18245,10 +18246,10 @@ msgstr "Typ obliczeń"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Typ informacji"
 
@@ -18272,11 +18273,11 @@ msgstr "NIEZNANE"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18297,7 +18298,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL nie jest prawidłowo zakodowany."
@@ -18322,7 +18323,7 @@ msgstr "Nazwa parametru URL jest pusta."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "Adresy URL"
@@ -18425,15 +18426,15 @@ msgstr "Nieoczekiwana odpowiedź dla akcji %1$s."
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18442,8 +18443,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Jednostki"
 
@@ -18469,7 +18470,7 @@ msgstr "Jednostki"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Nieznany"
@@ -18613,12 +18614,12 @@ msgstr "Działa"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18638,18 +18639,18 @@ msgstr "Działa"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18670,13 +18671,13 @@ msgstr "Aktualizuj istniejące"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Interwał aktualizacji"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "Aktualizacja operacji"
 
@@ -18815,7 +18816,7 @@ msgstr "Ciąg znaków agenta użytkownika"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr "Użytkownik nie może zmienić własnej roli."
@@ -18930,10 +18931,10 @@ msgstr "Menu użytkownika"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Nazwa użytkownika"
 
@@ -19002,7 +19003,7 @@ msgstr "Ustawienia użytkownika"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Brak parametrów współdzielenia użytkownika: %1$s dla mapy \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19380,12 +19381,12 @@ msgstr "Sprawdzenie"
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19447,8 +19448,8 @@ msgstr "Mapa wartości \"%s\" już istnieje."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Mapowanie wartości"
@@ -19565,8 +19566,8 @@ msgstr "Wersja serwera Zabbix lub proxy"
 msgid "Vertical"
 msgstr "Pionowe"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Ułożenie pionowe"
 
@@ -19771,8 +19772,7 @@ msgstr ""
 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."
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19783,12 +19783,13 @@ msgstr "Widżet jest za mały dla okreśłonej liczby kolumn i wierszy."
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19864,8 +19865,8 @@ msgstr "Błędne pola dla linku mapy."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19877,11 +19878,11 @@ msgstr "Oś X"
 msgid "X-Frame-Options HTTP header"
 msgstr "Nagłówek HTTP X-Frame-Options"
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19895,8 +19896,8 @@ msgstr "XML Xpath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "Dane XML"
 
@@ -19916,12 +19917,12 @@ msgstr ""
 msgid "XPath"
 msgstr "XPath"
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "MAX wartość osi Y"
 
@@ -19935,18 +19936,18 @@ msgstr "Wartość MAX osi Y musi być większa od wartości MIN osi Y."
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Wartość MAX osi Y musi być większa od wartości MIN osi Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "MIN wartość osi Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Strona osi Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Oś Y"
 
@@ -19966,11 +19967,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -21001,10 +21002,10 @@ msgstr "fuzzytime() - Różnica pomiędzy wartością elementy (jako znacznika c
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "globalne ustawienia porządkowania"
@@ -21033,8 +21034,8 @@ msgstr "host"
 msgid "host group"
 msgstr "grupa hostów"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "wzór hosta"
@@ -21067,7 +21068,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "Dołączanie podgrup"
 
@@ -21241,8 +21242,8 @@ msgstr "pozycja"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "wzór elementu"
 
@@ -21506,10 +21507,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "nazwa"
@@ -21556,7 +21557,7 @@ msgstr "brak uprawnień do od potwierdzenia problemów"
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr "nodata() - Nie odebrano danych podczas okresu czasu T (1 - prawda, 0- fałśz), Tryb (ścisły - ignoruj czas opóźenienia proxy w wysyłanych danych)"
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "żaden"
 
@@ -21586,7 +21587,7 @@ msgstr "liczba"
 msgid "of"
 msgstr "z"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21609,7 +21610,7 @@ msgstr "z"
 msgid "off"
 msgstr "wyłączone"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21781,8 +21782,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr "skrypt"
@@ -21919,8 +21920,8 @@ msgstr "dostarczone dane logowania nie są unikalne"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22207,17 +22208,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/pt_BR/LC_MESSAGES/frontend.po b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
index 7c0e0562687..22a1503a8d6 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] "%1$s mensagem"
 msgstr[1] "%1$s mensagens"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "%1$s tentava faltando"
 msgstr[1] "%1$s tentavas faltando"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -335,7 +335,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 segundos"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "visão 3D"
 
@@ -381,7 +381,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "ADICIONAR SOBREPOSIÇÃO"
 
@@ -471,27 +471,27 @@ msgstr "Acesso negado"
 msgid "Access denied!"
 msgstr "Acesso negado!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -563,35 +563,35 @@ msgstr "Eventos confirmados RESOLVIDOS"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -720,24 +720,24 @@ msgstr "Ativo até"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -773,13 +773,13 @@ msgstr "Ativo até"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -797,38 +797,38 @@ msgstr "Ativo até"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -855,7 +855,7 @@ msgstr "Adicionar elemento filho"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Adicionar múltiplos mapas"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "Adicionar novo conjunto de dados"
 
@@ -885,16 +885,16 @@ msgstr "Adicionar novo conjunto de dados"
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "Adicionar nova sobreposição"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Adicionar protótipo"
 
@@ -941,7 +941,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Adicionar widget"
@@ -1030,7 +1030,7 @@ msgstr "Interfaces do agente"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1038,11 +1038,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1069,8 +1069,8 @@ msgstr "Alinha elementos do mapa"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1086,8 +1086,8 @@ msgid "All dashboards"
 msgstr "Todos os dashboards"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Todos os grupos"
 
@@ -1103,13 +1103,13 @@ msgstr "Todos os links devem ter \"Nome\" e \"URL\" definidos"
 msgid "All maps"
 msgstr "Todos os mapas"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Todos os incidentes"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Todos os incidentes que o valor da etiqueta combine"
 
@@ -1130,19 +1130,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Permitir fechamento manual"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Hosts permitidos"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1159,21 +1159,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "E"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1187,7 +1187,7 @@ msgstr "E"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "E/OU"
 
@@ -1232,11 +1232,11 @@ msgstr "Erro na aplicação."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Aplicar"
@@ -1366,11 +1366,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Ao menos uma operação deve existir."
 
@@ -1464,8 +1464,8 @@ msgstr "Falha de autenticação: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
@@ -1527,8 +1527,8 @@ msgstr "Automático"
 msgid "Automatic icon mapping"
 msgstr "Mapeamento automático de icone"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Seleção automática de ícone"
 
@@ -1595,12 +1595,12 @@ msgstr "Retornar"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Fundo"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1608,9 +1608,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Imagem de fundo"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1618,8 +1618,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1662,15 +1662,15 @@ msgstr "Azul"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Corpo"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Corpo e cabeçalhos"
 
@@ -1681,8 +1681,8 @@ msgstr "Corpo e cabeçalhos"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Linha grossa"
 
@@ -1690,19 +1690,19 @@ msgstr "Linha grossa"
 msgid "Boolean to decimal"
 msgstr "Lógico para decimal"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Borda"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Tipo da borda"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Largura da borda"
 
@@ -1715,7 +1715,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Abaixo"
@@ -1798,7 +1798,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Calculado"
 
@@ -1822,22 +1822,22 @@ msgstr "Retorno"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3431,8 +3431,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Carácter"
 
@@ -3460,7 +3460,7 @@ msgstr "Chassi"
 msgid "Chassis information. Returns string"
 msgstr "Informação do chassi. Retorna um texto"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Verificação já existe."
 
@@ -3581,8 +3581,8 @@ msgid "Clear history"
 msgstr "Limpar histórico"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Limpar histórico e estatísticas (médias)"
 
@@ -3610,22 +3610,22 @@ msgstr "Relógio"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Clonar"
@@ -3633,28 +3633,28 @@ msgstr "Clonar"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Fechar"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Fechar construtor de expressão"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Fechar novo evento"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Fechar eventos antigos"
@@ -3668,7 +3668,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Recolher"
@@ -3682,11 +3682,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3695,7 +3695,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3783,9 +3783,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Condições"
@@ -3970,13 +3970,13 @@ msgstr "Parabéns! Você instalou com sucesso a interface web do Zabbix."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Connectado a"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "Conectado"
@@ -4068,8 +4068,8 @@ msgstr "Contato"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4149,13 +4149,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Número do contrato"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "Converter para JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Coordenadas"
 
@@ -4172,7 +4172,7 @@ msgstr "Copiar"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Correlacionamento"
 
@@ -4312,10 +4312,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4519,7 +4519,7 @@ msgid "Custom"
 msgstr "Customizar"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4533,8 +4533,8 @@ msgstr "Gráficos personalizados"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Intervalo customizado"
 
@@ -4700,8 +4700,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "Dashboards"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Linha tracejada"
 
@@ -4719,7 +4719,7 @@ msgstr "O dado não está corretamente codificado."
 msgid "Data overview"
 msgstr "Visão geral dados"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4903,11 +4903,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Padrão"
 
@@ -4949,7 +4949,7 @@ msgstr "Formulário padrão de login"
 msgid "Default media type"
 msgstr "Tipo de mídia padrão"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Duração padrão do passo da operação"
 
@@ -4983,7 +4983,7 @@ msgstr "Atrasado por"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4992,7 +4992,7 @@ msgstr "Atrasado por"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5000,47 +5000,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Excluir"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Excluir e limpar"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Excluir e limpar templates selecionados? (Aviso: todos os hosts associados terão as entidades herdadas dos templates excluídas, bem como os dados coletados!)"
 
@@ -5048,11 +5048,11 @@ msgstr "Excluir e limpar templates selecionados? (Aviso: todos os hosts associad
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Excluir e limpar template? (Aviso: todos os hosts associados terão as entidades herdadas dos templates excluídas, bem como os dados coletados!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Excluir a ação atual?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Excluir o correlacionamento atual?"
 
@@ -5065,10 +5065,10 @@ msgstr "Excluir o dashboard?"
 msgid "Delete discovery rule?"
 msgstr "Excluir a regra de descoberta?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Excluir expressão?"
 
@@ -5092,11 +5092,11 @@ msgstr "Excluir o histórico dos cenários web selecionados?"
 msgid "Delete icon map?"
 msgstr "Excluir o mapeamento de ícones?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Excluir o protótipo de item?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Excluir o item?"
 
@@ -5138,11 +5138,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5202,7 +5202,7 @@ msgstr "Excluir os protótipos de host selecionados?"
 msgid "Delete selected host?"
 msgstr "Excluir host selecionado?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Excluir hosts selecionados?"
 
@@ -5210,11 +5210,11 @@ msgstr "Excluir hosts selecionados?"
 msgid "Delete selected image?"
 msgstr "Excluir imagem selecionada?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Excluir o protótipos de item selecionados?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Excluir itens selecionados?"
 
@@ -5230,7 +5230,7 @@ msgstr "Excluir o mapa selecionado?"
 msgid "Delete selected maps?"
 msgstr "Excluir mapas selecionados?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Excluir tipos de mídia selecionados?"
 
@@ -5262,11 +5262,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Excluir scripts selecionados?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5274,19 +5274,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Excluir as formas seleciondas?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Excluir templates selecionados?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Excluir o protótipos de trigger selecionados?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Excluir triggers selecionadas?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Excluir usuários selecionados?"
 
@@ -5302,11 +5302,11 @@ msgstr "Excluir os cenários web selecionados?"
 msgid "Delete template?"
 msgstr "Excluir template?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Excluir o protótipo de trigger?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Excluir trigger?"
 
@@ -5332,7 +5332,7 @@ msgstr "Excluído: Protótipo de host \"%1$s\" em \"%2$s\"."
 msgid "Delimiter"
 msgstr "Delimitador"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5347,10 +5347,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Dependências"
 
@@ -5387,7 +5387,7 @@ msgstr "Status de desenvolvimento"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5397,13 +5397,13 @@ msgstr "Status de desenvolvimento"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Descrição"
@@ -5413,10 +5413,10 @@ msgstr "Descrição"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detalhes"
@@ -5457,7 +5457,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Tamanho do diretório (em bytes). Retorna inteiro"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5508,11 +5508,11 @@ msgstr "Desabilitar hosts monitorados pelos proxies selecionados?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5541,7 +5541,7 @@ msgstr "Desativar hosts selecionados?"
 msgid "Disable selected items?"
 msgstr "Desativar itens selecionados?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Desabilitar os tipos de mídia selecionados?"
 
@@ -5575,7 +5575,7 @@ msgstr "Desativar os cenários web selecionados?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5603,7 +5603,7 @@ msgstr "Desativar os cenários web selecionados?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Inativo"
 
@@ -5629,9 +5629,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5828,7 +5828,7 @@ msgstr "Estatísticas de gravação de disco. Retorna: inteiro - se o tipo for s
 msgid "Display OK triggers for"
 msgstr "Mostrar as triggers OK para"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Exibir gráfico"
 
@@ -5836,13 +5836,13 @@ msgstr "Exibir gráfico"
 msgid "Display problems"
 msgstr "Exibir incidentes"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Exibir gráfico empilhado"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5866,15 +5866,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5888,8 +5888,8 @@ msgstr "A expressão condicional foi substituída?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5899,8 +5899,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5910,8 +5910,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5919,8 +5919,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Pontilhado"
 
@@ -5949,16 +5949,16 @@ msgstr "Receber a configuração"
 msgid "Downtime"
 msgstr "Downtime"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "Desenhar"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Estilo"
 
@@ -6009,7 +6009,7 @@ msgstr "O userid \"%1$s\" está duplicado nos usuários do mapa \"%2$s\"."
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Duração"
 
@@ -6032,29 +6032,29 @@ msgstr "Itens dinâmicos"
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Editar"
@@ -6108,12 +6108,12 @@ msgstr "Erro no elasticsearch: %1$s."
 msgid "Element"
 msgstr "Elemento"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Nome do elemento"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Elipse"
 
@@ -6169,7 +6169,7 @@ msgstr "Parâmetro de entrada vazio."
 msgid "Empty map ID."
 msgstr "ID de mapa vazio."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6249,11 +6249,11 @@ msgstr "Ativar a limpeza de dados interna"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6283,7 +6283,7 @@ msgstr "Ativar os hosts selecionados?"
 msgid "Enable selected items?"
 msgstr "Ativar itens selecionados?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Ativar os tipos de mídia selecionados?"
 
@@ -6305,8 +6305,8 @@ msgstr "Ativar os cenários web selecionados?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "Ativar traps"
 
@@ -6328,7 +6328,7 @@ msgstr "Ativar traps"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6344,7 +6344,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6358,14 +6358,14 @@ msgstr "Ativar traps"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Ativo"
 
@@ -6418,8 +6418,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6596,7 +6596,7 @@ msgstr "Executa requisição WMI retornando o primeiro objeto selecionado. Retor
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6617,8 +6617,8 @@ msgstr "Executado"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Script executado"
 
@@ -6632,13 +6632,13 @@ msgstr "Confirmação de execução"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Expandir"
@@ -6708,15 +6708,15 @@ msgstr "Exportar para CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6729,10 +6729,10 @@ msgstr "Expressão"
 msgid "Expression cannot be empty"
 msgstr "Expressão não pode ser vazia"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Construtor de expressão"
 
@@ -6800,7 +6800,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Falha ao criar o dashboard"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Falha ao processar a URL."
@@ -6934,8 +6934,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Horário do arquivo. Retorna: timestamp UNIX (número inteiro)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6946,7 +6945,8 @@ msgstr "Horário do arquivo. Retorna: timestamp UNIX (número inteiro)"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "Preencher"
 
@@ -7043,7 +7043,7 @@ msgid "Fit to map"
 msgstr "Ajustar ao mapa"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fixo"
 
@@ -7055,9 +7055,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7065,22 +7065,22 @@ msgstr "Flexível"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Seguir redirecionamentos"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Fonte"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
@@ -7088,8 +7088,8 @@ msgstr "Tamanho da fonte"
 msgid "Form data"
 msgstr "Dado do formulário"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Fórmula"
 
@@ -7125,7 +7125,7 @@ msgstr "Sexta-feira"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "De"
 
@@ -7140,7 +7140,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Acesso à interface web"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Ativar mensagens globais"
 
@@ -7156,7 +7156,7 @@ msgid "Full clone"
 msgstr "Clone completo"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Função"
 
@@ -7573,8 +7573,8 @@ msgstr "Agente HTTP"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Autenticação HTTP"
 
@@ -7585,8 +7585,8 @@ msgstr "Formulário de autenticação HTTP"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
@@ -7623,10 +7623,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Cabeçalhos"
 
@@ -7642,7 +7642,7 @@ msgstr "Hebreu (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7748,7 +7748,7 @@ msgid "History cleared"
 msgstr "Histórico zerado"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Zerar o histórico pode levar um tempo bem longo. Continuar?"
 
@@ -7763,8 +7763,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Período de retenção do histórico"
 
@@ -7781,8 +7781,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Alinhamento horizontal"
 
@@ -7901,7 +7901,7 @@ msgstr[1] "Hosts ativados"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7987,9 +7987,9 @@ msgstr "Grupos de hosts"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Interface do host"
 
@@ -8277,8 +8277,8 @@ msgstr "Interfaces IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "Sensor IPMI"
 
@@ -8292,19 +8292,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ícone"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ícone (padrão)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ícone (desativado)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ícone (manutenção)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ícone (incidente)"
 
@@ -8351,7 +8351,7 @@ msgstr "Mapeamento de ícones"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "O ícone com o ID \"%1$s\" não está disponível."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Ícones"
 
@@ -8495,7 +8495,7 @@ msgstr "Imagens"
 msgid "Images for all maps will be updated!"
 msgstr "As imagens de todos os mapas serão atualizadas!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Imediatamente"
 
@@ -8579,6 +8579,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9463,10 +9464,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Informação"
@@ -9533,8 +9534,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Inserir"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Insira a expressão"
 
@@ -9651,9 +9652,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Intervalo"
@@ -10090,7 +10091,7 @@ msgstr "Italiano (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Item"
 
@@ -10355,8 +10356,8 @@ msgstr "Agente JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "Endpoint JMX"
 
@@ -10374,8 +10375,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "Dado JSON"
 
@@ -10414,8 +10415,8 @@ msgstr "Japonês (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10454,9 +10455,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Chave"
@@ -10522,13 +10523,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Texto"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Localização do texto"
 
@@ -10675,9 +10676,9 @@ msgstr "Lituâno (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10688,7 +10689,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Esquerda"
@@ -10721,25 +10722,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Limite de busca/filtro de elementos"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Linha"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Tipo da linha"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Largura da linha"
 
@@ -10761,9 +10762,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Indicadores de link"
 
@@ -10794,8 +10795,8 @@ msgstr "Associado aos templates"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Links"
 
@@ -10897,8 +10898,8 @@ msgstr "Longitude de localização"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -10911,8 +10912,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Monitoração de log. Retorna: log"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Formato de data no log"
 
@@ -11038,7 +11039,7 @@ msgstr "Navegação principal"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Manutenção"
 
@@ -11198,7 +11199,7 @@ msgstr "Árvore de navegação de mapas"
 msgid "Map owner cannot be empty."
 msgstr "O proprietário do mapa não pode estar vazio."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Forma do mapa"
 
@@ -11276,19 +11277,19 @@ msgstr "Máscara"
 msgid "Mass update"
 msgstr "Atualização em massa"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Atualização em massa de elementos"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Atualização em massa de formas"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Item mestre"
 
@@ -11372,8 +11373,8 @@ msgid "May"
 msgstr "Maio"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Mídia"
 
@@ -11497,8 +11498,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Enquanto a mensagem estiver visível"
 
@@ -11516,7 +11517,7 @@ msgstr "Mensagem/Comando"
 msgid "Messages"
 msgstr "Mensagens"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Mensagens"
 
@@ -11615,11 +11616,11 @@ msgstr "Está faltando o campo \"name\" para o protótipo de gráfico."
 msgid "Missing \"name\" field for graph."
 msgstr "Está faltando o campo \"name\" para o gráfico."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "Dado ausente"
 
@@ -11787,8 +11788,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Múltiplo"
 
@@ -11954,7 +11955,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11974,15 +11975,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11991,16 +11992,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12280,7 +12281,7 @@ msgstr "Sem detalhes"
 msgid "No discovery rule IDs given."
 msgstr "Não foram informados os IDs de regra de descoberta."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12336,8 +12337,8 @@ msgstr "Sem imagem"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Nenhuma interface encontrada"
 
@@ -12643,7 +12644,7 @@ msgstr "Não foi informado o arquivo de chave pública."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Não atualizar"
 
@@ -12689,8 +12690,8 @@ msgstr "Marcadores não booleanos serão descontinuados."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12698,17 +12699,17 @@ msgstr "Marcadores não booleanos serão descontinuados."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Nenhum"
@@ -12804,7 +12805,7 @@ msgstr "Relatório de notificações"
 msgid "Notifications"
 msgstr "Notificações"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12978,8 +12979,8 @@ msgstr "Sistema numeral"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numérico (fracionário)"
 
@@ -12989,8 +12990,8 @@ msgstr "Numérico (inteiro)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numérico (inteiro sem sinal)"
 
@@ -12998,8 +12999,8 @@ msgstr "Numérico (inteiro sem sinal)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13011,13 +13012,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "Fechamentos de eventos OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "Geração de eventos OK"
 
@@ -13078,7 +13079,7 @@ msgstr "Inativo"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13107,7 +13108,7 @@ msgstr "Ativo"
 msgid "On status change triggers blink for"
 msgstr "Ao mudar o status da trigger piscar por"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Uma vez"
 
@@ -13228,11 +13229,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operações"
@@ -13278,7 +13279,7 @@ msgstr "Opções"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13293,11 +13294,11 @@ msgstr "Opções"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Ou"
 
@@ -13392,8 +13393,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Sobrescrito por"
@@ -13610,8 +13611,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "INCIDENTE"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "Modo de geração de eventos de INCIDENTE"
 
@@ -13693,8 +13694,8 @@ msgstr "O parâmetro \"%1$s\" será descontinuado."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parâmetros"
 
@@ -13742,8 +13743,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Processar"
 
@@ -13774,12 +13775,12 @@ msgstr "Passivo"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13812,12 +13813,12 @@ msgid "Paste"
 msgstr "Colar"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13830,7 +13831,7 @@ msgstr "Colar sem os links externos"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "Pausar operações para incidentes suprimidos"
 
@@ -13873,8 +13874,8 @@ msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requ
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Período"
@@ -13895,9 +13896,9 @@ msgid "Periods"
 msgstr "Períodos"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13908,7 +13909,7 @@ msgstr "Períodos"
 msgid "Permissions"
 msgstr "Permissões"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Permissões devem ser definidas para grupos de usuários apenas."
 
@@ -13930,12 +13931,12 @@ msgstr "Informar algorítimo"
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Executar"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Executar som"
 
@@ -13965,8 +13966,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Favor selecionar dois elementos"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13976,14 +13976,15 @@ msgstr "Favor selecionar dois elementos"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "Tamanho do ponto"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Pontos"
 
@@ -13991,7 +13992,7 @@ msgstr "Pontos"
 msgid "Polish (pl_PL)"
 msgstr "Polonês (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Preencha o campo do inventário do host"
 
@@ -14053,16 +14054,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Pré-processamento"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Passos do pré-processamento"
 
@@ -14159,8 +14160,8 @@ msgstr "Privado"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Arquivo de chave privada"
 
@@ -14190,7 +14191,7 @@ msgstr "Nível de acesso"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Incidente"
 
@@ -14379,16 +14380,16 @@ msgstr "Público"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Chave pública"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Arquivo de chave pública"
 
@@ -14402,8 +14403,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Campos da consulta"
 
@@ -14453,8 +14454,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Dados brutos"
 
@@ -14480,14 +14481,14 @@ msgstr "Somente leitura"
 msgid "Read-only"
 msgstr "Leitura"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14501,14 +14502,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Leitura-escrita"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14554,7 +14555,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14563,10 +14564,10 @@ msgid "Recovery"
 msgstr "Recuperação"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Expressão de recuperação"
@@ -14576,7 +14577,7 @@ msgstr "Expressão de recuperação"
 msgid "Recovery expression syntax error."
 msgstr "Erro de sintaxe na expressão de recuperação."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Operações de recuperação"
 
@@ -14588,8 +14589,8 @@ msgstr "Operações de recuperação"
 msgid "Recovery time"
 msgstr "Hora da recuperação"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Retângulo"
 
@@ -14695,7 +14696,7 @@ msgstr "Comando remoto"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14726,13 +14727,13 @@ msgstr "Comando remoto"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14740,25 +14741,25 @@ msgstr "Comando remoto"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14786,14 +14787,14 @@ msgstr "Comando remoto"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14868,10 +14869,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Substituir"
 
@@ -14889,7 +14890,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14928,15 +14929,15 @@ msgstr "Relatórios"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "Requisitar corpo"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "Solicitar tipo de corpo"
 
@@ -14945,8 +14946,8 @@ msgid "Request sent successfully"
 msgstr "Requisição enviada com sucesso"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "Tipo de requisição"
 
@@ -14973,8 +14974,8 @@ msgstr "Desempenho requerido do servidor, novos valores por segundo"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Código de status requerido"
 
@@ -14987,11 +14988,11 @@ msgstr "Texto requerido"
 msgid "Reset"
 msgstr "Limpar"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Restaurar todos os campos aos seus valores originais?"
 
@@ -15008,11 +15009,11 @@ msgstr "Confirmação de restauração"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Restaurar padrões"
 
@@ -15116,8 +15117,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "Modo de busca"
 
@@ -15190,9 +15191,9 @@ msgstr "Retorna o percentual de perda de pacotes ICMP."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15200,7 +15201,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Direita"
@@ -15216,8 +15217,8 @@ msgstr "Direita Y"
 msgid "Right trim"
 msgstr "Remover espaços à direita"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15407,8 +15408,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15487,8 +15488,8 @@ msgstr "Total de SQL: %1$s (seleções: %2$s | execuções: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Pesquisa SQL"
 
@@ -15513,38 +15514,38 @@ msgstr "Agente SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Arquivo de certificado SSL"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Arquivo de chave SSL"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Senha do SSL"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "Verificação SSL do host"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "Verificação de par SSL"
 
@@ -15663,9 +15664,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15690,8 +15691,8 @@ msgstr "Escopo"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15823,10 +15824,10 @@ msgstr "Nome de segurança"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Selecionar"
@@ -15836,9 +15837,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Selecione o protótipo"
 
@@ -15859,7 +15860,7 @@ msgstr "A ação selecionada foi excluída"
 msgid "Selected and all other problems of related triggers"
 msgstr "Selecionado e todos os outros incidentes de triggers relacionadas"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Elementos selecionados"
 
@@ -16209,8 +16210,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "Severidade aumentada"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Forma"
@@ -16313,7 +16314,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16413,8 +16414,8 @@ msgstr "Gráfico simples"
 msgid "Simple graph prototype"
 msgstr "Protótipo gráfico simples"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Simples"
 
@@ -16459,7 +16460,7 @@ msgstr "Site - Estado / Província"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Tamanho"
 
@@ -16570,9 +16571,9 @@ msgstr "Velocidade"
 msgid "Stacked"
 msgstr "Pilha"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "Escadaria"
 
@@ -16593,7 +16594,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Iniciar em"
 
@@ -16788,14 +16789,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Já existe um passo com o nome \"%1$s\"."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Passos"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Parar"
 
@@ -16818,10 +16819,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17057,8 +17058,8 @@ msgstr "Prioridade de exibição de etiquetas"
 msgid "Tag filter"
 msgstr "Filtro de etiqueta"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Etiqueta para comparação"
 
@@ -17117,28 +17118,28 @@ msgstr "Valor da etiqueta"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Etiquetas"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Destino"
@@ -17299,14 +17300,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Testar"
@@ -17364,10 +17365,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Texto"
 
@@ -17520,8 +17521,8 @@ msgstr "Este mês"
 msgid "This month so far"
 msgstr "Até agora neste mês"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17625,9 +17626,9 @@ msgstr "Intervalo"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Deslocamento de tempo"
 
@@ -17645,8 +17646,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Tempo limite"
 
@@ -17672,7 +17673,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Para"
 
@@ -17696,7 +17697,7 @@ msgstr "Até agora hoje"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Acima"
@@ -17748,8 +17749,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17760,7 +17760,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "Transparência"
 
@@ -17768,9 +17769,9 @@ msgstr "Transparência"
 msgid "Transport error."
 msgstr "Erro de transporte."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "Tratar como 0"
@@ -17782,8 +17783,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Período de retenção das estatísticas"
 
@@ -17801,9 +17802,9 @@ msgstr "Estatísticas"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigger"
@@ -17905,7 +17906,7 @@ msgstr "Visão geral triggers"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Protótipo de trigger"
@@ -17971,7 +17972,7 @@ msgstr "Protótipos de trigger excluídos"
 msgid "Trigger prototypes updated"
 msgstr "Protótipos de trigger atualizados"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Severidade da trigger"
 
@@ -18078,23 +18079,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Tipo"
@@ -18103,12 +18104,12 @@ msgstr "Tipo"
 msgid "Type (Full details)"
 msgstr "Tipo (visão detalhada)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Tipo (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18119,10 +18120,10 @@ msgstr "Tipo do cálculo"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Tipo de informação"
 
@@ -18146,11 +18147,11 @@ msgstr "DESCONHECIDO"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18171,7 +18172,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "A URL não está codificada corretamente."
@@ -18196,7 +18197,7 @@ msgstr "O parâmetro URL está vazio."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18299,15 +18300,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18316,8 +18317,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Unidades"
 
@@ -18343,7 +18344,7 @@ msgstr "Unidades"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -18486,12 +18487,12 @@ msgstr "Ligado"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18511,18 +18512,18 @@ msgstr "Ligado"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18543,13 +18544,13 @@ msgstr "Atualizar existente"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Intervalo de atualização"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "Operações de atualização"
 
@@ -18688,7 +18689,7 @@ msgstr "Mensagem do agente de usuário"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18800,10 +18801,10 @@ msgstr "Menu de usuário"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Nome do usuário"
 
@@ -18871,7 +18872,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Compartilhamento de usuário com parâmetro ausente: %1$s no mapa \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19248,12 +19249,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19315,8 +19316,8 @@ msgstr "O mapeamento de valores \"%1$s\" já existe."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Mapeamento de valor"
@@ -19433,8 +19434,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Alinhamento vertical"
 
@@ -19637,8 +19638,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19649,12 +19649,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19730,8 +19731,8 @@ msgstr "Campos errados para o link no mapa."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19743,11 +19744,11 @@ msgstr "Eixo-X"
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19761,8 +19762,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "Dado XML"
 
@@ -19782,12 +19783,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "A"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Valor MÁXIMO no eixo Y"
 
@@ -19801,18 +19802,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "O valor MÁXIMO do eixo Y deve ser superior ao valor configurado para o MÍNIMO."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Valor MÍNIMO no eixo Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Lado do eixo Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Eixo-Y"
 
@@ -19832,11 +19833,11 @@ msgstr "d-m-Y H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20867,10 +20868,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "configurações globais de limpeza de dados"
@@ -20899,8 +20900,8 @@ msgstr "host"
 msgid "host group"
 msgstr "grupo de hosts"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "padrão de host"
@@ -20933,7 +20934,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "incluindo subgrupos"
 
@@ -21108,8 +21109,8 @@ msgstr "item"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "padrão de item"
 
@@ -21373,10 +21374,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "nome"
@@ -21423,7 +21424,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "nenhum"
 
@@ -21453,7 +21454,7 @@ msgstr "número"
 msgid "of"
 msgstr "de"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21476,7 +21477,7 @@ msgstr "de"
 msgid "off"
 msgstr "off"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21648,8 +21649,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21786,8 +21787,8 @@ msgstr "as credenciais informadas não são únicas"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22074,17 +22075,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/pt_PT/LC_MESSAGES/frontend.po b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
index 904c8d5eb45..48aceaac0b6 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2013-10-10 08:35+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -179,10 +179,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -227,9 +227,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "resta %1$s tentativa"
 msgstr[1] "restam %1$s tentativas"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -334,7 +334,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 segundos"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "Vista 3D"
 
@@ -380,7 +380,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -470,27 +470,27 @@ msgstr "Acesso negado"
 msgid "Access denied!"
 msgstr "Acesso negado!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -562,35 +562,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -719,24 +719,24 @@ msgstr "Activo até"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -772,13 +772,13 @@ msgstr "Activo até"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -796,38 +796,38 @@ msgstr "Activo até"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -854,7 +854,7 @@ msgstr "Adicionar elemento filho"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -875,7 +875,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Adicionar multiplos mapas"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -884,16 +884,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -903,7 +903,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Adicionar protótipo"
 
@@ -940,7 +940,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Adicionar widget"
@@ -1028,7 +1028,7 @@ msgstr "Interfaces do agente"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1036,11 +1036,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1067,8 +1067,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1084,8 +1084,8 @@ msgid "All dashboards"
 msgstr "Todos os dashboards"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Todos os grupos"
 
@@ -1101,13 +1101,13 @@ msgstr "Todos os links devem ter \"Nome\" e \"URL\" definidos"
 msgid "All maps"
 msgstr "Todos os mapas"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Todos os problemas"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Todos os problemas em que o valor da etiqueta seja igual"
 
@@ -1128,19 +1128,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Permitir encerramento manual"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Hosts permitidos"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1157,21 +1157,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "E"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1185,7 +1185,7 @@ msgstr "E"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "E/Ou"
 
@@ -1230,11 +1230,11 @@ msgstr "Erro na aplicação."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Aplicar"
@@ -1362,11 +1362,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1460,8 +1460,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
@@ -1523,8 +1523,8 @@ msgstr "Automático"
 msgid "Automatic icon mapping"
 msgstr "Mapeamento automático de icones"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Selecção automática de ícones"
 
@@ -1591,12 +1591,12 @@ msgstr "Voltar"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Fundo"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1604,9 +1604,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Imagem de fundo"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1614,8 +1614,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1658,15 +1658,15 @@ msgstr "Azul"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1677,8 +1677,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Linha em negrito"
 
@@ -1686,19 +1686,19 @@ msgstr "Linha em negrito"
 msgid "Boolean to decimal"
 msgstr "Lógico para decimal"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Borda"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Tipo da borda"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Largura da borda"
 
@@ -1711,7 +1711,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Abaixo"
@@ -1794,7 +1794,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Calculado"
 
@@ -1818,22 +1818,22 @@ msgstr "Callback"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3427,8 +3427,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Carácter"
 
@@ -3456,7 +3456,7 @@ msgstr "Chassis"
 msgid "Chassis information. Returns string"
 msgstr "Informação do chassis. Retorna um texto"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Verificação já existe."
 
@@ -3577,8 +3577,8 @@ msgid "Clear history"
 msgstr "Limpar hístorico"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Limpar histórico e tendências"
 
@@ -3606,22 +3606,22 @@ msgstr "Relógio"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Clonar"
@@ -3629,28 +3629,28 @@ msgstr "Clonar"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Fechar"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Fechar o construtor de expressões"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Fechar novo evento"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Fechar eventos antigos"
@@ -3664,7 +3664,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Recolher"
@@ -3678,11 +3678,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3691,7 +3691,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3779,9 +3779,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Condições"
@@ -3966,13 +3966,13 @@ msgstr "Parabéns! Instalou com sucesso a interface web do Zabbix."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Ligado a"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4064,8 +4064,8 @@ msgstr "Contacto"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4145,13 +4145,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Número de contrato"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Coordenadas"
 
@@ -4168,7 +4168,7 @@ msgstr "Copiar"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Correlacionamento"
 
@@ -4308,10 +4308,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4515,7 +4515,7 @@ msgid "Custom"
 msgstr "Personalizar"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4529,8 +4529,8 @@ msgstr "Gráficos personalizados"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Intervalo personalizado"
 
@@ -4696,8 +4696,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "Dashboards"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Linha tracejada"
 
@@ -4715,7 +4715,7 @@ msgstr "Os dados não estão correctamente codificados."
 msgid "Data overview"
 msgstr "Vista geral de dados"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4899,11 +4899,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Por omissão"
 
@@ -4945,7 +4945,7 @@ msgstr ""
 msgid "Default media type"
 msgstr "Tipo padrão de mídia"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Duração por omissão de cada passo da operação"
 
@@ -4979,7 +4979,7 @@ msgstr "Atrasado em"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4988,7 +4988,7 @@ msgstr "Atrasado em"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4996,47 +4996,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Eliminar"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Eliminar e limpar"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts associados serão limpos!)"
 
@@ -5044,11 +5044,11 @@ msgstr "Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Eliminar e limpar template? (Atenção: todos os hosts associados serão limpos!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Eliminar acção actual?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Eliminar o correlacionamento atual?"
 
@@ -5061,10 +5061,10 @@ msgstr "Eliminar o dashboard?"
 msgid "Delete discovery rule?"
 msgstr "Eliminar regra de descoberta?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Eliminar expressão?"
 
@@ -5088,11 +5088,11 @@ msgstr "Eliminar o histórico dos cenários web seleccionados?"
 msgid "Delete icon map?"
 msgstr "Eliminar mapa de ícones?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Eliminar o protótipo de item?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Eliminar item?"
 
@@ -5134,11 +5134,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5198,7 +5198,7 @@ msgstr "Eliminar os protótipos de host selecionados?"
 msgid "Delete selected host?"
 msgstr "Eliminar host seleccionado?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Eliminar hosts seleccionados?"
 
@@ -5206,11 +5206,11 @@ msgstr "Eliminar hosts seleccionados?"
 msgid "Delete selected image?"
 msgstr "Eliminar imagem seleccionada?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Eliminar o protótipos de item selecionados?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Eliminar itens seleccionados?"
 
@@ -5226,7 +5226,7 @@ msgstr "Eliminar o mapa seleccionado?"
 msgid "Delete selected maps?"
 msgstr "Eliminar mapas seleccionados?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Eliminar tipos de média seleccionados?"
 
@@ -5258,11 +5258,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Eliminar scripts seleccionados?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5270,19 +5270,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Eliminar as formas seleciondas?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Eliminar templates seleccionados?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Eliminar o protótipos de trigger selecionados?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Eliminar triggers seleccionados?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Eliminar utilizador seleccionado?"
 
@@ -5298,11 +5298,11 @@ msgstr "Eliminar os cenários web selecionados?"
 msgid "Delete template?"
 msgstr "Eliminar template?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Eliminar o protótipo de trigger?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Eliminar trigger?"
 
@@ -5328,7 +5328,7 @@ msgstr "Eliminado: Protótipo de host \"%1$s\" em \"%2$s\"."
 msgid "Delimiter"
 msgstr "Delimitador"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5343,10 +5343,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Dependências"
 
@@ -5383,7 +5383,7 @@ msgstr "Estado de deployment"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5393,13 +5393,13 @@ msgstr "Estado de deployment"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Descrição"
@@ -5409,10 +5409,10 @@ msgstr "Descrição"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detalhes"
@@ -5453,7 +5453,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Tamanho do diretório (em bytes). Retorna inteiro"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5504,11 +5504,11 @@ msgstr "Desactivar hosts monitorizados pelos proxies seleccionados?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5537,7 +5537,7 @@ msgstr "Desactivar hosts seleccionados?"
 msgid "Disable selected items?"
 msgstr "Desactivar items seleccionados?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Desactivar tipos de média seleccionados?"
 
@@ -5571,7 +5571,7 @@ msgstr "Desactivar os cenários web selecionados?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5599,7 +5599,7 @@ msgstr "Desactivar os cenários web selecionados?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -5625,9 +5625,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5823,7 +5823,7 @@ msgstr "Estatísticas de gravação de disco. Retorna: inteiro - se o tipo for s
 msgid "Display OK triggers for"
 msgstr "Mostrar triggers OK para"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Mostrar gráfico"
 
@@ -5831,13 +5831,13 @@ msgstr "Mostrar gráfico"
 msgid "Display problems"
 msgstr "Mostrar incidentes"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Mostrar gráfico empilhado"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5861,15 +5861,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5883,8 +5883,8 @@ msgstr "Deseja substituir a expressão condicional?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5894,8 +5894,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5905,8 +5905,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5914,8 +5914,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Pontilhado"
 
@@ -5944,16 +5944,16 @@ msgstr "Transferir a configuração"
 msgid "Downtime"
 msgstr "Downtime"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Estilo de desenho"
 
@@ -6004,7 +6004,7 @@ msgstr "O userid \"%1$s\" está duplicado nos utilizadores do mapa \"%2$s\"."
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Duração"
 
@@ -6027,29 +6027,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Editar"
@@ -6103,12 +6103,12 @@ msgstr "Erro do Elasticsearch: %1$s."
 msgid "Element"
 msgstr "Elemento"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Nome do elemento"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Elipse"
 
@@ -6164,7 +6164,7 @@ msgstr "Parâmetro de entrada vazio."
 msgid "Empty map ID."
 msgstr "ID de mapa vazio."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6244,11 +6244,11 @@ msgstr "Ativar a limpeza de dados interna"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6278,7 +6278,7 @@ msgstr "Activar hosts seleccionados?"
 msgid "Enable selected items?"
 msgstr "Activar os itens seleccionados?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Activar tipos de média seleccionados?"
 
@@ -6300,8 +6300,8 @@ msgstr "Ativar os cenários web selecionados?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6323,7 +6323,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6339,7 +6339,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6353,14 +6353,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Activado"
 
@@ -6413,8 +6413,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6592,7 +6592,7 @@ msgstr "Executa requisição WMI retornando o primeiro objeto seleccionado. Reto
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6613,8 +6613,8 @@ msgstr "Executado"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Script executado"
 
@@ -6628,13 +6628,13 @@ msgstr "Confirmação de execução"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Expandir"
@@ -6704,15 +6704,15 @@ msgstr "Exportar para CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6725,10 +6725,10 @@ msgstr "Expressão"
 msgid "Expression cannot be empty"
 msgstr "Expressão não pode ser vazia"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Construtor de expressões"
 
@@ -6796,7 +6796,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Falha ao criar o dashboard"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Falha ao processar a URL."
@@ -6930,8 +6930,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Horário do arquivo. Retorna: timestamp UNIX (número inteiro)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6942,7 +6941,8 @@ msgstr "Horário do arquivo. Retorna: timestamp UNIX (número inteiro)"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7039,7 +7039,7 @@ msgid "Fit to map"
 msgstr "Ajustar ao mapa"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fixo"
 
@@ -7051,9 +7051,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7061,22 +7061,22 @@ msgstr "Flexível"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Seguir redirecionamentos"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Fonte"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
@@ -7084,8 +7084,8 @@ msgstr "Tamanho da fonte"
 msgid "Form data"
 msgstr "Dados do formulário"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Fórmula"
 
@@ -7121,7 +7121,7 @@ msgstr "Sexta-feira"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "De"
 
@@ -7136,7 +7136,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Acesso ao frontend"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Mensagem do frontend"
 
@@ -7152,7 +7152,7 @@ msgid "Full clone"
 msgstr "Clone completo"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Função"
 
@@ -7569,8 +7569,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Autenticação HTTP"
 
@@ -7581,8 +7581,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
@@ -7619,10 +7619,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Cabeçalhos"
 
@@ -7638,7 +7638,7 @@ msgstr "Hebreu (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7744,7 +7744,7 @@ msgid "History cleared"
 msgstr "Histórico eliminado"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Eliminar o histórico pode demorar bastante tempo. Continuar?"
 
@@ -7759,8 +7759,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Período de armazenamento do histórico"
 
@@ -7777,8 +7777,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Alinhamento horizontal"
 
@@ -7897,7 +7897,7 @@ msgstr[1] "Hosts activados"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7983,9 +7983,9 @@ msgstr "Grupos de hosts"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Interface do host"
 
@@ -8273,8 +8273,8 @@ msgstr "Interfaces IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "Sensor IPMI"
 
@@ -8288,19 +8288,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ícone"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ícone (por omissão)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ícone (desactivado)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ícone (manutenção)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ícone (problema)"
 
@@ -8347,7 +8347,7 @@ msgstr "O mapeamento de ícone"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "O ícone com o ID \"%1$s\" não está disponível."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Ícones"
 
@@ -8491,7 +8491,7 @@ msgstr "Imagens"
 msgid "Images for all maps will be updated!"
 msgstr "Irão ser actualizadas as imagens de todos os mapas!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Imediatamente"
 
@@ -8575,6 +8575,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9459,10 +9460,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Informação"
@@ -9529,8 +9530,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Inserir"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Insira a expressão"
 
@@ -9647,9 +9648,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Intervalo"
@@ -10086,7 +10087,7 @@ msgstr "Italiano (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Item"
 
@@ -10349,8 +10350,8 @@ msgstr "Agente JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "Endpoint JMX"
 
@@ -10368,8 +10369,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10408,8 +10409,8 @@ msgstr "Japonês (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10448,9 +10449,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Chave"
@@ -10516,13 +10517,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Etiqueta"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Localização da etiqueta"
 
@@ -10669,9 +10670,9 @@ msgstr "Lituâno (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10682,7 +10683,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Esquerda"
@@ -10715,25 +10716,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Limite de elementos de Pesquisa/Filtragem"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Linha"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Tipo da linha"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Largura da linha"
 
@@ -10755,9 +10756,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Indicadores de ligação"
 
@@ -10788,8 +10789,8 @@ msgstr "Templates associados"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Links"
 
@@ -10891,8 +10892,8 @@ msgstr "Longitude da localização"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -10905,8 +10906,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Monitoração de log. Retorna: log"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Formato de data no log"
 
@@ -11032,7 +11033,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Manutenção"
 
@@ -11192,7 +11193,7 @@ msgstr "Árvore de navegação de mapas"
 msgid "Map owner cannot be empty."
 msgstr "O proprietário do mapa não pode estar vazio."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Forma do mapa"
 
@@ -11270,19 +11271,19 @@ msgstr "Máscara"
 msgid "Mass update"
 msgstr "Actualização em massa"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Actualização de elementos em massa"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Atualização em massa de formas"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Item mestre"
 
@@ -11366,8 +11367,8 @@ msgid "May"
 msgstr "Maio"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Média"
 
@@ -11491,8 +11492,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Expiração da mensagem"
 
@@ -11510,7 +11511,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Mensagens"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Mensagens"
 
@@ -11609,11 +11610,11 @@ msgstr "Está  faltar o campo \"name\" para o protótipo de gráfico."
 msgid "Missing \"name\" field for graph."
 msgstr "O campo \"name\" está em falta para o gráfico."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11781,8 +11782,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Múltiplo"
 
@@ -11948,7 +11949,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11968,15 +11969,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11985,16 +11986,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12274,7 +12275,7 @@ msgstr "Sem detalhes"
 msgid "No discovery rule IDs given."
 msgstr "Não foram fornecidos IDs de regras de descoberta."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12330,8 +12331,8 @@ msgstr "Sem imagem"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Interface não encontrado"
 
@@ -12635,7 +12636,7 @@ msgstr "Não foi especificado o ficheiro de chave pública."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Não atualizar"
 
@@ -12681,8 +12682,8 @@ msgstr "Marcadores não booleanos serão descontinuados."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12690,17 +12691,17 @@ msgstr "Marcadores não booleanos serão descontinuados."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Nenhum"
@@ -12796,7 +12797,7 @@ msgstr "Relatório de notificações"
 msgid "Notifications"
 msgstr "Notificações"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12970,8 +12971,8 @@ msgstr "Sistema numeral"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Númerico (float)"
 
@@ -12981,8 +12982,8 @@ msgstr "Numérico (inteiro)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numérico (unsigned)"
 
@@ -12990,8 +12991,8 @@ msgstr "Numérico (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13003,13 +13004,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "Encerramento de eventos OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "Geração de eventos OK"
 
@@ -13070,7 +13071,7 @@ msgstr "Inactivo"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13099,7 +13100,7 @@ msgstr "Activo"
 msgid "On status change triggers blink for"
 msgstr "Em alterações de estado os triggers piscam para"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Uma vez"
 
@@ -13220,11 +13221,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operações"
@@ -13270,7 +13271,7 @@ msgstr "Opções"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13285,11 +13286,11 @@ msgstr "Opções"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Ou"
 
@@ -13384,8 +13385,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Sobrescrito por"
@@ -13602,8 +13603,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLEMA"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "Modo de geração de eventos de INCIDENTE"
 
@@ -13685,8 +13686,8 @@ msgstr "O parâmetro \"%1$s\" será descontinuado."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parâmetros"
 
@@ -13734,8 +13735,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Processar"
 
@@ -13766,12 +13767,12 @@ msgstr "Passivo"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13804,12 +13805,12 @@ msgid "Paste"
 msgstr "Colar"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13822,7 +13823,7 @@ msgstr "Colar sem os links externos"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13865,8 +13866,8 @@ msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requ
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Período"
@@ -13887,9 +13888,9 @@ msgid "Periods"
 msgstr "Períodos"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13900,7 +13901,7 @@ msgstr "Períodos"
 msgid "Permissions"
 msgstr "Permissões"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "As permissões apenas podem ser atribuídas a grupos de utilizadores."
 
@@ -13922,12 +13923,12 @@ msgstr "Algoritmo de colocação"
 msgid "Plain text"
 msgstr "Texto simples"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Tocar"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Tocar som"
 
@@ -13957,8 +13958,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Por favor seleccione dois elementos"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13968,14 +13968,15 @@ msgstr "Por favor seleccione dois elementos"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Pontos"
 
@@ -13983,7 +13984,7 @@ msgstr "Pontos"
 msgid "Polish (pl_PL)"
 msgstr "Polaco (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Preenche o campo inventário do host"
 
@@ -14045,16 +14046,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Pré-processamento"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Passos do pré-processamento"
 
@@ -14151,8 +14152,8 @@ msgstr "Privado"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Ficheiro de chave privada"
 
@@ -14182,7 +14183,7 @@ msgstr "Nível de privilégios"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problema"
 
@@ -14371,16 +14372,16 @@ msgstr "Público"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Chave pública"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Ficheiro de chave pública"
 
@@ -14394,8 +14395,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Campos da consulta"
 
@@ -14445,8 +14446,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Dados brutos"
 
@@ -14472,14 +14473,14 @@ msgstr "Só leitura"
 msgid "Read-only"
 msgstr "Leitura"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14493,14 +14494,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Leitura e escrita"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14546,7 +14547,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14555,10 +14556,10 @@ msgid "Recovery"
 msgstr "Recuperação"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Expressão de recuperação"
@@ -14568,7 +14569,7 @@ msgstr "Expressão de recuperação"
 msgid "Recovery expression syntax error."
 msgstr "Erro de sintaxe na expressão de recuperação."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Operações de recuperação"
 
@@ -14580,8 +14581,8 @@ msgstr "Operações de recuperação"
 msgid "Recovery time"
 msgstr "Tempo para recuperação"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Retângulo"
 
@@ -14687,7 +14688,7 @@ msgstr "Comando remoto"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14718,13 +14719,13 @@ msgstr "Comando remoto"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14732,25 +14733,25 @@ msgstr "Comando remoto"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14778,14 +14779,14 @@ msgstr "Comando remoto"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14860,10 +14861,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Substituir"
 
@@ -14881,7 +14882,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14920,15 +14921,15 @@ msgstr "Relatórios"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14937,8 +14938,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14965,8 +14966,8 @@ msgstr "Performance necessária do servidor, novos valores por segundo"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Códigos de estado necessários"
 
@@ -14979,11 +14980,11 @@ msgstr "String obrigatória"
 msgid "Reset"
 msgstr "Reinicializar"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Reinicializar todos os campos para valores por omissão?"
 
@@ -15000,11 +15001,11 @@ msgstr "Confirmação de reinicialização"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Reinicializar para valores por omissão"
 
@@ -15108,8 +15109,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15182,9 +15183,9 @@ msgstr "Retorna o percentagem de perda de pacotes ICMP."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15192,7 +15193,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Direita"
@@ -15208,8 +15209,8 @@ msgstr ""
 msgid "Right trim"
 msgstr "Remover espaços à direita"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15399,8 +15400,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15479,8 +15480,8 @@ msgstr "Total de SQL: %1$s (selecções: %2$s | execuções: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Pesquisa SQL"
 
@@ -15505,38 +15506,38 @@ msgstr "Agente SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Arquivo de certificado SSL"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Arquivo de chave SSL"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Senha do SSL"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "Verificação SSL do host"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "Verificação de par SSL"
 
@@ -15655,9 +15656,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15682,8 +15683,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15815,10 +15816,10 @@ msgstr "Nome de segurança"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Seleccionar"
@@ -15828,9 +15829,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Seleccionar protótipos"
 
@@ -15851,7 +15852,7 @@ msgstr "Acções seleccionadas eliminadas"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Elementos seleccionados"
 
@@ -16201,8 +16202,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Forma"
@@ -16305,7 +16306,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16405,8 +16406,8 @@ msgstr "Gráfico simples"
 msgid "Simple graph prototype"
 msgstr "Protótipo gráfico simples"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Simples"
 
@@ -16451,7 +16452,7 @@ msgstr "Estado / Província"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Tamanho"
 
@@ -16562,9 +16563,9 @@ msgstr "Velocidade"
 msgid "Stacked"
 msgstr "Empilhado"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16585,7 +16586,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Começar em"
 
@@ -16780,14 +16781,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Já existe um passo com o nome \"%1$s\"."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Passos"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Parar"
 
@@ -16810,10 +16811,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17049,8 +17050,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Etiqueta para comparação"
 
@@ -17109,28 +17110,28 @@ msgstr "Valor da etiqueta"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Etiquetas"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Destino"
@@ -17291,14 +17292,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Teste"
@@ -17356,10 +17357,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Texto"
 
@@ -17512,8 +17513,8 @@ msgstr "Este mês"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17617,9 +17618,9 @@ msgstr "Período de tempo"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Desvio de tempo"
 
@@ -17637,8 +17638,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Timeout"
 
@@ -17664,7 +17665,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Para"
 
@@ -17688,7 +17689,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Top"
@@ -17740,8 +17741,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17752,7 +17752,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17760,9 +17761,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Erro de transporte."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17774,8 +17775,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Período de armazenamento das estatísticas"
 
@@ -17793,9 +17794,9 @@ msgstr "Tendências"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigger"
@@ -17897,7 +17898,7 @@ msgstr "Vista geral de triggers"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Protótipo de trigger"
@@ -17963,7 +17964,7 @@ msgstr "Protótipos de trigger eliminados"
 msgid "Trigger prototypes updated"
 msgstr "Protótipos de trigger actualizados"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Severidade do trigger"
 
@@ -18070,23 +18071,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Tipo"
@@ -18095,12 +18096,12 @@ msgstr "Tipo"
 msgid "Type (Full details)"
 msgstr "Tipo (detalhes completos)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Tipo (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18111,10 +18112,10 @@ msgstr "Tipo de cálculo"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Tipo de informação"
 
@@ -18138,11 +18139,11 @@ msgstr "DESCONHECIDO"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18163,7 +18164,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "A URL não está correctamente codificada."
@@ -18188,7 +18189,7 @@ msgstr "O parâmetro URL está vazio."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18291,15 +18292,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18308,8 +18309,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Unidades"
 
@@ -18335,7 +18336,7 @@ msgstr "Unidades"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -18478,12 +18479,12 @@ msgstr "Ligado"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18503,18 +18504,18 @@ msgstr "Ligado"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18535,13 +18536,13 @@ msgstr "Actualizar existentes"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Intervalo de actualização"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18680,7 +18681,7 @@ msgstr "Mensagem do agente de utilizador"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18792,10 +18793,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Nome do utilizador"
 
@@ -18863,7 +18864,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Partilha de utilizador com parâmetro não encontrado: %1$s no mapa \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19240,12 +19241,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19307,8 +19308,8 @@ msgstr "O mapa de valores \"%1$s\" já existe."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Mapeamento de valores"
@@ -19425,8 +19426,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Alinhamento vertical"
 
@@ -19629,8 +19630,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19641,12 +19641,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19722,8 +19723,8 @@ msgstr "Campos errados para o link no mapa."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19735,11 +19736,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19753,8 +19754,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19774,12 +19775,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Valor MÁX para o eixo Y"
 
@@ -19793,18 +19794,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "O valor MÁX para o eixo Y tem de ser maior que o valor MÍN."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Valor MÍN para o eixo Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Lado do eixo Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19824,11 +19825,11 @@ msgstr "d-m-Y H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20859,10 +20860,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "configurações globais de limpeza de dados"
@@ -20891,8 +20892,8 @@ msgstr "host"
 msgid "host group"
 msgstr "grupo de hosts"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20925,7 +20926,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "incluindo subgrupos"
 
@@ -21100,8 +21101,8 @@ msgstr "item"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21365,10 +21366,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "nome"
@@ -21415,7 +21416,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21445,7 +21446,7 @@ msgstr "número"
 msgid "of"
 msgstr "de"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21468,7 +21469,7 @@ msgstr "de"
 msgid "off"
 msgstr "off"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21640,8 +21641,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21778,8 +21779,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22066,17 +22067,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/ro/LC_MESSAGES/frontend.po b/ui/locale/ro/LC_MESSAGES/frontend.po
index 81d6f6e915c..bde08129479 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -188,10 +188,10 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -241,9 +241,9 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -352,7 +352,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 secunde"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "Vedere 3D"
 
@@ -398,7 +398,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -491,27 +491,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "Acces refuzat!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -583,35 +583,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -742,24 +742,24 @@ msgstr "Activ până la"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -795,13 +795,13 @@ msgstr "Activ până la"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -819,38 +819,38 @@ msgstr "Activ până la"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -877,7 +877,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -898,7 +898,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -907,16 +907,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Adaugă prototip"
 
@@ -963,7 +963,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1051,7 +1051,7 @@ msgstr "Interfețe agent"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1059,11 +1059,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1090,8 +1090,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1107,8 +1107,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1124,13 +1124,13 @@ msgstr "Toate linkurile trebuie sa aibă \"Nume\" și \"URL\" specificat"
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1151,19 +1151,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Servere permise"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1180,21 +1180,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1208,7 +1208,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1253,11 +1253,11 @@ msgstr "Eroare aplicație."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Aplică"
@@ -1385,11 +1385,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1483,8 +1483,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Metodă de autentificare"
 
@@ -1546,8 +1546,8 @@ msgstr "Automată"
 msgid "Automatic icon mapping"
 msgstr "Maparea icon automată"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Selectarea automată icon"
 
@@ -1614,12 +1614,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Fundal"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1627,9 +1627,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Imagine de fundal"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1637,8 +1637,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Bază DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1681,15 +1681,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1700,8 +1700,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Linie îngroșate"
 
@@ -1709,19 +1709,19 @@ msgstr "Linie îngroșate"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1734,7 +1734,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Jos"
@@ -1817,7 +1817,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Calculat"
 
@@ -1841,22 +1841,22 @@ msgstr "Apelare inversă"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3510,8 +3510,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Caracter"
 
@@ -3539,7 +3539,7 @@ msgstr "Șasiu"
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Verificarea există deja."
 
@@ -3660,8 +3660,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Șterge istoric și tendințe"
 
@@ -3689,22 +3689,22 @@ msgstr "Ceas"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Clonă"
@@ -3712,28 +3712,28 @@ msgstr "Clonă"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Închide"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Închide constructorul de expresii"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3747,7 +3747,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3761,11 +3761,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3774,7 +3774,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3862,9 +3862,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Condiții"
@@ -4049,13 +4049,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Conectare la"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4147,8 +4147,8 @@ msgstr "Contact"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4228,13 +4228,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Numărul contractului"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Coordonate"
 
@@ -4251,7 +4251,7 @@ msgstr "Copiază"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4393,10 +4393,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4600,7 +4600,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4614,8 +4614,8 @@ msgstr "Grafice personalizate"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4782,8 +4782,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Linie întreruptă"
 
@@ -4801,7 +4801,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Verificare date"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4985,11 +4985,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Implicit"
 
@@ -5031,7 +5031,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Durata etapei operației implicite"
 
@@ -5065,7 +5065,7 @@ msgstr "Întârziat de către"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5074,7 +5074,7 @@ msgstr "Întârziat de către"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5082,47 +5082,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Șterge"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Șterge și curăță"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Ștergere si curățare șabloane selectate? (Avertizare: toate serverele conectate vor fi șterse!)"
 
@@ -5130,11 +5130,11 @@ msgstr "Ștergere si curățare șabloane selectate? (Avertizare: toate serverel
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Ștergere si curățare șablon? (Avertizare: toate serverele conectate vor fi șterse!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Ștergere acțiune curentă?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5147,10 +5147,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "Ștergere regulă de detecție?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Ștergere expresie?"
 
@@ -5174,11 +5174,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr "Ștergere harta icoanei?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Ștergere prototip de element?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Ștergere element?"
 
@@ -5220,11 +5220,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5283,7 +5283,7 @@ msgstr "Ștergere prototipuri de servere selectați?"
 msgid "Delete selected host?"
 msgstr "Ștergere server selectat?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Ștergere servere selectate?"
 
@@ -5291,11 +5291,11 @@ msgstr "Ștergere servere selectate?"
 msgid "Delete selected image?"
 msgstr "Ștergere imagine selectată?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Ștergere elemente prototip selectațe?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Ștergere elementele selectate?"
 
@@ -5311,7 +5311,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr "Ștergere hărți selectate?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Ștergere elemente media selectate?"
 
@@ -5343,11 +5343,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Ștergere scripturi selectate?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5355,19 +5355,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Ștergere șabloane selectate?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Ștergere prototipuri de trigger selectați?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Ștergere triggeri selectați?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Ștergere utilizator selectat?"
 
@@ -5383,11 +5383,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr "Ștergere șablon?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Ștergere prototip de trigger?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Ștergere trigger?"
 
@@ -5413,7 +5413,7 @@ msgstr "Creat: Prototip server \"%1$s\" pe \"%2$s\"."
 msgid "Delimiter"
 msgstr "Delimitator"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5428,10 +5428,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Dependențe"
 
@@ -5468,7 +5468,7 @@ msgstr "Stare de implementare"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5478,13 +5478,13 @@ msgstr "Stare de implementare"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Descriere"
@@ -5494,10 +5494,10 @@ msgstr "Descriere"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detalii"
@@ -5538,7 +5538,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5589,11 +5589,11 @@ msgstr "Dezactivare servere monitorizate de proxy-urile selectate?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5622,7 +5622,7 @@ msgstr "Dezactivare servere selectate?"
 msgid "Disable selected items?"
 msgstr "Dezactivare itemi selectaţi?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Dezactivare elemente media selectate?"
 
@@ -5656,7 +5656,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5684,7 +5684,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Dezactivat"
 
@@ -5710,9 +5710,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5911,7 +5911,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr "Afișare triggeri OK pentru"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5919,13 +5919,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5949,15 +5949,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5971,8 +5971,8 @@ msgstr "Doreşti să înlocuiești expresia condițională?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5982,8 +5982,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5993,8 +5993,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -6002,8 +6002,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Punct"
 
@@ -6032,16 +6032,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "Avarie"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Stil de desen"
 
@@ -6092,7 +6092,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Durată"
 
@@ -6115,29 +6115,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Editare"
@@ -6191,12 +6191,12 @@ msgstr ""
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Nume element"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6252,7 +6252,7 @@ msgstr "Golire parametru de intrare."
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6332,11 +6332,11 @@ msgstr "Activare menaj intern"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6366,7 +6366,7 @@ msgstr "Activare servere selectate?"
 msgid "Enable selected items?"
 msgstr "Activare itemi selectați?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Activare elemente de tip media selectate?"
 
@@ -6388,8 +6388,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6411,7 +6411,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6427,7 +6427,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6441,14 +6441,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Activat"
 
@@ -6501,8 +6501,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6681,7 +6681,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6702,8 +6702,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Script executat"
 
@@ -6717,13 +6717,13 @@ msgstr "Confirmare de executare"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6793,15 +6793,15 @@ msgstr "Export în CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6814,10 +6814,10 @@ msgstr "Expresie"
 msgid "Expression cannot be empty"
 msgstr "Expresia nu poate fi vidă"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Constructor de expresii"
 
@@ -6885,7 +6885,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -7019,8 +7019,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -7031,7 +7030,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7128,7 +7128,7 @@ msgid "Fit to map"
 msgstr "Încadrează în hartă"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Remediat"
 
@@ -7140,9 +7140,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7150,22 +7150,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7173,8 +7173,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formulă"
 
@@ -7210,7 +7210,7 @@ msgstr "Vineri"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "De la"
 
@@ -7225,7 +7225,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Acces la interfață"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Mesaje de interfață"
 
@@ -7241,7 +7241,7 @@ msgid "Full clone"
 msgstr "Clonă completă"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funcție"
 
@@ -7661,8 +7661,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Autentificare HTTP"
 
@@ -7673,8 +7673,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "proxy HTTP"
 
@@ -7711,10 +7711,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7730,7 +7730,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7836,7 +7836,7 @@ msgid "History cleared"
 msgstr "Istoric șters"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Golirea istoricului poate lua o perioadă lungă de timp. Continuare?"
 
@@ -7851,8 +7851,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Perioadă de istoric a stocării"
 
@@ -7869,8 +7869,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Orizontal"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Aliniere orizontală"
 
@@ -7993,7 +7993,7 @@ msgstr[2] "Servere activate"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8079,9 +8079,9 @@ msgstr "Grupuri de servere"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Interfață server"
 
@@ -8371,8 +8371,8 @@ msgstr "Interfață IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "Senzor IPMI"
 
@@ -8386,19 +8386,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Iconiță"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Iconiță (implicit)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Iconiță (dezactivat)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Iconiță (mentenanță)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Iconiță (problemă)"
 
@@ -8445,7 +8445,7 @@ msgstr "mapare icon"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Iconițe"
 
@@ -8591,7 +8591,7 @@ msgstr "Imagini"
 msgid "Images for all maps will be updated!"
 msgstr "Imaginile pentru toate hărțile vor fi actualizate!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Imediat"
 
@@ -8675,6 +8675,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9559,10 +9560,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9629,8 +9630,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Inserează"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9746,9 +9747,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Interval"
@@ -10185,7 +10186,7 @@ msgstr "Italiană (it)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Item"
 
@@ -10453,8 +10454,8 @@ msgstr "Agent JMX"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10472,8 +10473,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10512,8 +10513,8 @@ msgstr "Japoneză (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10552,9 +10553,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Cheie"
@@ -10620,13 +10621,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Etichetă"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Locație etichetă"
 
@@ -10779,9 +10780,9 @@ msgstr "Letonă (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10792,7 +10793,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Stânga"
@@ -10825,25 +10826,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Limită elemente Căutare/Filtrare"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Linie"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10865,9 +10866,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Indicatori de legătură"
 
@@ -10898,8 +10899,8 @@ msgstr "Șabloane legate"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -11001,8 +11002,8 @@ msgstr "Longitudine locație"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Înregistrare"
 
@@ -11015,8 +11016,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Format timp autentificare"
 
@@ -11142,7 +11143,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Mentenanță"
 
@@ -11302,7 +11303,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11380,19 +11381,19 @@ msgstr "Mască"
 msgid "Mass update"
 msgstr "Masă zctualizată"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Elemente de masă actualizate"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11477,8 +11478,8 @@ msgid "May"
 msgstr "Mai"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11606,8 +11607,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Mesaj expirat"
 
@@ -11625,7 +11626,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Mesaje"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Trimitere mesaje"
 
@@ -11725,11 +11726,11 @@ msgstr "Câmp lipsă \"nume\" pentru prototip grafic."
 msgid "Missing \"name\" field for graph."
 msgstr "Câmp lipsă \"nume\" pentru element grafic."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11901,8 +11902,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -12068,7 +12069,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -12088,15 +12089,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12105,16 +12106,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12394,7 +12395,7 @@ msgstr "Niciun detaliu"
 msgid "No discovery rule IDs given."
 msgstr "Nicio regulă de detecție IDs dată."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12450,8 +12451,8 @@ msgstr "Nicio imagine"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Nicio interfață găsită"
 
@@ -12755,7 +12756,7 @@ msgstr "Nu a fost specificat nici un fișier cu cheie publică."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12801,8 +12802,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12810,17 +12811,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Niciunul"
@@ -12916,7 +12917,7 @@ msgstr "Raport de notificare"
 msgid "Notifications"
 msgstr "Notificări"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -13090,8 +13091,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numeric (float)"
 
@@ -13101,8 +13102,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numeric (nesemnat)"
 
@@ -13110,8 +13111,8 @@ msgstr "Numeric (nesemnat)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13123,13 +13124,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13190,7 +13191,7 @@ msgstr "Oprit"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13219,7 +13220,7 @@ msgstr "Pornit"
 msgid "On status change triggers blink for"
 msgstr "Statusul pornit modifică triggerii să lumineze pentru "
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Odată"
 
@@ -13341,11 +13342,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operațiuni"
@@ -13391,7 +13392,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13406,11 +13407,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13505,8 +13506,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Suprascrisă de "
@@ -13723,8 +13724,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLEMĂ"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13806,8 +13807,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13855,8 +13856,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13887,12 +13888,12 @@ msgstr "Pasiv"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13925,12 +13926,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13943,7 +13944,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13986,8 +13987,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Perioadă"
@@ -14008,9 +14009,9 @@ msgid "Periods"
 msgstr "Perioade"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -14021,7 +14022,7 @@ msgstr "Perioade"
 msgid "Permissions"
 msgstr "Permisiuni"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Persmisiunea poate fi atribuită doar grupurilor de utilizatori."
 
@@ -14043,12 +14044,12 @@ msgstr "Plasare algoritm"
 msgid "Plain text"
 msgstr "Text simplu"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Redare"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Redare sunet"
 
@@ -14078,8 +14079,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Va rog selectați două elemente"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14089,14 +14089,15 @@ msgstr "Va rog selectați două elemente"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -14104,7 +14105,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Poloneză (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Populare câmp server inventar"
 
@@ -14166,16 +14167,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14272,8 +14273,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Fișier cheie privată"
 
@@ -14303,7 +14304,7 @@ msgstr "Nivel privilegiat"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problemă"
 
@@ -14494,16 +14495,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Cheie publică"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Fișier cheie publică"
 
@@ -14517,8 +14518,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14568,8 +14569,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14595,14 +14596,14 @@ msgstr "Numai citire"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14616,14 +14617,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Citire-scriere"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14669,7 +14670,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14678,10 +14679,10 @@ msgid "Recovery"
 msgstr "Recuperare"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14691,7 +14692,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14703,8 +14704,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14811,7 +14812,7 @@ msgstr "Comandă de la distanță"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14842,13 +14843,13 @@ msgstr "Comandă de la distanță"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14856,25 +14857,25 @@ msgstr "Comandă de la distanță"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14902,14 +14903,14 @@ msgstr "Comandă de la distanță"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14984,10 +14985,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Înlocuire"
 
@@ -15005,7 +15006,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -15044,15 +15045,15 @@ msgstr "Rapoarte"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -15061,8 +15062,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -15089,8 +15090,8 @@ msgstr "Performanță server necesară, noi valori pe secundă"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Coduri de stare necesare"
 
@@ -15103,11 +15104,11 @@ msgstr "Șir necesar"
 msgid "Reset"
 msgstr "Resetează"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Resetează toate câmpurile la valorile implicite?"
 
@@ -15124,11 +15125,11 @@ msgstr "Confirmare de resetare"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Resetează implicite"
 
@@ -15232,8 +15233,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15306,9 +15307,9 @@ msgstr "Redă un procent din pachetele pierdute la ping ICMP."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15316,7 +15317,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Dreapta"
@@ -15332,8 +15333,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15526,8 +15527,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15606,8 +15607,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Cerere SQL"
 
@@ -15632,38 +15633,38 @@ msgstr "agent SSH"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15785,9 +15786,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15812,8 +15813,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15947,10 +15948,10 @@ msgstr "Nume securitate"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Selectează"
@@ -15960,9 +15961,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Selectează prototip"
 
@@ -15983,7 +15984,7 @@ msgstr "Acțiunile selectate șterse"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Elementele selectate"
 
@@ -16334,8 +16335,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16438,7 +16439,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16538,8 +16539,8 @@ msgstr "Grafic simplu"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16584,7 +16585,7 @@ msgstr "Site stat / provincie"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16695,9 +16696,9 @@ msgstr "Viteză"
 msgid "Stacked"
 msgstr "Stivuit"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16718,7 +16719,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Începe la"
 
@@ -16913,14 +16914,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Pas cu nume \"%1$s\" există deja."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Pași"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Stop"
 
@@ -16943,10 +16944,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17182,8 +17183,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17242,28 +17243,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Țintă"
@@ -17424,14 +17425,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17489,10 +17490,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Text"
 
@@ -17647,8 +17648,8 @@ msgstr "Luna aceasta"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17752,9 +17753,9 @@ msgstr "Perioadă de timp"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Timp rămas"
 
@@ -17772,8 +17773,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Pauză"
 
@@ -17799,7 +17800,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Către"
 
@@ -17823,7 +17824,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Sus"
@@ -17875,8 +17876,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17887,7 +17887,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17895,9 +17896,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Eroare de transport"
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17909,8 +17910,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Perioadă trend a stocării"
 
@@ -17928,9 +17929,9 @@ msgstr "Tendințe"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigger"
@@ -18035,7 +18036,7 @@ msgstr "Prezentare triggeri"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Prototip trigger"
@@ -18103,7 +18104,7 @@ msgstr "Prototipi trigger șters"
 msgid "Trigger prototypes updated"
 msgstr "Prototipi trigger actualizat"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Severitate trigger"
 
@@ -18210,23 +18211,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Tip"
@@ -18235,12 +18236,12 @@ msgstr "Tip"
 msgid "Type (Full details)"
 msgstr "Tip (Detalii complete)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Tip (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18251,10 +18252,10 @@ msgstr "Tip de calcul"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Tip de informație"
 
@@ -18278,11 +18279,11 @@ msgstr "NECUNOSCUT"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18303,7 +18304,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18328,7 +18329,7 @@ msgstr "Nume parametru URL este gol."
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URL-uri"
@@ -18431,15 +18432,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18448,8 +18449,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Unități"
 
@@ -18475,7 +18476,7 @@ msgstr "Unități"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Necunoscut"
@@ -18619,12 +18620,12 @@ msgstr "Sus"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18644,18 +18645,18 @@ msgstr "Sus"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18676,13 +18677,13 @@ msgstr "Actualizează existent"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Actualizare inventar"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18821,7 +18822,7 @@ msgstr ""
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18936,10 +18937,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Nume utilizator"
 
@@ -19008,7 +19009,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19386,12 +19387,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19453,8 +19454,8 @@ msgstr "Valoare hartă \"%1$s\" există deja."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Valoare mapare"
@@ -19571,8 +19572,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertical"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Aliniere verticală"
 
@@ -19777,8 +19778,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19789,12 +19789,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19870,8 +19871,8 @@ msgstr "Câmpuri greșite pentru legătură hartă."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19883,11 +19884,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19901,8 +19902,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19922,12 +19923,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Valoare MAX axă Y"
 
@@ -19941,18 +19942,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Valoarea MAX a axei Y trebuie să fie mai mare decât valoarea MIN a axei Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Valoare MIN a axei Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Parte axă Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19972,11 +19973,11 @@ msgstr "A-L-Z H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -21007,10 +21008,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "setări interne globale"
@@ -21039,8 +21040,8 @@ msgstr "server"
 msgid "host group"
 msgstr "grup server"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -21073,7 +21074,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21247,8 +21248,8 @@ msgstr "item"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21512,10 +21513,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21562,7 +21563,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21592,7 +21593,7 @@ msgstr ""
 msgid "of"
 msgstr "al"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21615,7 +21616,7 @@ msgstr "al"
 msgid "off"
 msgstr "închis"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21787,8 +21788,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21925,8 +21926,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22213,17 +22214,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po
index efff64a7e8d..9f44620014e 100644
--- a/ui/locale/ru/LC_MESSAGES/frontend.po
+++ b/ui/locale/ru/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: 2022-01-07 19:57+0200\n"
-"PO-Revision-Date: 2021-12-29 12:47+0300\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
+"PO-Revision-Date: 2022-01-10 22:09+0300\n"
 "Last-Translator: Alexey <dotneft@gmail.com>\n"
 "Language-Team: Zabbix translation team\n"
 "Language: ru\n"
@@ -13,13 +13,13 @@ 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: 1640774856.000000\n"
+"X-POOTLE-MTIME: 1641845398.000000\n"
 
 #: app/controllers/CControllerSlaReportList.php:181
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #, c-format
 msgid "\"%1$s\" date must be less than \"%2$s\" date."
-msgstr ""
+msgstr "Дата \"%1$s\" должна быть меньше чем \"%2$s\" дата."
 
 #: include/classes/db/MysqlDbBackend.php:70
 #: include/classes/db/OracleDbBackend.php:142
@@ -188,10 +188,10 @@ msgstr[0] "%1$s сообщение"
 msgstr[1] "%1$s сообщения"
 msgstr[2] "%1$s сообщений"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -241,9 +241,9 @@ msgstr[0] "%1$s попытка осталась"
 msgstr[1] "%1$s попытки осталось"
 msgstr[2] "%1$s попыток осталось"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -345,14 +345,14 @@ msgstr "100 наиболее загруженных триггеров"
 
 #: app/views/popup.sla.edit.php:100 include/classes/helpers/CSlaHelper.php:243
 msgid "24x7"
-msgstr ""
+msgstr "24x7"
 
 #: app/views/administration.queue.overview.php:48
 #: app/views/administration.queue.overview.proxy.php:48
 msgid "30 seconds"
 msgstr "30 секунд"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D вид"
 
@@ -398,7 +398,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr "Ср"
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "ДОБАВЛЕНИЕ ЗАМЕЩЕНИЯ"
 
@@ -491,27 +491,27 @@ msgstr "Доступ запрещен"
 msgid "Access denied!"
 msgstr "Доступ запрещен!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr "Доступ к API"
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr "Доступ к элементам веб-интерфейса"
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr "Доступ к действиям"
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr "Доступ к модулям"
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr "Доступ к услугам"
@@ -583,35 +583,35 @@ msgstr "Подтвержденные РЕШЕННЫЕ события"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -742,24 +742,24 @@ msgstr "Активно до"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -795,13 +795,13 @@ msgstr "Активно до"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -819,38 +819,38 @@ msgstr "Активно до"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -877,7 +877,7 @@ msgstr "Добавить элемент потомка"
 msgid "Add child service"
 msgstr "Добавить дочернюю услугу"
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr "Добавление дочерних услуг"
 
@@ -898,7 +898,7 @@ msgstr "Добавить отсутствующее"
 msgid "Add multiple maps"
 msgstr "Добавить несколько карт"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "Добавить новый набор данных"
 
@@ -907,16 +907,16 @@ msgstr "Добавить новый набор данных"
 msgid "Add new interface"
 msgstr "Добавить новый интерфейс"
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "Добавить новое замещение"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr "Добавить страницу"
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr "Добавление родительских услуг"
 
@@ -926,7 +926,7 @@ msgstr "Добавление комментариев к проблемам"
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Добавить прототип"
 
@@ -963,7 +963,7 @@ msgid "Add user group"
 msgstr "Добавить группу пользователей"
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Добавить виджет"
@@ -1051,7 +1051,7 @@ msgstr "Интерфейсы агента"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr "Проверка разновидности агента. Возвращается 1 - для Zabbix агента; 2 - для Zabbix агента 2"
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr "Агрегация"
 
@@ -1059,11 +1059,11 @@ msgstr "Агрегация"
 msgid "Aggregate functions"
 msgstr "Функции агрегации"
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr "Функция агрегации"
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr "Интервал агрегации"
 
@@ -1090,8 +1090,8 @@ msgstr "Выровнять элементы карты"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1107,8 +1107,8 @@ msgid "All dashboards"
 msgstr "Все панели"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Все группы"
 
@@ -1124,13 +1124,13 @@ msgstr "У всех ссылок должны быть указаны \"Имя\"
 msgid "All maps"
 msgstr "Все карты сети"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Все проблемы"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Все проблемы если значения тегов совпадают"
 
@@ -1151,19 +1151,19 @@ msgid "Allow list"
 msgstr "Список разрешений"
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Разрешить закрывать вручную"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Разрешенные хосты"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr "Разрешенные методы"
 
@@ -1180,21 +1180,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr "Общее количество потребляемой физической памяти хоста на резервное копирование страниц физической памяти гостя,  <url> - URL службы VMware, <uuid> - имя хоста виртуальной машины VMware"
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "И"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1208,7 +1208,7 @@ msgstr "И"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "И/ИЛИ"
 
@@ -1253,11 +1253,11 @@ msgstr "Ошибка приложения."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Применить"
@@ -1389,11 +1389,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr "Должна быть выбрана по крайней мере одна операция."
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Должна существовать по крайней мере одна операция."
 
@@ -1487,8 +1487,8 @@ msgstr "Ошибка при аутентификации: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Метод аутентификации"
 
@@ -1550,8 +1550,8 @@ msgstr "Автоматически"
 msgid "Automatic icon mapping"
 msgstr "Автоматическое соответствие иконок"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Автоматический выбор иконки"
 
@@ -1618,12 +1618,12 @@ msgstr "Назад"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Фон"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr "Цвет фона"
 
@@ -1631,9 +1631,9 @@ msgstr "Цвет фона"
 msgid "Background image"
 msgstr "Фоновое изображение"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr "Столбцы"
 
@@ -1641,8 +1641,8 @@ msgstr "Столбцы"
 msgid "Base DN"
 msgstr "База для поиска (Base DN)"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr "Основной цвет"
 
@@ -1685,15 +1685,15 @@ msgstr "Голубая"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Тело"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Тело и заголовки"
 
@@ -1704,8 +1704,8 @@ msgstr "Тело и заголовки"
 msgid "Bold"
 msgstr "Жирный"
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Жирная линия"
 
@@ -1713,19 +1713,19 @@ msgstr "Жирная линия"
 msgid "Boolean to decimal"
 msgstr "Логический в десятичный"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Рамка"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr "Цвет рамки"
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Тип рамки"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Ширина рамки"
 
@@ -1738,7 +1738,7 @@ msgstr "Оба пароля должны совпадать."
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "По нижнему краю"
@@ -1821,7 +1821,7 @@ msgid "CUID is expected"
 msgstr "Ожидается CUID "
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Вычисляемое"
 
@@ -1845,22 +1845,22 @@ msgstr "Callback"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3505,8 +3505,8 @@ msgstr "Изменить тип"
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Символ"
 
@@ -3534,7 +3534,7 @@ msgstr "Шасси"
 msgid "Chassis information. Returns string"
 msgstr "Информация о шасси. Возвращает строку"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Проверка уже существует."
 
@@ -3655,8 +3655,8 @@ msgid "Clear history"
 msgstr "Очистить историю"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Очистить историю и динамику изменений"
 
@@ -3684,22 +3684,22 @@ msgstr "Часы"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Клонировать"
@@ -3707,28 +3707,28 @@ msgstr "Клонировать"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Закрыть"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Закрыть конструктор выражения"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Закрыть новое событие"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Закрыть старые события"
@@ -3742,7 +3742,7 @@ msgid "Close problems"
 msgstr "Закрытие проблем"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Свернуть"
@@ -3756,11 +3756,11 @@ msgstr "Свернуть боковую панель"
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr "Цвет"
 
@@ -3769,7 +3769,7 @@ msgstr "Цвет"
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr "Цвет \"%1$s\" некорректный: ожидается шестнадцатеричный код цвета (6 символов)."
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr "Цвет (ОК)"
 
@@ -3857,9 +3857,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" замещением \"%1$s\" не задано."
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Условия"
@@ -4044,13 +4044,13 @@ msgstr "Поздравляем! Вы успешно установили Zabbix
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Подключаться через"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "Соединение"
@@ -4153,8 +4153,8 @@ msgstr "Контактная информация"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4234,13 +4234,13 @@ msgstr "Продолжить замещения"
 msgid "Contract number"
 msgstr "Номер контракта"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "Конвертация в JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Координаты"
 
@@ -4257,7 +4257,7 @@ msgstr "Копировать"
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Корреляция"
 
@@ -4399,10 +4399,10 @@ msgstr "Создать правило обнаружения (выберите �
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4606,7 +4606,7 @@ msgid "Custom"
 msgstr "Пользовательское"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4620,8 +4620,8 @@ msgstr "Пользовательские графики"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Пользовательские интервалы"
 
@@ -4788,8 +4788,8 @@ msgstr "Панель с ID \"%1$s\" недоступна."
 msgid "Dashboards"
 msgstr "Панели"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Пунктирная линия"
 
@@ -4807,7 +4807,7 @@ msgstr "Данные закодированы неправильно."
 msgid "Data overview"
 msgstr "Обзор данных"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4991,11 +4991,11 @@ msgstr "Уменьшение на"
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -5037,7 +5037,7 @@ msgstr "Диалог входа в систему по умолчанию"
 msgid "Default media type"
 msgstr "Тип способа оповещения по умолчанию"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Длительность шага операции по умолчанию"
 
@@ -5071,7 +5071,7 @@ msgstr "Задерживается на"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5080,7 +5080,7 @@ msgstr "Задерживается на"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5088,47 +5088,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Удалить"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr "Удалить все элементы, которые не присутствуют в файле импорта?"
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Удалить и очистить"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Удалить и очистить выбранные шаблоны? (Внимание: все присоединенные к ним узлы сети будут очищены!)"
 
@@ -5136,11 +5136,11 @@ msgstr "Удалить и очистить выбранные шаблоны? (�
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Удалить и очистить шаблон? (Внимание: все присоединенные к нему узлы сети будут очищены!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Удалить текущее действие?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Удалить текущую корреляцию?"
 
@@ -5153,10 +5153,10 @@ msgstr "Удалить панель?"
 msgid "Delete discovery rule?"
 msgstr "Удалить правило обнаружения?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Удалить выражение?"
 
@@ -5180,11 +5180,11 @@ msgstr "Очистить историю выбранных веб-сценари
 msgid "Delete icon map?"
 msgstr "Удалить соответствие иконок?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Удалить прототип элементов данных?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Удалить элемент данных?"
 
@@ -5226,11 +5226,11 @@ msgstr "Удалить выбранный API токен?"
 msgid "Delete selected API tokens?"
 msgstr "Удалить выбранные API токены?"
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5289,7 +5289,7 @@ msgstr "Удалить выбранные прототипы узлов сети
 msgid "Delete selected host?"
 msgstr "Удалить выбранный узел сети?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Удалить выбранные узлы сети?"
 
@@ -5297,11 +5297,11 @@ msgstr "Удалить выбранные узлы сети?"
 msgid "Delete selected image?"
 msgstr "Удалить выбранное изображение?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Удалить выбранные прототипы элементов данных?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Удалить выбранные элементы данных?"
 
@@ -5317,7 +5317,7 @@ msgstr "Удалить выбранную карту сети?"
 msgid "Delete selected maps?"
 msgstr "Удалить выбранные карты сети?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Удалить выбранные способы оповещений?"
 
@@ -5349,11 +5349,11 @@ msgstr "Удалить выбранные регулярные отчеты?"
 msgid "Delete selected scripts?"
 msgstr "Удалить выбранные скрипты?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr "Удалить выбранную услугу?"
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr "Удалить выбранные услуги?"
 
@@ -5361,19 +5361,19 @@ msgstr "Удалить выбранные услуги?"
 msgid "Delete selected shapes?"
 msgstr "Удалить выбранные фигуры?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Удалить выбранные шаблоны?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Удалить выбранные прототипы триггеров?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Удалить выбранные триггеры?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Удалить выбранного пользователя?"
 
@@ -5389,11 +5389,11 @@ msgstr "Удалить выбранные веб-сценарии?"
 msgid "Delete template?"
 msgstr "Удалить шаблон?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Удалить прототип триггеров?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Удалить триггер?"
 
@@ -5419,7 +5419,7 @@ msgstr "Удалено: Прототип узлов сети \"%1$s\" из \"%2$
 msgid "Delimiter"
 msgstr "Разделитель"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr "Запрещенные методы"
 
@@ -5434,10 +5434,10 @@ msgid "Deny list"
 msgstr "Список запретов"
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Зависимости"
 
@@ -5474,7 +5474,7 @@ msgstr "Состояние развертывания"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5484,13 +5484,13 @@ msgstr "Состояние развертывания"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Описание"
@@ -5500,10 +5500,10 @@ msgstr "Описание"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Детали"
@@ -5544,7 +5544,7 @@ msgstr "Директория"
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Размер директории (в байтах). Возвращается целое число"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5595,11 +5595,11 @@ msgstr "Деактивировать узлы сети наблюдаемые в
 msgid "Disable selected API tokens?"
 msgstr "Деактивировать выбранные API токены?"
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5628,7 +5628,7 @@ msgstr "Деактивировать выбранные узлы сети?"
 msgid "Disable selected items?"
 msgstr "Деактивировать выбранные элементы данных?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Деактивировать выбранные способы оповещения?"
 
@@ -5662,7 +5662,7 @@ msgstr "Деактивировать выбранные веб-сценарии?
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5690,7 +5690,7 @@ msgstr "Деактивировать выбранные веб-сценарии?
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Деактивировано"
 
@@ -5716,9 +5716,9 @@ msgstr "Отбросить значение"
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr "Обнаружение"
@@ -5916,7 +5916,7 @@ msgstr "Статистика записи на диск. Возвращает ц
 msgid "Display OK triggers for"
 msgstr "Отображать триггеры в состоянии ОК в течении"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Показать график"
 
@@ -5924,13 +5924,13 @@ msgstr "Показать график"
 msgid "Display problems"
 msgstr "Отображение проблем"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Показать стэкируемый график"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5954,15 +5954,15 @@ msgstr "Знаменатель деления"
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr "Не хранить историю"
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr "Не хранить динамику изменений"
 
@@ -5976,8 +5976,8 @@ msgstr "Вы хотите заменить условие выражения?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr "Не содержит"
 
@@ -5987,8 +5987,8 @@ msgstr "Не содержит"
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr "Не равно"
 
@@ -5998,8 +5998,8 @@ msgstr "Не равно"
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr "Не существует"
 
@@ -6007,8 +6007,8 @@ msgstr "Не существует"
 msgid "Does not match regular expression"
 msgstr "Не совпадает с регулярным выражением"
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Точечная линия"
 
@@ -6037,16 +6037,16 @@ msgstr "Загрузить конфигурационный файл"
 msgid "Downtime"
 msgstr "Недоступен"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "Отрисовка"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Стиль отрисовки"
 
@@ -6097,7 +6097,7 @@ msgstr "Дубликат userid \"%1$s\" в пользователях у кар
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Длительность"
 
@@ -6120,29 +6120,29 @@ msgstr "Динамические элементы данных"
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "У каждого URL должно быть уникальное имя. Пожалуйста, удостоверьтесь, что есть только один URL с этим именем"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr "Каждый элемент данных"
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Изменить"
@@ -6196,12 +6196,12 @@ msgstr "Ошибка Elasticsearch: %1$s."
 msgid "Element"
 msgstr "Элемент"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Название элемента"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Эллипс"
 
@@ -6257,7 +6257,7 @@ msgstr "Пустой входной параметр."
 msgid "Empty map ID."
 msgstr "Пустой ID карты сети."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6337,11 +6337,11 @@ msgstr "Активировать внутреннюю очистку истор�
 msgid "Enable selected API tokens?"
 msgstr "Активировать выбранные API токены?"
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6371,7 +6371,7 @@ msgstr "Активировать выбранные узлы сети?"
 msgid "Enable selected items?"
 msgstr "Активировать выбранные элементы данных?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Активировать выбранные способы оповещения?"
 
@@ -6393,8 +6393,8 @@ msgstr "Активировать выбранные веб-сценарии?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "Активировать трапы"
 
@@ -6416,7 +6416,7 @@ msgstr "Активировать трапы"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6432,7 +6432,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6446,14 +6446,14 @@ msgstr "Активировать трапы"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Активировано"
 
@@ -6506,8 +6506,8 @@ msgstr "Запись с UUID \"%1$s\" уже существует."
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6685,7 +6685,7 @@ msgstr "Выполнение запроса WMI и получение перво
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr "Выполнить сейчас"
@@ -6706,8 +6706,8 @@ msgstr "Выполнено"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Выполняемый скрипт"
 
@@ -6721,13 +6721,13 @@ msgstr "Подтверждение выполнения"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr "Существует"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Раскрыть"
@@ -6797,15 +6797,15 @@ msgstr "Экспорт в CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6818,10 +6818,10 @@ msgstr "Выражение"
 msgid "Expression cannot be empty"
 msgstr "Выражение не может быть пустым"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Конструктор выражения"
 
@@ -6889,7 +6889,7 @@ msgstr "Ошибка при входе"
 msgid "Failed to create dashboard"
 msgstr "Ошибка при создании панели"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Ошибка при разборе URL."
@@ -7023,8 +7023,7 @@ msgstr "Размер файла в байтах (по умолчанию) или
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Информация времени файла. Возвращает целое число (Unix timestamp)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -7035,7 +7034,8 @@ msgstr "Информация времени файла. Возвращает ц�
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "Заполнение"
 
@@ -7132,7 +7132,7 @@ msgid "Fit to map"
 msgstr "Вписать в карту сети"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Фиксированное"
 
@@ -7144,9 +7144,9 @@ msgstr "Заданное состояние"
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7154,22 +7154,22 @@ msgstr "Переменный"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Следовать перенаправлениям"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Шрифт"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr "Цвет фона"
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Размер шрифта"
 
@@ -7177,8 +7177,8 @@ msgstr "Размер шрифта"
 msgid "Form data"
 msgstr "Данные формы"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Формула"
 
@@ -7214,7 +7214,7 @@ msgstr "Пятница"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "От"
 
@@ -7229,7 +7229,7 @@ msgstr "URL веб-интерфейса"
 msgid "Frontend access"
 msgstr "Доступ к веб-интерфейсу"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Сообщения в веб-интерфейсе"
 
@@ -7245,7 +7245,7 @@ msgid "Full clone"
 msgstr "Полное клонирование"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Функция"
 
@@ -7664,8 +7664,8 @@ msgstr "HTTP агент"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP аутентификация"
 
@@ -7676,8 +7676,8 @@ msgstr "HTTP диалог входа в систему"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
@@ -7714,10 +7714,10 @@ msgstr "HashiCorp Vault"
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Заголовки"
 
@@ -7733,7 +7733,7 @@ msgstr "Иврит (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7839,7 +7839,7 @@ msgid "History cleared"
 msgstr "История очищена"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Очистка истории может занять продолжительное время. Продолжить?"
 
@@ -7854,8 +7854,8 @@ msgstr "Функции истории"
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Период хранения истории"
 
@@ -7872,8 +7872,8 @@ msgstr "Домашняя страница"
 msgid "Horizontal"
 msgstr "Горизонтальный"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Выравнивание по горизонтали"
 
@@ -7995,7 +7995,7 @@ msgstr[2] "Узлы сети активированы"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8081,9 +8081,9 @@ msgstr "Группы узлов сети"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Интерфейс узла сети"
 
@@ -8372,8 +8372,8 @@ msgstr "Интерфейсы IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI датчик"
 
@@ -8387,19 +8387,19 @@ msgstr "ID датчиков IPMI и другие связанные с датч�
 msgid "Icon"
 msgstr "Иконка"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Иконка (по умолчанию)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Иконка (деактивировано)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Иконка (обслуживание)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Иконка (проблема)"
 
@@ -8446,7 +8446,7 @@ msgstr "Соответствия иконок"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Иконка с ID \"%1$s\" недоступна."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Иконки"
 
@@ -8592,7 +8592,7 @@ msgstr "Изображения"
 msgid "Images for all maps will be updated!"
 msgstr "Изображения для всех карт сетей будут обновлены!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Незамедлительно"
 
@@ -8676,6 +8676,7 @@ msgid "Inaccessible item prototype"
 msgstr "Недоступный прототип элементов данных"
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9560,10 +9561,10 @@ msgstr "Бесконечно"
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Инфо"
@@ -9630,8 +9631,8 @@ msgstr "Начальный вид игнорируется, если задан
 msgid "Insert"
 msgstr "Вставить"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Вставить выражение"
 
@@ -9747,9 +9748,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Интервал"
@@ -10186,7 +10187,7 @@ msgstr "Итальянский (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Элемент данных"
 
@@ -10453,8 +10454,8 @@ msgstr "JMX агент"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX endpoint"
 
@@ -10472,8 +10473,8 @@ msgstr "Ожидается входящий JSON массив."
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "JSON данные"
 
@@ -10512,8 +10513,8 @@ msgstr "Японский (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr "JavaScript"
@@ -10552,9 +10553,9 @@ msgstr "Kerberos"
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Ключ"
@@ -10620,13 +10621,13 @@ msgstr "LLD макросы"
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Подпись"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Расположение подписи"
 
@@ -10779,9 +10780,9 @@ msgstr "Латышский (lv_LV)"
 msgid "Layout"
 msgstr "Размещение"
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10792,7 +10793,7 @@ msgstr "Размещение"
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "По левой стороне"
@@ -10825,25 +10826,25 @@ msgstr "Распространяется по лицензии"
 msgid "Limit for search and filter results"
 msgstr "Лимит элементов в результатах поиска и фильтрах"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Линия"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr "Цвет линии"
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Тип линии"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Толщина линии"
 
@@ -10865,9 +10866,9 @@ msgstr "Поле \"selementid1\" связи ссылается на несуще
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr "Поле \"selementid2\" связи ссылается на несуществующий \"%1$s\" ID элемента на карте \"%2$s\"."
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Индикаторы связи"
 
@@ -10898,8 +10899,8 @@ msgstr "Присоединенные шаблоны"
 msgid "Linked to templates"
 msgstr "Соединения с шаблонам"
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Связи"
 
@@ -11001,8 +11002,8 @@ msgstr "Размещение (долгота)"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Журнал (лог)"
 
@@ -11015,8 +11016,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Мониторинг файлов журналов логов. Возвращает лог"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Формат времени в журнале (логе)"
 
@@ -11142,7 +11143,7 @@ msgstr "Основная навигация"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Обслуживание"
 
@@ -11302,7 +11303,7 @@ msgstr "Дерево навигации карт сетей"
 msgid "Map owner cannot be empty."
 msgstr "Владелец карты сети не может быть пустым."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Фигура карты сети"
 
@@ -11380,19 +11381,19 @@ msgstr "Маска"
 msgid "Mass update"
 msgstr "Массовое обновление"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Массовое обновление элементов"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Массовое обновление фигур"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Основной элемент данных"
 
@@ -11477,8 +11478,8 @@ msgid "May"
 msgstr "Май"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Оповещения"
 
@@ -11605,8 +11606,8 @@ msgstr "Шаблон сообщений"
 msgid "Message templates"
 msgstr "Шаблоны сообщений"
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Время отображения сообщения"
 
@@ -11624,7 +11625,7 @@ msgstr "Сообщение/Команда"
 msgid "Messages"
 msgstr "Сообщения"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Сообщения"
 
@@ -11724,11 +11725,11 @@ msgstr "Пропущенное \"name\" поле для прототипа гр�
 msgid "Missing \"name\" field for graph."
 msgstr "Пропущенное поле \"name\" для графика."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "Отсутствующие данные"
 
@@ -11900,8 +11901,8 @@ msgstr "Самое критичное из дочерних услуг"
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Множественный"
 
@@ -12067,7 +12068,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -12087,15 +12088,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12104,16 +12105,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12393,7 +12394,7 @@ msgstr "Без деталей"
 msgid "No discovery rule IDs given."
 msgstr "ID правил обнаружения не указаны."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr "Активированные модули не найдены."
@@ -12449,8 +12450,8 @@ msgstr "Нет изображения"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Интерфейс не найден"
 
@@ -12754,7 +12755,7 @@ msgstr "Файл публичного ключа не указан."
 msgid "No recipients specified for action operation message."
 msgstr "Не указаны получатели для сообщения операции действия."
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Не обновлять"
 
@@ -12800,8 +12801,8 @@ msgstr "Не-логические флаги устарели."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12809,17 +12810,17 @@ msgstr "Не-логические флаги устарели."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Нет"
@@ -12915,7 +12916,7 @@ msgstr "Отчет об оповещениях"
 msgid "Notifications"
 msgstr "Оповещения"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr "Оповещение об отмененных эскалациях"
 
@@ -13089,8 +13090,8 @@ msgstr "Системы счисления"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Числовой (с плавающей точкой)"
 
@@ -13100,8 +13101,8 @@ msgstr "Числовой (целочисленный)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Числовой (целое положительное)"
 
@@ -13109,8 +13110,8 @@ msgstr "Числовой (целое положительное)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13122,13 +13123,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "ОК событие закрывает"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "Генерация ОК событий"
 
@@ -13189,7 +13190,7 @@ msgstr "Выкл"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13218,7 +13219,7 @@ msgstr "Вкл"
 msgid "On status change triggers blink for"
 msgstr "Мигание триггеров при изменении состояния"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Один раз"
 
@@ -13340,11 +13341,11 @@ msgstr "Операция не имеет шаблон для функциони�
 msgid "Operational data"
 msgstr "Оперативные данные"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Операции"
@@ -13390,7 +13391,7 @@ msgstr "Опции"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13405,11 +13406,11 @@ msgstr "Опции"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Или"
 
@@ -13504,8 +13505,8 @@ msgstr "Вывод"
 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\"."
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Переопределено"
@@ -13722,8 +13723,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМА"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "Режим генерации событий ПРОБЛЕМА"
 
@@ -13805,8 +13806,8 @@ msgstr "Параметр \"%1$s\" устарел."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Параметры"
 
@@ -13854,8 +13855,8 @@ msgstr "Конфликт взаимосвязи родитель-дочерни�
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Анализ"
 
@@ -13886,12 +13887,12 @@ msgstr "Пассивный"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13924,12 +13925,12 @@ msgid "Paste"
 msgstr "Вставить"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr "Вставить страницу"
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr "Вставить виджет"
 
@@ -13942,7 +13943,7 @@ msgstr "Вставить без внешних связей"
 msgid "Pattern"
 msgstr "Шаблон"
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "Приостановить операции для подавленных проблем"
 
@@ -13985,8 +13986,8 @@ msgstr "Выполнение DNS запроса. Возвращает строк
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Период"
@@ -14007,9 +14008,9 @@ msgid "Periods"
 msgstr "Периоды"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -14020,7 +14021,7 @@ msgstr "Периоды"
 msgid "Permissions"
 msgstr "Права доступа"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права доступа могут быть назначены только группам пользователей."
 
@@ -14042,12 +14043,12 @@ msgstr "Алгоритм размещения"
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Воспроизведение звукового сигнала"
 
@@ -14077,8 +14078,7 @@ msgstr "Пожалуйста, включите \"allow_url_fopen\" директ�
 msgid "Please select two elements"
 msgstr "Пожалуйста, выберите два элемента"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14088,14 +14088,15 @@ msgstr "Пожалуйста, выберите два элемента"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "Размер точек"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Точки"
 
@@ -14103,7 +14104,7 @@ msgstr "Точки"
 msgid "Polish (pl_PL)"
 msgstr "Польский (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Заполнение поля инвентаря узла сети"
 
@@ -14165,16 +14166,16 @@ msgstr "Функции прогнозирования"
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Предобработка"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Шаги предобработки"
 
@@ -14271,8 +14272,8 @@ msgstr "Приватный"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Файл приватного ключа"
 
@@ -14302,7 +14303,7 @@ msgstr "Уровень привилегий"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Проблема"
 
@@ -14492,16 +14493,16 @@ msgstr "Публичный"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Публичный ключ"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Файл публичного ключа"
 
@@ -14515,8 +14516,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Поля запроса"
 
@@ -14566,8 +14567,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Сырые данные"
 
@@ -14593,14 +14594,14 @@ msgstr "Только чтение"
 msgid "Read-only"
 msgstr "Только чтение"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr "Доступ к услугам только на чтение"
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr "Доступ к услугам с тегом только на чтение"
@@ -14614,14 +14615,14 @@ msgstr "Доступ к услугам с тегом только на чтен�
 msgid "Read-write"
 msgstr "Чтение-запись"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr "Доступ к услугам на чтение-запись"
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr "Доступ к услугам с тегом на чтение-запись"
@@ -14667,7 +14668,7 @@ msgstr "Получатели"
 msgid "Recordset ID"
 msgstr "ID набора записей"
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14676,10 +14677,10 @@ msgid "Recovery"
 msgstr "Восстановление"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Выражение восстановления"
@@ -14689,7 +14690,7 @@ msgstr "Выражение восстановления"
 msgid "Recovery expression syntax error."
 msgstr "Синтаксическая ошибка в выражении восстановления."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Операции восстановления"
 
@@ -14701,8 +14702,8 @@ msgstr "Операции восстановления"
 msgid "Recovery time"
 msgstr "Время восстановления"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Прямоугольник"
 
@@ -14809,7 +14810,7 @@ msgstr "Удаленная команда"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14840,13 +14841,13 @@ msgstr "Удаленная команда"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14854,25 +14855,25 @@ msgstr "Удаленная команда"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14900,14 +14901,14 @@ msgstr "Удаленная команда"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14982,10 +14983,10 @@ msgstr "Периодичность"
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Замена"
 
@@ -15003,7 +15004,7 @@ msgstr "Замена"
 msgid "Report \"%1$s\" already exists."
 msgstr "Отчет %1$s\" уже существует."
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr "Отчет сгенерированный другими пользователями изменится на текущего пользователя."
 
@@ -15042,15 +15043,15 @@ msgstr "Отчеты"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "Запрос тела"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "Типа запроса тела"
 
@@ -15059,8 +15060,8 @@ msgid "Request sent successfully"
 msgstr "Запрос успешно отправлен"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "Тип запроса"
 
@@ -15087,8 +15088,8 @@ msgstr "Требуемое быстродействие сервера, новы
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Требуемые коды состояния"
 
@@ -15101,11 +15102,11 @@ msgstr "Требуемая строка"
 msgid "Reset"
 msgstr "Сбросить"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Сбросить все поля на значения по умолчанию?"
 
@@ -15122,11 +15123,11 @@ msgstr "Сбросить подтверждение"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Сбросить по умолчанию"
 
@@ -15230,8 +15231,8 @@ msgstr "Применён результат с преобразованием з
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "Режим получения"
 
@@ -15304,9 +15305,9 @@ msgstr "Возвращает процент потерянных ICMP ping па�
 msgid "Revert changes"
 msgstr "Отменить изменения"
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15314,7 +15315,7 @@ msgstr "Отменить изменения"
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "По правой стороне"
@@ -15330,8 +15331,8 @@ msgstr "Ось Y справа"
 msgid "Right trim"
 msgstr "Обрезать справа"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr "Роль"
 
@@ -15524,8 +15525,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15604,8 +15605,8 @@ msgstr "SQL запросов: %1$s (selects: %2$s | executes: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL запрос"
 
@@ -15630,38 +15631,38 @@ msgstr "SSH агент"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Файл SSL сертификата"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Файл SSL ключа"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Пароль к SSL ключу"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "Проверка SSL хоста"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "Проверка SSL узла"
 
@@ -15783,9 +15784,9 @@ msgstr "Регулярные отчеты"
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15810,8 +15811,8 @@ msgstr "Границы"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Скрипт"
 
@@ -15944,10 +15945,10 @@ msgstr "Имя безопасности"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Выбрать"
@@ -15957,9 +15958,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Выбрать прототип"
 
@@ -15980,7 +15981,7 @@ msgstr "Выбранные действия удалены"
 msgid "Selected and all other problems of related triggers"
 msgstr "Выбранные и все другие проблемы связанные с триггерами"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Выбранные элементы"
 
@@ -16330,8 +16331,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "Важность увеличена"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Фигура"
@@ -16434,7 +16435,7 @@ msgstr "Отображать боковую панель"
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16534,8 +16535,8 @@ msgstr "Простой график"
 msgid "Simple graph prototype"
 msgstr "Прототип простого графика"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Одиночная"
 
@@ -16580,7 +16581,7 @@ msgstr "Область / район"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Размер"
 
@@ -16691,9 +16692,9 @@ msgstr "Скорость"
 msgid "Stacked"
 msgstr "Стэкируемый"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "Лестница"
 
@@ -16714,7 +16715,7 @@ msgstr "Начало"
 msgid "Start date"
 msgstr "Дата начала"
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Начинать в"
 
@@ -16909,14 +16910,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Шаг с именем \"%1$s\" уже существует."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Шаги"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Остановить"
 
@@ -16939,10 +16940,10 @@ msgstr "Остановлена"
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr "Период хранения"
 
@@ -17178,8 +17179,8 @@ msgstr "Приоритет отображения тегов"
 msgid "Tag filter"
 msgstr "Фильтр тегов"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Теги для совпадения"
 
@@ -17238,28 +17239,28 @@ msgstr "Значение тега"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Теги"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Цель"
@@ -17420,14 +17421,14 @@ msgstr "Шаблоны обновлены"
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Тест"
@@ -17485,10 +17486,10 @@ msgstr "Тестовая тема"
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Текст"
 
@@ -17643,8 +17644,8 @@ msgstr "Этот месяц"
 msgid "This month so far"
 msgstr "В этом месяце"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr "Этот тип информации может не соответствовать ключу."
 
@@ -17748,9 +17749,9 @@ msgstr "Период времени"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Сдвиг по времени"
 
@@ -17768,8 +17769,8 @@ msgstr "Часовой пояс"
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Время ожидания"
 
@@ -17795,7 +17796,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "К"
 
@@ -17819,7 +17820,7 @@ msgstr "Сегодня до сих пор"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "По верхнему краю"
@@ -17871,8 +17872,7 @@ msgstr "Преобразование результата SQL запроса в
 msgid "Transform SQL query result into a JSON array."
 msgstr "Преобразование результата SQL запроса в JSON массив."
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17883,7 +17883,8 @@ msgstr "Преобразование результата SQL запроса в
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "Прозрачность"
 
@@ -17891,9 +17892,9 @@ msgstr "Прозрачность"
 msgid "Transport error."
 msgstr "Транспортная ошибка."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "В виде 0"
@@ -17905,8 +17906,8 @@ msgstr "Статистика кэша функции динамики измен
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Период хранения динамики изменений"
 
@@ -17924,9 +17925,9 @@ msgstr "Динамика изменений"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Триггер"
@@ -18031,7 +18032,7 @@ msgstr "Обзор триггеров"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Прототип триггеров"
@@ -18098,7 +18099,7 @@ msgstr "Прототипы триггеров удалены"
 msgid "Trigger prototypes updated"
 msgstr "Прототипы триггеров обновлены"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Важность триггеров"
 
@@ -18205,23 +18206,23 @@ msgstr "Два и более полей не могут занимать одн�
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Тип"
@@ -18230,12 +18231,12 @@ msgstr "Тип"
 msgid "Type (Full details)"
 msgstr "Тип (полная детализация)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Тип (ОК)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18246,10 +18247,10 @@ msgstr "Тип вычисления"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Тип информации"
 
@@ -18273,11 +18274,11 @@ msgstr "НЕИЗВЕСТНО"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18298,7 +18299,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL закодирован некорректно."
@@ -18323,7 +18324,7 @@ msgstr "Параметр URL не может быть пустым."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLы"
@@ -18426,15 +18427,15 @@ msgstr "Неожиданный ответ для действия %1$s."
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr "Неожиданная ошибка сервера."
 
@@ -18443,8 +18444,8 @@ msgstr "Неожиданная ошибка сервера."
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Единицы измерения"
 
@@ -18470,7 +18471,7 @@ msgstr "Единицы измерения"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -18614,12 +18615,12 @@ msgstr "Доступен"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18639,18 +18640,18 @@ msgstr "Доступен"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18671,13 +18672,13 @@ msgstr "Обновить существующее"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Интервал обновления"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "Операции обновления"
 
@@ -18816,7 +18817,7 @@ msgstr "Строка user agent"
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Пользователь не может добавить себя в отключенную группу или в группу с отключенным доступом к Веб-интерфейсу."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr "Пользователь не может изменить свою роль."
@@ -18931,10 +18932,10 @@ msgstr "Меню пользователя"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Имя пользователя"
 
@@ -19003,7 +19004,7 @@ msgstr "Настройки пользователя"
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Общий доступ пользователям имеет отсутствующие параметры: %1$s у карты сети \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19381,12 +19382,12 @@ msgstr "Валидация"
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19448,8 +19449,8 @@ msgstr "Преобразование значений \"%1$s\" уже сущес
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Преобразование значений"
@@ -19566,8 +19567,8 @@ msgstr "Версия Zabbix сервера или прокси"
 msgid "Vertical"
 msgstr "Вертикальный"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Выравнивание по вертикали"
 
@@ -19772,8 +19773,7 @@ msgstr "Виджет по X:%3$d, Y:%4$d на странице #%2$d панел�
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "Виджет слишком маленький для указанного количества колонок и строк."
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19784,12 +19784,13 @@ msgstr "Виджет слишком маленький для указанног
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19865,8 +19866,8 @@ msgstr "Ошибочные поля для связи на карте сети."
 msgid "Wrong value for \"url\" field."
 msgstr "Ошибочное значение для поля \"url\"."
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19878,11 +19879,11 @@ msgstr "Ось X"
 msgid "X-Frame-Options HTTP header"
 msgstr "HTTP заголовок X-Frame-Options"
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19896,8 +19897,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "XML данные"
 
@@ -19917,12 +19918,12 @@ msgstr "XML в JSON"
 msgid "XPath"
 msgstr "XPath"
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "МАКС значение оси Y"
 
@@ -19936,18 +19937,18 @@ msgstr "МАКС значение оси Y должно быть больше ч
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "МАКС значение оси Y должно быть больше чем МИН значение оси Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "МИН значение оси Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Расположение оси"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Ось Y"
 
@@ -19967,11 +19968,11 @@ msgstr "d.m.Y H:i:s"
 msgid "Y-n-d"
 msgstr "d-n-Y"
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -21005,10 +21006,10 @@ msgstr "fuzzytime() - Разница между значением элемен�
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr "ожидаются географические координаты (значения широты и долготы, разделенные запятой)"
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "глобальные настройки очистки истории"
@@ -21037,8 +21038,8 @@ msgstr "узел сети"
 msgid "host group"
 msgstr "группа узла сети"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "шаблон узла сети"
@@ -21071,7 +21072,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr "in() - Проверяет равно ли значение одному из перечисленных значений (1 - равно, 0 - в противном случае)"
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "включая подгруппы"
 
@@ -21245,8 +21246,8 @@ msgstr "элемент данных"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr "элемент данных \"%1$s\" на узле сети \"%2$s\" не наблюдается"
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "шаблон элемента данных"
 
@@ -21510,10 +21511,10 @@ msgstr "d-n H:i"
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "название"
@@ -21560,7 +21561,7 @@ msgstr "нет прав отменять подтверждение пробле
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr "nodata() - Отсутствие данных полученных за период времени T (1 - правда, 0 - ложь), Режим (strict - игнорировать задержку прокси при отправке данных)"
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "нет"
 
@@ -21590,7 +21591,7 @@ msgstr "число"
 msgid "of"
 msgstr "из"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21613,7 +21614,7 @@ msgstr "из"
 msgid "off"
 msgstr "выкл"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21785,8 +21786,8 @@ msgstr "с"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr "скрипт"
@@ -21923,8 +21924,8 @@ msgstr "заданная учётная запись не уникальна"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22211,17 +22212,17 @@ msgstr "ожидается идентификатор в верхнем реги
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/sk/LC_MESSAGES/frontend.po b/ui/locale/sk/LC_MESSAGES/frontend.po
index 2c99c495215..734ee5f0bad 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -189,10 +189,10 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -242,9 +242,9 @@ msgstr[0] "ostáva %1$s pokus"
 msgstr[1] "ostávajú %1$s pokusy"
 msgstr[2] "ostáva %1$s pokusov"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -353,7 +353,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 sekúnd"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D pohľad"
 
@@ -399,7 +399,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -492,27 +492,27 @@ msgstr "Prístup zamietnutý"
 msgid "Access denied!"
 msgstr "Prístup zamietnutý!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -584,35 +584,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -743,24 +743,24 @@ msgstr "Aktívny do"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -796,13 +796,13 @@ msgstr "Aktívny do"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -820,38 +820,38 @@ msgstr "Aktívny do"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -878,7 +878,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -899,7 +899,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -908,16 +908,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -927,7 +927,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Pridať prototyp"
 
@@ -964,7 +964,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1052,7 +1052,7 @@ msgstr "Rozhrania agenta"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1060,11 +1060,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1091,8 +1091,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1108,8 +1108,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1125,13 +1125,13 @@ msgstr "Všetky linky by mali mať zadefinované \"Meno\" a \"URL\""
 msgid "All maps"
 msgstr "Všetky mapy"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1152,19 +1152,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Povolené hosty"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1181,21 +1181,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "A"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1209,7 +1209,7 @@ msgstr "A"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "A/Alebo"
 
@@ -1254,11 +1254,11 @@ msgstr "Chyba aplikácie."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Použiť"
@@ -1386,11 +1386,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1484,8 +1484,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Metóda autentifikácie"
 
@@ -1547,8 +1547,8 @@ msgstr "Automaticky"
 msgid "Automatic icon mapping"
 msgstr "Automatické mapovanie ikoniek"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Automatický výber ikoniek"
 
@@ -1615,12 +1615,12 @@ msgstr "Späť"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Pozadie"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1628,9 +1628,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Obrázok pozadia"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1638,8 +1638,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Koreňový DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1682,15 +1682,15 @@ msgstr "Modrá"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1701,8 +1701,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Hrubá čiara"
 
@@ -1710,19 +1710,19 @@ msgstr "Hrubá čiara"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1735,7 +1735,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Dole"
@@ -1818,7 +1818,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Vypočítaná"
 
@@ -1842,22 +1842,22 @@ msgstr "Callback úroveň"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3507,8 +3507,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Znak"
 
@@ -3536,7 +3536,7 @@ msgstr "Šasi"
 msgid "Chassis information. Returns string"
 msgstr "Informácie o šasi. Vráti reťazec"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Kontrola už existuje."
 
@@ -3657,8 +3657,8 @@ msgid "Clear history"
 msgstr "Vyčistiť históriu"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Vyčistiť históriu a trendy"
 
@@ -3686,22 +3686,22 @@ msgstr "Hodiny"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Klonovať"
@@ -3709,28 +3709,28 @@ msgstr "Klonovať"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Zavrieť konštruktéra výrazu"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3744,7 +3744,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Zavrieť"
@@ -3758,11 +3758,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3771,7 +3771,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3859,9 +3859,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Podmienky"
@@ -4046,13 +4046,13 @@ msgstr "Gratulácia! Práve ste úspešne nainštalovali Zabbix frontend."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Pripojiť k"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4144,8 +4144,8 @@ msgstr "Kontakt"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4225,13 +4225,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Číslo zmluvy"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Poloha"
 
@@ -4248,7 +4248,7 @@ msgstr "Kopírovať"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4390,10 +4390,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4597,7 +4597,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4611,8 +4611,8 @@ msgstr "Vlastné grafy"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Vlastné intervaly"
 
@@ -4779,8 +4779,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Čiarkovaná čiara"
 
@@ -4798,7 +4798,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Prehľad dát"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4982,11 +4982,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Predvolený"
 
@@ -5028,7 +5028,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Predvolené trvanie prevádzkového kroku"
 
@@ -5062,7 +5062,7 @@ msgstr "Oneskorené o"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5071,7 +5071,7 @@ msgstr "Oneskorené o"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5079,47 +5079,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Zmazať"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Zmazať a vyčistiť"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Zmazať a vyčistiť označené šablóny? (Pozor: všetky prepojené hosty budú tiež vyčistené!)"
 
@@ -5127,11 +5127,11 @@ msgstr "Zmazať a vyčistiť označené šablóny? (Pozor: všetky prepojené ho
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Zmazať a vyčistiť šablónu? (Pozor: všetky prepojené hosty budú tiež vyčistené!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Zmazať aktuálnu akciu?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5144,10 +5144,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "Zmazať zisťovacie pravidlo?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Zmazať výraz?"
 
@@ -5171,11 +5171,11 @@ msgstr "Zmazať históriu označených scenárov?"
 msgid "Delete icon map?"
 msgstr "Zmazať mapovú ikonu?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Zmazať prototyp položky?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Zmazať položku?"
 
@@ -5217,11 +5217,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5280,7 +5280,7 @@ msgstr "Zmazať označené prototypy hosta?"
 msgid "Delete selected host?"
 msgstr "Zmazať označeného hosta?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Zmazať označené hosty?"
 
@@ -5288,11 +5288,11 @@ msgstr "Zmazať označené hosty?"
 msgid "Delete selected image?"
 msgstr "Zmazať označený obrázok?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Zmazať označené prototypy položiek?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Zmazať označené položky?"
 
@@ -5308,7 +5308,7 @@ msgstr "Zmazať označenú mapu?"
 msgid "Delete selected maps?"
 msgstr "Zmazať označené mapy?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Zmazať označené typy médií?"
 
@@ -5340,11 +5340,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Zmazať označené skripty?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5352,19 +5352,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Zmazať označené šablóny?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Zmazať označené prototypy spúšťačov?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Zmazať označené spúšťače?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Zmazať označeného používateľa?"
 
@@ -5380,11 +5380,11 @@ msgstr "Zmazať označené scenáre?"
 msgid "Delete template?"
 msgstr "Zmazať šablónu?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Zmazať prototyp spúšťača?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Zmazať spúšťač?"
 
@@ -5410,7 +5410,7 @@ msgstr "Zmazané: Prototyp hosta \"%1$s\" na \"%2$s\"."
 msgid "Delimiter"
 msgstr "Oddeľovač"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5425,10 +5425,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Závislosti"
 
@@ -5465,7 +5465,7 @@ msgstr "Stav nasadenia"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5475,13 +5475,13 @@ msgstr "Stav nasadenia"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Poznámka"
@@ -5491,10 +5491,10 @@ msgstr "Poznámka"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Podrobnosti"
@@ -5535,7 +5535,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5586,11 +5586,11 @@ msgstr "Zakázať hostov monitorovaných cez označené proxy?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5619,7 +5619,7 @@ msgstr "Zakázať označené hosty?"
 msgid "Disable selected items?"
 msgstr "Zakázať označené položky?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Zakázať označené média typy?"
 
@@ -5653,7 +5653,7 @@ msgstr "Zakázať označené scenáre?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5681,7 +5681,7 @@ msgstr "Zakázať označené scenáre?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Vypnuté"
 
@@ -5707,9 +5707,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5908,7 +5908,7 @@ msgstr "Zapisovacie štatistiky disku. Vráti celé číslo pre položky v sekto
 msgid "Display OK triggers for"
 msgstr "Zobrazovať spúšťače v stave OK po dobu"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Zobraziť graf"
 
@@ -5916,13 +5916,13 @@ msgstr "Zobraziť graf"
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Zobraziť skladaný graf"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5946,15 +5946,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5968,8 +5968,8 @@ msgstr "Prajete si zameniť podmienkový výraz?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5979,8 +5979,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5990,8 +5990,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5999,8 +5999,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Bodka"
 
@@ -6029,16 +6029,16 @@ msgstr "Stiahnuť konfiguračný súbor"
 msgid "Downtime"
 msgstr "Prestoj"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Štýl vykreslenia"
 
@@ -6089,7 +6089,7 @@ msgstr "Duplicitné userid \"%1$s\" v používateľoch pre mapu \"%2$s\"."
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Trvanie"
 
@@ -6112,29 +6112,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Aktualizovať"
@@ -6188,12 +6188,12 @@ msgstr ""
 msgid "Element"
 msgstr "Element"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Meno elementu"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6249,7 +6249,7 @@ msgstr "Prázdny vstupný parameter."
 msgid "Empty map ID."
 msgstr "Prázdne ID mapy."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6329,11 +6329,11 @@ msgstr "Povoliť internú údržbu"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6363,7 +6363,7 @@ msgstr "Povoliť označených hostov?"
 msgid "Enable selected items?"
 msgstr "Povoliť označené položky?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Povoliť označené typy médií?"
 
@@ -6385,8 +6385,8 @@ msgstr "Povoliť označené scenáre?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6408,7 +6408,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6424,7 +6424,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6438,14 +6438,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Povolené"
 
@@ -6498,8 +6498,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6677,7 +6677,7 @@ msgstr "Spustí WMI dotaz a vráti prvý vybraný objekt. Vráti celé, desatinn
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6698,8 +6698,8 @@ msgstr "Vykonané"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Vykonaný skript"
 
@@ -6713,13 +6713,13 @@ msgstr "Potvrdenie vykonania"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Rozbaliť"
@@ -6789,15 +6789,15 @@ msgstr "Export do CSV súboru"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6810,10 +6810,10 @@ msgstr "Výraz"
 msgid "Expression cannot be empty"
 msgstr "Výraz nemôže byť prázdny"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Konštruktér výrazu"
 
@@ -6881,7 +6881,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -7015,8 +7015,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Informácie o čase súboru. Vráti celé číslo (Unix časová pečiatka)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -7027,7 +7026,8 @@ msgstr "Informácie o čase súboru. Vráti celé číslo (Unix časová pečiat
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7124,7 +7124,7 @@ msgid "Fit to map"
 msgstr "Prispôsobiť mape"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Pevná"
 
@@ -7136,9 +7136,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7146,22 +7146,22 @@ msgstr "Flexibilný"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Nasledovať presmerovania"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7169,8 +7169,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Vzorec"
 
@@ -7206,7 +7206,7 @@ msgstr "Piatok"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Od"
 
@@ -7221,7 +7221,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Frontend prístup"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Povoliť frontend správy"
 
@@ -7237,7 +7237,7 @@ msgid "Full clone"
 msgstr "Vytvoriť úplnú kópiu"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funkcia"
 
@@ -7656,8 +7656,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP autentifikácia"
 
@@ -7668,8 +7668,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
@@ -7706,10 +7706,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "HTTP hlavičky"
 
@@ -7725,7 +7725,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7831,7 +7831,7 @@ msgid "History cleared"
 msgstr "História vyčistená"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Čistenie histórie môže trvať dlhší čas. Pokračovať?"
 
@@ -7846,8 +7846,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Perióda uloženia histórie"
 
@@ -7864,8 +7864,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Vodorovný"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Vodorovné zarovnanie"
 
@@ -7987,7 +7987,7 @@ msgstr[2] "Hosty povolené"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8073,9 +8073,9 @@ msgstr "Skupiny hostov"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Rozhranie hosta"
 
@@ -8365,8 +8365,8 @@ msgstr "IPMI rozhrania"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI senzor"
 
@@ -8380,19 +8380,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ikona"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Ikona (predvolená)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Ikona (vypnuté)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Ikona (údržba)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Ikona (problém)"
 
@@ -8439,7 +8439,7 @@ msgstr "Mapovanie ikon"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Ikony"
 
@@ -8585,7 +8585,7 @@ msgstr "Obrázky"
 msgid "Images for all maps will be updated!"
 msgstr "Obrázky pre všetky mapy budú aktualizované!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Hneď"
 
@@ -8669,6 +8669,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9553,10 +9554,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Info"
@@ -9623,8 +9624,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Vložiť"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Vložiť výraz"
 
@@ -9740,9 +9741,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Interval"
@@ -10179,7 +10180,7 @@ msgstr "Taliansky (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Položka"
 
@@ -10447,8 +10448,8 @@ msgstr "JMX agent"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10466,8 +10467,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10506,8 +10507,8 @@ msgstr "Japonsky (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10546,9 +10547,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Kľúč"
@@ -10614,13 +10615,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Popisok"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Umiestnenie popisku"
 
@@ -10773,9 +10774,9 @@ msgstr "Litovsky (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10786,7 +10787,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Vľavo"
@@ -10819,25 +10820,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Obmedzenie počtu položiek pre vyhľadávanie/filter"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Čiara"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10859,9 +10860,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Ukazovateľ stavu spojnice"
 
@@ -10892,8 +10893,8 @@ msgstr "Pripojené šablóny"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Prepojenia"
 
@@ -10995,8 +10996,8 @@ msgstr "Zemepisná dĺžka umiestnenia"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -11009,8 +11010,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Log monitoring. Vráti log"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Formát času pre logovanie"
 
@@ -11136,7 +11137,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Údržba"
 
@@ -11296,7 +11297,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr "Vlastník mapy nemôže byť prázdny."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11374,19 +11375,19 @@ msgstr "Maska"
 msgid "Mass update"
 msgstr "Hromadná aktualizácia"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Hromadná aktualizácia elementov"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11471,8 +11472,8 @@ msgid "May"
 msgstr "Máj"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Médiá"
 
@@ -11599,8 +11600,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Časový limit správy"
 
@@ -11618,7 +11619,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Správy"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Správy"
 
@@ -11718,11 +11719,11 @@ msgstr "Chýbajúce pole \"name\" pre prototyp grafu."
 msgid "Missing \"name\" field for graph."
 msgstr "Chýbajúce pole \"name\" pre graf."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11894,8 +11895,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -12061,7 +12062,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -12081,15 +12082,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12098,16 +12099,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12387,7 +12388,7 @@ msgstr "Bez podrobností"
 msgid "No discovery rule IDs given."
 msgstr "Žiadne stanovené ID zisťovacích pravidiel."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12443,8 +12444,8 @@ msgstr "Žiadny obrázok"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Nenájdené žiadne rozhranie"
 
@@ -12748,7 +12749,7 @@ msgstr "Žiadny špecifikovaný súbor s verejným kľúčom."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12794,8 +12795,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12803,17 +12804,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Žiadna"
@@ -12909,7 +12910,7 @@ msgstr "Report hlásení"
 msgid "Notifications"
 msgstr "Správy"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -13083,8 +13084,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Číslo (float)"
 
@@ -13094,8 +13095,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Číslo (unsigned)"
 
@@ -13103,8 +13104,8 @@ msgstr "Číslo (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13116,13 +13117,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13183,7 +13184,7 @@ msgstr "Vypnuté"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13212,7 +13213,7 @@ msgstr "Zapnuté"
 msgid "On status change triggers blink for"
 msgstr "Pri zmena stavu spúšťača blikať po dobu"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Raz"
 
@@ -13334,11 +13335,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Operácie"
@@ -13384,7 +13385,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13399,11 +13400,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Alebo"
 
@@ -13498,8 +13499,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Prepísané"
@@ -13716,8 +13717,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLÉM"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13799,8 +13800,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parametre"
 
@@ -13848,8 +13849,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13880,12 +13881,12 @@ msgstr "Pasívny"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13918,12 +13919,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13936,7 +13937,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13979,8 +13980,8 @@ msgstr "Vykonať DNS dotaz. Vráti reťazec s požadovaným typom informácie"
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Perióda"
@@ -14001,9 +14002,9 @@ msgid "Periods"
 msgstr "Periódy"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -14014,7 +14015,7 @@ msgstr "Periódy"
 msgid "Permissions"
 msgstr "Oprávnenia"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Oprávnenia môžu byť priradené len používateľskej skupine, nie k používateľovi."
 
@@ -14036,12 +14037,12 @@ msgstr "Algoritmus umiestňovania"
 msgid "Plain text"
 msgstr "Jednoduchý text"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Prehrať"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Prehrávať zvuk"
 
@@ -14071,8 +14072,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Označte prosím dva elementy"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14082,14 +14082,15 @@ msgstr "Označte prosím dva elementy"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -14097,7 +14098,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "Polsky (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Vypĺňa polia hostovho inventára"
 
@@ -14159,16 +14160,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14265,8 +14266,8 @@ msgstr "Privátny"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Súbor so súkromným kľúčom"
 
@@ -14296,7 +14297,7 @@ msgstr "Úroveň oprávnenia"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problém"
 
@@ -14486,16 +14487,16 @@ msgstr "Verejný"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Verejný kľúč"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Súbor s verejným kľúčom"
 
@@ -14509,8 +14510,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14560,8 +14561,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14587,14 +14588,14 @@ msgstr "Len čítanie"
 msgid "Read-only"
 msgstr "Len na čítanie"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14608,14 +14609,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Čítanie a zápis"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14661,7 +14662,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14670,10 +14671,10 @@ msgid "Recovery"
 msgstr "Zotavenie"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14683,7 +14684,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14695,8 +14696,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14803,7 +14804,7 @@ msgstr "Vzdialený príkaz"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14834,13 +14835,13 @@ msgstr "Vzdialený príkaz"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14848,25 +14849,25 @@ msgstr "Vzdialený príkaz"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14894,14 +14895,14 @@ msgstr "Vzdialený príkaz"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14976,10 +14977,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Nahradiť"
 
@@ -14997,7 +14998,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -15036,15 +15037,15 @@ msgstr "Reporty"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -15053,8 +15054,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -15081,8 +15082,8 @@ msgstr "Požadovaný výkon servera, počet nových hodnôt za sekundu"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Požadovaný stavový kód"
 
@@ -15095,11 +15096,11 @@ msgstr "Požadovaný reťazec"
 msgid "Reset"
 msgstr "Reset"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Nastaviť všetky polia na predvolené hodnoty?"
 
@@ -15116,11 +15117,11 @@ msgstr "Potvrdenie obnovenia"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Obnoviť pôvodné hodnoty"
 
@@ -15224,8 +15225,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15298,9 +15299,9 @@ msgstr "Vrátí percento stratených ICMP ping paketov."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15308,7 +15309,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Vpravo"
@@ -15324,8 +15325,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15518,8 +15519,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15598,8 +15599,8 @@ msgstr "SQL počty: %1$s (selects: %2$s | executes: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL dotaz"
 
@@ -15624,38 +15625,38 @@ msgstr "SSH agent"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Súbor SSL certifikátu"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Súbor SSL kľúča"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Heslo k SSL kľúču"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL verifikácia mena hosta"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL verifikácia certifikátu hosta"
 
@@ -15777,9 +15778,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15804,8 +15805,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Skript"
 
@@ -15938,10 +15939,10 @@ msgstr "Bezpečnostné meno"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Vybrať"
@@ -15951,9 +15952,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Označ prototyp"
 
@@ -15974,7 +15975,7 @@ msgstr "Označené akcie zmazané"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Označené elementy"
 
@@ -16325,8 +16326,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16429,7 +16430,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16529,8 +16530,8 @@ msgstr "Jednoduchý graf"
 msgid "Simple graph prototype"
 msgstr "Prototyp jednoduchého grafu"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16575,7 +16576,7 @@ msgstr "Umiestnenie štát / provincia"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16686,9 +16687,9 @@ msgstr "Rýchlosť"
 msgid "Stacked"
 msgstr "Skladaný"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16709,7 +16710,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Začiatok v"
 
@@ -16904,14 +16905,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Krok s menom \"%1$s\" už existuje."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Kroky"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Zastaviť"
 
@@ -16934,10 +16935,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17173,8 +17174,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17233,28 +17234,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Cieľ"
@@ -17415,14 +17416,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17480,10 +17481,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Text"
 
@@ -17638,8 +17639,8 @@ msgstr "Tento mesiac"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17743,9 +17744,9 @@ msgstr "Časová perióda"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Časový posun"
 
@@ -17763,8 +17764,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Časový limit"
 
@@ -17790,7 +17791,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Do"
 
@@ -17814,7 +17815,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Hore"
@@ -17866,8 +17867,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17878,7 +17878,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17886,9 +17887,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Prenosová chyba."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17900,8 +17901,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Perióda uloženia trendov"
 
@@ -17919,9 +17920,9 @@ msgstr "Trendy"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Spúšťač"
@@ -18026,7 +18027,7 @@ msgstr "Prehľad spúšťačov"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Prototyp spúšťača"
@@ -18094,7 +18095,7 @@ msgstr "Prototypy spúšťačov zmazané"
 msgid "Trigger prototypes updated"
 msgstr "Prototypy spúšťačov aktualizované"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Závažnosť spúšťača"
 
@@ -18201,23 +18202,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Typ"
@@ -18226,12 +18227,12 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr "Typ (podrobne)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Typ (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18242,10 +18243,10 @@ msgstr "Typ kalkulácie"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Typ informácií"
 
@@ -18269,11 +18270,11 @@ msgstr "NEZNÁMY"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18294,7 +18295,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18319,7 +18320,7 @@ msgstr "URL parameter meno je prázdny."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLky"
@@ -18422,15 +18423,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18439,8 +18440,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Jednotky"
 
@@ -18466,7 +18467,7 @@ msgstr "Jednotky"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Neznámy"
@@ -18610,12 +18611,12 @@ msgstr "Dostupný"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18635,18 +18636,18 @@ msgstr "Dostupný"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18667,13 +18668,13 @@ msgstr "Aktualizovať existujúce"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Interval obnovovania"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18812,7 +18813,7 @@ msgstr "User agent reťazec"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18927,10 +18928,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Používateľské meno"
 
@@ -18999,7 +19000,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Používateľské zdieľanie je chýbajúci parameter: %1$s pre obrazovku \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19377,12 +19378,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19444,8 +19445,8 @@ msgstr "Mapa hodnôt \"%1$s\" už existuje."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Mapovanie hodnôt"
@@ -19562,8 +19563,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertikálny"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Vertikálne zarovnanie"
 
@@ -19768,8 +19769,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19780,12 +19780,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19861,8 +19862,8 @@ msgstr "Nesprávne polia pre linku mapy."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19874,11 +19875,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19892,8 +19893,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19913,12 +19914,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Maximálna hodnota osy Y"
 
@@ -19932,18 +19933,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Maximálna hodnota pre os Y musí byť väčšia ako minimálna hodnota pre túto os."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Minimálna hodnota osy Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Strana osi Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19963,11 +19964,11 @@ msgstr "d.m.Y H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20998,10 +20999,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "globálne nastavenia údržby"
@@ -21030,8 +21031,8 @@ msgstr "host"
 msgid "host group"
 msgstr "skupina"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -21064,7 +21065,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21238,8 +21239,8 @@ msgstr "položka"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21503,10 +21504,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21553,7 +21554,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21583,7 +21584,7 @@ msgstr ""
 msgid "of"
 msgstr "z"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21606,7 +21607,7 @@ msgstr "z"
 msgid "off"
 msgstr "off"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21778,8 +21779,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21916,8 +21917,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22204,17 +22205,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/sv/LC_MESSAGES/frontend.po b/ui/locale/sv/LC_MESSAGES/frontend.po
index 5ec3ca5205d..09e685dd2b7 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -335,7 +335,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 sekunder"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr ""
 
@@ -381,7 +381,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -471,27 +471,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr ""
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -563,35 +563,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -720,24 +720,24 @@ msgstr ""
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -773,13 +773,13 @@ msgstr ""
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -797,38 +797,38 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -855,7 +855,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -885,16 +885,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr ""
 
@@ -941,7 +941,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1029,7 +1029,7 @@ msgstr ""
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1037,11 +1037,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1068,8 +1068,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1085,8 +1085,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1102,13 +1102,13 @@ msgstr ""
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1129,19 +1129,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Tillåtna värdar"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1158,21 +1158,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr ""
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1186,7 +1186,7 @@ msgstr ""
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr ""
 
@@ -1231,11 +1231,11 @@ msgstr ""
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr ""
@@ -1363,11 +1363,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1461,8 +1461,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr ""
 
@@ -1524,8 +1524,8 @@ msgstr ""
 msgid "Automatic icon mapping"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr ""
 
@@ -1592,12 +1592,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Bakgrund"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1605,9 +1605,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Bakgrundsbild"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1615,8 +1615,8 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1659,15 +1659,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1678,8 +1678,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr ""
 
@@ -1687,19 +1687,19 @@ msgstr ""
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1712,7 +1712,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Nederkant"
@@ -1795,7 +1795,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Beräknade"
 
@@ -1819,22 +1819,22 @@ msgstr ""
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3427,8 +3427,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Tecken"
 
@@ -3456,7 +3456,7 @@ msgstr ""
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr ""
 
@@ -3577,8 +3577,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr ""
 
@@ -3606,22 +3606,22 @@ msgstr "Klocka"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr ""
@@ -3629,28 +3629,28 @@ msgstr ""
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3664,7 +3664,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3678,11 +3678,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3691,7 +3691,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3779,9 +3779,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Villkor"
@@ -3966,13 +3966,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4064,8 +4064,8 @@ msgstr "Kontakt"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4145,13 +4145,13 @@ msgstr ""
 msgid "Contract number"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr ""
 
@@ -4168,7 +4168,7 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4307,10 +4307,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4514,7 +4514,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4528,8 +4528,8 @@ msgstr "Anpassade diagram"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4695,8 +4695,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr ""
 
@@ -4714,7 +4714,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "Översikt över data"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4898,11 +4898,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Standard"
 
@@ -4944,7 +4944,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr ""
 
@@ -4978,7 +4978,7 @@ msgstr ""
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4987,7 +4987,7 @@ msgstr ""
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4995,47 +4995,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Ta bort"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr ""
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
@@ -5043,11 +5043,11 @@ msgstr ""
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -5060,10 +5060,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr ""
 
@@ -5087,11 +5087,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr ""
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr ""
 
@@ -5133,11 +5133,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5196,7 +5196,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr "Ta bort markerad värd?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Ta bort markerade värdar?"
 
@@ -5204,11 +5204,11 @@ msgstr "Ta bort markerade värdar?"
 msgid "Delete selected image?"
 msgstr "Ta bort markerad bild?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr ""
 
@@ -5224,7 +5224,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr ""
 
@@ -5256,11 +5256,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5268,19 +5268,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr ""
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr ""
 
@@ -5296,11 +5296,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr ""
 
@@ -5326,7 +5326,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr ""
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5341,10 +5341,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr ""
 
@@ -5381,7 +5381,7 @@ msgstr ""
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5391,13 +5391,13 @@ msgstr ""
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Beskrivning"
@@ -5407,10 +5407,10 @@ msgstr "Beskrivning"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detaljer"
@@ -5451,7 +5451,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5502,11 +5502,11 @@ msgstr ""
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5535,7 +5535,7 @@ msgstr ""
 msgid "Disable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr ""
 
@@ -5569,7 +5569,7 @@ msgstr ""
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5597,7 +5597,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Inaktiverad"
 
@@ -5623,9 +5623,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5820,7 +5820,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr ""
 
@@ -5828,13 +5828,13 @@ msgstr ""
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5858,15 +5858,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5880,8 +5880,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5891,8 +5891,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5902,8 +5902,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5911,8 +5911,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr ""
 
@@ -5941,16 +5941,16 @@ msgstr ""
 msgid "Downtime"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Ritstil"
 
@@ -6001,7 +6001,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Längd"
 
@@ -6024,29 +6024,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Redigera"
@@ -6100,12 +6100,12 @@ msgstr ""
 msgid "Element"
 msgstr ""
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Elementnamn"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6161,7 +6161,7 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6241,11 +6241,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6275,7 +6275,7 @@ msgstr ""
 msgid "Enable selected items?"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr ""
 
@@ -6297,8 +6297,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6320,7 +6320,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6336,7 +6336,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6350,14 +6350,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Aktiverad"
 
@@ -6410,8 +6410,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6588,7 +6588,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6609,8 +6609,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr ""
 
@@ -6624,13 +6624,13 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6700,15 +6700,15 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6721,10 +6721,10 @@ msgstr "Uttryck"
 msgid "Expression cannot be empty"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr ""
 
@@ -6792,7 +6792,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6926,8 +6926,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6938,7 +6937,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7035,7 +7035,7 @@ msgid "Fit to map"
 msgstr ""
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Fast"
 
@@ -7047,9 +7047,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7057,22 +7057,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7080,8 +7080,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr ""
 
@@ -7117,7 +7117,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Från"
 
@@ -7132,7 +7132,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr ""
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr ""
 
@@ -7148,7 +7148,7 @@ msgid "Full clone"
 msgstr ""
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Funktion"
 
@@ -7566,8 +7566,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr ""
 
@@ -7578,8 +7578,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7616,10 +7616,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7635,7 +7635,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7741,7 +7741,7 @@ msgid "History cleared"
 msgstr "Historik rensad"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr ""
 
@@ -7756,8 +7756,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7774,8 +7774,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Horisontell justering"
 
@@ -7894,7 +7894,7 @@ msgstr[1] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7980,9 +7980,9 @@ msgstr "Värdgrupper"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr ""
 
@@ -8270,8 +8270,8 @@ msgstr ""
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr ""
 
@@ -8285,19 +8285,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Ikon"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr ""
 
@@ -8344,7 +8344,7 @@ msgstr ""
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr ""
 
@@ -8488,7 +8488,7 @@ msgstr "Bilder"
 msgid "Images for all maps will be updated!"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr ""
 
@@ -8572,6 +8572,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9456,10 +9457,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr ""
@@ -9526,8 +9527,8 @@ msgstr ""
 msgid "Insert"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9643,9 +9644,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr ""
@@ -10082,7 +10083,7 @@ msgstr "Italienska (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Objekt"
 
@@ -10345,8 +10346,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10364,8 +10365,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10404,8 +10405,8 @@ msgstr "Japanska (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10444,9 +10445,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Nyckel"
@@ -10512,13 +10513,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Etikett"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Etikettposition"
 
@@ -10665,9 +10666,9 @@ msgstr "Lettiska (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10678,7 +10679,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Vänster"
@@ -10711,25 +10712,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10751,9 +10752,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr ""
 
@@ -10784,8 +10785,8 @@ msgstr ""
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10887,8 +10888,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Logg"
 
@@ -10901,8 +10902,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Tidsformat för logg"
 
@@ -11028,7 +11029,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr ""
 
@@ -11188,7 +11189,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11266,19 +11267,19 @@ msgstr ""
 msgid "Mass update"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11362,8 +11363,8 @@ msgid "May"
 msgstr ""
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11487,8 +11488,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr ""
 
@@ -11506,7 +11507,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr ""
 
@@ -11605,11 +11606,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11777,8 +11778,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11944,7 +11945,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11964,15 +11965,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11981,16 +11982,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12270,7 +12271,7 @@ msgstr ""
 msgid "No discovery rule IDs given."
 msgstr ""
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12326,8 +12327,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr ""
 
@@ -12631,7 +12632,7 @@ msgstr ""
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12677,8 +12678,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12686,17 +12687,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Ingen"
@@ -12792,7 +12793,7 @@ msgstr "Notifieringsrapport"
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12966,8 +12967,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Numerisk (flyttal)"
 
@@ -12977,8 +12978,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Numerisk (heltal 64-bit)"
 
@@ -12986,8 +12987,8 @@ msgstr "Numerisk (heltal 64-bit)"
 msgid "OEM"
 msgstr ""
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12999,13 +13000,13 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -13066,7 +13067,7 @@ msgstr "AV"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13095,7 +13096,7 @@ msgstr "P"
 msgid "On status change triggers blink for"
 msgstr ""
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr ""
 
@@ -13216,11 +13217,11 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr ""
@@ -13266,7 +13267,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13281,11 +13282,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13380,8 +13381,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13598,8 +13599,8 @@ msgstr ""
 msgid "PROBLEM"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13681,8 +13682,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13730,8 +13731,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13762,12 +13763,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13800,12 +13801,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13818,7 +13819,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13861,8 +13862,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Period"
@@ -13883,9 +13884,9 @@ msgid "Periods"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13896,7 +13897,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr ""
 
@@ -13918,12 +13919,12 @@ msgstr ""
 msgid "Plain text"
 msgstr "Ren text"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr ""
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr ""
 
@@ -13953,8 +13954,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13964,14 +13964,15 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13979,7 +13980,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr ""
 
@@ -14041,16 +14042,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14147,8 +14148,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr ""
 
@@ -14178,7 +14179,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr ""
 
@@ -14367,16 +14368,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr ""
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr ""
 
@@ -14390,8 +14391,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14441,8 +14442,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14468,14 +14469,14 @@ msgstr "Endast läs"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14489,14 +14490,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Läs-skriv"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14542,7 +14543,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14551,10 +14552,10 @@ msgid "Recovery"
 msgstr ""
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14564,7 +14565,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14576,8 +14577,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14683,7 +14684,7 @@ msgstr "Fjärrkommando"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14714,13 +14715,13 @@ msgstr "Fjärrkommando"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14728,25 +14729,25 @@ msgstr "Fjärrkommando"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14774,14 +14775,14 @@ msgstr "Fjärrkommando"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14856,10 +14857,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr ""
 
@@ -14877,7 +14878,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14916,15 +14917,15 @@ msgstr "Rapporter"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14933,8 +14934,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14961,8 +14962,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr ""
 
@@ -14975,11 +14976,11 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr ""
 
@@ -14996,11 +14997,11 @@ msgstr ""
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr ""
 
@@ -15104,8 +15105,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15178,9 +15179,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15188,7 +15189,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Rättighet"
@@ -15204,8 +15205,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15395,8 +15396,8 @@ msgstr ""
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15475,8 +15476,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15501,38 +15502,38 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15651,9 +15652,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15678,8 +15679,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Skript"
 
@@ -15811,10 +15812,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Välj"
@@ -15824,9 +15825,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr ""
 
@@ -15847,7 +15848,7 @@ msgstr ""
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr ""
 
@@ -16197,8 +16198,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16301,7 +16302,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16401,8 +16402,8 @@ msgstr "Enkelt diagram"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16447,7 +16448,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16558,9 +16559,9 @@ msgstr ""
 msgid "Stacked"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16581,7 +16582,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr ""
 
@@ -16776,14 +16777,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr ""
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr ""
 
@@ -16806,10 +16807,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17045,8 +17046,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -17105,28 +17106,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr ""
@@ -17287,14 +17288,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr ""
@@ -17352,10 +17353,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Text"
 
@@ -17508,8 +17509,8 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17613,9 +17614,9 @@ msgstr "Tidsperiod"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr ""
 
@@ -17633,8 +17634,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr ""
 
@@ -17660,7 +17661,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr ""
 
@@ -17684,7 +17685,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Överkant"
@@ -17736,8 +17737,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17748,7 +17748,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17756,9 +17757,9 @@ msgstr ""
 msgid "Transport error."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17770,8 +17771,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17789,9 +17790,9 @@ msgstr "Trender"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Utlösare"
@@ -17893,7 +17894,7 @@ msgstr "Översikt över utlösare"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr ""
@@ -17959,7 +17960,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Allvarlighetsgrad för utlösare"
 
@@ -18066,23 +18067,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Typ"
@@ -18091,12 +18092,12 @@ msgstr "Typ"
 msgid "Type (Full details)"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr ""
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18107,10 +18108,10 @@ msgstr ""
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Typ av information"
 
@@ -18134,11 +18135,11 @@ msgstr "OKÄNT"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18159,7 +18160,7 @@ msgstr ""
 msgid "URL C"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18184,7 +18185,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr ""
@@ -18287,15 +18288,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18304,8 +18305,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Enheter"
 
@@ -18331,7 +18332,7 @@ msgstr "Enheter"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Okänd"
@@ -18474,12 +18475,12 @@ msgstr ""
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18499,18 +18500,18 @@ msgstr ""
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18531,13 +18532,13 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Uppdateringsintervall"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18676,7 +18677,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18788,10 +18789,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr ""
 
@@ -18859,7 +18860,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19236,12 +19237,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19303,8 +19304,8 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Värdesmappning"
@@ -19421,8 +19422,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Vertikal justering"
 
@@ -19625,8 +19626,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19637,12 +19637,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19718,8 +19719,8 @@ msgstr ""
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19731,11 +19732,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19749,8 +19750,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19770,12 +19771,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "MAX-värde för Y-axel"
 
@@ -19789,18 +19790,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "MIN-värde för Y-axel"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Y-axel"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19820,11 +19821,11 @@ msgstr ""
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20855,10 +20856,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr ""
@@ -20887,8 +20888,8 @@ msgstr ""
 msgid "host group"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20921,7 +20922,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -21095,8 +21096,8 @@ msgstr ""
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21360,10 +21361,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21410,7 +21411,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21440,7 +21441,7 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21463,7 +21464,7 @@ msgstr ""
 msgid "off"
 msgstr ""
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21635,8 +21636,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21773,8 +21774,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22061,17 +22062,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/tr/LC_MESSAGES/frontend.po b/ui/locale/tr/LC_MESSAGES/frontend.po
index 0f0211d3a0c..a8a600ca3c6 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix translation team\n"
@@ -180,10 +180,10 @@ msgid_plural "%1$s messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -228,9 +228,9 @@ msgid_plural "%1$s retries left"
 msgstr[0] "Kalan deneme sayısı %1$s"
 msgstr[1] "Kalan deneme sayısı %1$s"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -336,7 +336,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 saniye"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3B görünüm"
 
@@ -383,7 +383,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -473,27 +473,27 @@ msgstr "Erişim reddedildi"
 msgid "Access denied!"
 msgstr "Erişim reddedildi!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -565,35 +565,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -722,24 +722,24 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -775,13 +775,13 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -799,38 +799,38 @@ msgstr "Şu zamana kadar aktif"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -857,7 +857,7 @@ msgstr "Alt öğe ekle"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -878,7 +878,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Birden çok harita ekle"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -887,16 +887,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -906,7 +906,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Prototip ekle"
 
@@ -943,7 +943,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Parçacık ekle"
@@ -1031,7 +1031,7 @@ msgstr "Aracı arayüzleri"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1039,11 +1039,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1070,8 +1070,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1087,8 +1087,8 @@ msgid "All dashboards"
 msgstr "Tüm panolar"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Tüm gruplar"
 
@@ -1104,13 +1104,13 @@ msgstr "Tüm bağlantılarda \"Name\" ve \"URL\" tanımlanmış olmalıdır"
 msgid "All maps"
 msgstr "Tüm haritalar"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Tüm problemler"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Etiket değerleri eşleşiyorsa tüm problemler"
 
@@ -1131,19 +1131,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Elle kapatmaya izin ver"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "İzin verilen ana makineler"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1160,21 +1160,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "Ve"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1188,7 +1188,7 @@ msgstr "Ve"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "Ve/Veya"
 
@@ -1233,11 +1233,11 @@ msgstr "Uygulama hatası."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Uygula"
@@ -1365,11 +1365,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1463,8 +1463,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Kimlik doğrulama yöntemi"
 
@@ -1526,8 +1526,8 @@ msgstr "Otomatik"
 msgid "Automatic icon mapping"
 msgstr "Otomatik simge haritası"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Otomatik simge seçimi"
 
@@ -1594,12 +1594,12 @@ msgstr "Geri"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Arkaplan"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1607,9 +1607,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Arkaplan resmi"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1617,8 +1617,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1661,15 +1661,15 @@ msgstr "Mavi"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1680,8 +1680,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Kalın çizgi"
 
@@ -1689,19 +1689,19 @@ msgstr "Kalın çizgi"
 msgid "Boolean to decimal"
 msgstr "boole'saldan ondalık sayıya"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Sınır"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Sınır türü"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Sınır genişliği"
 
@@ -1714,7 +1714,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Alt"
@@ -1798,7 +1798,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Hesaplanmış"
 
@@ -1822,22 +1822,22 @@ msgstr "Geri çağırma"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3431,8 +3431,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Karakter"
 
@@ -3460,7 +3460,7 @@ msgstr "Şasi"
 msgid "Chassis information. Returns string"
 msgstr "Şasi bilgisi. Karakter dizgisi döndürür"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Halihazırda olanları kontrol et."
 
@@ -3581,8 +3581,8 @@ msgid "Clear history"
 msgstr "Geçmişi temizle"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Geçmişi ve eğilimleri temizle"
 
@@ -3610,22 +3610,22 @@ msgstr "Saat"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Klonla"
@@ -3633,28 +3633,28 @@ msgstr "Klonla"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Kapat"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "İfade düzenleyicisini kapat"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Yeni olayı kapat"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Eski olayları kapat"
@@ -3668,7 +3668,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Daralt"
@@ -3682,11 +3682,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3695,7 +3695,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3783,9 +3783,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Koşullar"
@@ -3970,13 +3970,13 @@ msgstr "Tebrikler! Zabbix önyüzünü başarıyla kurdunuz."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Bağlan"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -4068,8 +4068,8 @@ msgstr "Kontak"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4149,13 +4149,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Kontak numarası"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Koordinatlar"
 
@@ -4172,7 +4172,7 @@ msgstr "Kopyala"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Korelasyon"
 
@@ -4312,10 +4312,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4519,7 +4519,7 @@ msgid "Custom"
 msgstr "Özel"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4533,8 +4533,8 @@ msgstr "Özel grafikler"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Özel aralıklar"
 
@@ -4700,8 +4700,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "Panolar"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Kesikli çizgi"
 
@@ -4719,7 +4719,7 @@ msgstr "Veriler doğru kodlanmamış."
 msgid "Data overview"
 msgstr "Verilere genel bakış"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4903,11 +4903,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Öntanımlı"
 
@@ -4949,7 +4949,7 @@ msgstr ""
 msgid "Default media type"
 msgstr "Öntanımlı medya türü"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Öntanımlı operasyon adımı süresi"
 
@@ -4983,7 +4983,7 @@ msgstr "Gecikmenin yapıldığı"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4992,7 +4992,7 @@ msgstr "Gecikmenin yapıldığı"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5000,47 +5000,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Sil"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Sil ve temizle"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Seçilen şablonlar silinsin ve temizlensin mi? (Uyarı: bütün bağlantılı ana makineler temizlenecektir!)"
 
@@ -5048,11 +5048,11 @@ msgstr "Seçilen şablonlar silinsin ve temizlensin mi? (Uyarı: bütün bağlan
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Şablon silinsin ve temizlensin mi? (Uyarı: bütün bağlantılı ana makineler temizlenecektir!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Şu anki eylem silinsin mi?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Mevcut korelasyon silinsin mi?"
 
@@ -5065,10 +5065,10 @@ msgstr "Pano silinsin mi?"
 msgid "Delete discovery rule?"
 msgstr "Keşif kuralı silinsin mi?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "İfade silinsin mi?"
 
@@ -5092,11 +5092,11 @@ msgstr "Seçilen web senaryolarının geçmişi silinsin mi?"
 msgid "Delete icon map?"
 msgstr "Simge eşlemesi silinsin mi?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Öğe prototipi silinsin mi?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Öğe silinsin mi?"
 
@@ -5138,11 +5138,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5201,7 +5201,7 @@ msgstr "Seçili ana makine prototipleri silinsin mi?"
 msgid "Delete selected host?"
 msgstr "Seçilen ana makine silinsin mi?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Seçilen ana makineler silinsin mi?"
 
@@ -5209,11 +5209,11 @@ msgstr "Seçilen ana makineler silinsin mi?"
 msgid "Delete selected image?"
 msgstr "Seçilen resim silinsin mi?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Seçili öğe prototipleri silinsin mi?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Seçilen öğeler silinsin mi?"
 
@@ -5229,7 +5229,7 @@ msgstr "Seçilen harita silinsin mi?"
 msgid "Delete selected maps?"
 msgstr "Seçilen haritalar silinsin mi?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Seçilen medya türleri silinsin mi?"
 
@@ -5261,11 +5261,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Seçilen betikler silinsin mi?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5273,19 +5273,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Seçilen şekiller silinsin mi?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Seçilen şablonlar silinsin mi?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Seçili tetikleyici prototipleri silinsin mi?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Seçilen tetikleyiciler silinsin mi?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Seçilen kullanıcı silinsin mi?"
 
@@ -5301,11 +5301,11 @@ msgstr "Seçilen web senaryoları silinsin mi?"
 msgid "Delete template?"
 msgstr "Şablon silinsin mi?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Seçili tetikleyici prototipi silinsin mi?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Tetikleyici silinsin mi?"
 
@@ -5331,7 +5331,7 @@ msgstr "Silindi: \"%2$s\" üzerindeki \"%1$s\" ana makine prototipi."
 msgid "Delimiter"
 msgstr "Sınırlayıcı"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5346,10 +5346,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Bağımlılıklar"
 
@@ -5386,7 +5386,7 @@ msgstr "Dağıtım durumu"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5396,13 +5396,13 @@ msgstr "Dağıtım durumu"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Açıklama"
@@ -5412,10 +5412,10 @@ msgstr "Açıklama"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Detaylar"
@@ -5456,7 +5456,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5507,11 +5507,11 @@ msgstr "Seçilen vekil sunucular tarafından izlenen ana makineler devre dışı
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5540,7 +5540,7 @@ msgstr "Seçilen ana makineler devre dışı bırakılsın mı?"
 msgid "Disable selected items?"
 msgstr "Seçilen öğeler devre dışı bırakılsın mı?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Seçilen medya türleri devre dışı bırakılsın mı?"
 
@@ -5574,7 +5574,7 @@ msgstr "Seçilen web senaryoları devre dışı bırakılsın mı?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5602,7 +5602,7 @@ msgstr "Seçilen web senaryoları devre dışı bırakılsın mı?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Devre dışı"
 
@@ -5628,9 +5628,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5826,7 +5826,7 @@ msgstr "Disk yazma istatistikleri. Sektörler, işlemler ve bayt türünde tam s
 msgid "Display OK triggers for"
 msgstr "Bunlar için TAMAM tetikleyicilerini göster"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Grafiği göster"
 
@@ -5834,13 +5834,13 @@ msgstr "Grafiği göster"
 msgid "Display problems"
 msgstr "Görüntüleme problemleri"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Yığılmış grafik göster"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5864,15 +5864,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5886,8 +5886,8 @@ msgstr "Koşulsal ifadeyi değiştirmek ister misiniz?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5897,8 +5897,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5908,8 +5908,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5917,8 +5917,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Nokta"
 
@@ -5947,16 +5947,16 @@ msgstr "Yapılandırma dosyasını indir"
 msgid "Downtime"
 msgstr "Aksama Süresi"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Çizim stili"
 
@@ -6007,7 +6007,7 @@ msgstr "\"%2$s\" haritası için kullanıcılarda \"%1$s\" userid'si mükerrer."
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Süre"
 
@@ -6030,29 +6030,29 @@ msgstr ""
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Düzenle"
@@ -6106,12 +6106,12 @@ msgstr "Elasticsearch hatası: %1$s."
 msgid "Element"
 msgstr "Eleman"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Eleman ismi"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Elips"
 
@@ -6167,7 +6167,7 @@ msgstr "Boş giriş parametresi."
 msgid "Empty map ID."
 msgstr "Boş harita ID'si."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6247,11 +6247,11 @@ msgstr "Dahili temizlik hizmetini etkinleştir"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6281,7 +6281,7 @@ msgstr "Seçilen ana makineler etkinleştirilsin mi?"
 msgid "Enable selected items?"
 msgstr "Seçilen öğeler etkinleştirilsin mi?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Seçili medya türleri etkinleştirilsin mi?"
 
@@ -6303,8 +6303,8 @@ msgstr "Seçilen web senaryoları etkinleştirilsin mi?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6326,7 +6326,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6342,7 +6342,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6356,14 +6356,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Etkin"
 
@@ -6416,8 +6416,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6594,7 +6594,7 @@ msgstr "WMI sorgusunu çalıştırır ve ilk seçilen nesneyi döndürür. Tam s
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6615,8 +6615,8 @@ msgstr "Çalıştırılmış"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Çalıştırılmış betik"
 
@@ -6630,13 +6630,13 @@ msgstr "Çalıştırma onayı"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Genişlet"
@@ -6706,15 +6706,15 @@ msgstr "CSV'e aktar"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6727,10 +6727,10 @@ msgstr "İfade"
 msgid "Expression cannot be empty"
 msgstr "İfade boş olamaz"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "İfade kurucusu"
 
@@ -6798,7 +6798,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Pano oluşturma başarısız"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "URL ayrıştırılamadı."
@@ -6932,8 +6932,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Dosya zaman bilgisi. Tam sayı döndürür (Unix zaman damgası)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6944,7 +6943,8 @@ msgstr "Dosya zaman bilgisi. Tam sayı döndürür (Unix zaman damgası)"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -7041,7 +7041,7 @@ msgid "Fit to map"
 msgstr "Haritaya sığdır"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Sabit"
 
@@ -7053,9 +7053,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7063,22 +7063,22 @@ msgstr "Esnek"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Yeniden yönlendirmeleri takip et"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Yazıtipi"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Yazıtipi boyutu"
 
@@ -7086,8 +7086,8 @@ msgstr "Yazıtipi boyutu"
 msgid "Form data"
 msgstr "Form verisi"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Formül"
 
@@ -7123,7 +7123,7 @@ msgstr "Cuma"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Kimden"
 
@@ -7138,7 +7138,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Önyüz erişimi"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Önyüz mesajlaşması"
 
@@ -7154,7 +7154,7 @@ msgid "Full clone"
 msgstr "Tam klonla"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Fonksiyon"
 
@@ -7571,8 +7571,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP kimlik doğrulaması"
 
@@ -7583,8 +7583,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP vekil sunucusu"
 
@@ -7621,10 +7621,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Başlık bilgileri"
 
@@ -7640,7 +7640,7 @@ msgstr "İbranice (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7746,7 +7746,7 @@ msgid "History cleared"
 msgstr "Geçmiş temizlendi"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Geçmişi temizlemek uzun zaman alabilir. Devam edilsin mi?"
 
@@ -7761,8 +7761,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Geçmiş saklama dönemi"
 
@@ -7779,8 +7779,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Yatay"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Yatay hizalama"
 
@@ -7899,7 +7899,7 @@ msgstr[1] "Ana makineler etkin"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7985,9 +7985,9 @@ msgstr "Ana makine grupları"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Ana makine arayüzü"
 
@@ -8275,8 +8275,8 @@ msgstr "IPMI arabirimleri"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI algılayıcısı"
 
@@ -8290,19 +8290,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Simge"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Simge (öntanımlı)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Simge (devre dışı)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Simge (bakım)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Simge (problem)"
 
@@ -8349,7 +8349,7 @@ msgstr "Simge eşleştirme"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li simge mevcut değil."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Simgeler"
 
@@ -8493,7 +8493,7 @@ msgstr "Resimler"
 msgid "Images for all maps will be updated!"
 msgstr "Tüm haritalar için resimler güncellenecek!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Hemen"
 
@@ -8577,6 +8577,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9461,10 +9462,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Bilgi"
@@ -9531,8 +9532,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Ekle"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "İfade ekle"
 
@@ -9648,9 +9649,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Zaman aralığı"
@@ -10087,7 +10088,7 @@ msgstr "İtalyanca (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Öğe"
 
@@ -10350,8 +10351,8 @@ msgstr "JMX aracısı"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX bitiş noktası"
 
@@ -10369,8 +10370,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10409,8 +10410,8 @@ msgstr "Japonca (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10449,9 +10450,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Anahtar"
@@ -10517,13 +10518,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Etiket"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Etiket konumu"
 
@@ -10670,9 +10671,9 @@ msgstr "Letonca (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10683,7 +10684,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Sol"
@@ -10716,25 +10717,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Arama ve filtreleme sonuçları için sınırlama"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Satır"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Çizgi türü"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Çizgi genişliği"
 
@@ -10756,9 +10757,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Bağlantı göstergeleri"
 
@@ -10789,8 +10790,8 @@ msgstr "Bağlantılı olduğu şablonlar"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Bağlantılar"
 
@@ -10892,8 +10893,8 @@ msgstr "Konum boylamı"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Günlük"
 
@@ -10906,8 +10907,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Kayıt dosyası izlemesi. Sistem günlüğü döndürür"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Günlük zaman biçimi"
 
@@ -11033,7 +11034,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Bakım"
 
@@ -11193,7 +11194,7 @@ msgstr "Harita gezinti ağacı"
 msgid "Map owner cannot be empty."
 msgstr "Harita sahibi boş olamaz."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Harita şekli"
 
@@ -11271,19 +11272,19 @@ msgstr "Maske"
 msgid "Mass update"
 msgstr "Toplu güncelleme"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Elemanları toplu güncelleme"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Şekilleri toplu güncelle"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Ana öğe"
 
@@ -11367,8 +11368,8 @@ msgid "May"
 msgstr "May"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Medya"
 
@@ -11492,8 +11493,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Mesaj zaman aşımı"
 
@@ -11511,7 +11512,7 @@ msgstr ""
 msgid "Messages"
 msgstr "Mesajlar"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Mesajlaşma"
 
@@ -11610,11 +11611,11 @@ msgstr "Grafik prototipi için eksik \"name\" alanı."
 msgid "Missing \"name\" field for graph."
 msgstr "Grafik için eksik \"name\" alanı."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11782,8 +11783,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Çoklu"
 
@@ -11949,7 +11950,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11969,15 +11970,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11986,16 +11987,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12275,7 +12276,7 @@ msgstr "Hiçbir detay yok"
 msgid "No discovery rule IDs given."
 msgstr "Hiçbir keşif kuralı ID'si verilmedi."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12331,8 +12332,8 @@ msgstr "Resim yok"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Hiçbir arabirim bulunamadı"
 
@@ -12636,7 +12637,7 @@ msgstr "Hiçbir açık anahtar dosyası belirtilmemiş."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Tazeleme yok"
 
@@ -12682,8 +12683,8 @@ msgstr "Boole-dışı bayraklar kullanımdan kaldırıldı."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12691,17 +12692,17 @@ msgstr "Boole-dışı bayraklar kullanımdan kaldırıldı."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Hiçbiri"
@@ -12797,7 +12798,7 @@ msgstr "Bildirim raporu"
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12971,8 +12972,8 @@ msgstr "Sayısal sistemler"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Sayısal (kayan noktalı)"
 
@@ -12982,8 +12983,8 @@ msgstr "Sayısal (tam sayısal)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Sayısal (işaretsiz)"
 
@@ -12991,8 +12992,8 @@ msgstr "Sayısal (işaretsiz)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13004,13 +13005,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "TAMAM"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "TAMAM olayı kapatır"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "TAMAM olayı oluşumları"
 
@@ -13071,7 +13072,7 @@ msgstr "Kapalı"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13100,7 +13101,7 @@ msgstr "Açık"
 msgid "On status change triggers blink for"
 msgstr "Durum değişikliğinde tetikleyiciler şunun için yanıp söner"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Bir kere"
 
@@ -13221,11 +13222,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "İşlemler"
@@ -13271,7 +13272,7 @@ msgstr "Seçenekler"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13286,11 +13287,11 @@ msgstr "Seçenekler"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Veya"
 
@@ -13385,8 +13386,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Tarafından geçersiz kılınır"
@@ -13603,8 +13604,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "SORUN"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "PROBLEM olayı oluşturma kipi"
 
@@ -13686,8 +13687,8 @@ msgstr "\"%1$s\" parametresi kullanımdan kaldırıldı."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Parametreler"
 
@@ -13735,8 +13736,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Ayrıştır"
 
@@ -13767,12 +13768,12 @@ msgstr "Pasif"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13805,12 +13806,12 @@ msgid "Paste"
 msgstr "Yapıştır"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13823,7 +13824,7 @@ msgstr "Harici bağlantılar olmadan yapıştır"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13866,8 +13867,8 @@ msgstr "Bir DNS sorgusu gerçekleştirir. Gerekli bilgi türünü içeren karakt
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Dönem"
@@ -13888,9 +13889,9 @@ msgid "Periods"
 msgstr "Dönemler"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13901,7 +13902,7 @@ msgstr "Dönemler"
 msgid "Permissions"
 msgstr "İzinler"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "İzinler yalnızca kullanıcı grupları için atanabilir."
 
@@ -13923,12 +13924,12 @@ msgstr "Yerleştirme algoritması"
 msgid "Plain text"
 msgstr "Düz metin"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Oynat"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Sesi oynat"
 
@@ -13958,8 +13959,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Lütfen iki eleman seçiniz"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13969,14 +13969,15 @@ msgstr "Lütfen iki eleman seçiniz"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Noktalar"
 
@@ -13984,7 +13985,7 @@ msgstr "Noktalar"
 msgid "Polish (pl_PL)"
 msgstr "Lehçe (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Ana makine envanter alanını doldurur"
 
@@ -14046,16 +14047,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Ön işleme"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Ön işleme adımları"
 
@@ -14152,8 +14153,8 @@ msgstr "Özel"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Özel anahtar dosyası"
 
@@ -14183,7 +14184,7 @@ msgstr "Öncelik seviyesi"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Problem"
 
@@ -14372,16 +14373,16 @@ msgstr "Herkese açık"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Açık anahtar"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Açık anahtar dosyası"
 
@@ -14395,8 +14396,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Sorgu alanları"
 
@@ -14446,8 +14447,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Ham veri"
 
@@ -14473,14 +14474,14 @@ msgstr "Yalnızca okuma"
 msgid "Read-only"
 msgstr "Yalnızca okunur"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14494,14 +14495,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Okuma-Yazma"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14547,7 +14548,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14556,10 +14557,10 @@ msgid "Recovery"
 msgstr "Kurtarma"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Kurtarma ifadesi"
@@ -14569,7 +14570,7 @@ msgstr "Kurtarma ifadesi"
 msgid "Recovery expression syntax error."
 msgstr "Kurtarma ifadesi sözdizimi hatası."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Kurtarma işlemleri"
 
@@ -14581,8 +14582,8 @@ msgstr "Kurtarma işlemleri"
 msgid "Recovery time"
 msgstr "Kurtarma zamanı"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Dikdörtgen"
 
@@ -14688,7 +14689,7 @@ msgstr "Uzak komut"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14719,13 +14720,13 @@ msgstr "Uzak komut"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14733,25 +14734,25 @@ msgstr "Uzak komut"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14779,14 +14780,14 @@ msgstr "Uzak komut"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14861,10 +14862,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Değiştir"
 
@@ -14882,7 +14883,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14921,15 +14922,15 @@ msgstr "Raporlar"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14938,8 +14939,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14966,8 +14967,8 @@ msgstr "Gerekli sunucu performansı, saniye başına yeni değer"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Gerekli durum kodları"
 
@@ -14980,11 +14981,11 @@ msgstr "Gerekli string"
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Tüm alanlar öntanımlı değerlerine sıfırlansın mı?"
 
@@ -15001,11 +15002,11 @@ msgstr "Sıfırlama onayı"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Öntanımlılara sıfırla"
 
@@ -15109,8 +15110,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15183,9 +15184,9 @@ msgstr "Kayıp ICMP ping paketlerinin yüzdesini döndürür."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15193,7 +15194,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Hak"
@@ -15209,8 +15210,8 @@ msgstr ""
 msgid "Right trim"
 msgstr "Sağ kırpma"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15400,8 +15401,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15480,8 +15481,8 @@ msgstr "SQL sayısı: %1$s (seçer: %2$s | çalıştırır: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL sorgusu"
 
@@ -15506,38 +15507,38 @@ msgstr "SSH aracısı"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "SSL sertifika dosyası"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "SSL anahtar dosyası"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "SSL anahtarı parola deyimi"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL doğrulama ana makinesi"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL eşini doğrula"
 
@@ -15656,9 +15657,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15683,8 +15684,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Betik"
 
@@ -15816,10 +15817,10 @@ msgstr "Güvenlik adı"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Seç"
@@ -15829,9 +15830,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Prototip seç"
 
@@ -15852,7 +15853,7 @@ msgstr "Seçilen eylemler silindi"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Seçilen öğeler"
 
@@ -16202,8 +16203,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Şekil"
@@ -16306,7 +16307,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16406,8 +16407,8 @@ msgstr "Basit grafik"
 msgid "Simple graph prototype"
 msgstr "Basit grafik prototipi"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Tek"
 
@@ -16453,7 +16454,7 @@ msgstr "Site eyalet/il"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Boyut"
 
@@ -16564,9 +16565,9 @@ msgstr "Hız"
 msgid "Stacked"
 msgstr "Yığılı"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16587,7 +16588,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Başlama yeri"
 
@@ -16782,14 +16783,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "\"%1$s\" adına sahip adım halihazırda mevcut."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Adımlar"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Dur"
 
@@ -16812,10 +16813,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17051,8 +17052,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Eşleşme için etiket"
 
@@ -17111,28 +17112,28 @@ msgstr "Etiket değeri"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Etiketler"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Hedef"
@@ -17293,14 +17294,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Test"
@@ -17358,10 +17359,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Metin"
 
@@ -17514,8 +17515,8 @@ msgstr "Bu ay"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17619,9 +17620,9 @@ msgstr "Zaman dönemi"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Zaman ötelemesi"
 
@@ -17639,8 +17640,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
@@ -17666,7 +17667,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "Kime"
 
@@ -17690,7 +17691,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Üst"
@@ -17742,8 +17743,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17754,7 +17754,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17762,9 +17763,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "Aktarım hatası."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17776,8 +17777,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Eğilim depolama süresi"
 
@@ -17795,9 +17796,9 @@ msgstr "Yönelimler"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Tetikleyici"
@@ -17899,7 +17900,7 @@ msgstr "Tetikleyicilere genel bakış"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Tetikleyici prototipi"
@@ -17965,7 +17966,7 @@ msgstr "Tetikleyici prototipleri silindi"
 msgid "Trigger prototypes updated"
 msgstr "Tetikleyici prototipleri güncellendi"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Tetikleyici önem derecesi"
 
@@ -18072,23 +18073,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Tür"
@@ -18097,12 +18098,12 @@ msgstr "Tür"
 msgid "Type (Full details)"
 msgstr "Tür (Bütün detaylar)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Tür (TAMAM)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18113,10 +18114,10 @@ msgstr "Hesaplama türü"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Bilgi türü"
 
@@ -18140,11 +18141,11 @@ msgstr "BİLİNMEYEN"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18165,7 +18166,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL düzgün şekilde kodlanmamış."
@@ -18190,7 +18191,7 @@ msgstr "URL parametre adı boş."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URL'ler"
@@ -18293,15 +18294,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18310,8 +18311,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Birim"
 
@@ -18337,7 +18338,7 @@ msgstr "Birim"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Bilinmeyen"
@@ -18480,12 +18481,12 @@ msgstr "Açık"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18505,18 +18506,18 @@ msgstr "Açık"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18537,13 +18538,13 @@ msgstr "Varolanları güncelle"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Güncelleme zaman aralığı"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18682,7 +18683,7 @@ msgstr "Kullanıcı aracısı stringi"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18794,10 +18795,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Kullanıcı adı"
 
@@ -18865,7 +18866,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Kullanıcı paylaşımında eksik parametreler: \"%2$s\" haritası için %1$s."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19242,12 +19243,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19309,8 +19310,8 @@ msgstr "\"%1$s\" değer eşlemesi zaten var."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Değer eşlemesi"
@@ -19427,8 +19428,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Dikey"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Dikey hizalama"
 
@@ -19631,8 +19632,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19643,12 +19643,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19724,8 +19725,8 @@ msgstr "Harita bağlantısı için yanlış alanlar."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19737,11 +19738,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19755,8 +19756,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19776,12 +19777,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Y ekseni MAKS değer"
 
@@ -19795,18 +19796,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y ekseni MAKS değeri, Y ekseni MİN değerinden büyük olmalıdır."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Y ekseni MIN değer"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Y ekseni tarafı"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19826,11 +19827,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20861,10 +20862,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "genel temizlik hizmeti ayarları"
@@ -20893,8 +20894,8 @@ msgstr "ana makine"
 msgid "host group"
 msgstr "ana makine grubu"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20927,7 +20928,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "alt gruplar dahil"
 
@@ -21101,8 +21102,8 @@ msgstr "öğe"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21366,10 +21367,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "ad"
@@ -21416,7 +21417,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21446,7 +21447,7 @@ msgstr "sayı"
 msgid "of"
 msgstr "un"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21469,7 +21470,7 @@ msgstr "un"
 msgid "off"
 msgstr "kapalı"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21641,8 +21642,8 @@ msgstr "sn"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21779,8 +21780,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22067,17 +22068,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/uk/LC_MESSAGES/frontend.po b/ui/locale/uk/LC_MESSAGES/frontend.po
index a16a9e4d028..38591b75ba8 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -188,10 +188,10 @@ msgstr[0] "%1$s повідомлення"
 msgstr[1] "%1$s повідомлення"
 msgstr[2] "%1$s повідомлень"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -241,9 +241,9 @@ msgstr[0] "залишилась %1$s спроба"
 msgstr[1] "залишилось %1$s спроби"
 msgstr[2] "залишилось %1$s спроб"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -352,7 +352,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 секунд"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D вид"
 
@@ -398,7 +398,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "ДОДАТИ ЗАМІЩЕННЯ"
 
@@ -491,27 +491,27 @@ msgstr "Доступ заборонено"
 msgid "Access denied!"
 msgstr "Доступ заборонено!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -583,35 +583,35 @@ msgstr "Підтверджені ВИРІШЕНІ події"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -742,24 +742,24 @@ msgstr "Активно до"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -795,13 +795,13 @@ msgstr "Активно до"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -819,38 +819,38 @@ msgstr "Активно до"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -877,7 +877,7 @@ msgstr "Додати підлеглий елемент"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -898,7 +898,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Додати кілька карт"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "Додати новий набір даних"
 
@@ -907,16 +907,16 @@ msgstr "Додати новий набір даних"
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "Додати нове заміщення"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Додати прототип"
 
@@ -963,7 +963,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Додати віджет"
@@ -1051,7 +1051,7 @@ msgstr "Інтерфейси агента"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1059,11 +1059,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1090,8 +1090,8 @@ msgstr "Вирівняти елементи карти"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1107,8 +1107,8 @@ msgid "All dashboards"
 msgstr "Всі панелі"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Всі групи"
 
@@ -1124,13 +1124,13 @@ msgstr "Всі посилання повинні мати вказані \"І'м
 msgid "All maps"
 msgstr "Всі карти мереж"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Всі проблеми"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Всі проблеми якщо значення тегів співпадають"
 
@@ -1151,19 +1151,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Дозволити закриття вручну"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Дозволені вузли мережі"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1180,21 +1180,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "Та"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1208,7 +1208,7 @@ msgstr "Та"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "Та/Або"
 
@@ -1253,11 +1253,11 @@ msgstr "Помилка програми."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Задіяти"
@@ -1389,11 +1389,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Принаймні одна операція має існувати."
 
@@ -1487,8 +1487,8 @@ msgstr "Невдала аутентийікація: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Метод аутентифікації"
 
@@ -1550,8 +1550,8 @@ msgstr "Автоматично"
 msgid "Automatic icon mapping"
 msgstr "Автоматичне призначення іконок"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Автоматичний вибір іконок"
 
@@ -1618,12 +1618,12 @@ msgstr "Назад"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Фонове зображення"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1631,9 +1631,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Фонове зображення"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1641,8 +1641,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "База для пошуку (BaseDN)"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1685,15 +1685,15 @@ msgstr "Блакитна"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Тіло"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Тіло та заголовки"
 
@@ -1704,8 +1704,8 @@ msgstr "Тіло та заголовки"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Товста лінія"
 
@@ -1713,19 +1713,19 @@ msgstr "Товста лінія"
 msgid "Boolean to decimal"
 msgstr "Логічне до десяткового"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Рамка"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Тип рамки"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Ширина рамки"
 
@@ -1738,7 +1738,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "По нижньому краю"
@@ -1821,7 +1821,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Вираховується автоматично"
 
@@ -1845,22 +1845,22 @@ msgstr "Зворотній виклик"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3508,8 +3508,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Символ"
 
@@ -3537,7 +3537,7 @@ msgstr "Шассі"
 msgid "Chassis information. Returns string"
 msgstr "Інформація про шасі. Повертає текст"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Перевірка вже існує."
 
@@ -3658,8 +3658,8 @@ msgid "Clear history"
 msgstr "Очистити історію"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Очистити історію та динаміку змін"
 
@@ -3687,22 +3687,22 @@ msgstr "Годинник"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Клонувати"
@@ -3710,28 +3710,28 @@ msgstr "Клонувати"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Закрити"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Закрити конструктор виразу"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Закрити нову подію"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Закрити старі події"
@@ -3745,7 +3745,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Згорнути"
@@ -3759,11 +3759,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3772,7 +3772,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3860,9 +3860,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Умови"
@@ -4047,13 +4047,13 @@ msgstr "Вітаємо! Ви успішно встановили веб-інте
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Підключатись використовуючи"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "З'єднано"
@@ -4145,8 +4145,8 @@ msgstr "Контактна інформація"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4226,13 +4226,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Номер контракту"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "Конвертувати в JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Координати"
 
@@ -4249,7 +4249,7 @@ msgstr "Копіювати"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Кореляція"
 
@@ -4392,10 +4392,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4599,7 +4599,7 @@ msgid "Custom"
 msgstr "Користувацьке"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4613,8 +4613,8 @@ msgstr "Графіки користувача"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Довільні інтервали"
 
@@ -4781,8 +4781,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "Панелі"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Пунктирна лінія"
 
@@ -4800,7 +4800,7 @@ msgstr "Дані закодовано неправильно."
 msgid "Data overview"
 msgstr "Огляд даних"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4984,11 +4984,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "По замовчуванню"
 
@@ -5030,7 +5030,7 @@ msgstr "Форма логіну по замовчуванню"
 msgid "Default media type"
 msgstr "Метод повідомлень по замовчуванню"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Тривалість кроку операції по замовчуванню"
 
@@ -5064,7 +5064,7 @@ msgstr "Затримується на"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -5073,7 +5073,7 @@ msgstr "Затримується на"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -5081,47 +5081,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Видалити"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Видалити та очистити"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Видалити та очистити вибрані шаблони? (УВАГА: всі приєднані вузли мережі буде очищено!)"
 
@@ -5129,11 +5129,11 @@ msgstr "Видалити та очистити вибрані шаблони? (�
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Видалити та очистити шаблон? (УВАГА: всі приєднані вузли мережі буде очищено!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "Видалити поточну дію?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "Видалити потчну кореляцію?"
 
@@ -5146,10 +5146,10 @@ msgstr "Видалити панель?"
 msgid "Delete discovery rule?"
 msgstr "Видалити правило виявлення?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Видалити вираз?"
 
@@ -5173,11 +5173,11 @@ msgstr "Видалити історію вибраних веб сценарії
 msgid "Delete icon map?"
 msgstr "Видалити призначення іконок?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Видалити прототип елементів даних?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Видалити елемент даних?"
 
@@ -5219,11 +5219,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5282,7 +5282,7 @@ msgstr "Видалити вибрані прототипи вузлів мере
 msgid "Delete selected host?"
 msgstr "Видалити вибраний вузел мережі?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Видалити вибрані вузли мережі?"
 
@@ -5290,11 +5290,11 @@ msgstr "Видалити вибрані вузли мережі?"
 msgid "Delete selected image?"
 msgstr "Видалити вибрані картинки?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Видалити вибрані прототипи елементів даних?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Видалити вибрані елементи даних?"
 
@@ -5310,7 +5310,7 @@ msgstr "Видалити вибрану карту мережі?"
 msgid "Delete selected maps?"
 msgstr "Видалити вибрані карти?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Видалити вибрані методи повідомлень?"
 
@@ -5342,11 +5342,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Видалити вибрані скрипти?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5354,19 +5354,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Видалити обрані фігури?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Видалити вибрані шаблони?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Видалити вибрані прототипи тригерів?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Видалити вибрані тригери?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Видалити обраного користувача?"
 
@@ -5382,11 +5382,11 @@ msgstr "Видалити вибрані веб сценарії?"
 msgid "Delete template?"
 msgstr "Видалити шаблон?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Видалити прототип тригерів?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Видалити тригер?"
 
@@ -5412,7 +5412,7 @@ msgstr "Видалено: Прототип вузлів мережі \"%1$s\" з
 msgid "Delimiter"
 msgstr "Розділювач"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5427,10 +5427,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Залежності"
 
@@ -5467,7 +5467,7 @@ msgstr "Статус розгортання"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5477,13 +5477,13 @@ msgstr "Статус розгортання"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Опис"
@@ -5493,10 +5493,10 @@ msgstr "Опис"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Деталі"
@@ -5537,7 +5537,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Розмір папки (в байтах). Повертає ціле"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5588,11 +5588,11 @@ msgstr "Дезактивувати вузли мережі, які моніто�
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5621,7 +5621,7 @@ msgstr "Дезактивувати вибрані вузли мережі?"
 msgid "Disable selected items?"
 msgstr "Дезактивувати вибрані елементи даних?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Дезактивувати вибрані методи повідомлень?"
 
@@ -5655,7 +5655,7 @@ msgstr "Дезактивувати вибрані веб сценарії?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5683,7 +5683,7 @@ msgstr "Дезактивувати вибрані веб сценарії?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Дезактивовано"
 
@@ -5709,9 +5709,9 @@ msgstr "Відкинути значення"
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5910,7 +5910,7 @@ msgstr "Статистика запису на диск. Повертає ціл
 msgid "Display OK triggers for"
 msgstr "Відображати тригери ОК протягом"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Показати графік"
 
@@ -5918,13 +5918,13 @@ msgstr "Показати графік"
 msgid "Display problems"
 msgstr "Відображення проблем"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "Показати стекований графік"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5948,15 +5948,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5970,8 +5970,8 @@ msgstr "Ви дійсно хочете замінити умовний вира�
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5981,8 +5981,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5992,8 +5992,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -6001,8 +6001,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr "Не відповідає регулярному виразу"
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "Лінія з крапок"
 
@@ -6031,16 +6031,16 @@ msgstr "Завантажити конфігураційний файл"
 msgid "Downtime"
 msgstr "Недоступний"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "Креслити"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Стиль креслення"
 
@@ -6091,7 +6091,7 @@ msgstr "Дублікат userid \"%1$s\" у користувачів для ка
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Тривалість"
 
@@ -6114,29 +6114,29 @@ msgstr "Динамічні елементи даних"
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Кожнен URL-запит повинен мати унікальне ім'я. Будь ласка переконайтесь що це тільки один URL-запит з таким іменем"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Змінити"
@@ -6190,12 +6190,12 @@ msgstr "Помилка Elasticsearch: %1$s."
 msgid "Element"
 msgstr "Елемент"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "Назва елемента"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Еліпс"
 
@@ -6251,7 +6251,7 @@ msgstr "Вхідний параметр пустий."
 msgid "Empty map ID."
 msgstr "Пустий ID карти мережі."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6331,11 +6331,11 @@ msgstr "Активувати внутрішню очистку"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6365,7 +6365,7 @@ msgstr "Активувати вибрані вузли мережі?"
 msgid "Enable selected items?"
 msgstr "Активувати вибрані елементи даних?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Активувати вибрані методи повідомлень?"
 
@@ -6387,8 +6387,8 @@ msgstr "Активувати вибрані прототипи веб сцена
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "Активувати трапи"
 
@@ -6410,7 +6410,7 @@ msgstr "Активувати трапи"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6426,7 +6426,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6440,14 +6440,14 @@ msgstr "Активувати трапи"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Активовано"
 
@@ -6500,8 +6500,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6679,7 +6679,7 @@ msgstr "Виконує WMI запит та повертає перший виб�
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6700,8 +6700,8 @@ msgstr "Виконано"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Скрипт для виконання"
 
@@ -6715,13 +6715,13 @@ msgstr "Підтвердження виконання"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Розгорнути"
@@ -6791,15 +6791,15 @@ msgstr "Експортувати в CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6812,10 +6812,10 @@ msgstr "Вираз"
 msgid "Expression cannot be empty"
 msgstr "Вираз не може бути пустим"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Конструктор виразу"
 
@@ -6883,7 +6883,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Помилка при створенні панелі"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Помилка при обробці URL."
@@ -7017,8 +7017,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Інформація часу файлу. Повертає ціле число (Unix timestamp)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -7029,7 +7028,8 @@ msgstr "Інформація часу файлу. Повертає ціле чи
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "Заливка"
 
@@ -7126,7 +7126,7 @@ msgid "Fit to map"
 msgstr "Вписати в карту мережі"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Фіксоване"
 
@@ -7138,9 +7138,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -7148,22 +7148,22 @@ msgstr "Гнучкий"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Слідувати перенаправленням"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Шрифт"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Розмір шрифту"
 
@@ -7171,8 +7171,8 @@ msgstr "Розмір шрифту"
 msgid "Form data"
 msgstr "Дані форми"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Формула"
 
@@ -7208,7 +7208,7 @@ msgstr "П'ятниця"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "З"
 
@@ -7223,7 +7223,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Доступ до веб-інтерфейсу"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Повідомлення у веб-інтерфейсі"
 
@@ -7239,7 +7239,7 @@ msgid "Full clone"
 msgstr "Клонувати повністю"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Функція"
 
@@ -7658,8 +7658,8 @@ msgstr "HTTP агент"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP аутентифікація"
 
@@ -7670,8 +7670,8 @@ msgstr "HTTP діалог входу в систему"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP проксі"
 
@@ -7708,10 +7708,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Заголовки"
 
@@ -7727,7 +7727,7 @@ msgstr "Іврит (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7833,7 +7833,7 @@ msgid "History cleared"
 msgstr "Історію очищено"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Очистка журналу може забрати багато часу. Продовжувати?"
 
@@ -7848,8 +7848,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Період зберігання історії"
 
@@ -7866,8 +7866,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Горизонтальний"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Вирівнювання по горизонталі"
 
@@ -7989,7 +7989,7 @@ msgstr[2] "Вузли мережі активовано"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -8075,9 +8075,9 @@ msgstr "Групи вузлів мережі"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Інтерфейс вузла мережі"
 
@@ -8366,8 +8366,8 @@ msgstr "Інтерфейси IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI датчик"
 
@@ -8381,19 +8381,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Іконка"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Іконка (по замовчуванню)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Іконка (відключено)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Іконка (обслуговування)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Іконка (проблема)"
 
@@ -8440,7 +8440,7 @@ msgstr "Призначення іконок"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Іконка з ID \"%1$s\" недоступна."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Іконки"
 
@@ -8586,7 +8586,7 @@ msgstr "Картинки"
 msgid "Images for all maps will be updated!"
 msgstr "Картинки для всіх карт мереж буде оновлено!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Негайно"
 
@@ -8670,6 +8670,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9554,10 +9555,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Інфо"
@@ -9624,8 +9625,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Вставити"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Вставити вираз"
 
@@ -9741,9 +9742,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Інтервал"
@@ -10180,7 +10181,7 @@ msgstr "Італійська (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Елемент даних"
 
@@ -10447,8 +10448,8 @@ msgstr "JMX агент"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX endpoint"
 
@@ -10466,8 +10467,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "JSON дані"
 
@@ -10506,8 +10507,8 @@ msgstr "Японська (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr "JavaScript"
@@ -10546,9 +10547,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Ключ"
@@ -10614,13 +10615,13 @@ msgstr "LLD макроси"
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Ярлик"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Розміщення ярлика"
 
@@ -10773,9 +10774,9 @@ msgstr "Латвійська (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10786,7 +10787,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "З лівого боку"
@@ -10819,25 +10820,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Ліміт елементів в пошуку/фільтрі"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Лінія"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Тип лінії"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Товщина лінії"
 
@@ -10859,9 +10860,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Індикатори лінка"
 
@@ -10892,8 +10893,8 @@ msgstr "Приєднані шаблони"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Зв'язки"
 
@@ -10995,8 +10996,8 @@ msgstr "Розміщення (довгота)"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Лог (багато полів)"
 
@@ -11009,8 +11010,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Моніторинг файлів журналів. Повертає лог"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Формат часу в журналі"
 
@@ -11136,7 +11137,7 @@ msgstr "Головна навігація"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Сервіс"
 
@@ -11296,7 +11297,7 @@ msgstr "Дерево навігації карт мереж"
 msgid "Map owner cannot be empty."
 msgstr "Власник карти мережі не може бути пустим."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Фігура карти мережі"
 
@@ -11374,19 +11375,19 @@ msgstr "Маска"
 msgid "Mass update"
 msgstr "Масове оновлення"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Масове оновлення елементів"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Масове оновлення фігур"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "Головний елемент даних"
 
@@ -11471,8 +11472,8 @@ msgid "May"
 msgstr "Травень"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Метод повідомлення"
 
@@ -11599,8 +11600,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Таймаут повідомлення"
 
@@ -11618,7 +11619,7 @@ msgstr "Повідомлення/Команда"
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Повідомлення"
 
@@ -11718,11 +11719,11 @@ msgstr "Відсутнє поле \"name\" для прототипу графі�
 msgid "Missing \"name\" field for graph."
 msgstr "Відсутнє поле \"name\" для графіку."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "Відсутні дані"
 
@@ -11894,8 +11895,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Багатократно"
 
@@ -12061,7 +12062,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -12081,15 +12082,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -12098,16 +12099,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12387,7 +12388,7 @@ msgstr "Подробиці відсутні"
 msgid "No discovery rule IDs given."
 msgstr "ID правил виявлення не вказано."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12443,8 +12444,8 @@ msgstr "Немає картинки"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Інтерфейсу не знайдено"
 
@@ -12748,7 +12749,7 @@ msgstr "Файл публічного ключа не вказано."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Не оновлювати"
 
@@ -12794,8 +12795,8 @@ msgstr "Не логічні атрибути більше не використ�
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12803,17 +12804,17 @@ msgstr "Не логічні атрибути більше не використ�
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Немає"
@@ -12909,7 +12910,7 @@ msgstr "Звіт про повідомлення"
 msgid "Notifications"
 msgstr "Повідомлення"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -13083,8 +13084,8 @@ msgstr "Числові системи"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Числовий (дробове)"
 
@@ -13094,8 +13095,8 @@ msgstr "Числовий (ціле)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Числовий (ціле додатне)"
 
@@ -13103,8 +13104,8 @@ msgstr "Числовий (ціле додатне)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -13116,13 +13117,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "подія ОК закриває"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "генерація події OK"
 
@@ -13183,7 +13184,7 @@ msgstr "Вимкн"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -13212,7 +13213,7 @@ msgstr "Увімк"
 msgid "On status change triggers blink for"
 msgstr "Мигання тригерів при зміні стану протягом"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Один раз"
 
@@ -13334,11 +13335,11 @@ msgstr "Операція не має шаблону для функціонув�
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Операції"
@@ -13384,7 +13385,7 @@ msgstr "Опції"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13399,11 +13400,11 @@ msgstr "Опції"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Або"
 
@@ -13498,8 +13499,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Перевизначено в"
@@ -13716,8 +13717,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "ПРОБЛЕМА"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "Режим генерації подій ПРОБЛЕМА"
 
@@ -13799,8 +13800,8 @@ msgstr "Параметр \"%1$s\" застарів."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Параметри"
 
@@ -13848,8 +13849,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Аналіз"
 
@@ -13880,12 +13881,12 @@ msgstr "Пасивний"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13918,12 +13919,12 @@ msgid "Paste"
 msgstr "Вставити"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13936,7 +13937,7 @@ msgstr "Вставити без зовнішніх зв'язків"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "Призупиняти операції для подавлених проблем"
 
@@ -13979,8 +13980,8 @@ msgstr "Виконує DNS запит. Повертає рядок символ�
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Період"
@@ -14001,9 +14002,9 @@ msgid "Periods"
 msgstr "Періоди"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -14014,7 +14015,7 @@ msgstr "Періоди"
 msgid "Permissions"
 msgstr "Права доступу"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Права доступу можуть бути призначені тільки групам користувачів."
 
@@ -14036,12 +14037,12 @@ msgstr "Алгоритм розміщення"
 msgid "Plain text"
 msgstr "Текст"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Грати"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Програвати звуковий сигнал"
 
@@ -14071,8 +14072,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Будь-ласка, оберіть два елементи"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -14082,14 +14082,15 @@ msgstr "Будь-ласка, оберіть два елементи"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "Розмір крапок"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "Крапки"
 
@@ -14097,7 +14098,7 @@ msgstr "Крапки"
 msgid "Polish (pl_PL)"
 msgstr "Польська (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Заповнює поле інвентарних даних вузла мережі"
 
@@ -14159,16 +14160,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Попередня обробка"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Кроки попередньої обробки"
 
@@ -14265,8 +14266,8 @@ msgstr "Приватний"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Файл приватного ключа"
 
@@ -14296,7 +14297,7 @@ msgstr "Рівень привілеїв"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Проблема"
 
@@ -14486,16 +14487,16 @@ msgstr "Публічний"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Публічний ключ"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Файл публічного ключа"
 
@@ -14509,8 +14510,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Поля запиту"
 
@@ -14560,8 +14561,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Необроблені дані"
 
@@ -14587,14 +14588,14 @@ msgstr "Тільки читання"
 msgid "Read-only"
 msgstr "Тільки читання"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14608,14 +14609,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Читання-запис"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14661,7 +14662,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14670,10 +14671,10 @@ msgid "Recovery"
 msgstr "Відновлення"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Вираз для відновлення"
@@ -14683,7 +14684,7 @@ msgstr "Вираз для відновлення"
 msgid "Recovery expression syntax error."
 msgstr "Синтаксична помилка у виразі для відновлення."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Операції відновлення"
 
@@ -14695,8 +14696,8 @@ msgstr "Операції відновлення"
 msgid "Recovery time"
 msgstr "Час відновлення"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Прямокутник"
 
@@ -14803,7 +14804,7 @@ msgstr "Віддалена команда"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14834,13 +14835,13 @@ msgstr "Віддалена команда"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14848,25 +14849,25 @@ msgstr "Віддалена команда"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14894,14 +14895,14 @@ msgstr "Віддалена команда"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14976,10 +14977,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Замінити"
 
@@ -14997,7 +14998,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -15036,15 +15037,15 @@ msgstr "Звіти"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "Запит тіла"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "Тип запиту тіла"
 
@@ -15053,8 +15054,8 @@ msgid "Request sent successfully"
 msgstr "Запит успішно відправлено"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "Тип запиту"
 
@@ -15081,8 +15082,8 @@ msgstr "Необхідна потужність сервера, нових зн�
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Необхідні коди статусу"
 
@@ -15095,11 +15096,11 @@ msgstr "Необхідна строка"
 msgid "Reset"
 msgstr "Скинути"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Скинути всі поля в значення по замовчуванню?"
 
@@ -15116,11 +15117,11 @@ msgstr "Скинути підтвердження"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Скинути по замовчуванню"
 
@@ -15224,8 +15225,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "Режим отримання"
 
@@ -15298,9 +15299,9 @@ msgstr "Повертає відсоток втрачених ICMP ping паке�
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15308,7 +15309,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "З правого боку"
@@ -15324,8 +15325,8 @@ msgstr "Вісь Y справа"
 msgid "Right trim"
 msgstr "Обрізати справа"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15518,8 +15519,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15598,8 +15599,8 @@ msgstr "SQL запитів: %1$s (selects: %2$s | executes: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL запит"
 
@@ -15624,38 +15625,38 @@ msgstr "SSH агент"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Файл SSL сертифікату"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Файл SSL ключа"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Пароль SSL ключа"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "Перевіряти SSL host"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "Перевіряти SSL peer"
 
@@ -15777,9 +15778,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15804,8 +15805,8 @@ msgstr "Межі"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Скрипт"
 
@@ -15938,10 +15939,10 @@ msgstr "Ім'я безпеки"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Вибрати"
@@ -15951,9 +15952,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Обрати прототип"
 
@@ -15974,7 +15975,7 @@ msgstr "Вибрані дії видалено"
 msgid "Selected and all other problems of related triggers"
 msgstr "Вибрані та всі інші проблеми пов'язаних тригерів"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Вибрані елементи"
 
@@ -16325,8 +16326,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "Важливість збільшено"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Фігура"
@@ -16429,7 +16430,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16529,8 +16530,8 @@ msgstr "Простий графік"
 msgid "Simple graph prototype"
 msgstr "Прототип простого графіку"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Один раз"
 
@@ -16575,7 +16576,7 @@ msgstr "Область / район"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Розмір"
 
@@ -16686,9 +16687,9 @@ msgstr "Швидкість"
 msgid "Stacked"
 msgstr "Накладається шарами в стек"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "Сходинки"
 
@@ -16709,7 +16710,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Початок в"
 
@@ -16904,14 +16905,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Крок з іменем \"%1$s\" вже існує."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Кроки"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Стоп"
 
@@ -16934,10 +16935,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -17173,8 +17174,8 @@ msgstr "Пріоритет відображення тегів"
 msgid "Tag filter"
 msgstr "Фільтр тегів"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Тег для співпадіння"
 
@@ -17233,28 +17234,28 @@ msgstr "Значення тегу"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Теги"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Ціль"
@@ -17415,14 +17416,14 @@ msgstr "Шаблони оновлено"
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Тест"
@@ -17480,10 +17481,10 @@ msgstr "Тема тесту"
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Текст (одне поле)"
 
@@ -17638,8 +17639,8 @@ msgstr "Цей місяць"
 msgid "This month so far"
 msgstr "Цей місяць по нині"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17743,9 +17744,9 @@ msgstr "Період часу"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Зсув часу"
 
@@ -17763,8 +17764,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Час очікування"
 
@@ -17790,7 +17791,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "До"
 
@@ -17814,7 +17815,7 @@ msgstr "Сьогодні по нині"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "По верхньому краю"
@@ -17866,8 +17867,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17878,7 +17878,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "Прозорість"
 
@@ -17886,9 +17887,9 @@ msgstr "Прозорість"
 msgid "Transport error."
 msgstr "Помилка транспорту."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "Вважати як 0"
@@ -17900,8 +17901,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Період зберігання трендів"
 
@@ -17919,9 +17920,9 @@ msgstr "Динаміка"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Тригер"
@@ -18026,7 +18027,7 @@ msgstr "Огляд тригерів"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Прототип тригера"
@@ -18093,7 +18094,7 @@ msgstr "Прототипи тригера видалено"
 msgid "Trigger prototypes updated"
 msgstr "Прототипи тригерів оновлено"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Важливість тригера"
 
@@ -18200,23 +18201,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Тип"
@@ -18225,12 +18226,12 @@ msgstr "Тип"
 msgid "Type (Full details)"
 msgstr "Тип (повні деталі)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Тип (ОК)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -18241,10 +18242,10 @@ msgstr "Тип підрахунку"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Тип інформації"
 
@@ -18268,11 +18269,11 @@ msgstr "НЕВІДОМО"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18293,7 +18294,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL закодовано некоректно."
@@ -18318,7 +18319,7 @@ msgstr "Ім'я параметра URL не може бути пустим."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLи"
@@ -18421,15 +18422,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18438,8 +18439,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Одиниця виміру"
 
@@ -18465,7 +18466,7 @@ msgstr "Одиниця виміру"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Невідомо"
@@ -18609,12 +18610,12 @@ msgstr "Доступний"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18634,18 +18635,18 @@ msgstr "Доступний"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18666,13 +18667,13 @@ msgstr "Оновити існуючі"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Інтервал оновлення"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "Операції оновлення"
 
@@ -18811,7 +18812,7 @@ msgstr "Рядок user agent"
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Користувач не може додати сам себе у відключену групу або в групу з відключеним доступом до Веб-інтерфейсу."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18926,10 +18927,10 @@ msgstr "Меню користувача"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Ім'я користувача"
 
@@ -18998,7 +18999,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "У спільного доступу користувачів відсутні параметри: %1$s для карти мережі \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19376,12 +19377,12 @@ msgstr "Валідація"
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19443,8 +19444,8 @@ msgstr "Перетворення значень \"%1$s\" вже існує."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Перетворення значень"
@@ -19561,8 +19562,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Вертикальний"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Вирівнювання по вертикалі"
 
@@ -19767,8 +19768,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19779,12 +19779,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19860,8 +19861,8 @@ msgstr "Помилкові поля для зв'язку на карті мер�
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19873,11 +19874,11 @@ msgstr "Вісь X"
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19891,8 +19892,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "XML дані"
 
@@ -19912,12 +19913,12 @@ msgstr ""
 msgid "XPath"
 msgstr "XPath"
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Максимальне значення вісі Y"
 
@@ -19931,18 +19932,18 @@ msgstr "Вісь Y МАКС значення має бути більшим ні
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "МАКС значення вісі Y має бути більшим ніж МІН значення вісі Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Мінімальне значення вісі Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Розміщення вісі Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Вісь Y"
 
@@ -19962,11 +19963,11 @@ msgstr "d.m.Y H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20997,10 +20998,10 @@ msgstr "fuzzytime() - Різниця між значенням елементу
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "глобальних налаштуваннях очистки історії"
@@ -21029,8 +21030,8 @@ msgstr "вузел мережі"
 msgid "host group"
 msgstr "група вузлів мережі"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "маска вузла мережі"
@@ -21063,7 +21064,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "включаючи субгрупи"
 
@@ -21237,8 +21238,8 @@ msgstr "елемент даних"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "маска елементу даних"
 
@@ -21502,10 +21503,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "назва"
@@ -21552,7 +21553,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "немає"
 
@@ -21582,7 +21583,7 @@ msgstr "число"
 msgid "of"
 msgstr "із"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21605,7 +21606,7 @@ msgstr "із"
 msgid "off"
 msgstr "вимк"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21777,8 +21778,8 @@ msgstr "с"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr "скрипт"
@@ -21915,8 +21916,8 @@ msgstr "наданий обліковий запис не унікальний"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -22203,17 +22204,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/vi/LC_MESSAGES/frontend.po b/ui/locale/vi/LC_MESSAGES/frontend.po
index dae80a36be5..27f6975b0a6 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -172,10 +172,10 @@ msgid "%1$s message"
 msgid_plural "%1$s messages"
 msgstr[0] "%1$s tin nhắn "
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -215,9 +215,9 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "%1$s thử lại "
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -318,7 +318,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30 giây"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "xem 3D"
 
@@ -364,7 +364,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "Thêm đè lên"
 
@@ -451,27 +451,27 @@ msgstr "Truy cập bị từ chối"
 msgid "Access denied!"
 msgstr "Truy cập bị từ chối!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -543,35 +543,35 @@ msgstr " Sự kiện được ghi nhận giải quyết"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -698,24 +698,24 @@ msgstr "Kích hoạt"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -751,13 +751,13 @@ msgstr "Kích hoạt"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -775,38 +775,38 @@ msgstr "Kích hoạt"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -833,7 +833,7 @@ msgstr "Thêm phần tử con"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -854,7 +854,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "Thêm nhiều sơ đồ "
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "Đặt lại dữ liệu mới"
 
@@ -863,16 +863,16 @@ msgstr "Đặt lại dữ liệu mới"
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "Ghi đè"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -882,7 +882,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "Thêm kiểu"
 
@@ -919,7 +919,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "Thêm ô điều khiển"
@@ -1007,7 +1007,7 @@ msgstr "Agent interfaces"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1015,11 +1015,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1046,8 +1046,8 @@ msgstr "Sắp xếp phần tử sơ đồ"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1063,8 +1063,8 @@ msgid "All dashboards"
 msgstr "Tất cả bảng điều khiển"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "Tất cả nhóm"
 
@@ -1080,13 +1080,13 @@ msgstr "Tất cả các đường dẫn phải có \"Tên\" và \"URL\""
 msgid "All maps"
 msgstr "Tất cả sơ đồ"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "Tất cả vấn đề"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "Tất cả vấn đề nếu khớp với thẻ giá trị"
 
@@ -1107,19 +1107,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "Cho phép đóng bằng tay"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "Những host được phép"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1136,21 +1136,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "Và"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1164,7 +1164,7 @@ msgstr "Và"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "Và/Hoặc"
 
@@ -1209,11 +1209,11 @@ msgstr "Lỗi ứng dụng."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "Áp dụng"
@@ -1345,11 +1345,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "Ít nhất một thao tác phải tồn tại."
 
@@ -1443,8 +1443,8 @@ msgstr "Xác thực lỗi: %1$s."
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "Phương thức xác thực"
 
@@ -1506,8 +1506,8 @@ msgstr "Tự động"
 msgid "Automatic icon mapping"
 msgstr "Tự động vẽ biểu tượng bản đồ"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "Tự động lựa chọn biểu tượng"
 
@@ -1574,12 +1574,12 @@ msgstr "Quay lại"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "Hình nền"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1587,9 +1587,9 @@ msgstr ""
 msgid "Background image"
 msgstr "Ảnh nền"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1597,8 +1597,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Tên Domain Name"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1641,15 +1641,15 @@ msgstr "Xanh da trời"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "Nội dung"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "Nội dung và tiêu đề"
 
@@ -1660,8 +1660,8 @@ msgstr "Nội dung và tiêu đề"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "Bold line"
 
@@ -1669,19 +1669,19 @@ msgstr "Bold line"
 msgid "Boolean to decimal"
 msgstr "Boolean đến decimal"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "Viền"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "Kiểu viền"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "Độ rộng viền"
 
@@ -1694,7 +1694,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "Dưới"
@@ -1777,7 +1777,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "Tính toán"
 
@@ -1801,22 +1801,22 @@ msgstr "Gọi lại"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3360,8 +3360,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "Ký tự"
 
@@ -3389,7 +3389,7 @@ msgstr "Chassis"
 msgid "Chassis information. Returns string"
 msgstr "Thông tin Chassis. Trả về kiểu string"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "Kiểm tra đã tồn tại."
 
@@ -3510,8 +3510,8 @@ msgid "Clear history"
 msgstr "Xóa lịch sử"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "Xóa lịch sử và phương hướng."
 
@@ -3539,22 +3539,22 @@ msgstr "Đồng hồ"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "Tạo bản sao"
@@ -3562,28 +3562,28 @@ msgstr "Tạo bản sao"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "Đóng"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "Đóng hàm tạo biểu thức"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Đóng sự kiện mới"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Đóng sự kiện cũ"
@@ -3597,7 +3597,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "Thu hẹp"
@@ -3611,11 +3611,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3624,7 +3624,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3712,9 +3712,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "Các điều kiện"
@@ -3899,13 +3899,13 @@ msgstr "Chúc mừng! Bạn đã cài đặt thành công Zabbix frontend."
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "Kết nối tới"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "Đã kết nối"
@@ -3997,8 +3997,8 @@ msgstr "Liên lạc"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4078,13 +4078,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "Contract number"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "Chuyển đổi thành JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "Tọa độ"
 
@@ -4101,7 +4101,7 @@ msgstr "Sao chép"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "Liên kết"
 
@@ -4238,10 +4238,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4445,7 +4445,7 @@ msgid "Custom"
 msgstr "Tự chọn"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4459,8 +4459,8 @@ msgstr "tùy chỉnh các đồ thị"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "Khoảng thời gian tự chọn"
 
@@ -4625,8 +4625,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "Bảng điều khiển"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "Dashed line"
 
@@ -4644,7 +4644,7 @@ msgstr "Dữ liệu không được mã hóa chính xác."
 msgid "Data overview"
 msgstr "Tổng quan dữ liệu"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4828,11 +4828,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "Mặc định"
 
@@ -4874,7 +4874,7 @@ msgstr "Mẫu đăng nhập mặc định"
 msgid "Default media type"
 msgstr "Loại phương tiện mặc định"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "Các bước thao tác mặc định"
 
@@ -4908,7 +4908,7 @@ msgstr "Trễ bởi"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4917,7 +4917,7 @@ msgstr "Trễ bởi"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4925,47 +4925,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "Xóa"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "Xóa và xóa sạch"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "Xóa và xóa hoàn toàn các template được chọn hay không? (Cảnh báo: tất cả các liên kết đến host sẽ bị xóa bỏ hoàn toàn!)"
 
@@ -4973,11 +4973,11 @@ msgstr "Xóa và xóa hoàn toàn các template được chọn hay khôn
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "Xóa và xóa bỏ hoàn toàn template hay không? (Cảnh báo: tất cả các liên kết đến các host sẽ bị xóa bỏ hoàn toàn!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 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:186
 msgid "Delete current correlation?"
 msgstr "Xóa sự liên kết hiện tại?"
 
@@ -4990,10 +4990,10 @@ msgstr "Xóa bảng điều khiển?"
 msgid "Delete discovery rule?"
 msgstr "Xóa quy tắc phát hiện?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "Xóa biểu thức?"
 
@@ -5017,11 +5017,11 @@ msgstr "Xóa lịch sử của web scenario được chọn?"
 msgid "Delete icon map?"
 msgstr "Xóa biểu tượng bản đồ?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "Xóa kiểu item?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "Xóa item?"
 
@@ -5063,11 +5063,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5126,7 +5126,7 @@ msgstr "Xóa các kiểu host được chọn?"
 msgid "Delete selected host?"
 msgstr "Xóa host được chọn?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "Xóa các host được chọn ?"
 
@@ -5134,11 +5134,11 @@ msgstr "Xóa các host được chọn ?"
 msgid "Delete selected image?"
 msgstr "Xóa các hình ảnh được chọn?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "Xóa các kiểu item được chọn?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "Xóa các item được chọn?"
 
@@ -5154,7 +5154,7 @@ msgstr "Xóa sơ đồ đã chọn?"
 msgid "Delete selected maps?"
 msgstr "Xóa các sơ đồ được chọn?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "Xóa các media type được chọn?"
 
@@ -5186,11 +5186,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "Xóa các script được chọn?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5198,19 +5198,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "Xóa hình đã chọn?"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "Xóa các template được chọn?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "Xóa các kiểu trigger được chọn?"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "Xóa các trigger được chọn?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "Xóa người dùng được chọn?"
 
@@ -5226,11 +5226,11 @@ msgstr "Xóa web scenario được chọn?"
 msgid "Delete template?"
 msgstr "Xóa template?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "Xóa kiểu trigger?"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "Xóa trigger?"
 
@@ -5256,7 +5256,7 @@ msgstr "Đã xóa: Kiểu host \"%1$s\" trên \"%2$s\"."
 msgid "Delimiter"
 msgstr "Bộ giới hạn"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5271,10 +5271,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "Quan hệ phụ thuộc"
 
@@ -5311,7 +5311,7 @@ msgstr "Trạng thái triển khai"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5321,13 +5321,13 @@ msgstr "Trạng thái triển khai"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "Mô tả"
@@ -5337,10 +5337,10 @@ msgstr "Mô tả"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "Chi tiết"
@@ -5381,7 +5381,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "Kích thước thư mục (byte). Trả về integer"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5432,11 +5432,11 @@ msgstr "Vô hiệu hóa host được giám sát bởi các proxy đã c
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5465,7 +5465,7 @@ msgstr "Vô hiệu hóa các host đã chọn?"
 msgid "Disable selected items?"
 msgstr "Vô hiệu hóa các item đã chọn?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "Vô hiệu hóa các media type đã chọn?"
 
@@ -5499,7 +5499,7 @@ msgstr "Vô hiệu hóa web scenario đã chọn?"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5527,7 +5527,7 @@ msgstr "Vô hiệu hóa web scenario đã chọn?"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "Đã vô hiệu hóa"
 
@@ -5553,9 +5553,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5748,7 +5748,7 @@ msgstr "Thống kê đĩa ghi. Trả về kiểu integer với loại trong các
 msgid "Display OK triggers for"
 msgstr "Các trigger hiển thị OK khi"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "Hiển thị đồ thị"
 
@@ -5756,13 +5756,13 @@ msgstr "Hiển thị đồ thị"
 msgid "Display problems"
 msgstr "Hiển thị vấn đề"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 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/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5786,15 +5786,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5808,8 +5808,8 @@ msgstr "Bạn có muốn thay thế biểu thức điều kiện không?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5819,8 +5819,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5830,8 +5830,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5839,8 +5839,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "chấm"
 
@@ -5869,16 +5869,16 @@ msgstr "Tải xuống tệp tin cấu hình"
 msgid "Downtime"
 msgstr "Thời gian down"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "vẽ"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "Kiểu dáng thiết kế"
 
@@ -5929,7 +5929,7 @@ msgstr "Tạo bản sao id người dùng \"%1$s\" trong người dùng cho sơ
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "Khoảng thời gian"
 
@@ -5952,29 +5952,29 @@ msgstr "Item động"
 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"
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "Chỉnh sửa"
@@ -6028,12 +6028,12 @@ msgstr "Lỗi tìm kiếm: %1$s."
 msgid "Element"
 msgstr "Phần tử"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "tên phần tử"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "Hình elip"
 
@@ -6089,7 +6089,7 @@ msgstr "Không có tham số đầu vào."
 msgid "Empty map ID."
 msgstr "ID sơ đồ trống."
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6169,11 +6169,11 @@ msgstr "Kích hoạt tính năng dọn dẹp nội bộ"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6203,7 +6203,7 @@ msgstr "Kích hoạt các host được chọn?"
 msgid "Enable selected items?"
 msgstr "Kích hoạt các item được chọn?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "Kích hoạt các media type đã chọn?"
 
@@ -6225,8 +6225,8 @@ msgstr "Kích hoạt web scenario đã được chọn?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "Kích hoạt trap"
 
@@ -6248,7 +6248,7 @@ msgstr "Kích hoạt trap"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6264,7 +6264,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6278,14 +6278,14 @@ msgstr "Kích hoạt trap"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "Đã kích hoạt"
 
@@ -6338,8 +6338,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6515,7 +6515,7 @@ msgstr "Thực hiện truy vấn WMI và trả về đối tượng được tr�
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6536,8 +6536,8 @@ msgstr "Thực thi"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "Câu lệnh đã thực hiện"
 
@@ -6551,13 +6551,13 @@ msgstr "Thực hiện xá nhận"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "Mở rộng"
@@ -6627,15 +6627,15 @@ msgstr "Export thành CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6648,10 +6648,10 @@ msgstr "Biểu thức"
 msgid "Expression cannot be empty"
 msgstr "Biểu thức không thể bị rỗng"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "Người xây dựng biểu thức"
 
@@ -6719,7 +6719,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "Không thể tạo bảng điều khiển"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Không thể phân tích cú pháp URL."
@@ -6853,8 +6853,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "Thông tin thời gian tập tin. Trả về kiểu integer (dấu thời gian Unix)"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6865,7 +6864,8 @@ msgstr "Thông tin thời gian tập tin. Trả về kiểu integer (dấu thờ
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "Điền"
 
@@ -6962,7 +6962,7 @@ msgid "Fit to map"
 msgstr "Ăn khớp với bản đồ"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "Đã sửa lỗi"
 
@@ -6974,9 +6974,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -6984,22 +6984,22 @@ msgstr "Linh hoạt"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "Theo dõi chuyển hướng"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "Font"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "Kích cỡ font"
 
@@ -7007,8 +7007,8 @@ msgstr "Kích cỡ font"
 msgid "Form data"
 msgstr "Mẫu dữ liệu"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "Công thức"
 
@@ -7044,7 +7044,7 @@ msgstr "Thứ sáu"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "Từ"
 
@@ -7059,7 +7059,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "Truy cập Frontend"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "Thông điệp frontend"
 
@@ -7075,7 +7075,7 @@ msgid "Full clone"
 msgstr "Nhân bản đầy đủ"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "Hàm"
 
@@ -7490,8 +7490,8 @@ msgstr "HTTP agent"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "Xác thực HTTP"
 
@@ -7502,8 +7502,8 @@ msgstr "Mẫu đăng nhập HTTP"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
@@ -7540,10 +7540,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "Tiêu đề"
 
@@ -7559,7 +7559,7 @@ msgstr "Hebrew (he_IL)"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7665,7 +7665,7 @@ msgid "History cleared"
 msgstr "Lịch sử bị xóa"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "Xóa lịch sử có thể mất một thời gian dài. Tiếp tục?"
 
@@ -7680,8 +7680,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "Lịch sử chu kỳ lưu trữ"
 
@@ -7698,8 +7698,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "Chiều ngang"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "Sắp xếp theo chiều ngang"
 
@@ -7815,7 +7815,7 @@ msgstr[0] "Host được kích hoạtCác host được kích hoạt"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7901,9 +7901,9 @@ msgstr "Các nhóm host"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "Giao diện host"
 
@@ -8190,8 +8190,8 @@ msgstr "Giao diện IPMI"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI sensor"
 
@@ -8205,19 +8205,19 @@ msgstr ""
 msgid "Icon"
 msgstr "Biểu tượng"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "Biểu tượng (mặc định)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "Biểu tượng (vô hiệu hóa)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "Biểu tượng (bảo trì)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "Biểu tượng (vấn đề)"
 
@@ -8264,7 +8264,7 @@ msgstr "Vẽ biểu tượng"
 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."
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "Các biểu tượng"
 
@@ -8406,7 +8406,7 @@ msgstr "Các hình ảnh"
 msgid "Images for all maps will be updated!"
 msgstr "Các hình ảnh cho tất cả bản đồ sẽ được cập nhật!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "Ngay lập tức"
 
@@ -8490,6 +8490,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9374,10 +9375,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "Thông tin"
@@ -9444,8 +9445,8 @@ msgstr ""
 msgid "Insert"
 msgstr "Chèn"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "Chèn biểu thức"
 
@@ -9561,9 +9562,9 @@ msgstr "Internet Explorer"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "Khoảng thời gian"
@@ -10000,7 +10001,7 @@ msgstr "Italian (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "Item"
 
@@ -10259,8 +10260,8 @@ msgstr "JMX agent"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX endpoint"
 
@@ -10278,8 +10279,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "JSON data"
 
@@ -10318,8 +10319,8 @@ msgstr "Japanese (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10358,9 +10359,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "Key"
@@ -10426,13 +10427,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "Nhãn"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "Vị trí nhãn"
 
@@ -10573,9 +10574,9 @@ msgstr "Latvian (lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10586,7 +10587,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "Bên trái"
@@ -10619,25 +10620,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "Tìm kiếm/lọc các yếu tố giới hạn"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "Đường kẻ"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "Loại đường"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "Độ rộng đường"
 
@@ -10659,9 +10660,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "Chỉ số liên kết"
 
@@ -10692,8 +10693,8 @@ msgstr "Các template đã liên kết"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "Liên kết"
 
@@ -10795,8 +10796,8 @@ msgstr "Vị trí kinh độ"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "Log"
 
@@ -10809,8 +10810,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "Giám sát tệp tin log. Trả về kiểu log"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "Dạng thức thời gian log"
 
@@ -10936,7 +10937,7 @@ msgstr "Điều hướng chính"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "Bảo trì"
 
@@ -11096,7 +11097,7 @@ msgstr "Cây điều hướng bản đồ"
 msgid "Map owner cannot be empty."
 msgstr "Chủ sở hữu sơ đồ không thể để trống."
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "Hình sơ đồ"
 
@@ -11174,19 +11175,19 @@ msgstr "Mặt nạ"
 msgid "Mass update"
 msgstr "Cập nhật hàng loạt"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "Cập nhật hàng loạt các phần tử"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "Hình dạng cập nhật lớn"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "item chủ"
 
@@ -11269,8 +11270,8 @@ msgid "May"
 msgstr "Tháng 5"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "Media"
 
@@ -11391,8 +11392,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "Thời hạn tin nhắn"
 
@@ -11410,7 +11411,7 @@ msgstr "Tin nhắn/Lệnh"
 msgid "Messages"
 msgstr "Các tin nhắn"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "Viết tin nhắn"
 
@@ -11508,11 +11509,11 @@ msgstr "Thiếu trường \"tên\" cho kiểu đồ thị."
 msgid "Missing \"name\" field for graph."
 msgstr "Thiếu trường \"tên\" cho đồ thị."
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "Thiếu dữ liệu"
 
@@ -11676,8 +11677,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "Nhiều"
 
@@ -11843,7 +11844,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11863,15 +11864,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11880,16 +11881,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12169,7 +12170,7 @@ msgstr "Không có thông tin chi tiết"
 msgid "No discovery rule IDs given."
 msgstr "Không có quy tắc phát hiện các ID cho."
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12225,8 +12226,8 @@ msgstr "Không có hình ảnh"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "Không tìm thấy interface "
 
@@ -12530,7 +12531,7 @@ msgstr "Không quy định được khóa tập tin công khai."
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "Không làm mới"
 
@@ -12576,8 +12577,8 @@ msgstr "Không có cờ boolean bị phản đối."
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12585,17 +12586,17 @@ msgstr "Không có cờ boolean bị phản đối."
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "Không có"
@@ -12691,7 +12692,7 @@ msgstr "Thông báo báo cáo"
 msgid "Notifications"
 msgstr "Thông báo"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12865,8 +12866,8 @@ msgstr "Hệ thống số"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "Số (float)"
 
@@ -12876,8 +12877,8 @@ msgstr "Số lượng (integer)"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "Số (unsigned)"
 
@@ -12885,8 +12886,8 @@ msgstr "Số (unsigned)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12898,13 +12899,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "Đóng sự kiện OK"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "Tạo sự kiện OK"
 
@@ -12965,7 +12966,7 @@ msgstr "Off"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -12994,7 +12995,7 @@ msgstr "On"
 msgid "On status change triggers blink for"
 msgstr "Thay đổi trạng thái trigger trong nháy mắt"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "Một lần"
 
@@ -13114,11 +13115,11 @@ 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:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "Các thao tác"
@@ -13164,7 +13165,7 @@ msgstr "Tùy chọn"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13179,11 +13180,11 @@ msgstr "Tùy chọn"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "Hoặc"
 
@@ -13278,8 +13279,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "Ghi đè bởi"
@@ -13496,8 +13497,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "PROBLEM"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "Chế độ tạo sự kiện PROBLEM"
 
@@ -13579,8 +13580,8 @@ msgstr "Tham số \"%1$s\" được yêu cầu."
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "Tham số"
 
@@ -13628,8 +13629,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "Phân tích"
 
@@ -13660,12 +13661,12 @@ msgstr "Thụ động"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13698,12 +13699,12 @@ msgid "Paste"
 msgstr "Dán"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13716,7 +13717,7 @@ msgstr "Dán mà không cần liên kết bên ngoài"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr "Tạm dừng hoạt động cho các vấn đề bị hạn chế"
 
@@ -13759,8 +13760,8 @@ msgstr "Thực hiện một truy vấn DNS. Trả về chuỗi ký tự với lo
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "Chu kỳ"
@@ -13781,9 +13782,9 @@ msgid "Periods"
 msgstr "Các chu kỳ"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13794,7 +13795,7 @@ msgstr "Các chu kỳ"
 msgid "Permissions"
 msgstr "Quyền truy cập"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "Quyền truy cập có thể chỉ được gán cho nhóm người dùng."
 
@@ -13816,12 +13817,12 @@ msgstr "Đặt thuật toán"
 msgid "Plain text"
 msgstr "Văn bản gốc"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "Phát"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "Phát âm thanh"
 
@@ -13851,8 +13852,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "Xin vui lòng lựa chọn 2 phần tử"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13862,14 +13862,15 @@ msgstr "Xin vui lòng lựa chọn 2 phần tử"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "Kích cỡ điểm"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "điểm"
 
@@ -13877,7 +13878,7 @@ msgstr "điểm"
 msgid "Polish (pl_PL)"
 msgstr "Polish (pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "Gắn linh kiện vào trường host còn lại"
 
@@ -13939,16 +13940,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "Tiền xử lý"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "Bước tiền xử lý"
 
@@ -14045,8 +14046,8 @@ msgstr "Riêng"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "Key file riêng"
 
@@ -14076,7 +14077,7 @@ msgstr "Cấp đặc quyền"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "Vấn đề"
 
@@ -14264,16 +14265,16 @@ msgstr "Công khai"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "Khóa công khai"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "Key file công khai"
 
@@ -14287,8 +14288,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "Trường truy vấn"
 
@@ -14338,8 +14339,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "Dữ liệu thô"
 
@@ -14365,14 +14366,14 @@ msgstr "Chỉ đọc"
 msgid "Read-only"
 msgstr "Chỉ đọc"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14386,14 +14387,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "Đọc-ghi"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14439,7 +14440,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14448,10 +14449,10 @@ msgid "Recovery"
 msgstr "Sự phục hồi"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "Biểu thức phục hồi"
@@ -14461,7 +14462,7 @@ msgstr "Biểu thức phục hồi"
 msgid "Recovery expression syntax error."
 msgstr "Phục hồi lỗi cú pháp biểu thức."
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "Phục hồi hoạt động"
 
@@ -14473,8 +14474,8 @@ msgstr "Phục hồi hoạt động"
 msgid "Recovery time"
 msgstr "Thời gian phục hồi"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "Hình chữ nhật"
 
@@ -14579,7 +14580,7 @@ msgstr "Lệnh từ xa"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14610,13 +14611,13 @@ msgstr "Lệnh từ xa"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14624,25 +14625,25 @@ msgstr "Lệnh từ xa"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14670,14 +14671,14 @@ msgstr "Lệnh từ xa"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14752,10 +14753,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "Thay thế"
 
@@ -14773,7 +14774,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14812,15 +14813,15 @@ msgstr "Các thông báo"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr "Yêu cầu nội dung"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr "Yêu cầu kiểu nội dung"
 
@@ -14829,8 +14830,8 @@ msgid "Request sent successfully"
 msgstr "Yêu cầu gửi thành công"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "Yêu cầu kiểu"
 
@@ -14857,8 +14858,8 @@ msgstr "Hiệu năng cần thiết của máy chủ, các giá trị mớ
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "Các mã trạng thái được yêu cầu"
 
@@ -14871,11 +14872,11 @@ msgstr "Chuỗi được yêu cầu"
 msgid "Reset"
 msgstr "Phục hồi"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "Đặt lại tất cả các trường thành giá trị mặc định?"
 
@@ -14892,11 +14893,11 @@ msgstr "Phục hồi xác nhận"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "Phục hồi mặc định"
 
@@ -15000,8 +15001,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "Lấy lại chế độ"
 
@@ -15074,9 +15075,9 @@ msgstr "Trả về tỉ lệ mất gói tin ping ICMP."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15084,7 +15085,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "Bên phải"
@@ -15100,8 +15101,8 @@ msgstr "Trục phải Y"
 msgid "Right trim"
 msgstr "Cắt bên phải"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15288,8 +15289,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15368,8 +15369,8 @@ msgstr "Đếm SQL: %1$s (chọn: %2$s | thực thi: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "Truy vấn SQL"
 
@@ -15394,38 +15395,38 @@ msgstr "SSH agent"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "Tệp chứng chỉ SSL"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "Tệp khóa SSL"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "Mật khẩu SSL"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "Máy chủ xác minh SSL"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "Xác minh SSL ngang hàng"
 
@@ -15541,9 +15542,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15568,8 +15569,8 @@ msgstr "Phạm vi"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "Script"
 
@@ -15700,10 +15701,10 @@ msgstr "Tên bảo mật"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "Lựa chọn"
@@ -15713,9 +15714,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "Lựa chọn kiểu"
 
@@ -15736,7 +15737,7 @@ msgstr "Các action đã chọn bị xóa"
 msgid "Selected and all other problems of related triggers"
 msgstr "Đã chọn và tất cả các vấn đề khác của các trigger liên quan"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "Các phần tử đã chọn"
 
@@ -16085,8 +16086,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "Mức độ nghiêm trọng đã tăng"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "Hình dạng"
@@ -16189,7 +16190,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16289,8 +16290,8 @@ msgstr "Simple graph"
 msgid "Simple graph prototype"
 msgstr "Kiểu đồ thị đơn giản"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "Đơn"
 
@@ -16335,7 +16336,7 @@ msgstr "Site quốc gia / tỉnh"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "Kích thước"
 
@@ -16446,9 +16447,9 @@ msgstr "Tốc độ"
 msgid "Stacked"
 msgstr "Xếp chồng"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "Staircase"
 
@@ -16469,7 +16470,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "Bắt đầu"
 
@@ -16664,14 +16665,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "Bước có tên \"%1$s\" đã tồn tại."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "Các bước"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "Dừng lại"
 
@@ -16694,10 +16695,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -16933,8 +16934,8 @@ msgstr "Thẻ hiển thị ưu tiên"
 msgid "Tag filter"
 msgstr "Thẻ bộ lọc"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "Thẻ cho phù hợp"
 
@@ -16993,28 +16994,28 @@ msgstr "Thẻ giá trị"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "Thẻ"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "Target"
@@ -17175,14 +17176,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "Kiểm tra"
@@ -17240,10 +17241,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "Văn bản"
 
@@ -17394,8 +17395,8 @@ msgstr "Tháng này"
 msgid "This month so far"
 msgstr "Tháng này đến nay"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17499,9 +17500,9 @@ msgstr "Chu kỳ thời gian"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "Di chuyển mốc thời gian"
 
@@ -17519,8 +17520,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "Hết giờ"
 
@@ -17546,7 +17547,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "To"
 
@@ -17570,7 +17571,7 @@ msgstr "Hôm nay"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "Top"
@@ -17622,8 +17623,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17634,7 +17634,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "Công khai"
 
@@ -17642,9 +17643,9 @@ msgstr "Công khai"
 msgid "Transport error."
 msgstr "Lỗi đường truyền."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "Coi là 0"
@@ -17656,8 +17657,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "Khuynh hướng chu kỳ lưu trữ dữ liệu"
 
@@ -17675,9 +17676,9 @@ msgstr "Các khuynh hướng "
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "Trigger"
@@ -17776,7 +17777,7 @@ msgstr "Tổng quan các trigger"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "Kiểu trigger"
@@ -17841,7 +17842,7 @@ msgstr "Các kiểu trigger đã bị xóa"
 msgid "Trigger prototypes updated"
 msgstr "Các kiểu trigger đã được cập nhật"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "Mức độ quan trọng của trigger"
 
@@ -17948,23 +17949,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "Kiểu"
@@ -17973,12 +17974,12 @@ msgstr "Kiểu"
 msgid "Type (Full details)"
 msgstr "Kiểu (đầy đủ chi tiết)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "Kiểu (OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -17989,10 +17990,10 @@ msgstr "Kiểu tính toán"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "Kiểu thông tin"
 
@@ -18016,11 +18017,11 @@ msgstr "UNKNOWN"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18041,7 +18042,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "URL không được mã hóa chính xác."
@@ -18066,7 +18067,7 @@ msgstr "Tên tham số URL là trống."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18169,15 +18170,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18186,8 +18187,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "Đơn vị"
 
@@ -18213,7 +18214,7 @@ msgstr "Đơn vị"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Không rõ"
@@ -18355,12 +18356,12 @@ msgstr "Up"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18380,18 +18381,18 @@ msgstr "Up"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18412,13 +18413,13 @@ msgstr "Cập nhật đã tồn tại"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "Khoảng thời gian cập nhật"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "Cập nhật thao tác"
 
@@ -18557,7 +18558,7 @@ msgstr "Chuỗi người dùng agent"
 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."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18666,10 +18667,10 @@ msgstr "Danh sách người dùng"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "Tên người dùng"
 
@@ -18736,7 +18737,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "Chia sẻ của người dùng bị thiếu tham số: %1$s cho sơ đồ \"%2$s\"."
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19112,12 +19113,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19179,8 +19180,8 @@ msgstr "Giá trị bản đồ \"%1$s\" đã tồn tại."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "Lập giá trị bản đồ"
@@ -19297,8 +19298,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "Thẳng đứng"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "Căn hàng thẳng đứng"
 
@@ -19499,8 +19500,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19511,12 +19511,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19592,8 +19593,8 @@ msgstr "Những trường không đúng đối với liên kết bản đ�
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19605,11 +19606,11 @@ msgstr "trục X"
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19623,8 +19624,8 @@ msgstr "Đường dẫn XML"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "Dữ liệu XML"
 
@@ -19644,12 +19645,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "Giá trị cực đại của trục Y"
 
@@ -19663,18 +19664,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Giá trị cực đại của trục Y phải lớn hơn giá trị cực tiểu trục Y."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "Giá trị cực tiểu trục Y"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "Trục bên Y"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Trục Y"
 
@@ -19694,11 +19695,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20729,10 +20730,10 @@ msgstr "fuzzytime () - Chênh lệch giữa giá trị item (dưới dạng dấ
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "Cài đặt global housekeeping"
@@ -20761,8 +20762,8 @@ msgstr "host"
 msgid "host group"
 msgstr "Nhóm host"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "Mẫu máy chủ"
@@ -20795,7 +20796,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "bao gồm các nhóm nhỏ"
 
@@ -20969,8 +20970,8 @@ msgstr "item"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "item mẫu"
 
@@ -21234,10 +21235,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "tên"
@@ -21284,7 +21285,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "Không có "
 
@@ -21314,7 +21315,7 @@ msgstr "số"
 msgid "of"
 msgstr "of"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21337,7 +21338,7 @@ msgstr "of"
 msgid "off"
 msgstr "off"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21509,8 +21510,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21647,8 +21648,8 @@ msgstr "thông tin được cung cấp không phải là duy nhất"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -21935,17 +21936,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/zh_CN/LC_MESSAGES/frontend.po b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
index d1f0273235c..b51326bb4a4 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\n"
 "PO-Revision-Date: 2016-05-11 02:08+0300\n"
 "Last-Translator: 岂几 <tom3000@126.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -176,10 +176,10 @@ msgid "%1$s message"
 msgid_plural "%1$s messages"
 msgstr[0] "%1$s 消息"
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -219,9 +219,9 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "剩余%1$s 重试次数"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -324,7 +324,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30秒"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D 视图"
 
@@ -370,7 +370,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr "添加覆盖"
 
@@ -457,27 +457,27 @@ msgstr "访问拒绝"
 msgid "Access denied!"
 msgstr "访问拒绝!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -549,35 +549,35 @@ msgstr "确认已解决的事件"
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -704,24 +704,24 @@ msgstr "启用直到"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -757,13 +757,13 @@ msgstr "启用直到"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -781,38 +781,38 @@ msgstr "启用直到"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -839,7 +839,7 @@ msgstr "添加子节点元素"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr "添加多个拓扑图"
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr "添加新数据集"
 
@@ -869,16 +869,16 @@ msgstr "添加新数据集"
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr "添加新的覆盖"
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "添加原型"
 
@@ -925,7 +925,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr "添加构件"
@@ -1013,7 +1013,7 @@ msgstr "agent代理程序的接口"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1021,11 +1021,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1052,8 +1052,8 @@ msgstr "对齐拓扑元素"
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1069,8 +1069,8 @@ msgid "All dashboards"
 msgstr "添加仪表盘"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr "所有组"
 
@@ -1086,13 +1086,13 @@ msgstr "所有的链接应含 特定的名称和URL"
 msgid "All maps"
 msgstr "所有地图"
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr "所有问题"
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr "所有问题如果标签值匹配"
 
@@ -1113,19 +1113,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr "允许手动关闭"
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "允许的主机"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1142,21 +1142,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "和（同时满足）"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1170,7 +1170,7 @@ msgstr "和（同时满足）"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "与/或（默认）"
 
@@ -1215,11 +1215,11 @@ msgstr "应用集 错误."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "应用"
@@ -1347,11 +1347,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr "必须至少设置一个执行内容。"
 
@@ -1445,8 +1445,8 @@ msgstr "验证失败: %1$s"
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "认证方法"
 
@@ -1508,8 +1508,8 @@ msgstr "自动地"
 msgid "Automatic icon mapping"
 msgstr "自动的图标映射"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "自动的图标选择"
 
@@ -1576,12 +1576,12 @@ msgstr "返回"
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "背景"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1589,9 +1589,9 @@ msgstr ""
 msgid "Background image"
 msgstr "背景图片"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1599,8 +1599,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "基于 DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1643,15 +1643,15 @@ msgstr "蓝"
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr "内容"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr "body 和 headers"
 
@@ -1662,8 +1662,8 @@ msgstr "body 和 headers"
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "粗线"
 
@@ -1671,19 +1671,19 @@ msgstr "粗线"
 msgid "Boolean to decimal"
 msgstr "布尔值到十进制"
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr "边"
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr "边框类型"
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr "边框宽度"
 
@@ -1696,7 +1696,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "底部"
@@ -1779,7 +1779,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "可计算的"
 
@@ -1803,22 +1803,22 @@ msgstr "回调"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3358,8 +3358,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "字符"
 
@@ -3387,7 +3387,7 @@ msgstr "机壳"
 msgid "Chassis information. Returns string"
 msgstr "机架信息。返回字符串"
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "检查已存在."
 
@@ -3508,8 +3508,8 @@ msgid "Clear history"
 msgstr "清除历史"
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "清除历史和趋势"
 
@@ -3537,22 +3537,22 @@ msgstr "时钟"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "克隆"
@@ -3560,28 +3560,28 @@ msgstr "克隆"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "关闭"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "关闭表达式构造器"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "关闭新的事件"
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "关闭过去的事件"
@@ -3595,7 +3595,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr "宕机"
@@ -3609,11 +3609,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3622,7 +3622,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3710,9 +3710,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "条件"
@@ -3897,13 +3897,13 @@ msgstr "恩！不错zabbix前端已经配置好了！千山万水第一步！加
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "连接到"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr "已连接"
@@ -3995,8 +3995,8 @@ msgstr "联系"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4076,13 +4076,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "合同号码"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr "转换到 JSON"
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "座标"
 
@@ -4099,7 +4099,7 @@ msgstr "复制"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr "相关性"
 
@@ -4236,10 +4236,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4443,7 +4443,7 @@ msgid "Custom"
 msgstr "习惯"
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4457,8 +4457,8 @@ msgstr "自定义图表"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr "自定义时间间隔"
 
@@ -4623,8 +4623,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr "仪表盘"
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "虚线"
 
@@ -4642,7 +4642,7 @@ msgstr "数据不正确的编码。"
 msgid "Data overview"
 msgstr "数据概览"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4826,11 +4826,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "默认"
 
@@ -4872,7 +4872,7 @@ msgstr "默认登录表格"
 msgid "Default media type"
 msgstr "默认媒介类型"
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "默认操作步骤持续时间"
 
@@ -4906,7 +4906,7 @@ msgstr "被延迟由于"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4915,7 +4915,7 @@ msgstr "被延迟由于"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4923,47 +4923,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "删除"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "删除并清除"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "删除并清除所选的模板? (警告: 所有链接的主机将被清除!)"
 
@@ -4971,11 +4971,11 @@ msgstr "删除并清除所选的模板? (警告: 所有链接的主机将被清�
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "删除并清除模板? (警告: 所有链接的主机将被清除!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "删除目前的动作?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr "删除当前的关联项？"
 
@@ -4988,10 +4988,10 @@ msgstr "你确定要删除仪表盘？"
 msgid "Delete discovery rule?"
 msgstr "删除发现规则?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "删除表达式?"
 
@@ -5015,11 +5015,11 @@ msgstr "删除所选的 web 场景历史？"
 msgid "Delete icon map?"
 msgstr "删除图标映射?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr "删除监控项目模板?"
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "删除监控项?"
 
@@ -5061,11 +5061,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5124,7 +5124,7 @@ msgstr "删除所选定的主机模板?"
 msgid "Delete selected host?"
 msgstr "删除所选的主机?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "删除所选的主机?"
 
@@ -5132,11 +5132,11 @@ msgstr "删除所选的主机?"
 msgid "Delete selected image?"
 msgstr "删除所选的图像?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr "删除所选定的监控项目模板?"
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "删除所选的监控项?"
 
@@ -5152,7 +5152,7 @@ msgstr "删除选择的拓扑图？"
 msgid "Delete selected maps?"
 msgstr "删除所选的地图?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "删除所选的报警媒体类型?"
 
@@ -5184,11 +5184,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "删除所选的脚本?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5196,19 +5196,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr "删除所选形状？"
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "删除所选的模板?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr "删除所选的触发器原型？"
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "删除所选的触发器?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "删除所选的用户?"
 
@@ -5224,11 +5224,11 @@ msgstr "删除所选的 web 场景？"
 msgid "Delete template?"
 msgstr "删除模板?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr "删除触发器原型？"
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "删除触发器?"
 
@@ -5254,7 +5254,7 @@ msgstr "已删除：主机原型 \"%1$s\" 于 \"%2$s\"。"
 msgid "Delimiter"
 msgstr "分隔符"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5269,10 +5269,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "依赖关系"
 
@@ -5309,7 +5309,7 @@ msgstr "部署状态"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5319,13 +5319,13 @@ msgstr "部署状态"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "描述"
@@ -5335,10 +5335,10 @@ msgstr "描述"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "细节"
@@ -5379,7 +5379,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr "目录大小（bytes）。返回整数"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5430,11 +5430,11 @@ msgstr "停用所选的agent代理程序所监测的主机?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5463,7 +5463,7 @@ msgstr "停用所选的主机?"
 msgid "Disable selected items?"
 msgstr "停用所选的监控项?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "停用所选的报警媒介类型?"
 
@@ -5497,7 +5497,7 @@ msgstr "禁用所选定的web场景？"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5525,7 +5525,7 @@ msgstr "禁用所选定的web场景？"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "停用的"
 
@@ -5551,9 +5551,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5746,7 +5746,7 @@ msgstr "磁盘写入数据。类型是sectors, operations, bytes;返回整数，
 msgid "Display OK triggers for"
 msgstr "显示OK触发器予"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "显示数据图"
 
@@ -5754,13 +5754,13 @@ msgstr "显示数据图"
 msgid "Display problems"
 msgstr "显示问题"
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "显示堆叠数据图"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5784,15 +5784,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5806,8 +5806,8 @@ msgstr "您想要替换条件式表达式吗?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5817,8 +5817,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5828,8 +5828,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5837,8 +5837,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "点"
 
@@ -5867,16 +5867,16 @@ msgstr "下载配置文件"
 msgid "Downtime"
 msgstr "断线时间"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr "绘制"
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "绘图风格"
 
@@ -5927,7 +5927,7 @@ msgstr "用户ID \"%1$s\" 与 \"%2$s\" 冲突"
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "持续时间"
 
@@ -5950,29 +5950,29 @@ msgstr "动态监控项"
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "每个URL必须是唯一的. 请确保只有一个被命名的 URL."
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "编辑"
@@ -6026,12 +6026,12 @@ msgstr "Elasticsearch 错误：%1$s。"
 msgid "Element"
 msgstr "组件"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "组件名称"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr "椭圆"
 
@@ -6087,7 +6087,7 @@ msgstr "空的输入参数."
 msgid "Empty map ID."
 msgstr "空的拓扑图ID。"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6167,11 +6167,11 @@ msgstr "开启内部管家"
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6201,7 +6201,7 @@ msgstr "启用所选的主机?"
 msgid "Enable selected items?"
 msgstr "启用所选的监控项？"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "启用所选的报警媒介类型?"
 
@@ -6223,8 +6223,8 @@ msgstr "启用所选定的web场景?"
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr "启用trapping"
 
@@ -6246,7 +6246,7 @@ msgstr "启用trapping"
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6262,7 +6262,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6276,14 +6276,14 @@ msgstr "启用trapping"
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "已启用"
 
@@ -6336,8 +6336,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6513,7 +6513,7 @@ msgstr "执行 WMI 查询返回第一个对象。返回整形、浮点、字符�
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6534,8 +6534,8 @@ msgstr "已执行"
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "已执行的脚本"
 
@@ -6549,13 +6549,13 @@ msgstr "执行确认"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr "扩展"
@@ -6625,15 +6625,15 @@ msgstr "导出到CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6646,10 +6646,10 @@ msgstr "表达式"
 msgid "Expression cannot be empty"
 msgstr "表达式不能为空白"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "表达式构造器"
 
@@ -6717,7 +6717,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr "创建仪表盘失败"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "无法解析URL。"
@@ -6851,8 +6851,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr "文件事件信息，返回的是时间戳 整数"
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6863,7 +6862,8 @@ msgstr "文件事件信息，返回的是时间戳 整数"
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr "填"
 
@@ -6960,7 +6960,7 @@ msgid "Fit to map"
 msgstr "调整至符合拓扑图"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "固定的"
 
@@ -6972,9 +6972,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -6982,22 +6982,22 @@ msgstr "灵活"
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr "跟随跳转"
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr "字体"
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr "字体大小"
 
@@ -7005,8 +7005,8 @@ msgstr "字体大小"
 msgid "Form data"
 msgstr "表格资料"
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "公式"
 
@@ -7042,7 +7042,7 @@ msgstr "周五"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "自从"
 
@@ -7057,7 +7057,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "前端访问"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "前端信息中"
 
@@ -7074,7 +7074,7 @@ msgid "Full clone"
 msgstr "全克隆"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "功能"
 
@@ -7490,8 +7490,8 @@ msgstr "HTTP 代理"
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP认证"
 
@@ -7502,8 +7502,8 @@ msgstr "HTTP 登录表格"
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr "HTTP 代理"
 
@@ -7540,10 +7540,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr "头"
 
@@ -7559,7 +7559,7 @@ msgstr "希伯来语（he_IL）"
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7666,7 +7666,7 @@ msgid "History cleared"
 msgstr "历史已清除"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "历史清除可能会很久。继续吗?"
 
@@ -7681,8 +7681,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr "历史数据保留时长"
 
@@ -7699,8 +7699,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "横向"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "横向对齐"
 
@@ -7816,7 +7816,7 @@ msgstr[0] "主机已启用"
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7902,9 +7902,9 @@ msgstr "主机群组"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "主机接口"
 
@@ -8191,8 +8191,8 @@ msgstr "IPMI接口"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI传感器"
 
@@ -8206,19 +8206,19 @@ msgstr ""
 msgid "Icon"
 msgstr "图标"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "图标(默认)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "图标(停用的)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "图标(维修)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "图标(问题)"
 
@@ -8265,7 +8265,7 @@ msgstr "图标映射"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的图标不可用。"
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "图标"
 
@@ -8407,7 +8407,7 @@ msgstr "图片"
 msgid "Images for all maps will be updated!"
 msgstr "所有拓扑图都将被更新!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "立即地"
 
@@ -8491,6 +8491,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9375,10 +9376,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "信息"
@@ -9445,8 +9446,8 @@ msgstr ""
 msgid "Insert"
 msgstr "插入"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr "插入表达式"
 
@@ -9562,9 +9563,9 @@ msgstr "IE浏览器"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "间隔"
@@ -10001,7 +10002,7 @@ msgstr "意大利语 (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "监控项"
 
@@ -10260,8 +10261,8 @@ msgstr "JMX agent代理程序"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr "JMX 端点"
 
@@ -10279,8 +10280,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr "JSON 数据"
 
@@ -10319,8 +10320,8 @@ msgstr "日语 (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10359,9 +10360,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "键值"
@@ -10427,13 +10428,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "标签"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "标签位置"
 
@@ -10574,9 +10575,9 @@ msgstr "拉脱维亚语(lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10587,7 +10588,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "左侧"
@@ -10621,25 +10622,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "搜索/过滤组件限制"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "线"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr "线类型"
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr "线高度"
 
@@ -10661,9 +10662,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "链接指示器"
 
@@ -10694,8 +10695,8 @@ msgstr "链接的模板"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr "链接"
 
@@ -10797,8 +10798,8 @@ msgstr "位置经度"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "日志"
 
@@ -10811,8 +10812,8 @@ msgid "Log file monitoring. Returns log"
 msgstr "日志文件监控。返回日志"
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "日志时间格式"
 
@@ -10938,7 +10939,7 @@ msgstr "主导航栏"
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "维护"
 
@@ -11098,7 +11099,7 @@ msgstr "拓扑图导航树"
 msgid "Map owner cannot be empty."
 msgstr "地图的所有者不能为空。"
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr "拓扑图形状"
 
@@ -11176,19 +11177,19 @@ msgstr "掩码"
 msgid "Mass update"
 msgstr "批量更新"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "批量更新组件"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr "批量更新形状"
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr "主要项"
 
@@ -11271,8 +11272,8 @@ msgid "May"
 msgstr "五月"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "报警媒介"
 
@@ -11393,8 +11394,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "消息超时"
 
@@ -11412,7 +11413,7 @@ msgstr "信息/命令"
 msgid "Messages"
 msgstr "消息"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "正在发送消息"
 
@@ -11510,11 +11511,11 @@ msgstr "数据图模板缺失\"name\"字段"
 msgid "Missing \"name\" field for graph."
 msgstr "缺少\"名称\"的图形栏位"
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr "缺少数据"
 
@@ -11678,8 +11679,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr "多重"
 
@@ -11845,7 +11846,7 @@ msgstr "NTLM"
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11865,15 +11866,15 @@ msgstr "NTLM"
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11882,16 +11883,16 @@ msgstr "NTLM"
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12171,7 +12172,7 @@ msgstr "没有细节"
 msgid "No discovery rule IDs given."
 msgstr "没有所称的自动发现规则ID"
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12227,8 +12228,8 @@ msgstr "没有图片"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "没有找到接口"
 
@@ -12532,7 +12533,7 @@ msgstr "没有指定的公钥文件"
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr "没有刷新"
 
@@ -12578,8 +12579,8 @@ msgstr "不推荐使用非布尔标志。"
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12587,17 +12588,17 @@ msgstr "不推荐使用非布尔标志。"
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "无"
@@ -12693,7 +12694,7 @@ msgstr "警报汇总"
 msgid "Notifications"
 msgstr "警报"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12867,8 +12868,8 @@ msgstr "数字系统"
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "浮点数"
 
@@ -12878,8 +12879,8 @@ msgstr "数字（整数）"
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "数字 (无正负)"
 
@@ -12887,8 +12888,8 @@ msgstr "数字 (无正负)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12900,13 +12901,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "正常"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr "事件成功关闭"
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr "事件成功迭代"
 
@@ -12967,7 +12968,7 @@ msgstr "关"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -12996,7 +12997,7 @@ msgstr "开"
 msgid "On status change triggers blink for"
 msgstr "于状态改变时, 触发器因此闪烁于"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "一次"
 
@@ -13116,11 +13117,11 @@ msgstr "操作并无模板来操作."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "操作"
@@ -13166,7 +13167,7 @@ msgstr "选项"
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13181,11 +13182,11 @@ msgstr "选项"
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr "或"
 
@@ -13280,8 +13281,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr "覆盖被"
@@ -13498,8 +13499,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "问题"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr "问题事件生成模式"
 
@@ -13581,8 +13582,8 @@ msgstr "参数 \"%1$s\" 已被弃用。"
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr "参数"
 
@@ -13630,8 +13631,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr "分析"
 
@@ -13662,12 +13663,12 @@ msgstr "被动式"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13700,12 +13701,12 @@ msgid "Paste"
 msgstr "粘贴"
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13718,7 +13719,7 @@ msgstr "粘贴无外部链接"
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 #, fuzzy
 msgid "Pause operations for suppressed problems"
 msgstr "暂停操作以制止问题"
@@ -13762,8 +13763,8 @@ msgstr "执行DNS查询。返回字符串信息"
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "期间"
@@ -13784,9 +13785,9 @@ msgid "Periods"
 msgstr "期间"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13797,7 +13798,7 @@ msgstr "期间"
 msgid "Permissions"
 msgstr "权限"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "权限只能被指派给用户群组"
 
@@ -13819,12 +13820,12 @@ msgstr "置入演算法"
 msgid "Plain text"
 msgstr "文本"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "播放"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "播放声音"
 
@@ -13854,8 +13855,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "请选择两个组件"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13865,14 +13865,15 @@ msgstr "请选择两个组件"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr "点尺寸"
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr "点"
 
@@ -13880,7 +13881,7 @@ msgstr "点"
 msgid "Polish (pl_PL)"
 msgstr "波兰(pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "填入主机资产纪录栏位"
 
@@ -13942,16 +13943,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr "进程"
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr "预定步骤"
 
@@ -14048,8 +14049,8 @@ msgstr "Private（私人的）"
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "私钥文件"
 
@@ -14079,7 +14080,7 @@ msgstr "优先权层级"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "问题"
 
@@ -14267,16 +14268,16 @@ msgstr "公开"
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "公钥"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "公钥文件"
 
@@ -14290,8 +14291,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr "查询字段"
 
@@ -14341,8 +14342,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr "原始数据"
 
@@ -14368,14 +14369,14 @@ msgstr "只读"
 msgid "Read-only"
 msgstr "只读"
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14389,14 +14390,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "读写"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14442,7 +14443,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14451,10 +14452,10 @@ msgid "Recovery"
 msgstr "恢复"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr "恢复表达式"
@@ -14464,7 +14465,7 @@ msgstr "恢复表达式"
 msgid "Recovery expression syntax error."
 msgstr "恢复表达式语法错误。"
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr "恢复操作"
 
@@ -14476,8 +14477,8 @@ msgstr "恢复操作"
 msgid "Recovery time"
 msgstr "恢复时间"
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr "矩形"
 
@@ -14582,7 +14583,7 @@ msgstr "远程命令"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14613,13 +14614,13 @@ msgstr "远程命令"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14627,25 +14628,25 @@ msgstr "远程命令"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14673,14 +14674,14 @@ msgstr "远程命令"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14755,10 +14756,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "替换"
 
@@ -14776,7 +14777,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14815,16 +14816,16 @@ msgstr "报表"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 #, fuzzy
 msgid "Request body"
 msgstr "请求正文"
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 #, fuzzy
 msgid "Request body type"
 msgstr "请求 body 类型"
@@ -14834,8 +14835,8 @@ msgid "Request sent successfully"
 msgstr "请求发送成功"
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr "请求类型"
 
@@ -14862,8 +14863,8 @@ msgstr "要求的主机性能, 每秒新值"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "要求的状态码"
 
@@ -14876,11 +14877,11 @@ msgstr "要求的字串"
 msgid "Reset"
 msgstr "重设"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "重设所有的栏位为默认值?"
 
@@ -14897,11 +14898,11 @@ msgstr "重设确认"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "重设预设"
 
@@ -15005,8 +15006,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr "恢复模式"
 
@@ -15079,9 +15080,9 @@ msgstr "返回ICMP ping包丢失的百分数."
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15089,7 +15090,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "右"
@@ -15106,8 +15107,8 @@ msgstr "Right Y"
 msgid "Right trim"
 msgstr "修整右边"
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15294,8 +15295,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15374,8 +15375,8 @@ msgstr "SQL count: %1$s (selects: %2$s | executes: %3$s)"
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr "SQL查询"
 
@@ -15400,38 +15401,38 @@ msgstr "SSH 客户端"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr "SSL证书文件"
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr "SSL秘钥文件"
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr "SSL秘钥密码"
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr "SSL验证主机"
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr "SSL验证对端"
 
@@ -15547,9 +15548,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15574,8 +15575,8 @@ msgstr "范围"
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "脚本"
 
@@ -15706,10 +15707,10 @@ msgstr "安全名称"
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "选择"
@@ -15719,9 +15720,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "选择原型"
 
@@ -15742,7 +15743,7 @@ msgstr "所选的动作已删除"
 msgid "Selected and all other problems of related triggers"
 msgstr "已选择的和所有其他问题的关联触发器"
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "所选的组件"
 
@@ -16091,8 +16092,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr "严重性提升"
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr "形"
@@ -16195,7 +16196,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16295,8 +16296,8 @@ msgstr "简单图形"
 msgid "Simple graph prototype"
 msgstr "简单数据图模板"
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr "单个"
 
@@ -16341,7 +16342,7 @@ msgstr "场所州/省"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr "大小"
 
@@ -16452,9 +16453,9 @@ msgstr "速度"
 msgid "Stacked"
 msgstr "层积的"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr "楼梯"
 
@@ -16475,7 +16476,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "开始于"
 
@@ -16670,14 +16671,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr "名字为\"%1$s\"的步骤已经存在."
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "步骤"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "停止"
 
@@ -16700,10 +16701,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -16939,8 +16940,8 @@ msgstr "标签显示优先级"
 msgid "Tag filter"
 msgstr "标签过滤器"
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr "匹配标记"
 
@@ -16999,28 +17000,28 @@ msgstr "标记值"
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr "标记"
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "目标"
@@ -17181,14 +17182,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "测试"
@@ -17246,10 +17247,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "文本"
 
@@ -17400,8 +17401,8 @@ msgstr "本月"
 msgid "This month so far"
 msgstr "这个月到目前为止"
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17506,9 +17507,9 @@ msgstr "时间期间"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "间隔(秒)"
 
@@ -17526,8 +17527,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "超时"
 
@@ -17553,7 +17554,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "到"
 
@@ -17577,7 +17578,7 @@ msgstr "今天到目前为止"
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "顶部"
@@ -17629,8 +17630,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17641,7 +17641,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr "透明度"
 
@@ -17649,9 +17650,9 @@ msgstr "透明度"
 msgid "Transport error."
 msgstr "传输错误."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr "视为 0"
@@ -17663,8 +17664,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr "趋势存储时间"
 
@@ -17682,9 +17683,9 @@ msgstr "趋势"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "触发器"
@@ -17783,7 +17784,7 @@ msgstr "触发器概览"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "触发器类型"
@@ -17848,7 +17849,7 @@ msgstr "触发器模板已删除"
 msgid "Trigger prototypes updated"
 msgstr "触发器模板已更新"
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "触发器示警度"
 
@@ -17955,23 +17956,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "类型"
@@ -17980,12 +17981,12 @@ msgstr "类型"
 msgid "Type (Full details)"
 msgstr "类型(全细节)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "类型(OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -17996,10 +17997,10 @@ msgstr "计算方式"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "信息类型"
 
@@ -18023,11 +18024,11 @@ msgstr "未知的"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18048,7 +18049,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr "网址未正确编码。"
@@ -18073,7 +18074,7 @@ msgstr "URL 参数名为空."
 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/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18176,15 +18177,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18193,8 +18194,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "单位"
 
@@ -18220,7 +18221,7 @@ msgstr "单位"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "未知的"
@@ -18362,12 +18363,12 @@ msgstr "上"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18387,18 +18388,18 @@ msgstr "上"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18419,13 +18420,13 @@ msgstr "更新现有的"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "更新间隔"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr "更新操作"
 
@@ -18564,7 +18565,7 @@ msgstr "用户代理字符串"
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "用户不能将自己加进一个取消的群组或已关闭图形接口访问权的群组."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18673,10 +18674,10 @@ msgstr "用户菜单"
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "用户名称"
 
@@ -18743,7 +18744,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr "拓扑图 \"%2$s\" 用户共享缺少参数 %1$s "
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19119,12 +19120,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19186,8 +19187,8 @@ msgstr "值映射 \"%1$s\"已存在."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "值映射"
@@ -19304,8 +19305,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "垂直的"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "纵向对齐"
 
@@ -19506,8 +19507,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19518,12 +19518,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19599,8 +19600,8 @@ msgstr "错误的图像连接栏位."
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19612,11 +19613,11 @@ msgstr "X轴"
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr "X1"
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr "X2"
 
@@ -19630,8 +19631,8 @@ msgstr "XML XPath"
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr "XML 数据"
 
@@ -19651,12 +19652,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "纵轴最大值"
 
@@ -19670,18 +19671,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y axis MAX value must be greater than Y axis MIN value."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "纵轴Y最小值MIN"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "纵轴Y侧"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr "Y轴"
 
@@ -19701,11 +19702,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr "Y1"
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr "Y2"
 
@@ -20736,10 +20737,10 @@ msgstr "fuzzytime() - 监控项值的时间戳和 Zabbix 服务器时间戳之�
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "全局管家设置"
@@ -20768,8 +20769,8 @@ msgstr "主机"
 msgid "host group"
 msgstr "主机群组"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr "主机样式"
@@ -20802,7 +20803,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr "包括子组"
 
@@ -20976,8 +20977,8 @@ msgstr "监控项"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr "监控项模式"
 
@@ -21241,10 +21242,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr "名字"
@@ -21291,7 +21292,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr "无"
 
@@ -21321,7 +21322,7 @@ msgstr "数字"
 msgid "of"
 msgstr "其"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21344,7 +21345,7 @@ msgstr "其"
 msgid "off"
 msgstr "关闭"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21516,8 +21517,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21654,8 +21655,8 @@ msgstr "提供的凭据不是唯一的"
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -21942,17 +21943,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/locale/zh_TW/LC_MESSAGES/frontend.po b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
index 1d09046907b..e458305243f 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: 2022-01-07 19:57+0200\n"
+"POT-Creation-Date: 2022-01-11 10:46+0200\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"
@@ -175,10 +175,10 @@ msgid "%1$s message"
 msgid_plural "%1$s messages"
 msgstr[0] ""
 
+#: include/classes/widgets/CWidgetConfig.php:297
 #: include/classes/widgets/CWidgetConfig.php:298
 #: include/classes/widgets/CWidgetConfig.php:299
-#: include/classes/widgets/CWidgetConfig.php:300
-#: include/classes/widgets/CWidgetConfig.php:301 include/func.inc.php:2555
+#: include/classes/widgets/CWidgetConfig.php:300 include/func.inc.php:2555
 #: jsLoader.php:158 jsLoader.php:159 jsLoader.php:160 jsLoader.php:161
 #, c-format
 msgid "%1$s minute"
@@ -218,9 +218,9 @@ msgid "%1$s retry left"
 msgid_plural "%1$s retries left"
 msgstr[0] "尚有%1$s次重試"
 
-#: app/views/administration.user.edit.php:671
-#: include/classes/widgets/CWidgetConfig.php:296
-#: include/classes/widgets/CWidgetConfig.php:297 include/func.inc.php:2562
+#: app/views/administration.user.edit.php:665
+#: include/classes/widgets/CWidgetConfig.php:295
+#: include/classes/widgets/CWidgetConfig.php:296 include/func.inc.php:2562
 #: jsLoader.php:156 jsLoader.php:157
 #, c-format
 msgid "%1$s second"
@@ -321,7 +321,7 @@ msgstr ""
 msgid "30 seconds"
 msgstr "30秒"
 
-#: include/views/configuration.graph.edit.php:324
+#: include/views/configuration.graph.edit.php:322
 msgid "3D view"
 msgstr "3D 檢視"
 
@@ -367,7 +367,7 @@ msgctxt "abbreviation of severity level"
 msgid "A"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:870
+#: include/classes/widgets/CWidgetHelper.php:871
 msgid "ADD OVERRIDE"
 msgstr ""
 
@@ -454,27 +454,27 @@ msgstr ""
 msgid "Access denied!"
 msgstr "存取被拒!"
 
-#: app/views/administration.user.edit.php:603
+#: app/views/administration.user.edit.php:597
 #: app/views/administration.userrole.edit.php:271
 msgid "Access to API"
 msgstr ""
 
-#: app/views/administration.user.edit.php:456
+#: app/views/administration.user.edit.php:450
 #: app/views/administration.userrole.edit.php:81
 msgid "Access to UI elements"
 msgstr ""
 
-#: app/views/administration.user.edit.php:632
+#: app/views/administration.user.edit.php:626
 #: app/views/administration.userrole.edit.php:320
 msgid "Access to actions"
 msgstr ""
 
-#: app/views/administration.user.edit.php:574
+#: app/views/administration.user.edit.php:568
 #: app/views/administration.userrole.edit.php:222
 msgid "Access to modules"
 msgstr ""
 
-#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:472
 #: app/views/administration.userrole.edit.php:134
 msgid "Access to services"
 msgstr ""
@@ -546,35 +546,35 @@ msgstr ""
 #: include/actions.inc.php:1921
 #: include/views/administration.auditacts.list.php:64
 #: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
-#: include/views/configuration.action.edit.php:485
-#: include/views/configuration.graph.edit.php:358
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
+#: include/views/configuration.action.edit.php:487
+#: include/views/configuration.graph.edit.php:356
 #: include/views/configuration.host.discovery.edit.php:134
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/configuration.host.discovery.edit.php:914
 #: include/views/configuration.host.prototype.edit.php:118
 #: include/views/configuration.httpconf.edit.php:209
-#: include/views/configuration.item.edit.php:193
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:178
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:192
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:177
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45
 #: include/views/configuration.template.edit.php:69
-#: include/views/configuration.trigger.prototype.edit.php:199
-#: include/views/configuration.trigger.prototype.edit.php:394
-#: include/views/configuration.trigger.prototype.edit.php:567
-#: include/views/configuration.triggers.edit.php:221
-#: include/views/configuration.triggers.edit.php:418
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.trigger.prototype.edit.php:201
+#: include/views/configuration.trigger.prototype.edit.php:400
+#: include/views/configuration.trigger.prototype.edit.php:576
+#: include/views/configuration.triggers.edit.php:224
+#: include/views/configuration.triggers.edit.php:426
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.edit.php:322
 #: include/views/monitoring.sysmap.edit.php:359
@@ -701,24 +701,24 @@ msgstr "作用中直到"
 #: app/views/administration.script.edit.php:86
 #: app/views/administration.script.edit.php:274
 #: app/views/administration.token.edit.php:102
-#: app/views/administration.user.edit.php:370
-#: app/views/administration.user.edit.php:776
+#: app/views/administration.user.edit.php:368
+#: app/views/administration.user.edit.php:770
 #: app/views/administration.usergroup.edit.php:143
 #: app/views/administration.usergroup.edit.php:194
 #: app/views/administration.usergroup.edit.php:233
 #: app/views/administration.userrole.edit.php:380
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:99
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:176
 #: app/views/configuration.dashboard.edit.php:60
 #: app/views/configuration.discovery.edit.php:82
 #: app/views/configuration.discovery.edit.php:145
 #: app/views/configuration.host.edit.php:36
 #: app/views/js/administration.mediatype.edit.js.php:134
-#: app/views/js/administration.mediatype.edit.js.php:234
+#: app/views/js/administration.mediatype.edit.js.php:240
 #: app/views/js/administration.script.edit.js.php:263
 #: app/views/js/administration.userrole.edit.js.php:268
-#: app/views/js/reports.scheduledreport.edit.js.php:133
+#: app/views/js/reports.scheduledreport.edit.js.php:134
 #: app/views/monitoring.dashboard.view.php:140
 #: app/views/monitoring.dashboard.widget.edit.php:39
 #: app/views/popup.condition.common.php:699
@@ -754,13 +754,13 @@ msgstr "作用中直到"
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126
 #: include/classes/helpers/CTagFilterFieldHelper.php:92
-#: include/classes/widgets/CWidgetHelper.php:618 include/forms.inc.php:1504
+#: include/classes/widgets/CWidgetHelper.php:619 include/forms.inc.php:1504
 #: include/forms.inc.php:2068 include/views/configuration.action.edit.php:135
-#: include/views/configuration.action.edit.php:297
-#: include/views/configuration.action.edit.php:381
-#: include/views/configuration.action.edit.php:457
-#: include/views/configuration.action.edit.php:508
-#: include/views/configuration.graph.edit.php:401
+#: include/views/configuration.action.edit.php:299
+#: include/views/configuration.action.edit.php:383
+#: include/views/configuration.action.edit.php:459
+#: include/views/configuration.action.edit.php:510
+#: include/views/configuration.graph.edit.php:399
 #: include/views/configuration.graph.edit.php:496
 #: include/views/configuration.host.discovery.edit.php:162
 #: include/views/configuration.host.discovery.edit.php:179
@@ -778,38 +778,38 @@ msgstr "作用中直到"
 #: include/views/configuration.httpconf.edit.php:138
 #: include/views/configuration.httpconf.edit.php:215
 #: include/views/configuration.httpconf.edit.php:275
-#: include/views/configuration.item.edit.php:220
-#: include/views/configuration.item.edit.php:237
-#: include/views/configuration.item.edit.php:382
-#: include/views/configuration.item.edit.php:784
-#: include/views/configuration.item.edit.php:1045
-#: include/views/configuration.item.prototype.edit.php:205
-#: include/views/configuration.item.prototype.edit.php:222
-#: include/views/configuration.item.prototype.edit.php:367
-#: include/views/configuration.item.prototype.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.item.edit.php:219
+#: include/views/configuration.item.edit.php:236
+#: include/views/configuration.item.edit.php:381
+#: include/views/configuration.item.edit.php:783
+#: include/views/configuration.item.edit.php:1044
+#: include/views/configuration.item.prototype.edit.php:204
+#: include/views/configuration.item.prototype.edit.php:221
+#: include/views/configuration.item.prototype.edit.php:366
+#: include/views/configuration.item.prototype.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:910
 #: include/views/configuration.maintenance.edit.php:86
 #: include/views/configuration.maintenance.edit.php:200
 #: include/views/configuration.maintenance.edit.php:275
 #: include/views/configuration.template.edit.php:234
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:148
-#: include/views/configuration.trigger.prototype.edit.php:305
-#: include/views/configuration.trigger.prototype.edit.php:341
-#: include/views/configuration.trigger.prototype.edit.php:611
-#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.trigger.prototype.edit.php:150
+#: include/views/configuration.trigger.prototype.edit.php:310
+#: include/views/configuration.trigger.prototype.edit.php:347
+#: include/views/configuration.trigger.prototype.edit.php:620
+#: include/views/configuration.trigger.prototype.edit.php:672
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:170
-#: include/views/configuration.triggers.edit.php:350
-#: include/views/configuration.triggers.edit.php:365
-#: include/views/configuration.triggers.edit.php:625
-#: include/views/configuration.triggers.edit.php:657
+#: include/views/configuration.triggers.edit.php:173
+#: include/views/configuration.triggers.edit.php:356
+#: include/views/configuration.triggers.edit.php:373
+#: include/views/configuration.triggers.edit.php:636
+#: include/views/configuration.triggers.edit.php:668
 #: include/views/js/configuration.action.edit.js.php:171
 #: include/views/js/monitoring.sysmap.edit.js.php:152
 #: include/views/js/monitoring.sysmaps.js.php:200
-#: include/views/js/monitoring.sysmaps.js.php:244
-#: include/views/js/monitoring.sysmaps.js.php:317
-#: include/views/js/monitoring.sysmaps.js.php:795
+#: include/views/js/monitoring.sysmaps.js.php:243
+#: include/views/js/monitoring.sysmaps.js.php:316
+#: include/views/js/monitoring.sysmaps.js.php:794
 #: include/views/monitoring.sysmap.constructor.php:32
 #: include/views/monitoring.sysmap.constructor.php:38
 #: include/views/monitoring.sysmap.constructor.php:44
@@ -836,7 +836,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:382
+#: app/views/js/popup.service.edit.js.php:380
 msgid "Add child services"
 msgstr ""
 
@@ -857,7 +857,7 @@ msgstr ""
 msgid "Add multiple maps"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1296
+#: include/classes/widgets/CWidgetHelper.php:1297
 msgid "Add new data set"
 msgstr ""
 
@@ -866,16 +866,16 @@ msgstr ""
 msgid "Add new interface"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:824
+#: include/classes/widgets/CWidgetHelper.php:825
 msgid "Add new override"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:202
-#: app/views/js/monitoring.dashboard.view.js.php:287
+#: app/views/js/monitoring.dashboard.view.js.php:290
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:412 jsLoader.php:417
+#: app/views/js/popup.service.edit.js.php:410 jsLoader.php:417
 msgid "Add parent services"
 msgstr ""
 
@@ -885,7 +885,7 @@ msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:101
 #: include/views/configuration.graph.edit.php:407
-#: include/views/configuration.trigger.prototype.edit.php:625
+#: include/views/configuration.trigger.prototype.edit.php:634
 msgid "Add prototype"
 msgstr "新增原型"
 
@@ -922,7 +922,7 @@ msgid "Add user group"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:198
-#: app/views/js/monitoring.dashboard.view.js.php:283
+#: app/views/js/monitoring.dashboard.view.js.php:286
 #: app/views/monitoring.dashboard.widget.edit.php:35
 msgid "Add widget"
 msgstr ""
@@ -1010,7 +1010,7 @@ msgstr "端點代理程式的介面"
 msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1235
+#: include/classes/widgets/CWidgetHelper.php:1236
 msgid "Aggregate"
 msgstr ""
 
@@ -1018,11 +1018,11 @@ msgstr ""
 msgid "Aggregate functions"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1207
+#: include/classes/widgets/CWidgetHelper.php:1208
 msgid "Aggregation function"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1226
+#: include/classes/widgets/CWidgetHelper.php:1227
 msgid "Aggregation interval"
 msgstr ""
 
@@ -1049,8 +1049,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:219
 #: app/views/administration.script.list.php:191
 #: app/views/administration.script.list.php:192
-#: app/views/administration.user.edit.php:484
-#: app/views/administration.user.edit.php:529
+#: app/views/administration.user.edit.php:478
+#: app/views/administration.user.edit.php:523
 #: app/views/administration.userrole.edit.php:143
 #: app/views/administration.userrole.edit.php:184
 #: app/views/monitoring.dashboard.list.php:65
@@ -1066,8 +1066,8 @@ msgid "All dashboards"
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
+#: app/views/administration.user.edit.php:423
 #: app/views/administration.user.edit.php:429
-#: app/views/administration.user.edit.php:435
 msgid "All groups"
 msgstr ""
 
@@ -1083,13 +1083,13 @@ msgstr "所有的連結應含 特定的名稱和URL"
 msgid "All maps"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:502
-#: include/views/configuration.triggers.edit.php:529
+#: include/views/configuration.trigger.prototype.edit.php:511
+#: include/views/configuration.triggers.edit.php:540
 msgid "All problems"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:503
-#: include/views/configuration.triggers.edit.php:530
+#: include/views/configuration.trigger.prototype.edit.php:512
+#: include/views/configuration.triggers.edit.php:541
 msgid "All problems if tag values match"
 msgstr ""
 
@@ -1110,19 +1110,19 @@ msgid "Allow list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994
-#: include/views/configuration.trigger.prototype.edit.php:515
-#: include/views/configuration.triggers.edit.php:542
+#: include/views/configuration.trigger.prototype.edit.php:524
+#: include/views/configuration.triggers.edit.php:553
 msgid "Allow manual close"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:382
 #: include/views/configuration.host.discovery.edit.php:695
-#: include/views/configuration.item.edit.php:918
-#: include/views/configuration.item.prototype.edit.php:832
+#: include/views/configuration.item.edit.php:917
+#: include/views/configuration.item.prototype.edit.php:831
 msgid "Allowed hosts"
 msgstr "容許的主機"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Allowed methods"
 msgstr ""
 
@@ -1139,21 +1139,21 @@ msgid "Amount of host physical memory consumed for backing up guest physical mem
 msgstr ""
 
 #: app/partials/popup.operations.php:240
-#: app/views/configuration.correlation.edit.php:114
+#: app/views/configuration.correlation.edit.php:117
 #: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064
 #: include/views/configuration.action.edit.php:125
 #: include/views/configuration.host.discovery.edit.php:724
-#: include/views/configuration.trigger.prototype.edit.php:155
-#: include/views/configuration.trigger.prototype.edit.php:348
-#: include/views/configuration.triggers.edit.php:177
-#: include/views/configuration.triggers.edit.php:372
+#: include/views/configuration.trigger.prototype.edit.php:157
+#: include/views/configuration.trigger.prototype.edit.php:354
+#: include/views/configuration.triggers.edit.php:180
+#: include/views/configuration.triggers.edit.php:380
 msgid "And"
 msgstr "且"
 
 #: app/partials/monitoring.host.filter.php:32
 #: app/partials/monitoring.problem.filter.php:161
 #: app/partials/popup.operations.php:239
-#: app/views/configuration.correlation.edit.php:113
+#: app/views/configuration.correlation.edit.php:116
 #: app/views/popup.lldoverride.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:53
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:52
@@ -1167,7 +1167,7 @@ msgstr "且"
 #: include/views/configuration.action.edit.php:124
 #: include/views/configuration.host.discovery.edit.php:723
 #: include/views/configuration.maintenance.edit.php:141
-#: include/views/js/monitoring.sysmaps.js.php:237
+#: include/views/js/monitoring.sysmaps.js.php:236
 msgid "And/Or"
 msgstr "且/或"
 
@@ -1212,11 +1212,11 @@ msgstr "應用集 錯誤."
 #: 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:205
+#: include/views/js/monitoring.sysmaps.js.php:326
+#: include/views/js/monitoring.sysmaps.js.php:479
+#: include/views/js/monitoring.sysmaps.js.php:603
+#: include/views/js/monitoring.sysmaps.js.php:708
+#: include/views/js/monitoring.sysmaps.js.php:814 jsLoader.php:205
 #: jsLoader.php:330
 msgid "Apply"
 msgstr "適用"
@@ -1344,11 +1344,11 @@ 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:159
 msgid "At least one operation must be selected."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:518
+#: include/views/configuration.action.edit.php:520
 msgid "At least one operation must exist."
 msgstr ""
 
@@ -1442,8 +1442,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:129
 #: app/views/popup.massupdate.item.php:169
 #: include/views/configuration.host.discovery.edit.php:549
-#: include/views/configuration.item.edit.php:630
-#: include/views/configuration.item.prototype.edit.php:614
+#: include/views/configuration.item.edit.php:629
+#: include/views/configuration.item.prototype.edit.php:613
 msgid "Authentication method"
 msgstr "認證方法"
 
@@ -1505,8 +1505,8 @@ msgstr "自動地"
 msgid "Automatic icon mapping"
 msgstr "自動的圖示對應"
 
-#: include/views/js/monitoring.sysmaps.js.php:255
-#: include/views/js/monitoring.sysmaps.js.php:670
+#: include/views/js/monitoring.sysmaps.js.php:254
+#: include/views/js/monitoring.sysmaps.js.php:669
 msgid "Automatic icon selection"
 msgstr "自動的圖示選擇"
 
@@ -1573,12 +1573,12 @@ msgstr ""
 
 #: app/views/administration.image.edit.php:73
 #: app/views/administration.image.list.php:51
-#: include/views/js/monitoring.sysmaps.js.php:400
+#: include/views/js/monitoring.sysmaps.js.php:399
 msgid "Background"
 msgstr "背景"
 
 #: include/classes/widgets/forms/CWidgetFormItem.php:384
-#: include/views/js/monitoring.sysmaps.js.php:565
+#: include/views/js/monitoring.sysmaps.js.php:564
 msgid "Background color"
 msgstr ""
 
@@ -1586,9 +1586,9 @@ msgstr ""
 msgid "Background image"
 msgstr "背景圖片"
 
-#: include/classes/widgets/CWidgetHelper.php:846
-#: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1137
+#: include/classes/widgets/CWidgetHelper.php:847
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1138
 msgid "Bar"
 msgstr ""
 
@@ -1596,8 +1596,8 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
-#: include/classes/widgets/CWidgetHelper.php:872
-#: include/classes/widgets/CWidgetHelper.php:1128
+#: include/classes/widgets/CWidgetHelper.php:873
+#: include/classes/widgets/CWidgetHelper.php:1129
 msgid "Base color"
 msgstr ""
 
@@ -1640,15 +1640,15 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:160
 #: include/views/configuration.host.discovery.edit.php:372
-#: include/views/configuration.item.edit.php:431
-#: include/views/configuration.item.prototype.edit.php:416
+#: include/views/configuration.item.edit.php:430
+#: include/views/configuration.item.prototype.edit.php:415
 msgid "Body"
 msgstr ""
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:374
-#: include/views/configuration.item.edit.php:433
-#: include/views/configuration.item.prototype.edit.php:418
+#: include/views/configuration.item.edit.php:432
+#: include/views/configuration.item.prototype.edit.php:417
 msgid "Body and headers"
 msgstr ""
 
@@ -1659,8 +1659,8 @@ msgstr ""
 msgid "Bold"
 msgstr ""
 
-#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
-#: include/views/js/monitoring.sysmaps.js.php:871
+#: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:780
+#: include/views/js/monitoring.sysmaps.js.php:870
 msgid "Bold line"
 msgstr "粗線"
 
@@ -1668,19 +1668,19 @@ msgstr "粗線"
 msgid "Boolean to decimal"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:409
 msgid "Border"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:596
+#: include/views/js/monitoring.sysmaps.js.php:595
 msgid "Border color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:574
+#: include/views/js/monitoring.sysmaps.js.php:573
 msgid "Border type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:586
+#: include/views/js/monitoring.sysmaps.js.php:585
 msgid "Border width"
 msgstr ""
 
@@ -1693,7 +1693,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:312
 #: include/views/js/monitoring.sysmaps.js.php:42
 #: include/views/js/monitoring.sysmaps.js.php:146
-#: include/views/js/monitoring.sysmaps.js.php:660
+#: include/views/js/monitoring.sysmaps.js.php:659
 #: include/views/monitoring.sysmap.edit.php:248
 msgid "Bottom"
 msgstr "底部"
@@ -1776,7 +1776,7 @@ msgid "CUID is expected"
 msgstr ""
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
-#: include/views/configuration.graph.edit.php:252
+#: include/views/configuration.graph.edit.php:251
 msgid "Calculated"
 msgstr "計算的"
 
@@ -1800,22 +1800,22 @@ msgstr "回呼"
 #: app/views/administration.regex.edit.php:165
 #: app/views/administration.script.edit.php:267
 #: app/views/administration.token.edit.php:96
-#: app/views/administration.user.edit.php:755
-#: app/views/administration.user.edit.php:786
+#: app/views/administration.user.edit.php:749
+#: app/views/administration.user.edit.php:780
 #: app/views/administration.usergroup.edit.php:213
 #: app/views/administration.userrole.edit.php:351
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:170
 #: app/views/configuration.dashboard.edit.php:68
 #: app/views/configuration.discovery.edit.php:139
 #: app/views/configuration.host.edit.php:29
-#: app/views/js/administration.audit.settings.edit.js.php:45
-#: app/views/js/administration.gui.edit.js.php:35
-#: app/views/js/administration.housekeeping.edit.js.php:71
-#: app/views/js/administration.miscconfig.edit.js.php:45
-#: app/views/js/administration.trigdisplay.edit.js.php:51
-#: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154
-#: app/views/js/reports.scheduledreport.edit.js.php:85
+#: app/views/js/administration.audit.settings.edit.js.php:46
+#: app/views/js/administration.gui.edit.js.php:36
+#: app/views/js/administration.housekeeping.edit.js.php:72
+#: app/views/js/administration.miscconfig.edit.js.php:46
+#: app/views/js/administration.trigdisplay.edit.js.php:52
+#: app/views/js/popup.import.js.php:61 app/views/js/popup.import.js.php:156
+#: app/views/js/reports.scheduledreport.edit.js.php:86
 #: app/views/monitoring.dashboard.view.php:148
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
@@ -3357,8 +3357,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:139
 #: app/views/popup.massupdate.item.php:157 include/items.inc.php:127
-#: include/views/configuration.item.edit.php:120
-#: include/views/configuration.item.prototype.edit.php:105
+#: include/views/configuration.item.edit.php:119
+#: include/views/configuration.item.prototype.edit.php:104
 msgid "Character"
 msgstr "字元"
 
@@ -3386,7 +3386,7 @@ msgstr "機殼"
 msgid "Chassis information. Returns string"
 msgstr ""
 
-#: app/views/js/configuration.discovery.edit.js.php:382
+#: app/views/js/configuration.discovery.edit.js.php:388
 msgid "Check already exists."
 msgstr "檢查已存在."
 
@@ -3507,8 +3507,8 @@ msgid "Clear history"
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:261
-#: include/views/configuration.item.edit.php:1029
-#: include/views/configuration.item.edit.php:1032
+#: include/views/configuration.item.edit.php:1028
+#: include/views/configuration.item.edit.php:1031
 msgid "Clear history and trends"
 msgstr "清除歷史和趨勢"
 
@@ -3536,22 +3536,22 @@ msgstr "Clock"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:283
 #: app/views/administration.userrole.edit.php:361
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
 #: app/views/popup.service.edit.php:367 app/views/popup.sla.edit.php:250
-#: include/views/configuration.action.edit.php:497
+#: include/views/configuration.action.edit.php:499
 #: include/views/configuration.graph.edit.php:488
 #: include/views/configuration.host.discovery.edit.php:960
 #: include/views/configuration.hostgroups.edit.php:62
 #: include/views/configuration.host.prototype.edit.php:419
 #: include/views/configuration.httpconf.edit.php:254
-#: include/views/configuration.item.edit.php:1015
-#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.edit.php:1014
+#: include/views/configuration.item.prototype.edit.php:900
 #: include/views/configuration.maintenance.edit.php:266
 #: include/views/configuration.template.edit.php:219
-#: include/views/configuration.trigger.prototype.edit.php:655
-#: include/views/configuration.triggers.edit.php:648
+#: include/views/configuration.trigger.prototype.edit.php:664
+#: include/views/configuration.triggers.edit.php:659
 #: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:353
 msgid "Clone"
 msgstr "克隆"
@@ -3559,28 +3559,28 @@ msgstr "克隆"
 #: app/views/administration.token.view.php:64
 #: app/views/administration.user.token.view.php:63
 #: app/views/popup.import.compare.php:162 include/func.inc.php:1723
-#: include/views/js/monitoring.sysmaps.js.php:334
-#: 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:217
+#: include/views/js/monitoring.sysmaps.js.php:333
+#: include/views/js/monitoring.sysmaps.js.php:486
+#: include/views/js/monitoring.sysmaps.js.php:610
+#: include/views/js/monitoring.sysmaps.js.php:715
+#: include/views/js/monitoring.sysmaps.js.php:818 jsLoader.php:217
 #: jsLoader.php:296 jsLoader.php:313 jsLoader.php:397
 msgid "Close"
 msgstr "關閉"
 
-#: include/views/configuration.trigger.prototype.edit.php:286
-#: include/views/configuration.trigger.prototype.edit.php:482
-#: include/views/configuration.triggers.edit.php:311
-#: include/views/configuration.triggers.edit.php:509
+#: include/views/configuration.trigger.prototype.edit.php:291
+#: include/views/configuration.trigger.prototype.edit.php:491
+#: include/views/configuration.triggers.edit.php:317
+#: include/views/configuration.triggers.edit.php:520
 msgid "Close expression constructor"
 msgstr "關閉表示式建構"
 
-#: app/views/configuration.correlation.edit.php:152
+#: app/views/configuration.correlation.edit.php:155
 #: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
+#: app/views/configuration.correlation.edit.php:149
 #: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
@@ -3594,7 +3594,7 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:307
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:307
 #: jsLoader.php:312
 msgid "Collapse"
 msgstr ""
@@ -3608,11 +3608,11 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:221
 #: include/classes/widgets/forms/CWidgetFormItem.php:284
 #: include/classes/widgets/forms/CWidgetFormItem.php:344
-#: include/views/configuration.graph.edit.php:357
-#: include/views/js/monitoring.sysmaps.js.php:381
-#: include/views/js/monitoring.sysmaps.js.php:402
-#: include/views/js/monitoring.sysmaps.js.php:422
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/configuration.graph.edit.php:355
+#: include/views/js/monitoring.sysmaps.js.php:380
+#: include/views/js/monitoring.sysmaps.js.php:401
+#: include/views/js/monitoring.sysmaps.js.php:421
+#: include/views/js/monitoring.sysmaps.js.php:791
 msgid "Color"
 msgstr ""
 
@@ -3621,7 +3621,7 @@ msgstr ""
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:786
+#: include/views/js/monitoring.sysmaps.js.php:785
 msgid "Color (OK)"
 msgstr ""
 
@@ -3709,9 +3709,9 @@ msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not
 msgstr ""
 
 #: app/partials/popup.operations.php:254
-#: app/views/configuration.correlation.edit.php:126
+#: app/views/configuration.correlation.edit.php:129
 #: app/views/configuration.correlation.list.php:76
-#: include/views/configuration.action.edit.php:143
+#: include/views/configuration.action.edit.php:145
 #: include/views/configuration.action.list.php:102
 msgid "Conditions"
 msgstr "條件"
@@ -3896,13 +3896,13 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:49 include/hosts.inc.php:1223
 #: include/views/inventory.host.view.php:81
-#: include/views/js/monitoring.sysmaps.js.php:771
+#: include/views/js/monitoring.sysmaps.js.php:770
 msgid "Connect to"
 msgstr "連接到"
 
-#: include/classes/widgets/CWidgetHelper.php:852
-#: include/classes/widgets/CWidgetHelper.php:927
-#: include/classes/widgets/CWidgetHelper.php:1186
+#: include/classes/widgets/CWidgetHelper.php:853
+#: include/classes/widgets/CWidgetHelper.php:928
+#: include/classes/widgets/CWidgetHelper.php:1187
 msgctxt "missing data function"
 msgid "Connected"
 msgstr ""
@@ -3994,8 +3994,8 @@ msgstr "聯絡"
 #: app/views/popup.service.edit.php:90 app/views/popup.sla.edit.php:150
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
-#: include/classes/widgets/CWidgetHelper.php:579
-#: include/classes/widgets/CWidgetHelper.php:645
+#: include/classes/widgets/CWidgetHelper.php:580
+#: include/classes/widgets/CWidgetHelper.php:646
 #: include/views/configuration.maintenance.edit.php:156
 #: include/views/configuration.maintenance.edit.php:178
 #: include/views/js/configuration.maintenance.edit.js.php:33
@@ -4075,13 +4075,13 @@ msgstr ""
 msgid "Contract number"
 msgstr "合約號碼"
 
-#: include/views/configuration.item.edit.php:440
-#: include/views/configuration.item.prototype.edit.php:424
+#: include/views/configuration.item.edit.php:439
+#: include/views/configuration.item.prototype.edit.php:423
 msgid "Convert to JSON"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:302
-#: include/views/js/monitoring.sysmaps.js.php:431
+#: include/views/js/monitoring.sysmaps.js.php:301
+#: include/views/js/monitoring.sysmaps.js.php:430
 msgid "Coordinates"
 msgstr "座標"
 
@@ -4098,7 +4098,7 @@ msgstr "複製"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:167
 msgid "Correlation"
 msgstr ""
 
@@ -4234,10 +4234,10 @@ msgstr ""
 #: include/views/configuration.host.prototype.edit.php:286
 #: include/views/configuration.host.prototype.list.php:61
 #: include/views/configuration.host.prototype.list.php:187
-#: include/views/configuration.item.prototype.edit.php:847
+#: include/views/configuration.item.prototype.edit.php:846
 #: include/views/configuration.item.prototype.list.php:65
 #: include/views/configuration.item.prototype.list.php:189
-#: include/views/configuration.trigger.prototype.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:545
 #: include/views/configuration.trigger.prototype.list.php:61
 #: include/views/configuration.trigger.prototype.list.php:195
 msgid "Create enabled"
@@ -4441,7 +4441,7 @@ msgid "Custom"
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOverride.php:84
-#: app/views/configuration.correlation.edit.php:116
+#: app/views/configuration.correlation.edit.php:119
 #: app/views/popup.lldoverride.php:70
 #: include/views/configuration.action.edit.php:127
 #: include/views/configuration.host.discovery.edit.php:726
@@ -4455,8 +4455,8 @@ msgstr "自訂圖形"
 #: app/views/popup.lldoperation.php:169
 #: app/views/popup.massupdate.item.php:275
 #: include/views/configuration.host.discovery.edit.php:675
-#: include/views/configuration.item.edit.php:790
-#: include/views/configuration.item.prototype.edit.php:757
+#: include/views/configuration.item.edit.php:789
+#: include/views/configuration.item.prototype.edit.php:756
 msgid "Custom intervals"
 msgstr ""
 
@@ -4621,8 +4621,8 @@ msgstr ""
 msgid "Dashboards"
 msgstr ""
 
-#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
-#: include/views/js/monitoring.sysmaps.js.php:873
+#: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:782
+#: include/views/js/monitoring.sysmaps.js.php:872
 msgid "Dashed line"
 msgstr "虛線"
 
@@ -4640,7 +4640,7 @@ msgstr ""
 msgid "Data overview"
 msgstr "資料概覽"
 
-#: include/classes/widgets/CWidgetHelper.php:1241
+#: include/classes/widgets/CWidgetHelper.php:1242
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
 #: include/classes/widgets/views/widget.svggraph.form.view.php:301
 msgid "Data set"
@@ -4824,11 +4824,11 @@ msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:224
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:226
 #: include/views/inventory.host.view.php:81
 #: 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:269
+#: include/views/js/monitoring.sysmaps.js.php:262
+#: include/views/js/monitoring.sysmaps.js.php:658 jsLoader.php:269
 msgid "Default"
 msgstr "預設"
 
@@ -4870,7 +4870,7 @@ msgstr ""
 msgid "Default media type"
 msgstr ""
 
-#: actionconf.php:52 include/views/configuration.action.edit.php:157
+#: actionconf.php:52 include/views/configuration.action.edit.php:159
 msgid "Default operation step duration"
 msgstr "預設操作步驟停留時間 "
 
@@ -4904,7 +4904,7 @@ msgstr "延遲因"
 #: app/views/administration.iconmap.edit.php:139
 #: app/views/administration.image.edit.php:79
 #: app/views/administration.mediatype.edit.php:364
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 #: app/views/administration.proxy.edit.php:162
 #: app/views/administration.proxy.list.php:189
 #: app/views/administration.regex.edit.php:148
@@ -4913,7 +4913,7 @@ msgstr "延遲因"
 #: app/views/administration.script.list.php:202
 #: app/views/administration.token.edit.php:110
 #: app/views/administration.token.list.php:201
-#: app/views/administration.user.edit.php:764
+#: app/views/administration.user.edit.php:758
 #: app/views/administration.usergroup.edit.php:222
 #: app/views/administration.usergroup.list.php:237
 #: app/views/administration.user.list.php:250
@@ -4921,47 +4921,47 @@ 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:182
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:155
 #: app/views/configuration.discovery.list.php:122
 #: app/views/configuration.host.edit.php:49
-#: app/views/configuration.host.list.php:522
+#: app/views/configuration.host.list.php:524
 #: app/views/monitoring.dashboard.list.php:123
 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:381
 #: app/views/popup.sla.edit.php:264 app/views/popup.tabfilter.edit.php:71
 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175
 #: include/classes/html/CButtonDelete.php:25
-#: include/classes/widgets/CWidgetHelper.php:763
-#: include/classes/widgets/CWidgetHelper.php:1114
+#: include/classes/widgets/CWidgetHelper.php:764
+#: include/classes/widgets/CWidgetHelper.php:1115
 #: include/views/configuration.action.list.php:169
 #: include/views/configuration.graph.list.php:240
 #: include/views/configuration.host.discovery.list.php:333
 #: include/views/configuration.hostgroups.list.php:204
 #: include/views/configuration.host.prototype.list.php:193
 #: include/views/configuration.httpconf.list.php:224
-#: include/views/configuration.item.list.php:314
-#: include/views/configuration.item.prototype.list.php:201
+#: include/views/configuration.item.list.php:318
+#: include/views/configuration.item.prototype.list.php:205
 #: include/views/configuration.maintenance.list.php:124
-#: include/views/configuration.template.list.php:284
-#: include/views/configuration.trigger.prototype.list.php:207
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.template.list.php:288
+#: include/views/configuration.trigger.prototype.list.php:211
+#: include/views/configuration.triggers.list.php:354
 #: include/views/monitoring.sysmap.list.php:110 jsLoader.php:135
 #: jsLoader.php:164 jsLoader.php:359
 msgid "Delete"
 msgstr "删除"
 
-#: app/views/js/popup.import.js.php:47
+#: app/views/js/popup.import.js.php:48
 msgid "Delete all elements that are not present in the import file?"
 msgstr ""
 
 #: include/views/configuration.template.edit.php:224
-#: include/views/configuration.template.list.php:285
+#: include/views/configuration.template.list.php:289
 msgid "Delete and clear"
 msgstr "刪除並清除"
 
-#: include/views/configuration.template.list.php:286
+#: include/views/configuration.template.list.php:290
 msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
 msgstr "刪除並清除所選的模板? (警告: 所有連結的主機將被清除!)"
 
@@ -4969,11 +4969,11 @@ msgstr "刪除並清除所選的模板? (警告: 所有連結的主機將被清�
 msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
 msgstr "刪除並清除模板? (警告: 所有連結的主機將被清除!)"
 
-#: include/views/configuration.action.edit.php:499
+#: include/views/configuration.action.edit.php:501
 msgid "Delete current action?"
 msgstr "刪除目前的動作?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:186
 msgid "Delete current correlation?"
 msgstr ""
 
@@ -4986,10 +4986,10 @@ msgstr ""
 msgid "Delete discovery rule?"
 msgstr "刪除探索規則?"
 
-#: include/views/configuration.trigger.prototype.edit.php:247
-#: include/views/configuration.trigger.prototype.edit.php:443
-#: include/views/configuration.triggers.edit.php:270
-#: include/views/configuration.triggers.edit.php:468
+#: include/views/configuration.trigger.prototype.edit.php:249
+#: include/views/configuration.trigger.prototype.edit.php:449
+#: include/views/configuration.triggers.edit.php:273
+#: include/views/configuration.triggers.edit.php:476
 msgid "Delete expression?"
 msgstr "删除表示式?"
 
@@ -5013,11 +5013,11 @@ msgstr ""
 msgid "Delete icon map?"
 msgstr "刪除圖示對應?"
 
-#: include/views/configuration.item.prototype.edit.php:903
+#: include/views/configuration.item.prototype.edit.php:902
 msgid "Delete item prototype?"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:1037
+#: include/views/configuration.item.edit.php:1036
 msgid "Delete item?"
 msgstr "刪除項目?"
 
@@ -5059,11 +5059,11 @@ msgstr ""
 msgid "Delete selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:129 app/views/popup.sla.edit.php:265
+#: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:265
 msgid "Delete selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:128
+#: app/views/js/sla.list.js.php:129
 msgid "Delete selected SLAs?"
 msgstr ""
 
@@ -5122,7 +5122,7 @@ msgstr ""
 msgid "Delete selected host?"
 msgstr "刪除所選的主機?"
 
-#: app/views/configuration.host.list.php:523
+#: app/views/configuration.host.list.php:525
 msgid "Delete selected hosts?"
 msgstr "删除所選的主機?"
 
@@ -5130,11 +5130,11 @@ msgstr "删除所選的主機?"
 msgid "Delete selected image?"
 msgstr "删除所選的圖片?"
 
-#: include/views/configuration.item.prototype.list.php:202
+#: include/views/configuration.item.prototype.list.php:206
 msgid "Delete selected item prototypes?"
 msgstr ""
 
-#: include/views/configuration.item.list.php:314
+#: include/views/configuration.item.list.php:318
 msgid "Delete selected items?"
 msgstr "删除所選的項目?"
 
@@ -5150,7 +5150,7 @@ msgstr ""
 msgid "Delete selected maps?"
 msgstr "删除所選的拓墣圖?"
 
-#: app/views/administration.mediatype.list.php:183
+#: app/views/administration.mediatype.list.php:186
 msgid "Delete selected media types?"
 msgstr "刪除所選的示警媒介類型?"
 
@@ -5182,11 +5182,11 @@ msgstr ""
 msgid "Delete selected scripts?"
 msgstr "删除所選的脚本?"
 
-#: app/views/js/service.list.js.php:146 app/views/popup.service.edit.php:382
+#: app/views/js/service.list.js.php:152 app/views/popup.service.edit.php:382
 msgid "Delete selected service?"
 msgstr ""
 
-#: app/views/js/service.list.js.php:145
+#: app/views/js/service.list.js.php:151
 msgid "Delete selected services?"
 msgstr ""
 
@@ -5194,19 +5194,19 @@ msgstr ""
 msgid "Delete selected shapes?"
 msgstr ""
 
-#: include/views/configuration.template.list.php:284
+#: include/views/configuration.template.list.php:288
 msgid "Delete selected templates?"
 msgstr "删除所選的模板?"
 
-#: include/views/configuration.trigger.prototype.list.php:208
+#: include/views/configuration.trigger.prototype.list.php:212
 msgid "Delete selected trigger prototypes?"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:350
+#: include/views/configuration.triggers.list.php:354
 msgid "Delete selected triggers?"
 msgstr "删除所選的觸發器?"
 
-#: app/views/administration.user.edit.php:766
+#: app/views/administration.user.edit.php:760
 msgid "Delete selected user?"
 msgstr "删除所選的用戶?"
 
@@ -5222,11 +5222,11 @@ msgstr ""
 msgid "Delete template?"
 msgstr "刪除模板?"
 
-#: include/views/configuration.trigger.prototype.edit.php:645
+#: include/views/configuration.trigger.prototype.edit.php:654
 msgid "Delete trigger prototype?"
 msgstr ""
 
-#: include/views/configuration.triggers.edit.php:649
+#: include/views/configuration.triggers.edit.php:660
 msgid "Delete trigger?"
 msgstr "刪除觸發器?"
 
@@ -5252,7 +5252,7 @@ msgstr ""
 msgid "Delimiter"
 msgstr "分隔符"
 
-#: app/views/administration.user.edit.php:623
+#: app/views/administration.user.edit.php:617
 msgid "Denied methods"
 msgstr ""
 
@@ -5267,10 +5267,10 @@ msgid "Deny list"
 msgstr ""
 
 #: app/views/popup.massupdate.trigger.php:150
-#: include/views/configuration.trigger.prototype.edit.php:607
-#: include/views/configuration.trigger.prototype.edit.php:641
-#: include/views/configuration.triggers.edit.php:620
-#: include/views/configuration.triggers.edit.php:642
+#: include/views/configuration.trigger.prototype.edit.php:616
+#: include/views/configuration.trigger.prototype.edit.php:650
+#: include/views/configuration.triggers.edit.php:631
+#: include/views/configuration.triggers.edit.php:653
 msgid "Dependencies"
 msgstr "相依關係"
 
@@ -5307,7 +5307,7 @@ msgstr "佈署狀態"
 #: app/views/administration.token.view.php:55
 #: app/views/administration.user.token.edit.php:51
 #: app/views/administration.user.token.view.php:54
-#: app/views/configuration.correlation.edit.php:134
+#: app/views/configuration.correlation.edit.php:137
 #: app/views/popup.massupdate.host.php:111
 #: app/views/popup.massupdate.item.php:465
 #: app/views/popup.massupdate.template.php:114
@@ -5317,13 +5317,13 @@ msgstr "佈署狀態"
 #: include/classes/widgets/views/widget.item.form.view.php:50
 #: include/events.inc.php:264
 #: include/views/configuration.host.discovery.edit.php:701
-#: include/views/configuration.item.edit.php:961
-#: include/views/configuration.item.prototype.edit.php:839
+#: include/views/configuration.item.edit.php:960
+#: include/views/configuration.item.prototype.edit.php:838
 #: include/views/configuration.maintenance.edit.php:252
 #: include/views/configuration.maintenance.list.php:90
 #: include/views/configuration.template.edit.php:170
-#: include/views/configuration.trigger.prototype.edit.php:531
-#: include/views/configuration.triggers.edit.php:558
+#: include/views/configuration.trigger.prototype.edit.php:540
+#: include/views/configuration.triggers.edit.php:569
 #: include/views/inventory.host.view.php:129
 msgid "Description"
 msgstr "描述"
@@ -5333,10 +5333,10 @@ msgstr "描述"
 #: app/views/js/reports.auditlog.list.js.php:153
 #: app/views/reports.auditlog.list.php:96
 #: app/views/reports.auditlog.list.php:129 include/func.inc.php:1668
-#: include/views/configuration.action.edit.php:170
-#: include/views/configuration.action.edit.php:174
-#: include/views/configuration.action.edit.php:314
-#: include/views/configuration.action.edit.php:402
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:176
+#: include/views/configuration.action.edit.php:316
+#: include/views/configuration.action.edit.php:404
 #: include/views/inventory.host.view.php:257
 msgid "Details"
 msgstr "細節"
@@ -5377,7 +5377,7 @@ msgstr ""
 msgid "Directory size (in bytes). Returns integer"
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 #: app/views/administration.module.list.php:124
 #: app/views/administration.token.list.php:200
 #: app/views/administration.usergroup.list.php:219
@@ -5428,11 +5428,11 @@ msgstr "停用所選的系統代理程式所監測的主機?"
 msgid "Disable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:117
+#: app/views/js/sla.list.js.php:118
 msgid "Disable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:116
+#: app/views/js/sla.list.js.php:117
 msgid "Disable selected SLAs?"
 msgstr ""
 
@@ -5461,7 +5461,7 @@ msgstr "停用所選的主機?"
 msgid "Disable selected items?"
 msgstr "停用所選的項目?"
 
-#: app/views/administration.mediatype.list.php:174
+#: app/views/administration.mediatype.list.php:177
 msgid "Disable selected media types?"
 msgstr "停用所選的示警媒介類型?"
 
@@ -5495,7 +5495,7 @@ msgstr "停用選取的網頁檢測？"
 #: app/views/administration.token.list.php:95
 #: app/views/administration.token.list.php:183
 #: app/views/administration.user.edit.php:304
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.list.php:54
 #: app/views/administration.usergroup.list.php:92
 #: app/views/administration.usergroup.list.php:130
@@ -5523,7 +5523,7 @@ msgstr "停用選取的網頁檢測？"
 #: include/views/configuration.action.list.php:133
 #: include/views/configuration.host.discovery.list.php:167
 #: include/views/configuration.host.prototype.edit.php:360
-#: include/views/js/monitoring.sysmaps.js.php:290
+#: include/views/js/monitoring.sysmaps.js.php:289
 msgid "Disabled"
 msgstr "停用的"
 
@@ -5549,9 +5549,9 @@ msgstr ""
 #: include/views/configuration.graph.list.php:138
 #: include/views/configuration.host.prototype.edit.php:290
 #: include/views/configuration.host.prototype.list.php:62
-#: include/views/configuration.item.prototype.edit.php:851
+#: include/views/configuration.item.prototype.edit.php:850
 #: include/views/configuration.item.prototype.list.php:66
-#: include/views/configuration.trigger.prototype.edit.php:537
+#: include/views/configuration.trigger.prototype.edit.php:546
 #: include/views/configuration.trigger.prototype.list.php:62
 msgid "Discover"
 msgstr ""
@@ -5744,7 +5744,7 @@ msgstr ""
 msgid "Display OK triggers for"
 msgstr "顯示OK觸發器予"
 
-#: app/partials/monitoring.latest.view.html.php:250
+#: app/partials/monitoring.latest.view.html.php:265
 msgid "Display graph"
 msgstr "顯示圖表"
 
@@ -5752,13 +5752,13 @@ msgstr "顯示圖表"
 msgid "Display problems"
 msgstr ""
 
-#: app/partials/monitoring.latest.view.html.php:249
+#: app/partials/monitoring.latest.view.html.php:264
 msgid "Display stacked graph"
 msgstr "顯示重疊圖表"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
 #: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:357
+#: app/views/js/popup.service.edit.js.php:355
 #: app/views/monitoring.widget.slareport.view.php:85 app/views/search.php:187
 #: app/views/search.php:272 app/views/search.php:371
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
@@ -5782,15 +5782,15 @@ msgstr ""
 
 #: app/views/popup.lldoperation.php:190
 #: app/views/popup.massupdate.item.php:293
-#: include/views/configuration.item.edit.php:823
-#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.edit.php:822
+#: include/views/configuration.item.prototype.edit.php:766
 msgid "Do not keep history"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:211
 #: app/views/popup.massupdate.item.php:309
-#: include/views/configuration.item.edit.php:863
-#: include/views/configuration.item.prototype.edit.php:782
+#: include/views/configuration.item.edit.php:862
+#: include/views/configuration.item.prototype.edit.php:781
 msgid "Do not keep trends"
 msgstr ""
 
@@ -5804,8 +5804,8 @@ msgstr "您想要替換條件式表示式嗎?"
 #: app/partials/monitoring.problem.filter.php:363
 #: include/classes/helpers/CTagFilterFieldHelper.php:72
 #: include/classes/helpers/CTagFilterFieldHelper.php:127
-#: include/classes/widgets/CWidgetHelper.php:582
-#: include/classes/widgets/CWidgetHelper.php:648
+#: include/classes/widgets/CWidgetHelper.php:583
+#: include/classes/widgets/CWidgetHelper.php:649
 msgid "Does not contain"
 msgstr ""
 
@@ -5815,8 +5815,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:362
 #: include/classes/helpers/CTagFilterFieldHelper.php:71
 #: include/classes/helpers/CTagFilterFieldHelper.php:126
-#: include/classes/widgets/CWidgetHelper.php:581
-#: include/classes/widgets/CWidgetHelper.php:647
+#: include/classes/widgets/CWidgetHelper.php:582
+#: include/classes/widgets/CWidgetHelper.php:648
 msgid "Does not equal"
 msgstr ""
 
@@ -5826,8 +5826,8 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:361
 #: include/classes/helpers/CTagFilterFieldHelper.php:70
 #: include/classes/helpers/CTagFilterFieldHelper.php:125
-#: include/classes/widgets/CWidgetHelper.php:580
-#: include/classes/widgets/CWidgetHelper.php:646
+#: include/classes/widgets/CWidgetHelper.php:581
+#: include/classes/widgets/CWidgetHelper.php:647
 msgid "Does not exist"
 msgstr ""
 
@@ -5835,8 +5835,8 @@ msgstr ""
 msgid "Does not match regular expression"
 msgstr ""
 
-#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:782
-#: include/views/js/monitoring.sysmaps.js.php:872
+#: include/graphs.inc.php:61 include/views/js/monitoring.sysmaps.js.php:781
+#: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Dot"
 msgstr "點"
 
@@ -5865,16 +5865,16 @@ msgstr ""
 msgid "Downtime"
 msgstr "斷線時間"
 
-#: include/classes/widgets/CWidgetHelper.php:842
-#: include/classes/widgets/CWidgetHelper.php:886
+#: include/classes/widgets/CWidgetHelper.php:843
 #: include/classes/widgets/CWidgetHelper.php:887
 #: include/classes/widgets/CWidgetHelper.php:888
 #: include/classes/widgets/CWidgetHelper.php:889
-#: include/classes/widgets/CWidgetHelper.php:1132
+#: include/classes/widgets/CWidgetHelper.php:890
+#: include/classes/widgets/CWidgetHelper.php:1133
 msgid "Draw"
 msgstr ""
 
-#: include/views/configuration.graph.edit.php:347
+#: include/views/configuration.graph.edit.php:345
 msgid "Draw style"
 msgstr "繪圖風格"
 
@@ -5925,7 +5925,7 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:862
 #: include/classes/screens/CScreenProblem.php:887
 #: include/classes/screens/CScreenProblem.php:1156 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Duration"
 msgstr "持續時間"
 
@@ -5948,29 +5948,29 @@ msgstr ""
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "每個URL必須是唯一的. 請確保僅有一個URL為名."
 
-#: include/classes/widgets/CWidgetHelper.php:1240
+#: include/classes/widgets/CWidgetHelper.php:1241
 msgid "Each item"
 msgstr ""
 
 #: app/partials/service.list.edit.php:126
-#: app/views/administration.user.edit.php:355
+#: app/views/administration.user.edit.php:353
 #: 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:173
 #: app/views/js/popup.sla.edit.js.php:110 app/views/service.list.edit.php:138
 #: app/views/service.list.php:114
-#: include/views/configuration.action.edit.php:241
-#: include/views/configuration.action.edit.php:269
-#: include/views/configuration.action.edit.php:353
-#: include/views/configuration.action.edit.php:431
+#: include/views/configuration.action.edit.php:243
+#: include/views/configuration.action.edit.php:271
+#: include/views/configuration.action.edit.php:355
+#: include/views/configuration.action.edit.php:433
 #: include/views/configuration.maintenance.edit.php:68
 #: include/views/configuration.trigger.prototype.edit.php:111
-#: include/views/configuration.trigger.prototype.edit.php:305
+#: include/views/configuration.trigger.prototype.edit.php:310
 #: include/views/configuration.triggers.edit.php:150
-#: include/views/configuration.triggers.edit.php:350
+#: include/views/configuration.triggers.edit.php:356
 #: 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:165
+#: include/views/js/monitoring.sysmaps.js.php:835
+#: include/views/js/monitoring.sysmaps.js.php:850 jsLoader.php:165
 #: jsLoader.php:207
 msgid "Edit"
 msgstr "編輯"
@@ -6024,12 +6024,12 @@ msgstr ""
 msgid "Element"
 msgstr "組件"
 
-#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:737
+#: include/maps.inc.php:47 include/views/js/monitoring.sysmaps.js.php:736
 msgid "Element name"
 msgstr "組件名稱"
 
-#: include/views/js/monitoring.sysmaps.js.php:361
-#: include/views/js/monitoring.sysmaps.js.php:515
+#: include/views/js/monitoring.sysmaps.js.php:360
+#: include/views/js/monitoring.sysmaps.js.php:514
 msgid "Ellipse"
 msgstr ""
 
@@ -6085,7 +6085,7 @@ msgstr "空的輸入參數."
 msgid "Empty map ID."
 msgstr ""
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:199
 #: app/views/administration.usergroup.list.php:213
@@ -6165,11 +6165,11 @@ msgstr ""
 msgid "Enable selected API tokens?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:105
+#: app/views/js/sla.list.js.php:106
 msgid "Enable selected SLA?"
 msgstr ""
 
-#: app/views/js/sla.list.js.php:104
+#: app/views/js/sla.list.js.php:105
 msgid "Enable selected SLAs?"
 msgstr ""
 
@@ -6199,7 +6199,7 @@ msgstr "啟用所選的主機?"
 msgid "Enable selected items?"
 msgstr "啟用所選的項目?"
 
-#: app/views/administration.mediatype.list.php:173
+#: app/views/administration.mediatype.list.php:176
 msgid "Enable selected media types?"
 msgstr "啟用所選的示警媒介類型?"
 
@@ -6221,8 +6221,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:375
 #: include/views/configuration.host.discovery.edit.php:689
-#: include/views/configuration.item.edit.php:909
-#: include/views/configuration.item.prototype.edit.php:826
+#: include/views/configuration.item.edit.php:908
+#: include/views/configuration.item.prototype.edit.php:825
 msgid "Enable trapping"
 msgstr ""
 
@@ -6244,7 +6244,7 @@ msgstr ""
 #: app/views/administration.token.list.php:174
 #: app/views/administration.token.view.php:56
 #: app/views/administration.user.edit.php:298
-#: app/views/administration.user.edit.php:604
+#: app/views/administration.user.edit.php:598
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:91
 #: app/views/administration.usergroup.edit.php:92
@@ -6260,7 +6260,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:160
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:130
@@ -6274,14 +6274,14 @@ msgstr ""
 #: 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:1872
-#: include/views/configuration.action.edit.php:149
+#: include/views/configuration.action.edit.php:151
 #: include/views/configuration.action.list.php:80
 #: include/views/configuration.action.list.php:141
 #: include/views/configuration.host.discovery.edit.php:705
 #: include/views/configuration.host.discovery.list.php:166
 #: include/views/configuration.httpconf.edit.php:148
-#: include/views/configuration.item.edit.php:970
-#: include/views/configuration.triggers.edit.php:564
+#: include/views/configuration.item.edit.php:969
+#: include/views/configuration.triggers.edit.php:575
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -6334,8 +6334,8 @@ msgstr ""
 #: app/views/popup.service.edit.php:89 app/views/popup.sla.edit.php:149
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
-#: include/classes/widgets/CWidgetHelper.php:578
-#: include/classes/widgets/CWidgetHelper.php:644
+#: include/classes/widgets/CWidgetHelper.php:579
+#: include/classes/widgets/CWidgetHelper.php:645
 #: include/views/configuration.maintenance.edit.php:157
 #: include/views/configuration.maintenance.edit.php:179
 #: include/views/js/configuration.maintenance.edit.js.php:34
@@ -6511,7 +6511,7 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:963
 #: include/views/configuration.host.discovery.list.php:329
-#: include/views/configuration.item.edit.php:1018
+#: include/views/configuration.item.edit.php:1017
 #: include/views/configuration.item.list.php:301
 msgid "Execute now"
 msgstr ""
@@ -6532,8 +6532,8 @@ msgstr ""
 
 #: include/items.inc.php:1766
 #: include/views/configuration.host.discovery.edit.php:600
-#: include/views/configuration.item.edit.php:685
-#: include/views/configuration.item.prototype.edit.php:667
+#: include/views/configuration.item.edit.php:684
+#: include/views/configuration.item.prototype.edit.php:666
 msgid "Executed script"
 msgstr "已執行的腳本"
 
@@ -6547,13 +6547,13 @@ msgstr "執行確認"
 #: app/partials/monitoring.problem.filter.php:358
 #: include/classes/helpers/CTagFilterFieldHelper.php:67
 #: include/classes/helpers/CTagFilterFieldHelper.php:122
-#: include/classes/widgets/CWidgetHelper.php:577
-#: include/classes/widgets/CWidgetHelper.php:643
+#: include/classes/widgets/CWidgetHelper.php:578
+#: include/classes/widgets/CWidgetHelper.php:644
 msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:1070 jsLoader.php:308
+#: include/classes/widgets/CWidgetHelper.php:1071 jsLoader.php:308
 #: jsLoader.php:311
 msgid "Expand"
 msgstr ""
@@ -6623,15 +6623,15 @@ msgstr "匯出到CSV"
 #: app/views/popup.testtriggerexpr.php:48 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:94
 #: include/views/configuration.item.list.php:171
-#: include/views/configuration.trigger.prototype.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:198
-#: include/views/configuration.trigger.prototype.edit.php:297
-#: include/views/configuration.trigger.prototype.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:189
+#: include/views/configuration.trigger.prototype.edit.php:200
+#: include/views/configuration.trigger.prototype.edit.php:302
+#: include/views/configuration.trigger.prototype.edit.php:399
 #: include/views/configuration.trigger.prototype.list.php:60
-#: include/views/configuration.triggers.edit.php:209
-#: include/views/configuration.triggers.edit.php:220
-#: include/views/configuration.triggers.edit.php:322
-#: include/views/configuration.triggers.edit.php:417
+#: include/views/configuration.triggers.edit.php:212
+#: include/views/configuration.triggers.edit.php:223
+#: include/views/configuration.triggers.edit.php:328
+#: include/views/configuration.triggers.edit.php:425
 #: include/views/configuration.triggers.list.php:194
 #: include/views/js/configuration.triggers.edit.js.php:53
 #: trigger_prototypes.php:40 trigger_prototypes.php:52 triggers.php:48
@@ -6644,10 +6644,10 @@ msgstr "表示式"
 msgid "Expression cannot be empty"
 msgstr "表示式不能為空白"
 
-#: include/views/configuration.trigger.prototype.edit.php:176
-#: include/views/configuration.trigger.prototype.edit.php:369
-#: include/views/configuration.triggers.edit.php:198
-#: include/views/configuration.triggers.edit.php:393
+#: include/views/configuration.trigger.prototype.edit.php:178
+#: include/views/configuration.trigger.prototype.edit.php:375
+#: include/views/configuration.triggers.edit.php:201
+#: include/views/configuration.triggers.edit.php:401
 msgid "Expression constructor"
 msgstr "表示式建構子"
 
@@ -6715,7 +6715,7 @@ msgstr ""
 msgid "Failed to create dashboard"
 msgstr ""
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr ""
@@ -6849,8 +6849,7 @@ msgstr ""
 msgid "File time information. Returns integer (Unix timestamp)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:848
-#: include/classes/widgets/CWidgetHelper.php:903
+#: include/classes/widgets/CWidgetHelper.php:849
 #: include/classes/widgets/CWidgetHelper.php:904
 #: include/classes/widgets/CWidgetHelper.php:905
 #: include/classes/widgets/CWidgetHelper.php:906
@@ -6861,7 +6860,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:911
 #: include/classes/widgets/CWidgetHelper.php:912
 #: include/classes/widgets/CWidgetHelper.php:913
-#: include/classes/widgets/CWidgetHelper.php:1166
+#: include/classes/widgets/CWidgetHelper.php:914
+#: include/classes/widgets/CWidgetHelper.php:1167
 msgid "Fill"
 msgstr ""
 
@@ -6958,7 +6958,7 @@ msgid "Fit to map"
 msgstr "調整至符合拓墣圖"
 
 #: include/views/configuration.graph.edit.php:177
-#: include/views/configuration.graph.edit.php:253
+#: include/views/configuration.graph.edit.php:252
 msgid "Fixed"
 msgstr "固定的"
 
@@ -6970,9 +6970,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:124
 #: app/views/popup.massupdate.item.php:233
 #: include/views/configuration.host.discovery.edit.php:637
-#: include/views/configuration.item.edit.php:742
-#: include/views/configuration.item.edit.php:749
-#: include/views/configuration.item.prototype.edit.php:719
+#: include/views/configuration.item.edit.php:741
+#: include/views/configuration.item.edit.php:748
+#: include/views/configuration.item.prototype.edit.php:718
 #: include/views/js/common.item.edit.js.php:33
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:132
 msgid "Flexible"
@@ -6980,22 +6980,22 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:153
 #: include/views/configuration.host.discovery.edit.php:362
-#: include/views/configuration.item.edit.php:421
-#: include/views/configuration.item.prototype.edit.php:406
+#: include/views/configuration.item.edit.php:420
+#: include/views/configuration.item.prototype.edit.php:405
 msgid "Follow redirects"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:373
-#: include/views/js/monitoring.sysmaps.js.php:529
+#: include/views/js/monitoring.sysmaps.js.php:372
+#: include/views/js/monitoring.sysmaps.js.php:528
 msgid "Font"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:541
+#: include/views/js/monitoring.sysmaps.js.php:540
 msgid "Font color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:377
-#: include/views/js/monitoring.sysmaps.js.php:535
+#: include/views/js/monitoring.sysmaps.js.php:376
+#: include/views/js/monitoring.sysmaps.js.php:534
 msgid "Font size"
 msgstr ""
 
@@ -7003,8 +7003,8 @@ msgstr ""
 msgid "Form data"
 msgstr ""
 
-#: include/items.inc.php:1770 include/views/configuration.item.edit.php:707
-#: include/views/configuration.item.prototype.edit.php:687
+#: include/items.inc.php:1770 include/views/configuration.item.edit.php:706
+#: include/views/configuration.item.prototype.edit.php:686
 msgid "Formula"
 msgstr "公式"
 
@@ -7040,7 +7040,7 @@ msgstr "週五"
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:60
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:79
-#: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191
+#: include/views/js/monitoring.sysmaps.js.php:747 report4.php:191
 msgid "From"
 msgstr "自從"
 
@@ -7055,7 +7055,7 @@ msgstr ""
 msgid "Frontend access"
 msgstr "前端存取"
 
-#: app/views/administration.user.edit.php:655
+#: app/views/administration.user.edit.php:649
 msgid "Frontend messaging"
 msgstr "前端訊息中"
 
@@ -7071,7 +7071,7 @@ msgid "Full clone"
 msgstr "全克隆"
 
 #: app/views/popup.triggerexpr.php:133
-#: include/views/configuration.graph.edit.php:344
+#: include/views/configuration.graph.edit.php:342
 msgid "Function"
 msgstr "功能"
 
@@ -7487,8 +7487,8 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:391
 #: include/views/configuration.httpconf.edit.php:156
-#: include/views/configuration.item.edit.php:458
-#: include/views/configuration.item.prototype.edit.php:442
+#: include/views/configuration.item.edit.php:457
+#: include/views/configuration.item.prototype.edit.php:441
 msgid "HTTP authentication"
 msgstr "HTTP認證"
 
@@ -7499,8 +7499,8 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:381
 #: include/views/configuration.httpconf.edit.php:105
 #: include/views/configuration.httpconf.list.php:139
-#: include/views/configuration.item.edit.php:448
-#: include/views/configuration.item.prototype.edit.php:432
+#: include/views/configuration.item.edit.php:447
+#: include/views/configuration.item.prototype.edit.php:431
 msgid "HTTP proxy"
 msgstr ""
 
@@ -7537,10 +7537,10 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:315
 #: include/views/configuration.host.discovery.edit.php:373
 #: include/views/configuration.httpconf.edit.php:130
-#: include/views/configuration.item.edit.php:374
-#: include/views/configuration.item.edit.php:432
-#: include/views/configuration.item.prototype.edit.php:359
-#: include/views/configuration.item.prototype.edit.php:417
+#: include/views/configuration.item.edit.php:373
+#: include/views/configuration.item.edit.php:431
+#: include/views/configuration.item.prototype.edit.php:358
+#: include/views/configuration.item.prototype.edit.php:416
 msgid "Headers"
 msgstr ""
 
@@ -7556,7 +7556,7 @@ msgstr ""
 #: graphs.php:45 include/views/configuration.graph.edit.php:101
 #: include/views/configuration.graph.list.php:152
 #: include/views/js/monitoring.sysmaps.js.php:123
-#: include/views/js/monitoring.sysmaps.js.php:469
+#: include/views/js/monitoring.sysmaps.js.php:468
 #: include/views/monitoring.sysmap.edit.php:105
 #: include/views/monitoring.sysmap.list.php:68 sysmaps.php:40
 msgid "Height"
@@ -7662,7 +7662,7 @@ msgid "History cleared"
 msgstr "歷史已清除"
 
 #: include/views/configuration.httpconf.edit.php:262
-#: include/views/configuration.item.edit.php:1033
+#: include/views/configuration.item.edit.php:1032
 msgid "History clearing can take a long time. Continue?"
 msgstr "歷史清除可能會很久?繼續嗎?"
 
@@ -7677,8 +7677,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:219
 #: app/views/popup.lldoperation.php:185
 #: app/views/popup.massupdate.item.php:290 disc_prototypes.php:131
-#: include/views/configuration.item.edit.php:820
-#: include/views/configuration.item.prototype.edit.php:764 items.php:67
+#: include/views/configuration.item.edit.php:819
+#: include/views/configuration.item.prototype.edit.php:763 items.php:67
 msgid "History storage period"
 msgstr ""
 
@@ -7695,8 +7695,8 @@ msgstr ""
 msgid "Horizontal"
 msgstr "横向"
 
-#: include/views/js/monitoring.sysmaps.js.php:385
-#: include/views/js/monitoring.sysmaps.js.php:547
+#: include/views/js/monitoring.sysmaps.js.php:384
+#: include/views/js/monitoring.sysmaps.js.php:546
 msgid "Horizontal align"
 msgstr "横向對齊"
 
@@ -7813,7 +7813,7 @@ msgstr[0] ""
 #: app/partials/popup.operations.php:183
 #: app/views/administration.script.edit.php:223
 #: app/views/administration.script.list.php:81
-#: app/views/administration.user.edit.php:426
+#: app/views/administration.user.edit.php:420
 #: app/views/monitoring.widget.problemhosts.view.php:31
 #: app/views/monitoring.widget.problemsbysv.view.php:40
 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68
@@ -7899,9 +7899,9 @@ msgstr "主機群組"
 
 #: app/views/popup.massupdate.item.php:59
 #: include/views/configuration.host.discovery.edit.php:514
-#: include/views/configuration.item.edit.php:578
-#: include/views/configuration.item.edit.php:595
-#: include/views/configuration.item.prototype.edit.php:580
+#: include/views/configuration.item.edit.php:577
+#: include/views/configuration.item.edit.php:594
+#: include/views/configuration.item.prototype.edit.php:579
 msgid "Host interface"
 msgstr "主機介面"
 
@@ -8188,8 +8188,8 @@ msgstr "IPMI介面"
 
 #: disc_prototypes.php:111 host_discovery.php:106
 #: include/views/configuration.host.discovery.edit.php:542
-#: include/views/configuration.item.edit.php:624
-#: include/views/configuration.item.prototype.edit.php:608 items.php:126
+#: include/views/configuration.item.edit.php:623
+#: include/views/configuration.item.prototype.edit.php:607 items.php:126
 msgid "IPMI sensor"
 msgstr "IPMI感應器"
 
@@ -8203,19 +8203,19 @@ msgstr ""
 msgid "Icon"
 msgstr "圖示"
 
-#: include/views/js/monitoring.sysmaps.js.php:677
+#: include/views/js/monitoring.sysmaps.js.php:676
 msgid "Icon (default)"
 msgstr "圖示(預設)"
 
-#: include/views/js/monitoring.sysmaps.js.php:701
+#: include/views/js/monitoring.sysmaps.js.php:700
 msgid "Icon (disabled)"
 msgstr "圖示(停用的)"
 
-#: include/views/js/monitoring.sysmaps.js.php:693
+#: include/views/js/monitoring.sysmaps.js.php:692
 msgid "Icon (maintenance)"
 msgstr "圖示(維修)"
 
-#: include/views/js/monitoring.sysmaps.js.php:685
+#: include/views/js/monitoring.sysmaps.js.php:684
 msgid "Icon (problem)"
 msgstr "圖示(問題)"
 
@@ -8262,7 +8262,7 @@ msgstr "圖示對應"
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:259
+#: include/views/js/monitoring.sysmaps.js.php:258
 msgid "Icons"
 msgstr "圖示"
 
@@ -8404,7 +8404,7 @@ msgstr "圖片"
 msgid "Images for all maps will be updated!"
 msgstr "所有拓墣圖都將被更新!"
 
-#: include/views/configuration.action.edit.php:231
+#: include/views/configuration.action.edit.php:233
 msgid "Immediately"
 msgstr "立即地"
 
@@ -8488,6 +8488,7 @@ msgid "Inaccessible item prototype"
 msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:105
+#: app/partials/monitoring.latest.view.html.php:190
 #: app/views/configuration.host.list.php:267
 #: include/classes/screens/CScreenProblem.php:386
 #: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
@@ -9372,10 +9373,10 @@ msgstr ""
 #: include/views/configuration.hostgroups.list.php:70
 #: include/views/configuration.httpconf.list.php:142
 #: include/views/configuration.item.list.php:94
-#: include/views/configuration.trigger.prototype.edit.php:200
-#: include/views/configuration.trigger.prototype.edit.php:395
-#: include/views/configuration.triggers.edit.php:222
-#: include/views/configuration.triggers.edit.php:419
+#: include/views/configuration.trigger.prototype.edit.php:202
+#: include/views/configuration.trigger.prototype.edit.php:401
+#: include/views/configuration.triggers.edit.php:225
+#: include/views/configuration.triggers.edit.php:427
 #: include/views/configuration.triggers.list.php:196
 msgid "Info"
 msgstr "資訊"
@@ -9442,8 +9443,8 @@ msgstr ""
 msgid "Insert"
 msgstr "插入"
 
-#: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:363
+#: include/views/configuration.trigger.prototype.edit.php:138
+#: include/views/configuration.triggers.edit.php:165 jsLoader.php:363
 msgid "Insert expression"
 msgstr ""
 
@@ -9559,9 +9560,9 @@ msgstr "IE瀏覽器"
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:88
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:61
 msgid "Interval"
 msgstr "間隔"
@@ -9998,7 +9999,7 @@ msgstr "意大利語 (it_IT)"
 #: include/classes/widgets/forms/CWidgetFormGraph.php:48
 #: include/classes/widgets/forms/CWidgetFormItem.php:45
 #: include/forms.inc.php:890 include/views/configuration.graph.edit.php:178
-#: include/views/configuration.graph.edit.php:254
+#: include/views/configuration.graph.edit.php:253
 msgid "Item"
 msgstr "項目"
 
@@ -10257,8 +10258,8 @@ msgstr "JMX 端點代理程式"
 
 #: app/views/popup.massupdate.item.php:78
 #: include/views/configuration.host.discovery.edit.php:559
-#: include/views/configuration.item.edit.php:644
-#: include/views/configuration.item.prototype.edit.php:626
+#: include/views/configuration.item.edit.php:643
+#: include/views/configuration.item.prototype.edit.php:625
 msgid "JMX endpoint"
 msgstr ""
 
@@ -10276,8 +10277,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:94
 #: include/views/configuration.host.discovery.edit.php:285
-#: include/views/configuration.item.edit.php:343
-#: include/views/configuration.item.prototype.edit.php:328
+#: include/views/configuration.item.edit.php:342
+#: include/views/configuration.item.prototype.edit.php:327
 msgid "JSON data"
 msgstr ""
 
@@ -10316,8 +10317,8 @@ msgstr "日語 (ja_JP)"
 #: app/views/administration.script.edit.php:187 include/forms.inc.php:1322
 #: include/items.inc.php:1861
 #: include/views/configuration.host.discovery.edit.php:242
-#: include/views/configuration.item.edit.php:300
-#: include/views/configuration.item.prototype.edit.php:285
+#: include/views/configuration.item.edit.php:299
+#: include/views/configuration.item.prototype.edit.php:284
 #: include/views/js/item.preprocessing.js.php:204
 msgid "JavaScript"
 msgstr ""
@@ -10356,9 +10357,9 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:80
 #: include/views/configuration.host.discovery.list.php:103
 #: include/views/configuration.host.discovery.list.php:198
-#: include/views/configuration.item.edit.php:132
+#: include/views/configuration.item.edit.php:131
 #: include/views/configuration.item.list.php:87
-#: include/views/configuration.item.prototype.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:116
 #: include/views/configuration.item.prototype.list.php:60 items.php:49
 msgid "Key"
 msgstr "鍵值"
@@ -10424,13 +10425,13 @@ msgstr ""
 #: include/views/configuration.action.edit.php:59
 #: include/views/configuration.host.discovery.edit.php:742
 #: include/views/js/monitoring.sysmaps.js.php:135
-#: include/views/js/monitoring.sysmaps.js.php:647
-#: include/views/js/monitoring.sysmaps.js.php:765
+#: include/views/js/monitoring.sysmaps.js.php:646
+#: include/views/js/monitoring.sysmaps.js.php:764
 msgid "Label"
 msgstr "標示"
 
 #: include/views/js/monitoring.sysmaps.js.php:141
-#: include/views/js/monitoring.sysmaps.js.php:656
+#: include/views/js/monitoring.sysmaps.js.php:655
 msgid "Label location"
 msgstr "標示位置"
 
@@ -10571,9 +10572,9 @@ msgstr "拉脱維亞語(lv_LV)"
 msgid "Layout"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:855
-#: include/classes/widgets/CWidgetHelper.php:930
-#: include/classes/widgets/CWidgetHelper.php:1197
+#: include/classes/widgets/CWidgetHelper.php:856
+#: include/classes/widgets/CWidgetHelper.php:931
+#: include/classes/widgets/CWidgetHelper.php:1198
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:85
 #: include/classes/widgets/forms/CWidgetFormItem.php:91
 #: include/classes/widgets/forms/CWidgetFormItem.php:172
@@ -10584,7 +10585,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:147
 #: include/views/js/monitoring.sysmaps.js.php:34
 #: include/views/js/monitoring.sysmaps.js.php:147
-#: include/views/js/monitoring.sysmaps.js.php:661
+#: include/views/js/monitoring.sysmaps.js.php:660
 #: include/views/monitoring.sysmap.edit.php:249
 msgid "Left"
 msgstr "左側"
@@ -10617,25 +10618,25 @@ msgstr ""
 msgid "Limit for search and filter results"
 msgstr "搜尋/過濾組件限制"
 
-#: include/classes/widgets/CWidgetHelper.php:843
-#: include/classes/widgets/CWidgetHelper.php:886
-#: include/classes/widgets/CWidgetHelper.php:1134 include/graphs.inc.php:55
-#: include/views/js/monitoring.sysmaps.js.php:362
-#: include/views/js/monitoring.sysmaps.js.php:411
-#: include/views/js/monitoring.sysmaps.js.php:780
-#: include/views/js/monitoring.sysmaps.js.php:870
+#: include/classes/widgets/CWidgetHelper.php:844
+#: include/classes/widgets/CWidgetHelper.php:887
+#: include/classes/widgets/CWidgetHelper.php:1135 include/graphs.inc.php:55
+#: include/views/js/monitoring.sysmaps.js.php:361
+#: include/views/js/monitoring.sysmaps.js.php:410
+#: include/views/js/monitoring.sysmaps.js.php:779
+#: include/views/js/monitoring.sysmaps.js.php:869
 msgid "Line"
 msgstr "線"
 
-#: include/views/js/monitoring.sysmaps.js.php:597
+#: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Line color"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:575
+#: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Line type"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:587
+#: include/views/js/monitoring.sysmaps.js.php:586
 msgid "Line width"
 msgstr ""
 
@@ -10657,9 +10658,9 @@ msgstr ""
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:737
-#: include/views/js/monitoring.sysmaps.js.php:748
-#: include/views/js/monitoring.sysmaps.js.php:789
+#: include/views/js/monitoring.sysmaps.js.php:736
+#: include/views/js/monitoring.sysmaps.js.php:747
+#: include/views/js/monitoring.sysmaps.js.php:788
 msgid "Link indicators"
 msgstr "連結指示器"
 
@@ -10690,8 +10691,8 @@ msgstr "連結的模板"
 msgid "Linked to templates"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:734
-#: include/views/js/monitoring.sysmaps.js.php:745
+#: include/views/js/monitoring.sysmaps.js.php:733
+#: include/views/js/monitoring.sysmaps.js.php:744
 msgid "Links"
 msgstr ""
 
@@ -10793,8 +10794,8 @@ msgstr "位置經度"
 
 #: app/partials/configuration.filter.items.php:140
 #: app/views/popup.massupdate.item.php:158 include/items.inc.php:129
-#: include/views/configuration.item.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/configuration.item.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:105
 msgid "Log"
 msgstr "日誌"
 
@@ -10807,8 +10808,8 @@ msgid "Log file monitoring. Returns log"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:343
-#: include/views/configuration.item.edit.php:875
-#: include/views/configuration.item.prototype.edit.php:792
+#: include/views/configuration.item.edit.php:874
+#: include/views/configuration.item.prototype.edit.php:791
 msgid "Log time format"
 msgstr "日誌時間格式"
 
@@ -10934,7 +10935,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:194
 #: include/classes/helpers/CRoleHelper.php:403
 #: include/views/configuration.maintenance.edit.php:259
-#: include/views/js/monitoring.sysmaps.js.php:281
+#: include/views/js/monitoring.sysmaps.js.php:280
 msgid "Maintenance"
 msgstr "維修"
 
@@ -11094,7 +11095,7 @@ msgstr ""
 msgid "Map owner cannot be empty."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:347
+#: include/views/js/monitoring.sysmaps.js.php:346
 msgid "Map shape"
 msgstr ""
 
@@ -11172,19 +11173,19 @@ msgstr ""
 msgid "Mass update"
 msgstr "批量更新"
 
-#: include/views/js/monitoring.sysmaps.js.php:624
+#: include/views/js/monitoring.sysmaps.js.php:623
 msgid "Mass update elements"
 msgstr "大量更新組件"
 
-#: include/views/js/monitoring.sysmaps.js.php:500
+#: include/views/js/monitoring.sysmaps.js.php:499
 msgid "Mass update shapes"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:455 disc_prototypes.php:51
 #: host_discovery.php:54
 #: include/views/configuration.host.discovery.edit.php:470
-#: include/views/configuration.item.edit.php:534
-#: include/views/configuration.item.prototype.edit.php:564 items.php:53
+#: include/views/configuration.item.edit.php:533
+#: include/views/configuration.item.prototype.edit.php:563 items.php:53
 msgid "Master item"
 msgstr ""
 
@@ -11267,8 +11268,8 @@ msgid "May"
 msgstr "五月"
 
 #: app/controllers/CControllerPopupMedia.php:167
-#: app/views/administration.user.edit.php:367
-#: app/views/administration.user.edit.php:382 app/views/popup.media.php:69
+#: app/views/administration.user.edit.php:365
+#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69
 msgid "Media"
 msgstr "示警媒介"
 
@@ -11391,8 +11392,8 @@ msgstr ""
 msgid "Message templates"
 msgstr ""
 
-#: app/views/administration.user.edit.php:660
-#: app/views/administration.user.edit.php:672
+#: app/views/administration.user.edit.php:654
+#: app/views/administration.user.edit.php:666
 msgid "Message timeout"
 msgstr "訊息逾時"
 
@@ -11410,7 +11411,7 @@ msgstr ""
 msgid "Messages"
 msgstr "訊息"
 
-#: app/views/administration.user.edit.php:750
+#: app/views/administration.user.edit.php:744
 msgid "Messaging"
 msgstr "訊息中"
 
@@ -11508,11 +11509,11 @@ msgstr ""
 msgid "Missing \"name\" field for graph."
 msgstr "缺少圖形的\"名稱\"欄位"
 
-#: include/classes/widgets/CWidgetHelper.php:850
-#: include/classes/widgets/CWidgetHelper.php:926
+#: include/classes/widgets/CWidgetHelper.php:851
 #: include/classes/widgets/CWidgetHelper.php:927
 #: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1181
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1182
 msgid "Missing data"
 msgstr ""
 
@@ -11676,8 +11677,8 @@ msgstr ""
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
-#: include/views/configuration.trigger.prototype.edit.php:496
-#: include/views/configuration.triggers.edit.php:523
+#: include/views/configuration.trigger.prototype.edit.php:505
+#: include/views/configuration.triggers.edit.php:534
 msgid "Multiple"
 msgstr ""
 
@@ -11843,7 +11844,7 @@ msgstr ""
 #: include/views/configuration.action.list.php:72
 #: include/views/configuration.action.list.php:101
 #: include/views/configuration.graph.edit.php:90
-#: include/views/configuration.graph.edit.php:337
+#: include/views/configuration.graph.edit.php:335
 #: include/views/configuration.graph.list.php:150
 #: include/views/configuration.host.discovery.edit.php:60
 #: include/views/configuration.host.discovery.edit.php:132
@@ -11863,15 +11864,15 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:202
 #: include/views/configuration.httpconf.list.php:134
 #: include/views/configuration.item.edit.php:76
-#: include/views/configuration.item.edit.php:191
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
+#: include/views/configuration.item.edit.php:190
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
 #: include/views/configuration.item.list.php:85
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.item.prototype.edit.php:60
-#: include/views/configuration.item.prototype.edit.php:176
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.prototype.edit.php:175
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.item.prototype.list.php:59
 #: include/views/configuration.maintenance.edit.php:94
 #: include/views/configuration.maintenance.list.php:60
@@ -11880,16 +11881,16 @@ msgstr ""
 #: include/views/configuration.template.list.php:80
 #: include/views/configuration.template.list.php:114
 #: include/views/configuration.trigger.prototype.edit.php:70
-#: include/views/configuration.trigger.prototype.edit.php:567
+#: include/views/configuration.trigger.prototype.edit.php:576
 #: include/views/configuration.trigger.prototype.list.php:58
 #: include/views/configuration.triggers.edit.php:92
-#: include/views/configuration.triggers.edit.php:591
+#: include/views/configuration.triggers.edit.php:602
 #: include/views/configuration.triggers.list.php:67
 #: include/views/configuration.triggers.list.php:192
 #: include/views/inventory.host.list.php:86
 #: include/views/js/monitoring.sysmaps.js.php:173
-#: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/js/monitoring.sysmaps.js.php:637
+#: include/views/js/monitoring.sysmaps.js.php:313
+#: include/views/js/monitoring.sysmaps.js.php:636
 #: include/views/monitoring.sysmap.edit.php:93
 #: include/views/monitoring.sysmap.edit.php:278
 #: include/views/monitoring.sysmap.list.php:47
@@ -12169,7 +12170,7 @@ msgstr "沒有細節"
 msgid "No discovery rule IDs given."
 msgstr "沒有所稱的探索規則ID"
 
-#: app/views/administration.user.edit.php:578
+#: app/views/administration.user.edit.php:572
 #: app/views/administration.userrole.edit.php:253
 msgid "No enabled modules found."
 msgstr ""
@@ -12225,8 +12226,8 @@ msgstr "沒有圖片"
 
 #: app/views/popup.massupdate.item.php:66
 #: include/views/configuration.host.discovery.edit.php:519
-#: include/views/configuration.item.edit.php:600
-#: include/views/configuration.item.prototype.edit.php:585 jsLoader.php:392
+#: include/views/configuration.item.edit.php:599
+#: include/views/configuration.item.prototype.edit.php:584 jsLoader.php:392
 msgid "No interface found"
 msgstr "沒有找到介面"
 
@@ -12530,7 +12531,7 @@ msgstr "沒有指定的公開金鑰檔"
 msgid "No recipients specified for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:295 jsLoader.php:166
+#: include/classes/widgets/CWidgetConfig.php:294 jsLoader.php:166
 msgid "No refresh"
 msgstr ""
 
@@ -12576,8 +12577,8 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:90
 #: app/views/administration.proxy.list.php:135
 #: app/views/administration.proxy.list.php:148
-#: app/views/administration.user.edit.php:492
-#: app/views/administration.user.edit.php:537
+#: app/views/administration.user.edit.php:486
+#: app/views/administration.user.edit.php:531
 #: app/views/administration.usergroup.edit.php:134
 #: app/views/administration.userrole.edit.php:142
 #: app/views/administration.userrole.edit.php:183
@@ -12585,17 +12586,17 @@ msgstr ""
 #: app/views/configuration.host.list.php:375
 #: app/views/configuration.host.list.php:388
 #: app/views/configuration.host.list.php:391
-#: include/classes/widgets/CWidgetHelper.php:851
-#: include/classes/widgets/CWidgetHelper.php:926
-#: include/classes/widgets/CWidgetHelper.php:1185
+#: include/classes/widgets/CWidgetHelper.php:852
+#: include/classes/widgets/CWidgetHelper.php:927
+#: include/classes/widgets/CWidgetHelper.php:1186
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:118
 #: include/classes/widgets/forms/CWidgetFormProblems.php:140
 #: include/classes/widgets/forms/CWidgetFormProblems.php:160
 #: include/hosts.inc.php:32 include/httptest.inc.php:27
-#: include/users.inc.php:424 include/views/configuration.item.edit.php:932
-#: include/views/configuration.trigger.prototype.edit.php:299
-#: include/views/configuration.triggers.edit.php:324
+#: include/users.inc.php:424 include/views/configuration.item.edit.php:931
+#: include/views/configuration.trigger.prototype.edit.php:304
+#: include/views/configuration.triggers.edit.php:330
 #: include/views/js/monitoring.sysmaps.js.php:27
 msgid "None"
 msgstr "無"
@@ -12691,7 +12692,7 @@ msgstr "警報匯總"
 msgid "Notifications"
 msgstr "警報"
 
-#: actionconf.php:87 include/views/configuration.action.edit.php:477
+#: actionconf.php:87 include/views/configuration.action.edit.php:479
 msgid "Notify about canceled escalations"
 msgstr ""
 
@@ -12865,8 +12866,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:138
 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125
-#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:119
-#: include/views/configuration.item.prototype.edit.php:104
+#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118
+#: include/views/configuration.item.prototype.edit.php:103
 msgid "Numeric (float)"
 msgstr "數字的 (浮點)"
 
@@ -12876,8 +12877,8 @@ msgstr ""
 
 #: app/partials/configuration.filter.items.php:137
 #: app/views/popup.massupdate.item.php:155 include/items.inc.php:123
-#: include/views/configuration.item.edit.php:118
-#: include/views/configuration.item.prototype.edit.php:103
+#: include/views/configuration.item.edit.php:117
+#: include/views/configuration.item.prototype.edit.php:102
 msgid "Numeric (unsigned)"
 msgstr "數字的 (無正負)"
 
@@ -12885,8 +12886,8 @@ msgstr "數字的 (無正負)"
 msgid "OEM"
 msgstr "OEM"
 
-#: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149
-#: app/views/js/reports.scheduledreport.edit.js.php:77
+#: app/views/js/popup.import.js.php:51 app/views/js/popup.import.js.php:151
+#: app/views/js/reports.scheduledreport.edit.js.php:78
 #: app/views/popup.service.edit.php:220 app/views/service.list.edit.php:80
 #: app/views/service.list.php:83 chart4.php:164
 #: include/classes/helpers/CServiceHelper.php:133
@@ -12898,13 +12899,13 @@ msgstr "OEM"
 msgid "OK"
 msgstr "正常"
 
-#: include/views/configuration.trigger.prototype.edit.php:500
-#: include/views/configuration.triggers.edit.php:527
+#: include/views/configuration.trigger.prototype.edit.php:509
+#: include/views/configuration.triggers.edit.php:538
 msgid "OK event closes"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:295
-#: include/views/configuration.triggers.edit.php:320
+#: include/views/configuration.trigger.prototype.edit.php:300
+#: include/views/configuration.triggers.edit.php:326
 msgid "OK event generation"
 msgstr ""
 
@@ -12965,7 +12966,7 @@ msgstr "關"
 #: app/views/js/reports.auditlog.list.js.php:158
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
-#: include/views/js/common.item.edit.js.php:204
+#: include/views/js/common.item.edit.js.php:205
 #: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:406
 #: report2.php:507
 msgid "Ok"
@@ -12994,7 +12995,7 @@ msgstr "開"
 msgid "On status change triggers blink for"
 msgstr "於狀態改變時, 觸發器因此閃爍於"
 
-#: app/views/administration.user.edit.php:670
+#: app/views/administration.user.edit.php:664
 msgid "Once"
 msgstr "一次"
 
@@ -13114,11 +13115,11 @@ msgstr "操作並無模板來操作."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:143
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:486
+#: include/views/configuration.action.edit.php:304
+#: include/views/configuration.action.edit.php:488
 #: include/views/configuration.action.list.php:103
 msgid "Operations"
 msgstr "操作"
@@ -13164,7 +13165,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:33
 #: app/partials/monitoring.problem.filter.php:162
 #: app/partials/popup.operations.php:241
-#: app/views/configuration.correlation.edit.php:115
+#: app/views/configuration.correlation.edit.php:118
 #: app/views/popup.lldoverride.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:54
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:53
@@ -13179,11 +13180,11 @@ msgstr ""
 #: include/views/configuration.action.edit.php:126
 #: include/views/configuration.host.discovery.edit.php:725
 #: include/views/configuration.maintenance.edit.php:142
-#: include/views/configuration.trigger.prototype.edit.php:162
-#: include/views/configuration.trigger.prototype.edit.php:355
-#: include/views/configuration.triggers.edit.php:184
-#: include/views/configuration.triggers.edit.php:379
-#: include/views/js/monitoring.sysmaps.js.php:238
+#: include/views/configuration.trigger.prototype.edit.php:164
+#: include/views/configuration.trigger.prototype.edit.php:361
+#: include/views/configuration.triggers.edit.php:187
+#: include/views/configuration.triggers.edit.php:387
+#: include/views/js/monitoring.sysmaps.js.php:237
 msgid "Or"
 msgstr ""
 
@@ -13278,8 +13279,8 @@ msgstr ""
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
 
-#: include/views/configuration.item.edit.php:811
-#: include/views/configuration.item.edit.php:848
+#: include/views/configuration.item.edit.php:810
+#: include/views/configuration.item.edit.php:847
 msgctxt "item_form"
 msgid "Overridden by"
 msgstr ""
@@ -13496,8 +13497,8 @@ msgstr "POP"
 msgid "PROBLEM"
 msgstr "問題"
 
-#: include/views/configuration.trigger.prototype.edit.php:493
-#: include/views/configuration.triggers.edit.php:520
+#: include/views/configuration.trigger.prototype.edit.php:502
+#: include/views/configuration.triggers.edit.php:531
 msgid "PROBLEM event generation mode"
 msgstr ""
 
@@ -13579,8 +13580,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:179
 #: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1218
 #: include/views/configuration.host.discovery.edit.php:231
-#: include/views/configuration.item.edit.php:289
-#: include/views/configuration.item.prototype.edit.php:274
+#: include/views/configuration.item.edit.php:288
+#: include/views/configuration.item.prototype.edit.php:273
 msgid "Parameters"
 msgstr ""
 
@@ -13628,8 +13629,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:97
-#: include/views/configuration.item.edit.php:157
-#: include/views/configuration.item.prototype.edit.php:142
+#: include/views/configuration.item.edit.php:156
+#: include/views/configuration.item.prototype.edit.php:141
 msgid "Parse"
 msgstr ""
 
@@ -13660,12 +13661,12 @@ msgstr "被動式"
 #: include/views/configuration.host.discovery.edit.php:593
 #: include/views/configuration.host.prototype.edit.php:315
 #: include/views/configuration.httpconf.edit.php:170
-#: include/views/configuration.item.edit.php:480
-#: include/views/configuration.item.edit.php:637
-#: include/views/configuration.item.edit.php:678
-#: include/views/configuration.item.prototype.edit.php:464
-#: include/views/configuration.item.prototype.edit.php:620
-#: include/views/configuration.item.prototype.edit.php:660
+#: include/views/configuration.item.edit.php:479
+#: include/views/configuration.item.edit.php:636
+#: include/views/configuration.item.edit.php:677
+#: include/views/configuration.item.prototype.edit.php:463
+#: include/views/configuration.item.prototype.edit.php:619
+#: include/views/configuration.item.prototype.edit.php:659
 #: include/views/general.login.php:74
 #: include/views/js/common.item.edit.js.php:59 items.php:219
 msgid "Password"
@@ -13698,12 +13699,12 @@ msgid "Paste"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:217
-#: app/views/js/monitoring.dashboard.view.js.php:302
+#: app/views/js/monitoring.dashboard.view.js.php:305
 msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:295 jsLoader.php:142
+#: app/views/js/monitoring.dashboard.view.js.php:298 jsLoader.php:142
 msgid "Paste widget"
 msgstr ""
 
@@ -13716,7 +13717,7 @@ msgstr ""
 msgid "Pattern"
 msgstr ""
 
-#: actionconf.php:82 include/views/configuration.action.edit.php:473
+#: actionconf.php:82 include/views/configuration.action.edit.php:475
 msgid "Pause operations for suppressed problems"
 msgstr ""
 
@@ -13759,8 +13760,8 @@ msgstr ""
 #: app/views/popup.lldoperation.php:116
 #: app/views/popup.massupdate.item.php:226 app/views/popup.triggerexpr.php:182
 #: include/views/configuration.host.discovery.edit.php:632
-#: include/views/configuration.item.edit.php:735
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.edit.php:734
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
 msgid "Period"
 msgstr "期間"
@@ -13781,9 +13782,9 @@ msgid "Periods"
 msgstr "期間"
 
 #: app/partials/administration.usergroup.grouprights.html.php:29
-#: app/views/administration.user.edit.php:426
-#: app/views/administration.user.edit.php:446
-#: app/views/administration.user.edit.php:649
+#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:440
+#: app/views/administration.user.edit.php:643
 #: app/views/administration.usergroup.edit.php:105
 #: app/views/administration.usergroup.edit.php:156
 #: app/views/administration.usergroup.edit.php:207
@@ -13794,7 +13795,7 @@ msgstr "期間"
 msgid "Permissions"
 msgstr "許可權"
 
-#: app/views/administration.user.edit.php:451
+#: app/views/administration.user.edit.php:445
 msgid "Permissions can be assigned for user groups only."
 msgstr "許可權只能被指派予用戶群組"
 
@@ -13816,12 +13817,12 @@ msgstr "置入演算法"
 msgid "Plain text"
 msgstr "文本"
 
-#: app/views/administration.user.edit.php:691
-#: app/views/administration.user.edit.php:726
+#: app/views/administration.user.edit.php:685
+#: app/views/administration.user.edit.php:720
 msgid "Play"
 msgstr "播放"
 
-#: app/views/administration.user.edit.php:664
+#: app/views/administration.user.edit.php:658
 msgid "Play sound"
 msgstr "播放聲音"
 
@@ -13851,8 +13852,7 @@ msgstr ""
 msgid "Please select two elements"
 msgstr "請選擇兩組件"
 
-#: include/classes/widgets/CWidgetHelper.php:849
-#: include/classes/widgets/CWidgetHelper.php:915
+#: include/classes/widgets/CWidgetHelper.php:850
 #: include/classes/widgets/CWidgetHelper.php:916
 #: include/classes/widgets/CWidgetHelper.php:917
 #: include/classes/widgets/CWidgetHelper.php:918
@@ -13862,14 +13862,15 @@ msgstr "請選擇兩組件"
 #: include/classes/widgets/CWidgetHelper.php:922
 #: include/classes/widgets/CWidgetHelper.php:923
 #: include/classes/widgets/CWidgetHelper.php:924
-#: include/classes/widgets/CWidgetHelper.php:1149
+#: include/classes/widgets/CWidgetHelper.php:925
+#: include/classes/widgets/CWidgetHelper.php:1150
 msgid "Point size"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:844
-#: include/classes/widgets/CWidgetHelper.php:887
-#: include/classes/widgets/CWidgetHelper.php:1135
-#: include/views/js/monitoring.sysmaps.js.php:432
+#: include/classes/widgets/CWidgetHelper.php:845
+#: include/classes/widgets/CWidgetHelper.php:888
+#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/views/js/monitoring.sysmaps.js.php:431
 msgid "Points"
 msgstr ""
 
@@ -13877,7 +13878,7 @@ msgstr ""
 msgid "Polish (pl_PL)"
 msgstr "波蘭(pl_PL)"
 
-#: include/views/configuration.item.edit.php:952
+#: include/views/configuration.item.edit.php:951
 msgid "Populates host inventory field"
 msgstr "填入主機資產紀錄欄位"
 
@@ -13939,16 +13940,16 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:493
 #: include/views/configuration.host.discovery.edit.php:939
-#: include/views/configuration.item.edit.php:987
-#: include/views/configuration.item.prototype.edit.php:871
+#: include/views/configuration.item.edit.php:986
+#: include/views/configuration.item.prototype.edit.php:870
 msgid "Preprocessing"
 msgstr ""
 
 #: app/views/popup.itemtestedit.view.php:354
 #: app/views/popup.massupdate.item.php:209
 #: include/views/configuration.host.discovery.edit.php:943
-#: include/views/configuration.item.edit.php:991
-#: include/views/configuration.item.prototype.edit.php:875
+#: include/views/configuration.item.edit.php:990
+#: include/views/configuration.item.prototype.edit.php:874
 msgid "Preprocessing steps"
 msgstr ""
 
@@ -14045,8 +14046,8 @@ msgstr ""
 #: app/views/administration.script.edit.php:149
 #: app/views/popup.massupdate.item.php:193
 #: include/views/configuration.host.discovery.edit.php:584
-#: include/views/configuration.item.edit.php:669
-#: include/views/configuration.item.prototype.edit.php:651
+#: include/views/configuration.item.edit.php:668
+#: include/views/configuration.item.prototype.edit.php:650
 msgid "Private key file"
 msgstr "私有金鑰檔"
 
@@ -14076,7 +14077,7 @@ msgstr "優先權層級"
 #: include/views/configuration.trigger.prototype.list.php:166
 #: include/views/configuration.triggers.list.php:95
 #: include/views/configuration.triggers.list.php:306
-#: include/views/js/monitoring.sysmaps.js.php:271
+#: include/views/js/monitoring.sysmaps.js.php:270
 msgid "Problem"
 msgstr "問題"
 
@@ -14264,16 +14265,16 @@ msgstr ""
 #: app/views/administration.script.edit.php:136
 #: app/views/popup.massupdate.item.php:175
 #: include/views/configuration.host.discovery.edit.php:555
-#: include/views/configuration.item.edit.php:638
-#: include/views/configuration.item.prototype.edit.php:621
+#: include/views/configuration.item.edit.php:637
+#: include/views/configuration.item.prototype.edit.php:620
 msgid "Public key"
 msgstr "公開金鑰"
 
 #: app/views/administration.script.edit.php:144
 #: app/views/popup.massupdate.item.php:188
 #: include/views/configuration.host.discovery.edit.php:575
-#: include/views/configuration.item.edit.php:660
-#: include/views/configuration.item.prototype.edit.php:642
+#: include/views/configuration.item.edit.php:659
+#: include/views/configuration.item.prototype.edit.php:641
 msgid "Public key file"
 msgstr "公開金鑰檔"
 
@@ -14287,8 +14288,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:64
 #: include/views/configuration.host.discovery.edit.php:171
-#: include/views/configuration.item.edit.php:229
-#: include/views/configuration.item.prototype.edit.php:214
+#: include/views/configuration.item.edit.php:228
+#: include/views/configuration.item.prototype.edit.php:213
 msgid "Query fields"
 msgstr ""
 
@@ -14338,8 +14339,8 @@ msgstr "RMCP+"
 
 #: app/views/popup.httpstep.php:86 app/views/popup.massupdate.item.php:93
 #: include/views/configuration.host.discovery.edit.php:284
-#: include/views/configuration.item.edit.php:342
-#: include/views/configuration.item.prototype.edit.php:327
+#: include/views/configuration.item.edit.php:341
+#: include/views/configuration.item.prototype.edit.php:326
 msgid "Raw data"
 msgstr ""
 
@@ -14365,14 +14366,14 @@ msgstr "唯讀"
 msgid "Read-only"
 msgstr ""
 
-#: app/views/administration.user.edit.php:528
-#: app/views/administration.user.edit.php:536
-#: app/views/administration.user.edit.php:550
+#: app/views/administration.user.edit.php:522
+#: app/views/administration.user.edit.php:530
+#: app/views/administration.user.edit.php:544
 #: app/views/administration.userrole.edit.php:179
 msgid "Read-only access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:559
+#: app/views/administration.user.edit.php:553
 #: app/views/administration.userrole.edit.php:203
 msgid "Read-only access to services with tag"
 msgstr ""
@@ -14386,14 +14387,14 @@ msgstr ""
 msgid "Read-write"
 msgstr "讀寫"
 
-#: app/views/administration.user.edit.php:483
-#: app/views/administration.user.edit.php:491
-#: app/views/administration.user.edit.php:505
+#: app/views/administration.user.edit.php:477
+#: app/views/administration.user.edit.php:485
+#: app/views/administration.user.edit.php:499
 #: app/views/administration.userrole.edit.php:138
 msgid "Read-write access to services"
 msgstr ""
 
-#: app/views/administration.user.edit.php:514
+#: app/views/administration.user.edit.php:508
 #: app/views/administration.userrole.edit.php:162
 msgid "Read-write access to services with tag"
 msgstr ""
@@ -14439,7 +14440,7 @@ msgstr ""
 msgid "Recordset ID"
 msgstr ""
 
-#: app/views/administration.user.edit.php:682
+#: app/views/administration.user.edit.php:676
 #: include/classes/screens/CScreenProblem.php:1062
 #: include/views/configuration.item.list.php:204
 #: include/views/configuration.trigger.prototype.list.php:167
@@ -14448,10 +14449,10 @@ msgid "Recovery"
 msgstr "恢復"
 
 #: include/triggers.inc.php:986
-#: include/views/configuration.trigger.prototype.edit.php:298
-#: include/views/configuration.trigger.prototype.edit.php:381
-#: include/views/configuration.triggers.edit.php:323
-#: include/views/configuration.triggers.edit.php:405 trigger_prototypes.php:41
+#: include/views/configuration.trigger.prototype.edit.php:303
+#: include/views/configuration.trigger.prototype.edit.php:387
+#: include/views/configuration.triggers.edit.php:329
+#: include/views/configuration.triggers.edit.php:413 trigger_prototypes.php:41
 #: trigger_prototypes.php:54 triggers.php:49 triggers.php:61
 msgid "Recovery expression"
 msgstr ""
@@ -14461,7 +14462,7 @@ msgstr ""
 msgid "Recovery expression syntax error."
 msgstr ""
 
-#: include/views/configuration.action.edit.php:388
+#: include/views/configuration.action.edit.php:390
 msgid "Recovery operations"
 msgstr ""
 
@@ -14473,8 +14474,8 @@ msgstr ""
 msgid "Recovery time"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:360
-#: include/views/js/monitoring.sysmaps.js.php:514
+#: include/views/js/monitoring.sysmaps.js.php:359
+#: include/views/js/monitoring.sysmaps.js.php:513
 msgid "Rectangle"
 msgstr ""
 
@@ -14579,7 +14580,7 @@ msgstr "遠端命令"
 #: app/views/administration.regex.edit.php:80
 #: app/views/administration.script.edit.php:43
 #: app/views/administration.script.edit.php:77
-#: app/views/administration.user.edit.php:358
+#: app/views/administration.user.edit.php:356
 #: app/views/configuration.correlation.edit.php:84
 #: app/views/js/administration.iconmap.edit.js.php:54
 #: app/views/js/administration.macros.edit.js.php:45
@@ -14610,13 +14611,13 @@ msgstr "遠端命令"
 #: app/views/popup.sla.edit.php:158 app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
-#: include/classes/widgets/CWidgetHelper.php:606
-#: include/classes/widgets/CWidgetHelper.php:659 include/forms.inc.php:1484
+#: include/classes/widgets/CWidgetHelper.php:607
+#: include/classes/widgets/CWidgetHelper.php:660 include/forms.inc.php:1484
 #: include/forms.inc.php:2032 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:251
-#: include/views/configuration.action.edit.php:279
-#: include/views/configuration.action.edit.php:363
-#: include/views/configuration.action.edit.php:441
+#: include/views/configuration.action.edit.php:253
+#: include/views/configuration.action.edit.php:281
+#: include/views/configuration.action.edit.php:365
+#: include/views/configuration.action.edit.php:443
 #: include/views/configuration.host.discovery.edit.php:151
 #: include/views/configuration.host.discovery.edit.php:196
 #: include/views/configuration.host.discovery.edit.php:222
@@ -14624,25 +14625,25 @@ msgstr "遠端命令"
 #: include/views/configuration.host.discovery.edit.php:661
 #: include/views/configuration.host.discovery.edit.php:799
 #: include/views/configuration.host.discovery.edit.php:876
-#: include/views/configuration.item.edit.php:210
-#: include/views/configuration.item.edit.php:254
-#: include/views/configuration.item.edit.php:280
-#: include/views/configuration.item.edit.php:399
-#: include/views/configuration.item.edit.php:776
-#: include/views/configuration.item.prototype.edit.php:195
-#: include/views/configuration.item.prototype.edit.php:239
-#: include/views/configuration.item.prototype.edit.php:265
-#: include/views/configuration.item.prototype.edit.php:384
-#: include/views/configuration.item.prototype.edit.php:743
+#: include/views/configuration.item.edit.php:209
+#: include/views/configuration.item.edit.php:253
+#: include/views/configuration.item.edit.php:279
+#: include/views/configuration.item.edit.php:398
+#: include/views/configuration.item.edit.php:775
+#: include/views/configuration.item.prototype.edit.php:194
+#: include/views/configuration.item.prototype.edit.php:238
+#: include/views/configuration.item.prototype.edit.php:264
+#: include/views/configuration.item.prototype.edit.php:383
+#: include/views/configuration.item.prototype.edit.php:742
 #: include/views/configuration.maintenance.edit.php:72
 #: include/views/configuration.maintenance.edit.php:164
 #: include/views/configuration.maintenance.edit.php:187
-#: include/views/configuration.trigger.prototype.edit.php:244
-#: include/views/configuration.trigger.prototype.edit.php:440
-#: include/views/configuration.trigger.prototype.edit.php:596
-#: include/views/configuration.triggers.edit.php:267
-#: include/views/configuration.triggers.edit.php:465
-#: include/views/configuration.triggers.edit.php:611
+#: include/views/configuration.trigger.prototype.edit.php:246
+#: include/views/configuration.trigger.prototype.edit.php:446
+#: include/views/configuration.trigger.prototype.edit.php:605
+#: include/views/configuration.triggers.edit.php:270
+#: include/views/configuration.triggers.edit.php:473
+#: include/views/configuration.triggers.edit.php:622
 #: include/views/js/common.item.edit.js.php:48
 #: include/views/js/common.template.edit.js.php:41
 #: include/views/js/common.template.edit.js.php:91
@@ -14670,14 +14671,14 @@ msgstr "遠端命令"
 #: include/views/js/monitoring.sysmap.edit.js.php:34
 #: include/views/js/monitoring.sysmap.edit.js.php:65
 #: include/views/js/monitoring.sysmap.edit.js.php:99
-#: include/views/js/monitoring.sysmaps.js.php:330
-#: include/views/js/monitoring.sysmaps.js.php:483
-#: include/views/js/monitoring.sysmaps.js.php:607
-#: include/views/js/monitoring.sysmaps.js.php:712
-#: include/views/js/monitoring.sysmaps.js.php:816
-#: include/views/js/monitoring.sysmaps.js.php:878
-#: include/views/js/monitoring.sysmaps.js.php:894
-#: include/views/js/monitoring.sysmaps.js.php:923
+#: include/views/js/monitoring.sysmaps.js.php:329
+#: include/views/js/monitoring.sysmaps.js.php:482
+#: include/views/js/monitoring.sysmaps.js.php:606
+#: include/views/js/monitoring.sysmaps.js.php:711
+#: include/views/js/monitoring.sysmaps.js.php:815
+#: include/views/js/monitoring.sysmaps.js.php:877
+#: include/views/js/monitoring.sysmaps.js.php:893
+#: include/views/js/monitoring.sysmaps.js.php:922
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
@@ -14752,10 +14753,10 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:92
 #: app/views/popup.massupdate.template.php:126
 #: app/views/popup.massupdate.trigger.php:78 include/items.inc.php:1805
-#: include/views/configuration.trigger.prototype.edit.php:169
-#: include/views/configuration.trigger.prototype.edit.php:362
-#: include/views/configuration.triggers.edit.php:191
-#: include/views/configuration.triggers.edit.php:386
+#: include/views/configuration.trigger.prototype.edit.php:171
+#: include/views/configuration.trigger.prototype.edit.php:368
+#: include/views/configuration.triggers.edit.php:194
+#: include/views/configuration.triggers.edit.php:394
 msgid "Replace"
 msgstr "取代"
 
@@ -14773,7 +14774,7 @@ msgstr ""
 msgid "Report \"%1$s\" already exists."
 msgstr ""
 
-#: app/views/js/reports.scheduledreport.edit.js.php:74
+#: app/views/js/reports.scheduledreport.edit.js.php:75
 msgid "Report generated by other users will be changed to the current user."
 msgstr ""
 
@@ -14812,15 +14813,15 @@ msgstr "報表"
 
 #: app/views/popup.massupdate.item.php:105
 #: include/views/configuration.host.discovery.edit.php:293
-#: include/views/configuration.item.edit.php:351
-#: include/views/configuration.item.prototype.edit.php:336
+#: include/views/configuration.item.edit.php:350
+#: include/views/configuration.item.prototype.edit.php:335
 msgid "Request body"
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:90
 #: include/views/configuration.host.discovery.edit.php:282
-#: include/views/configuration.item.edit.php:340
-#: include/views/configuration.item.prototype.edit.php:325
+#: include/views/configuration.item.edit.php:339
+#: include/views/configuration.item.prototype.edit.php:324
 msgid "Request body type"
 msgstr ""
 
@@ -14829,8 +14830,8 @@ msgid "Request sent successfully"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:256
-#: include/views/configuration.item.edit.php:314
-#: include/views/configuration.item.prototype.edit.php:299
+#: include/views/configuration.item.edit.php:313
+#: include/views/configuration.item.prototype.edit.php:298
 msgid "Request type"
 msgstr ""
 
@@ -14857,8 +14858,8 @@ msgstr "要求的主機效能, 每秒新值"
 
 #: app/views/popup.httpstep.php:175
 #: include/views/configuration.host.discovery.edit.php:355
-#: include/views/configuration.item.edit.php:414
-#: include/views/configuration.item.prototype.edit.php:399
+#: include/views/configuration.item.edit.php:413
+#: include/views/configuration.item.prototype.edit.php:398
 msgid "Required status codes"
 msgstr "要求的狀態碼"
 
@@ -14871,11 +14872,11 @@ msgstr "要求的字串"
 msgid "Reset"
 msgstr "重設"
 
-#: app/views/js/administration.audit.settings.edit.js.php:42
-#: app/views/js/administration.gui.edit.js.php:32
-#: app/views/js/administration.housekeeping.edit.js.php:68
-#: app/views/js/administration.miscconfig.edit.js.php:42
-#: app/views/js/administration.trigdisplay.edit.js.php:48
+#: app/views/js/administration.audit.settings.edit.js.php:43
+#: app/views/js/administration.gui.edit.js.php:33
+#: app/views/js/administration.housekeeping.edit.js.php:69
+#: app/views/js/administration.miscconfig.edit.js.php:43
+#: app/views/js/administration.trigdisplay.edit.js.php:49
 msgid "Reset all fields to default values?"
 msgstr "重設所有的欄位為預設值?"
 
@@ -14892,11 +14893,11 @@ msgstr "重設確認"
 #: app/views/administration.housekeeping.edit.php:187
 #: app/views/administration.miscconfig.edit.php:190
 #: app/views/administration.trigdisplay.edit.php:168
-#: app/views/js/administration.audit.settings.edit.js.php:51
-#: app/views/js/administration.gui.edit.js.php:41
-#: app/views/js/administration.housekeeping.edit.js.php:77
-#: app/views/js/administration.miscconfig.edit.js.php:51
-#: app/views/js/administration.trigdisplay.edit.js.php:57
+#: app/views/js/administration.audit.settings.edit.js.php:52
+#: app/views/js/administration.gui.edit.js.php:42
+#: app/views/js/administration.housekeeping.edit.js.php:78
+#: app/views/js/administration.miscconfig.edit.js.php:52
+#: app/views/js/administration.trigdisplay.edit.js.php:58
 msgid "Reset defaults"
 msgstr "重設預設"
 
@@ -15000,8 +15001,8 @@ msgstr ""
 
 #: app/views/popup.httpstep.php:158
 #: include/views/configuration.host.discovery.edit.php:370
-#: include/views/configuration.item.edit.php:429
-#: include/views/configuration.item.prototype.edit.php:414
+#: include/views/configuration.item.edit.php:428
+#: include/views/configuration.item.prototype.edit.php:413
 msgid "Retrieve mode"
 msgstr ""
 
@@ -15074,9 +15075,9 @@ msgstr ""
 msgid "Revert changes"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:856
-#: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1198
+#: include/classes/widgets/CWidgetHelper.php:857
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1199
 #: include/classes/widgets/forms/CWidgetFormItem.php:93
 #: include/classes/widgets/forms/CWidgetFormItem.php:174
 #: include/classes/widgets/forms/CWidgetFormItem.php:297
@@ -15084,7 +15085,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:148
 #: include/views/js/monitoring.sysmaps.js.php:36
 #: include/views/js/monitoring.sysmaps.js.php:148
-#: include/views/js/monitoring.sysmaps.js.php:662
+#: include/views/js/monitoring.sysmaps.js.php:661
 #: include/views/monitoring.sysmap.edit.php:250
 msgid "Right"
 msgstr "右"
@@ -15100,8 +15101,8 @@ msgstr ""
 msgid "Right trim"
 msgstr ""
 
-#: app/views/administration.user.edit.php:406
-#: app/views/administration.user.edit.php:416
+#: app/views/administration.user.edit.php:400
+#: app/views/administration.user.edit.php:410
 msgid "Role"
 msgstr ""
 
@@ -15288,8 +15289,8 @@ msgstr "SNMP"
 #: host_discovery.php:102
 #: include/views/configuration.host.discovery.edit.php:530
 #: include/views/configuration.host.discovery.list.php:146
-#: include/views/configuration.item.edit.php:612
-#: include/views/configuration.item.prototype.edit.php:596 items.php:121
+#: include/views/configuration.item.edit.php:611
+#: include/views/configuration.item.prototype.edit.php:595 items.php:121
 msgid "SNMP OID"
 msgstr "SNMP OID"
 
@@ -15368,8 +15369,8 @@ msgstr ""
 
 #: include/items.inc.php:1768
 #: include/views/configuration.host.discovery.edit.php:610
-#: include/views/configuration.item.edit.php:696
-#: include/views/configuration.item.prototype.edit.php:677
+#: include/views/configuration.item.edit.php:695
+#: include/views/configuration.item.prototype.edit.php:676
 msgid "SQL query"
 msgstr ""
 
@@ -15394,38 +15395,38 @@ msgstr "SSH 端點代理程式"
 
 #: include/views/configuration.host.discovery.edit.php:441
 #: include/views/configuration.httpconf.edit.php:181
-#: include/views/configuration.item.edit.php:507
-#: include/views/configuration.item.prototype.edit.php:491
+#: include/views/configuration.item.edit.php:506
+#: include/views/configuration.item.prototype.edit.php:490
 msgid "SSL certificate file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:450
 #: include/views/configuration.httpconf.edit.php:184
-#: include/views/configuration.item.edit.php:515
-#: include/views/configuration.item.prototype.edit.php:499
+#: include/views/configuration.item.edit.php:514
+#: include/views/configuration.item.prototype.edit.php:498
 msgid "SSL key file"
 msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:459
 #: include/views/configuration.httpconf.edit.php:187
-#: include/views/configuration.item.edit.php:523
-#: include/views/configuration.item.prototype.edit.php:507
+#: include/views/configuration.item.edit.php:522
+#: include/views/configuration.item.prototype.edit.php:506
 msgid "SSL key password"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:87
 #: include/views/configuration.host.discovery.edit.php:432
 #: include/views/configuration.httpconf.edit.php:178
-#: include/views/configuration.item.edit.php:499
-#: include/views/configuration.item.prototype.edit.php:483
+#: include/views/configuration.item.edit.php:498
+#: include/views/configuration.item.prototype.edit.php:482
 msgid "SSL verify host"
 msgstr ""
 
 #: app/views/administration.mediatype.edit.php:86
 #: include/views/configuration.host.discovery.edit.php:424
 #: include/views/configuration.httpconf.edit.php:175
-#: include/views/configuration.item.edit.php:491
-#: include/views/configuration.item.prototype.edit.php:475
+#: include/views/configuration.item.edit.php:490
+#: include/views/configuration.item.prototype.edit.php:474
 msgid "SSL verify peer"
 msgstr ""
 
@@ -15541,9 +15542,9 @@ msgstr ""
 #: app/views/popup.lldoperation.php:125
 #: app/views/popup.massupdate.item.php:234
 #: include/views/configuration.host.discovery.edit.php:638
-#: include/views/configuration.item.edit.php:743
-#: include/views/configuration.item.edit.php:750
-#: include/views/configuration.item.prototype.edit.php:720
+#: include/views/configuration.item.edit.php:742
+#: include/views/configuration.item.edit.php:749
+#: include/views/configuration.item.prototype.edit.php:719
 #: include/views/js/common.item.edit.js.php:36
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:133
 msgid "Scheduling"
@@ -15568,8 +15569,8 @@ msgstr ""
 #: app/views/administration.script.list.php:140 include/items.inc.php:103
 #: include/items.inc.php:1762 include/media.inc.php:25
 #: include/views/configuration.host.discovery.edit.php:238
-#: include/views/configuration.item.edit.php:296
-#: include/views/configuration.item.prototype.edit.php:281
+#: include/views/configuration.item.edit.php:295
+#: include/views/configuration.item.prototype.edit.php:280
 msgid "Script"
 msgstr "脚本"
 
@@ -15700,10 +15701,10 @@ msgstr ""
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:451
 #: include/views/configuration.graph.edit.php:196
-#: include/views/configuration.graph.edit.php:272
+#: include/views/configuration.graph.edit.php:271
 #: include/views/configuration.item.edit.php:104
 #: include/views/configuration.item.prototype.edit.php:89
-#: include/views/configuration.item.prototype.edit.php:528
+#: include/views/configuration.item.prototype.edit.php:527
 #: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:338
 msgid "Select"
 msgstr "選擇"
@@ -15713,9 +15714,9 @@ msgid "Select SLA to display SLA report."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:438 app/views/popup.triggerexpr.php:83
-#: include/views/configuration.graph.edit.php:217
-#: include/views/configuration.graph.edit.php:293
-#: include/views/configuration.item.prototype.edit.php:546
+#: include/views/configuration.graph.edit.php:216
+#: include/views/configuration.graph.edit.php:291
+#: include/views/configuration.item.prototype.edit.php:545
 msgid "Select prototype"
 msgstr "選擇原型"
 
@@ -15736,7 +15737,7 @@ msgstr "所選的動作已刪除"
 msgid "Selected and all other problems of related triggers"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:634
+#: include/views/js/monitoring.sysmaps.js.php:633
 msgid "Selected elements"
 msgstr "所選的組件"
 
@@ -16085,8 +16086,8 @@ msgctxt "screen reader"
 msgid "Severity increased"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:358
-#: include/views/js/monitoring.sysmaps.js.php:512
+#: include/views/js/monitoring.sysmaps.js.php:357
+#: include/views/js/monitoring.sysmaps.js.php:511
 #: include/views/monitoring.sysmap.constructor.php:37
 msgid "Shape"
 msgstr ""
@@ -16189,7 +16190,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.filter.php:140
 #: app/partials/monitoring.problem.filter.php:249
-#: app/views/administration.user.edit.php:744
+#: app/views/administration.user.edit.php:738
 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154
@@ -16289,8 +16290,8 @@ msgstr "簡單圖形"
 msgid "Simple graph prototype"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:495
-#: include/views/configuration.triggers.edit.php:522
+#: include/views/configuration.trigger.prototype.edit.php:504
+#: include/views/configuration.triggers.edit.php:533
 msgid "Single"
 msgstr ""
 
@@ -16335,7 +16336,7 @@ msgstr "場所州/省"
 #: include/classes/widgets/forms/CWidgetFormItem.php:201
 #: include/classes/widgets/forms/CWidgetFormItem.php:264
 #: include/classes/widgets/forms/CWidgetFormItem.php:324
-#: include/views/js/monitoring.sysmaps.js.php:455
+#: include/views/js/monitoring.sysmaps.js.php:454
 msgid "Size"
 msgstr ""
 
@@ -16446,9 +16447,9 @@ msgstr "速度"
 msgid "Stacked"
 msgstr "層積的"
 
-#: include/classes/widgets/CWidgetHelper.php:845
-#: include/classes/widgets/CWidgetHelper.php:888
-#: include/classes/widgets/CWidgetHelper.php:1136
+#: include/classes/widgets/CWidgetHelper.php:846
+#: include/classes/widgets/CWidgetHelper.php:889
+#: include/classes/widgets/CWidgetHelper.php:1137
 msgid "Staircase"
 msgstr ""
 
@@ -16469,7 +16470,7 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 msgid "Start in"
 msgstr "開始於"
 
@@ -16664,14 +16665,14 @@ msgid "Step with name \"%1$s\" already exists."
 msgstr ""
 
 #: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:170
+#: include/views/configuration.action.edit.php:172
 #: include/views/configuration.httpconf.edit.php:227
 #: include/views/configuration.httpconf.edit.php:236
 msgid "Steps"
 msgstr "步驟"
 
-#: app/views/administration.user.edit.php:696
-#: app/views/administration.user.edit.php:731
+#: app/views/administration.user.edit.php:690
+#: app/views/administration.user.edit.php:725
 msgid "Stop"
 msgstr "停止"
 
@@ -16694,10 +16695,10 @@ msgstr ""
 #: app/views/popup.lldoperation.php:191 app/views/popup.lldoperation.php:212
 #: app/views/popup.massupdate.item.php:294
 #: app/views/popup.massupdate.item.php:310
-#: include/views/configuration.item.edit.php:824
-#: include/views/configuration.item.edit.php:864
-#: include/views/configuration.item.prototype.edit.php:768
-#: include/views/configuration.item.prototype.edit.php:783
+#: include/views/configuration.item.edit.php:823
+#: include/views/configuration.item.edit.php:863
+#: include/views/configuration.item.prototype.edit.php:767
+#: include/views/configuration.item.prototype.edit.php:782
 msgid "Storage period"
 msgstr ""
 
@@ -16933,8 +16934,8 @@ msgstr ""
 msgid "Tag filter"
 msgstr ""
 
-#: include/views/configuration.trigger.prototype.edit.php:509
-#: include/views/configuration.triggers.edit.php:536
+#: include/views/configuration.trigger.prototype.edit.php:518
+#: include/views/configuration.triggers.edit.php:547
 msgid "Tag for matching"
 msgstr ""
 
@@ -16993,28 +16994,28 @@ msgstr ""
 #: include/views/configuration.httpconf.edit.php:237
 #: include/views/configuration.httpconf.list.php:77
 #: include/views/configuration.httpconf.list.php:141
-#: include/views/configuration.item.edit.php:977
+#: include/views/configuration.item.edit.php:976
 #: include/views/configuration.item.list.php:93
-#: include/views/configuration.item.prototype.edit.php:861
+#: include/views/configuration.item.prototype.edit.php:860
 #: include/views/configuration.item.prototype.list.php:67
 #: include/views/configuration.maintenance.edit.php:247
 #: include/views/configuration.template.edit.php:179
 #: include/views/configuration.template.list.php:83
 #: include/views/configuration.template.list.php:126
-#: include/views/configuration.trigger.prototype.edit.php:551
+#: include/views/configuration.trigger.prototype.edit.php:560
 #: include/views/configuration.trigger.prototype.list.php:63
-#: include/views/configuration.triggers.edit.php:574
+#: include/views/configuration.triggers.edit.php:585
 #: include/views/configuration.triggers.list.php:111
 #: include/views/configuration.triggers.list.php:197
-#: include/views/js/monitoring.sysmaps.js.php:230
+#: include/views/js/monitoring.sysmaps.js.php:229
 msgid "Tags"
 msgstr ""
 
 #: include/views/configuration.copy.elements.php:68
-#: include/views/configuration.trigger.prototype.edit.php:197
-#: include/views/configuration.trigger.prototype.edit.php:392
-#: include/views/configuration.triggers.edit.php:219
-#: include/views/configuration.triggers.edit.php:416 trigger_prototypes.php:53
+#: include/views/configuration.trigger.prototype.edit.php:199
+#: include/views/configuration.trigger.prototype.edit.php:398
+#: include/views/configuration.triggers.edit.php:222
+#: include/views/configuration.triggers.edit.php:424 trigger_prototypes.php:53
 #: trigger_prototypes.php:55 triggers.php:60 triggers.php:62
 msgid "Target"
 msgstr "目標"
@@ -17175,14 +17176,14 @@ msgstr ""
 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1480
 #: include/views/configuration.host.discovery.edit.php:970
 #: include/views/configuration.host.discovery.edit.php:982
-#: include/views/configuration.item.edit.php:1025
-#: include/views/configuration.item.edit.php:1046
-#: include/views/configuration.item.prototype.edit.php:902
-#: include/views/configuration.item.prototype.edit.php:912
-#: include/views/configuration.trigger.prototype.edit.php:264
-#: include/views/configuration.trigger.prototype.edit.php:460
-#: include/views/configuration.triggers.edit.php:287
-#: include/views/configuration.triggers.edit.php:485
+#: include/views/configuration.item.edit.php:1024
+#: include/views/configuration.item.edit.php:1045
+#: include/views/configuration.item.prototype.edit.php:901
+#: include/views/configuration.item.prototype.edit.php:911
+#: include/views/configuration.trigger.prototype.edit.php:266
+#: include/views/configuration.trigger.prototype.edit.php:466
+#: include/views/configuration.triggers.edit.php:290
+#: include/views/configuration.triggers.edit.php:493
 #: include/views/js/item.preprocessing.js.php:53
 msgid "Test"
 msgstr "測試"
@@ -17240,10 +17241,10 @@ msgstr ""
 #: include/classes/html/CMacroValue.php:156 include/items.inc.php:131
 #: include/items.inc.php:1800 include/items.inc.php:1804
 #: include/items.inc.php:1808 include/items.inc.php:1812
-#: include/items.inc.php:1816 include/views/configuration.item.edit.php:122
-#: include/views/configuration.item.prototype.edit.php:107
-#: include/views/js/monitoring.sysmaps.js.php:366
-#: include/views/js/monitoring.sysmaps.js.php:521
+#: include/items.inc.php:1816 include/views/configuration.item.edit.php:121
+#: include/views/configuration.item.prototype.edit.php:106
+#: include/views/js/monitoring.sysmaps.js.php:365
+#: include/views/js/monitoring.sysmaps.js.php:520
 msgid "Text"
 msgstr "文字"
 
@@ -17394,8 +17395,8 @@ msgstr "本月"
 msgid "This month so far"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:124
-#: include/views/configuration.item.prototype.edit.php:109
+#: include/views/configuration.item.edit.php:123
+#: include/views/configuration.item.prototype.edit.php:108
 msgid "This type of information may not match the key."
 msgstr ""
 
@@ -17499,9 +17500,9 @@ msgstr "時間期間"
 #: app/controllers/CControllerPopupTriggerExpr.php:239
 #: app/controllers/CControllerPopupTriggerExpr.php:258
 #: app/controllers/CControllerPopupTriggerExpr.php:287
-#: include/classes/widgets/CWidgetHelper.php:857
-#: include/classes/widgets/CWidgetHelper.php:933
-#: include/classes/widgets/CWidgetHelper.php:1201
+#: include/classes/widgets/CWidgetHelper.php:858
+#: include/classes/widgets/CWidgetHelper.php:934
+#: include/classes/widgets/CWidgetHelper.php:1202
 msgid "Time shift"
 msgstr "排班"
 
@@ -17519,8 +17520,8 @@ msgstr ""
 #: disc_prototypes.php:147 host_discovery.php:122
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.httpconf.edit.php:203
-#: include/views/configuration.item.edit.php:330
-#: include/views/configuration.item.prototype.edit.php:315 items.php:151
+#: include/views/configuration.item.edit.php:329
+#: include/views/configuration.item.prototype.edit.php:314 items.php:151
 msgid "Timeout"
 msgstr "逾時"
 
@@ -17546,7 +17547,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:69
 #: include/classes/widgets/forms/CWidgetFormSlaReport.php:104
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:94
-#: include/views/js/monitoring.sysmaps.js.php:748
+#: include/views/js/monitoring.sysmaps.js.php:747
 msgid "To"
 msgstr "到"
 
@@ -17570,7 +17571,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:102
 #: include/views/js/monitoring.sysmaps.js.php:40
 #: include/views/js/monitoring.sysmaps.js.php:149
-#: include/views/js/monitoring.sysmaps.js.php:663
+#: include/views/js/monitoring.sysmaps.js.php:662
 #: include/views/monitoring.sysmap.edit.php:251
 msgid "Top"
 msgstr "頂部"
@@ -17622,8 +17623,7 @@ msgstr ""
 msgid "Transform SQL query result into a JSON array."
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:847
-#: include/classes/widgets/CWidgetHelper.php:891
+#: include/classes/widgets/CWidgetHelper.php:848
 #: include/classes/widgets/CWidgetHelper.php:892
 #: include/classes/widgets/CWidgetHelper.php:893
 #: include/classes/widgets/CWidgetHelper.php:894
@@ -17634,7 +17634,8 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:899
 #: include/classes/widgets/CWidgetHelper.php:900
 #: include/classes/widgets/CWidgetHelper.php:901
-#: include/classes/widgets/CWidgetHelper.php:1157
+#: include/classes/widgets/CWidgetHelper.php:902
+#: include/classes/widgets/CWidgetHelper.php:1158
 msgid "Transparency"
 msgstr ""
 
@@ -17642,9 +17643,9 @@ msgstr ""
 msgid "Transport error."
 msgstr "傳輸錯誤."
 
-#: include/classes/widgets/CWidgetHelper.php:853
-#: include/classes/widgets/CWidgetHelper.php:928
-#: include/classes/widgets/CWidgetHelper.php:1189
+#: include/classes/widgets/CWidgetHelper.php:854
+#: include/classes/widgets/CWidgetHelper.php:929
+#: include/classes/widgets/CWidgetHelper.php:1190
 msgctxt "missing data function"
 msgid "Treat as 0"
 msgstr ""
@@ -17656,8 +17657,8 @@ msgstr ""
 #: app/controllers/CControllerPopupLldOperation.php:227
 #: app/views/popup.lldoperation.php:206
 #: app/views/popup.massupdate.item.php:306 disc_prototypes.php:139
-#: include/views/configuration.item.edit.php:858
-#: include/views/configuration.item.prototype.edit.php:777 items.php:84
+#: include/views/configuration.item.edit.php:857
+#: include/views/configuration.item.prototype.edit.php:776 items.php:84
 msgid "Trend storage period"
 msgstr ""
 
@@ -17675,9 +17676,9 @@ msgstr "趨勢"
 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
 #: include/maps.inc.php:26 include/triggers.inc.php:960
-#: include/views/configuration.triggers.edit.php:571
+#: include/views/configuration.triggers.edit.php:582
 #: include/views/js/monitoring.sysmaps.js.php:94
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/reports.toptriggers.php:86 jsLoader.php:266 jsLoader.php:380
 msgid "Trigger"
 msgstr "觸發器"
@@ -17776,7 +17777,7 @@ msgstr "觸發器概覽"
 #: app/controllers/CControllerAuditLogList.php:243
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:148
-#: include/views/configuration.trigger.prototype.edit.php:548
+#: include/views/configuration.trigger.prototype.edit.php:557
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:166
 msgid "Trigger prototype"
 msgstr "觸發器類型"
@@ -17841,7 +17842,7 @@ msgstr ""
 msgid "Trigger prototypes updated"
 msgstr ""
 
-#: app/views/administration.user.edit.php:743 include/actions.inc.php:45
+#: app/views/administration.user.edit.php:737 include/actions.inc.php:45
 msgid "Trigger severity"
 msgstr "觸發器示警度"
 
@@ -17948,23 +17949,23 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
 #: include/hosts.inc.php:99 include/hosts.inc.php:1208
 #: include/views/administration.auditacts.list.php:65
-#: include/views/configuration.graph.edit.php:342
+#: include/views/configuration.graph.edit.php:340
 #: include/views/configuration.host.discovery.edit.php:69
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:138
 #: include/views/configuration.host.discovery.list.php:200
 #: include/views/configuration.item.edit.php:86
-#: include/views/configuration.item.edit.php:735
+#: include/views/configuration.item.edit.php:734
 #: include/views/configuration.item.list.php:91
 #: include/views/configuration.item.prototype.edit.php:70
-#: include/views/configuration.item.prototype.edit.php:714
+#: include/views/configuration.item.prototype.edit.php:713
 #: include/views/configuration.item.prototype.list.php:64
 #: include/views/configuration.maintenance.list.php:86
 #: include/views/inventory.host.list.php:87
 #: include/views/js/monitoring.sysmaps.js.php:88
-#: include/views/js/monitoring.sysmaps.js.php:413
-#: include/views/js/monitoring.sysmaps.js.php:637
-#: include/views/js/monitoring.sysmaps.js.php:792
+#: include/views/js/monitoring.sysmaps.js.php:412
+#: include/views/js/monitoring.sysmaps.js.php:636
+#: include/views/js/monitoring.sysmaps.js.php:791
 #: include/views/monitoring.sysmap.edit.php:396
 msgid "Type"
 msgstr "類型"
@@ -17973,12 +17974,12 @@ msgstr "類型"
 msgid "Type (Full details)"
 msgstr "類型(全細節)"
 
-#: include/views/js/monitoring.sysmaps.js.php:776
+#: include/views/js/monitoring.sysmaps.js.php:775
 msgid "Type (OK)"
 msgstr "類型(OK)"
 
 #: app/partials/popup.operations.php:243
-#: app/views/configuration.correlation.edit.php:107
+#: app/views/configuration.correlation.edit.php:110
 #: app/views/popup.lldoverride.php:79
 #: include/views/configuration.action.edit.php:118
 #: include/views/configuration.host.discovery.edit.php:716
@@ -17989,10 +17990,10 @@ msgstr "計算方式"
 #: app/controllers/CControllerPopupGeneric.php:285
 #: app/partials/configuration.filter.items.php:146
 #: app/views/popup.massupdate.item.php:150 include/forms.inc.php:508
-#: include/views/configuration.item.edit.php:136
-#: include/views/configuration.item.edit.php:997
-#: include/views/configuration.item.prototype.edit.php:121
-#: include/views/configuration.item.prototype.edit.php:881
+#: include/views/configuration.item.edit.php:135
+#: include/views/configuration.item.edit.php:996
+#: include/views/configuration.item.prototype.edit.php:120
+#: include/views/configuration.item.prototype.edit.php:880
 msgid "Type of information"
 msgstr "數據類型"
 
@@ -18016,11 +18017,11 @@ msgstr "未知的"
 #: include/classes/widgets/forms/CWidgetFormUrl.php:31
 #: include/views/configuration.host.discovery.edit.php:89
 #: include/views/configuration.httpconf.edit.php:204
-#: include/views/configuration.item.edit.php:149
-#: include/views/configuration.item.prototype.edit.php:134
-#: 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/configuration.item.edit.php:148
+#: include/views/configuration.item.prototype.edit.php:133
+#: include/views/configuration.trigger.prototype.edit.php:539
+#: include/views/configuration.triggers.edit.php:568
+#: include/views/js/monitoring.sysmaps.js.php:313
 #: include/views/monitoring.sysmap.edit.php:278 items.php:156 jsLoader.php:381
 msgid "URL"
 msgstr "URL"
@@ -18041,7 +18042,7 @@ msgstr "URL B"
 msgid "URL C"
 msgstr "URL C"
 
-#: include/views/js/common.item.edit.js.php:200
+#: include/views/js/common.item.edit.js.php:201
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
 msgstr ""
@@ -18066,7 +18067,7 @@ msgstr ""
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:311
+#: include/views/js/monitoring.sysmaps.js.php:310
 #: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:382
 msgid "URLs"
 msgstr "URLs"
@@ -18169,15 +18170,15 @@ msgstr ""
 #: app/controllers/CControllerSlaCreateUpdate.php:72
 #: app/controllers/CControllerSlaCreateUpdate.php:76
 #: app/views/js/configuration.host.edit.js.php:158
-#: app/views/js/configuration.host.list.js.php:130
-#: app/views/js/popup.host.edit.js.php:171
-#: app/views/js/popup.service.edit.js.php:485
-#: app/views/js/popup.service.edit.js.php:557
+#: app/views/js/configuration.host.list.js.php:133
+#: app/views/js/popup.host.edit.js.php:177
+#: app/views/js/popup.service.edit.js.php:483
+#: app/views/js/popup.service.edit.js.php:555
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.sla.edit.js.php:240
 #: app/views/js/popup.sla.edit.js.php:305
 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78
-#: app/views/js/service.list.js.php:183 app/views/js/sla.list.js.php:170
+#: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171
 msgid "Unexpected server error."
 msgstr ""
 
@@ -18186,8 +18187,8 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormItem.php:240
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:155
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227
-#: include/views/configuration.item.edit.php:718
-#: include/views/configuration.item.prototype.edit.php:697
+#: include/views/configuration.item.edit.php:717
+#: include/views/configuration.item.prototype.edit.php:696
 msgid "Units"
 msgstr "單位"
 
@@ -18213,7 +18214,7 @@ msgstr "單位"
 #: include/maintenances.inc.php:33 include/maps.inc.php:39
 #: include/triggers.inc.php:83 include/triggers.inc.php:1872
 #: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:228
+#: include/views/configuration.action.edit.php:230
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "未知的"
@@ -18355,12 +18356,12 @@ msgstr "上"
 #: app/views/administration.script.edit.php:282
 #: app/views/administration.token.edit.php:106
 #: app/views/administration.trigdisplay.edit.php:167
-#: app/views/administration.user.edit.php:762
-#: app/views/administration.user.edit.php:785
+#: app/views/administration.user.edit.php:756
+#: app/views/administration.user.edit.php:779
 #: app/views/administration.usergroup.edit.php:220
 #: app/views/administration.userrole.edit.php:377
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:153
 #: app/views/configuration.host.edit.php:41
 #: app/views/popup.acknowledge.edit.php:115
@@ -18380,18 +18381,18 @@ msgstr "上"
 #: app/views/popup.sla.excludeddowntime.edit.php:91
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
 #: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:496
+#: include/views/configuration.action.edit.php:498
 #: include/views/configuration.graph.edit.php:472
 #: include/views/configuration.host.discovery.edit.php:977
 #: include/views/configuration.hostgroups.edit.php:61
 #: include/views/configuration.host.prototype.edit.php:417
 #: include/views/configuration.httpconf.edit.php:271
-#: include/views/configuration.item.edit.php:1041
-#: include/views/configuration.item.prototype.edit.php:900
+#: include/views/configuration.item.edit.php:1040
+#: include/views/configuration.item.prototype.edit.php:899
 #: include/views/configuration.maintenance.edit.php:264
 #: include/views/configuration.template.edit.php:217
-#: include/views/configuration.trigger.prototype.edit.php:654
-#: include/views/configuration.triggers.edit.php:647
+#: include/views/configuration.trigger.prototype.edit.php:663
+#: include/views/configuration.triggers.edit.php:658
 #: include/views/monitoring.sysmap.constructor.php:76
 #: include/views/monitoring.sysmap.edit.php:419
 msgid "Update"
@@ -18412,13 +18413,13 @@ msgstr "更新現有的"
 #: include/views/configuration.host.discovery.edit.php:620
 #: include/views/configuration.host.discovery.list.php:139
 #: include/views/configuration.httpconf.edit.php:70
-#: include/views/configuration.item.edit.php:723
-#: include/views/configuration.item.prototype.edit.php:702 items.php:61
+#: include/views/configuration.item.edit.php:722
+#: include/views/configuration.item.prototype.edit.php:701 items.php:61
 #: items.php:258
 msgid "Update interval"
 msgstr "更新間隔"
 
-#: include/views/configuration.action.edit.php:464
+#: include/views/configuration.action.edit.php:466
 msgid "Update operations"
 msgstr ""
 
@@ -18557,7 +18558,7 @@ msgstr ""
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "用戶不能將自己加進一個取消的群組或已取消圖形介面存取權的群組."
 
-#: app/views/administration.user.edit.php:409
+#: app/views/administration.user.edit.php:403
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
 msgstr ""
@@ -18666,10 +18667,10 @@ msgstr ""
 #: host_discovery.php:79
 #: include/views/configuration.host.discovery.edit.php:402
 #: include/views/configuration.host.discovery.edit.php:568
-#: include/views/configuration.item.edit.php:469
-#: include/views/configuration.item.edit.php:653
-#: include/views/configuration.item.prototype.edit.php:453
-#: include/views/configuration.item.prototype.edit.php:635 items.php:94
+#: include/views/configuration.item.edit.php:468
+#: include/views/configuration.item.edit.php:652
+#: include/views/configuration.item.prototype.edit.php:452
+#: include/views/configuration.item.prototype.edit.php:634 items.php:94
 msgid "User name"
 msgstr "用戶名稱"
 
@@ -18736,7 +18737,7 @@ msgstr ""
 msgid "User sharing is missing parameters: %1$s for map \"%2$s\"."
 msgstr ""
 
-#: app/views/administration.user.edit.php:420
+#: app/views/administration.user.edit.php:414
 #: app/views/administration.userrole.edit.php:53
 #: app/views/administration.userrole.edit.php:68
 msgid "User type"
@@ -19112,12 +19113,12 @@ msgstr ""
 #: include/views/configuration.host.discovery.edit.php:319
 #: include/views/configuration.httpconf.edit.php:117
 #: include/views/configuration.httpconf.edit.php:135
-#: include/views/configuration.item.edit.php:192
-#: include/views/configuration.item.edit.php:233
-#: include/views/configuration.item.edit.php:378
-#: include/views/configuration.item.prototype.edit.php:177
-#: include/views/configuration.item.prototype.edit.php:218
-#: include/views/configuration.item.prototype.edit.php:363
+#: include/views/configuration.item.edit.php:191
+#: include/views/configuration.item.edit.php:232
+#: include/views/configuration.item.edit.php:377
+#: include/views/configuration.item.prototype.edit.php:176
+#: include/views/configuration.item.prototype.edit.php:217
+#: include/views/configuration.item.prototype.edit.php:362
 #: include/views/configuration.triggers.list.php:91
 #: include/views/configuration.triggers.list.php:186
 #: include/views/monitoring.history.php:161
@@ -19179,8 +19180,8 @@ msgstr "值對應 \"%1$s\"已存在."
 #: app/views/popup.massupdate.host.php:299
 #: app/views/popup.massupdate.item.php:350
 #: app/views/popup.massupdate.template.php:152
-#: include/views/configuration.item.edit.php:883
-#: include/views/configuration.item.prototype.edit.php:800
+#: include/views/configuration.item.edit.php:882
+#: include/views/configuration.item.prototype.edit.php:799
 #: include/views/configuration.template.edit.php:204
 msgid "Value mapping"
 msgstr "值對應"
@@ -19297,8 +19298,8 @@ msgstr ""
 msgid "Vertical"
 msgstr "垂直的"
 
-#: include/views/js/monitoring.sysmaps.js.php:392
-#: include/views/js/monitoring.sysmaps.js.php:556
+#: include/views/js/monitoring.sysmaps.js.php:391
+#: include/views/js/monitoring.sysmaps.js.php:555
 msgid "Vertical align"
 msgstr "縱向對齊"
 
@@ -19499,8 +19500,7 @@ msgstr ""
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
-#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:841
-#: include/classes/widgets/CWidgetHelper.php:874
+#: graphs.php:44 include/classes/widgets/CWidgetHelper.php:842
 #: include/classes/widgets/CWidgetHelper.php:875
 #: include/classes/widgets/CWidgetHelper.php:876
 #: include/classes/widgets/CWidgetHelper.php:877
@@ -19511,12 +19511,13 @@ msgstr ""
 #: include/classes/widgets/CWidgetHelper.php:882
 #: include/classes/widgets/CWidgetHelper.php:883
 #: include/classes/widgets/CWidgetHelper.php:884
-#: include/classes/widgets/CWidgetHelper.php:1141
+#: include/classes/widgets/CWidgetHelper.php:885
+#: include/classes/widgets/CWidgetHelper.php:1142
 #: include/views/configuration.graph.edit.php:96
 #: include/views/configuration.graph.list.php:151
 #: include/views/js/monitoring.sysmaps.js.php:117
-#: include/views/js/monitoring.sysmaps.js.php:418
-#: include/views/js/monitoring.sysmaps.js.php:460
+#: include/views/js/monitoring.sysmaps.js.php:417
+#: include/views/js/monitoring.sysmaps.js.php:459
 #: include/views/monitoring.sysmap.edit.php:100
 #: include/views/monitoring.sysmap.list.php:67 sysmaps.php:39
 msgid "Width"
@@ -19592,8 +19593,8 @@ msgstr "拓墣圖連結的錯誤欄位"
 msgid "Wrong value for \"url\" field."
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:303
-#: include/views/js/monitoring.sysmaps.js.php:436
+#: include/views/js/monitoring.sysmaps.js.php:302
+#: include/views/js/monitoring.sysmaps.js.php:435
 msgid "X"
 msgstr "X"
 
@@ -19605,11 +19606,11 @@ msgstr ""
 msgid "X-Frame-Options HTTP header"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:437
+#: include/views/js/monitoring.sysmaps.js.php:436
 msgid "X1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:461
+#: include/views/js/monitoring.sysmaps.js.php:460
 msgid "X2"
 msgstr ""
 
@@ -19623,8 +19624,8 @@ msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:286
-#: include/views/configuration.item.edit.php:344
-#: include/views/configuration.item.prototype.edit.php:329
+#: include/views/configuration.item.edit.php:343
+#: include/views/configuration.item.prototype.edit.php:328
 msgid "XML data"
 msgstr ""
 
@@ -19644,12 +19645,12 @@ msgstr ""
 msgid "XPath"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:307
-#: include/views/js/monitoring.sysmaps.js.php:445
+#: include/views/js/monitoring.sysmaps.js.php:306
+#: include/views/js/monitoring.sysmaps.js.php:444
 msgid "Y"
 msgstr "Y"
 
-#: include/views/configuration.graph.edit.php:314
+#: include/views/configuration.graph.edit.php:312
 msgid "Y axis MAX value"
 msgstr "縱軸最大值"
 
@@ -19663,18 +19664,18 @@ msgstr ""
 msgid "Y axis MAX value must be greater than Y axis MIN value."
 msgstr "Y axis MAX value must be greater than Y axis MIN value."
 
-#: include/views/configuration.graph.edit.php:238
+#: include/views/configuration.graph.edit.php:237
 msgid "Y axis MIN value"
 msgstr "縱軸Y最小值MIN"
 
-#: include/views/configuration.graph.edit.php:353
+#: include/views/configuration.graph.edit.php:351
 msgid "Y axis side"
 msgstr "縱軸Y側"
 
-#: include/classes/widgets/CWidgetHelper.php:854
-#: include/classes/widgets/CWidgetHelper.php:930
+#: include/classes/widgets/CWidgetHelper.php:855
 #: include/classes/widgets/CWidgetHelper.php:931
-#: include/classes/widgets/CWidgetHelper.php:1195
+#: include/classes/widgets/CWidgetHelper.php:932
+#: include/classes/widgets/CWidgetHelper.php:1196
 msgid "Y-axis"
 msgstr ""
 
@@ -19694,11 +19695,11 @@ msgstr "Y-m-d H:i:s"
 msgid "Y-n-d"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:446
+#: include/views/js/monitoring.sysmaps.js.php:445
 msgid "Y1"
 msgstr ""
 
-#: include/views/js/monitoring.sysmaps.js.php:470
+#: include/views/js/monitoring.sysmaps.js.php:469
 msgid "Y2"
 msgstr ""
 
@@ -20729,10 +20730,10 @@ msgstr ""
 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
 msgstr ""
 
-#: include/views/configuration.item.edit.php:803
-#: include/views/configuration.item.edit.php:808
-#: include/views/configuration.item.edit.php:840
-#: include/views/configuration.item.edit.php:845
+#: include/views/configuration.item.edit.php:802
+#: include/views/configuration.item.edit.php:807
+#: include/views/configuration.item.edit.php:839
+#: include/views/configuration.item.edit.php:844
 msgctxt "item_form"
 msgid "global housekeeping settings"
 msgstr "清除數據之全域設定"
@@ -20761,8 +20762,8 @@ msgstr "主機"
 msgid "host group"
 msgstr "主機群組"
 
-#: include/classes/widgets/CWidgetHelper.php:717
-#: include/classes/widgets/CWidgetHelper.php:1076
+#: include/classes/widgets/CWidgetHelper.php:718
+#: include/classes/widgets/CWidgetHelper.php:1077
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:338
 msgid "host pattern"
 msgstr ""
@@ -20795,7 +20796,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals,
 msgstr ""
 
 #: app/partials/administration.usergroup.grouprights.html.php:61
-#: app/views/administration.user.edit.php:436
+#: app/views/administration.user.edit.php:430
 msgid "including subgroups"
 msgstr ""
 
@@ -20969,8 +20970,8 @@ msgstr "項目"
 msgid "item \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:737
-#: include/classes/widgets/CWidgetHelper.php:1093
+#: include/classes/widgets/CWidgetHelper.php:738
+#: include/classes/widgets/CWidgetHelper.php:1094
 msgid "item pattern"
 msgstr ""
 
@@ -21234,10 +21235,10 @@ msgstr ""
 
 #: include/views/configuration.host.discovery.edit.php:190
 #: include/views/configuration.host.discovery.edit.php:334
-#: include/views/configuration.item.edit.php:248
-#: include/views/configuration.item.edit.php:393
-#: include/views/configuration.item.prototype.edit.php:233
-#: include/views/configuration.item.prototype.edit.php:378
+#: include/views/configuration.item.edit.php:247
+#: include/views/configuration.item.edit.php:392
+#: include/views/configuration.item.prototype.edit.php:232
+#: include/views/configuration.item.prototype.edit.php:377
 #: include/views/js/configuration.httpconf.edit.js.php:68
 msgid "name"
 msgstr ""
@@ -21284,7 +21285,7 @@ msgstr ""
 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
 msgstr ""
 
-#: include/classes/widgets/CWidgetHelper.php:1203 include/graphs.inc.php:74
+#: include/classes/widgets/CWidgetHelper.php:1204 include/graphs.inc.php:74
 msgid "none"
 msgstr ""
 
@@ -21314,7 +21315,7 @@ msgstr ""
 msgid "of"
 msgstr "其"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:238
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
@@ -21337,7 +21338,7 @@ msgstr "其"
 msgid "off"
 msgstr "關閉"
 
-#: app/views/administration.user.edit.php:329
+#: app/views/administration.user.edit.php:327
 #: include/classes/setup/CFrontendSetup.php:291
 #: include/classes/setup/CFrontendSetup.php:308
 #: include/classes/setup/CFrontendSetup.php:329
@@ -21509,8 +21510,8 @@ msgstr "s"
 #: app/views/administration.mediatype.edit.php:220
 #: app/views/administration.script.edit.php:188 include/forms.inc.php:1323
 #: include/views/configuration.host.discovery.edit.php:243
-#: include/views/configuration.item.edit.php:301
-#: include/views/configuration.item.prototype.edit.php:286
+#: include/views/configuration.item.edit.php:300
+#: include/views/configuration.item.prototype.edit.php:285
 #: include/views/js/item.preprocessing.js.php:205
 msgid "script"
 msgstr ""
@@ -21647,8 +21648,8 @@ msgstr ""
 #: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
-#: include/classes/widgets/CWidgetHelper.php:594
-#: include/classes/widgets/CWidgetHelper.php:638 include/forms.inc.php:2024
+#: include/classes/widgets/CWidgetHelper.php:595
+#: include/classes/widgets/CWidgetHelper.php:639 include/forms.inc.php:2024
 #: include/views/configuration.maintenance.edit.php:174
 #: include/views/js/configuration.maintenance.edit.js.php:30
 #: include/views/js/configuration.maintenance.edit.js.php:60
@@ -21935,17 +21936,17 @@ msgstr ""
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
 #: include/classes/html/CMacroValue.php:148
-#: include/classes/widgets/CWidgetHelper.php:600
-#: include/classes/widgets/CWidgetHelper.php:654
+#: include/classes/widgets/CWidgetHelper.php:601
+#: include/classes/widgets/CWidgetHelper.php:655
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244
 #: include/forms.inc.php:1350 include/forms.inc.php:2029
 #: include/views/configuration.host.discovery.edit.php:194
 #: include/views/configuration.host.discovery.edit.php:338
-#: include/views/configuration.item.edit.php:252
-#: include/views/configuration.item.edit.php:397
-#: include/views/configuration.item.prototype.edit.php:237
-#: include/views/configuration.item.prototype.edit.php:382
+#: include/views/configuration.item.edit.php:251
+#: include/views/configuration.item.edit.php:396
+#: include/views/configuration.item.prototype.edit.php:236
+#: include/views/configuration.item.prototype.edit.php:381
 #: include/views/configuration.maintenance.edit.php:183
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
diff --git a/ui/tests/api_json/data/data_test.sql b/ui/tests/api_json/data/data_test.sql
index f36ae6960fa..3b9731f8b55 100644
--- a/ui/tests/api_json/data/data_test.sql
+++ b/ui/tests/api_json/data/data_test.sql
@@ -29,14 +29,14 @@ INSERT INTO hstgrp (groupid,name,internal) VALUES (50011,'API host group delete4
 INSERT INTO hosts (hostid, host, name, status, flags, description) VALUES (50011, 'API host prototype {#FSNAME}', 'API host prototype {#FSNAME}', 0, 2, '');
 INSERT INTO hstgrp (groupid,name,internal) VALUES (50014,'API group for host prototype',0);
 INSERT INTO host_discovery (hostid,parent_hostid,parent_itemid) VALUES (50011,NULL,40066);
-INSERT INTO group_prototype (group_prototypeid, hostid, name, groupid, templateid) VALUES (108, 50011, 'API discovery group {#HV.NAME}', NULL, NULL);
-INSERT INTO group_prototype (group_prototypeid, hostid, name, groupid, templateid) VALUES (109, 50011, '', 50014, NULL);
+INSERT INTO group_prototype (group_prototypeid, hostid, name, groupid, templateid) VALUES (50108, 50011, 'API discovery group {#HV.NAME}', NULL, NULL);
+INSERT INTO group_prototype (group_prototypeid, hostid, name, groupid, templateid) VALUES (50109, 50011, '', 50014, NULL);
 INSERT INTO hstgrp (groupid,name,internal,flags) VALUES (50015,'API discovery group {#HV.NAME}',0,4);
-INSERT INTO group_discovery (groupid, parent_group_prototypeid, name) VALUES (50015, 108, 'API discovery group {#HV.NAME}');
+INSERT INTO group_discovery (groupid, parent_group_prototypeid, name) VALUES (50015, 50108, 'API discovery group {#HV.NAME}');
 -- host prototype for delete
 INSERT INTO hosts (hostid, host, name, status, flags, description, custom_interfaces) VALUES (50015, 'API host prototype for delete {#FSNAME}', 'API host prototype for delete {#FSNAME}', 0, 2, '', 1);
 INSERT INTO host_discovery (hostid,parent_hostid,parent_itemid) VALUES (50015,NULL,40066);
-INSERT INTO group_prototype (group_prototypeid, hostid, name, groupid, templateid) VALUES (112, 50015, '', 50014, NULL);
+INSERT INTO group_prototype (group_prototypeid, hostid, name, groupid, templateid) VALUES (50112, 50015, '', 50014, NULL);
 INSERT INTO interface (interfaceid,hostid,main,type,useip,ip,dns,port) values (50028,50015,1,2,1,'127.0.0.1','','10050');
 INSERT INTO interface_snmp (interfaceid, version, bulk, community) values (50028, 2, 1, '{$SNMP_COMMUNITY}');
 
@@ -1480,9 +1480,9 @@ INSERT INTO hosts (hostid, host, name, status, flags, description) VALUES (99010
 INSERT INTO hosts (hostid, host, name, status, flags, description) VALUES (99011, '{#VALUE}', '{#VALUE}', 0, 2, '');
 INSERT INTO hosts (hostid, host, name, status, flags, description) VALUES (99012, 'discovered', 'discovered', 0, 4, '');
 INSERT INTO items (itemid, type, hostid, name, key_, delay, history, trends, status, value_type, flags, params, description, posts, headers) VALUES (58735, 2, 99010, 'trap', 'trap', '0', '90d', '0', 0, 4, 1, '', '', '', '');
-INSERT INTO group_prototype (group_prototypeid, hostid, name) VALUES (110, 99011, 'host group {#VALUE}');
-INSERT INTO group_prototype (group_prototypeid, hostid, groupid) VALUES (111, 99011, 50025);
-INSERT INTO group_discovery (groupid, parent_group_prototypeid, name) VALUES (50026, 110, 'host group {#VALUE}');
+INSERT INTO group_prototype (group_prototypeid, hostid, name) VALUES (50110, 99011, 'host group {#VALUE}');
+INSERT INTO group_prototype (group_prototypeid, hostid, groupid) VALUES (50111, 99011, 50025);
+INSERT INTO group_discovery (groupid, parent_group_prototypeid, name) VALUES (50026, 50110, 'host group {#VALUE}');
 INSERT INTO hosts_groups (hostgroupid, hostid, groupid) VALUES (50020, 99010, 50025);
 INSERT INTO hosts_groups (hostgroupid, hostid, groupid) VALUES (50021, 99012, 50025);
 INSERT INTO hosts_groups (hostgroupid, hostid, groupid) VALUES (50022, 99012, 50026);
diff --git a/ui/tests/integration/testEscalations.php b/ui/tests/integration/testEscalations.php
index 892e51eb86d..ba74dce80af 100644
--- a/ui/tests/integration/testEscalations.php
+++ b/ui/tests/integration/testEscalations.php
@@ -232,8 +232,7 @@ class testEscalations extends CIntegrationTest {
 
 		$response = $this->call('maintenance.create', [
 			'name' => 'Test maintenance',
-			'groupids' => [],
-			'hostids' => [self::$hostid],
+			'hosts' => ['hostid' => self::$hostid],
 			'active_since' => self::$maint_start_tm,
 			'active_till' => $maint_end_tm,
 			'tags_evaltype' => MAINTENANCE_TAG_EVAL_TYPE_AND_OR,
@@ -291,8 +290,7 @@ class testEscalations extends CIntegrationTest {
 
 		$response = $this->call('maintenance.create', [
 			'name' => 'Test maintenance',
-			'groupids' => [],
-			'hostids' => [self::$hostid],
+			'hosts' => ['hostid' => self::$hostid],
 			'active_since' => self::$maint_start_tm,
 			'active_till' => $maint_end_tm,
 			'tags_evaltype' => MAINTENANCE_TAG_EVAL_TYPE_AND_OR,
@@ -354,8 +352,7 @@ class testEscalations extends CIntegrationTest {
 
 		$response = $this->call('maintenance.create', [
 			'name' => 'Test maintenance',
-			'groupids' => [],
-			'hostids' => [self::$hostid],
+			'hosts' => ['hostid' => self::$hostid],
 			'active_since' => self::$maint_start_tm,
 			'active_till' => $maint_end_tm,
 			'tags_evaltype' => MAINTENANCE_TAG_EVAL_TYPE_AND_OR,
diff --git a/ui/tests/selenium/roles/testFormUserRoles.php b/ui/tests/selenium/roles/testFormUserRoles.php
index d738fcbd1d6..7470aa5f213 100644
--- a/ui/tests/selenium/roles/testFormUserRoles.php
+++ b/ui/tests/selenium/roles/testFormUserRoles.php
@@ -847,7 +847,8 @@ class testFormUserRoles extends CWebTest {
 		// New role check with screenshots.
 		$this->page->open('zabbix.php?action=userrole.edit')->waitUntilReady();
 		$this->page->removeFocus();
-		$screenshot_area = $this->query('id:user_role_tab')->one();
+
+		$screenshot_area = $this->query('xpath://main')->one();
 		foreach ($roles as $role) {
 			$this->query('id:user-type')->one()->asZDropdown()->select($role);